From 57c042115124427495156fe2a0e5bf3d5e0595e2 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 9 Oct 2022 18:09:41 +0900 Subject: [PATCH] Map funcs (#811) * Many duplicate funcs, still around 41 left :P * 19 duplicate funcs left * Finished matching some duplicate funcs in world/area * wipperz * hos_01 funcs * more funx * 3 hos_04 funcs * hos_04 funcs * more hos * tik_25 func * mores * progress * clean * mo * meep * PRs Co-authored-by: Nasina7 --- include/common_structs.h | 24 +- include/dead.h | 9 +- include/enums.h | 1 + include/functions.h | 3 +- include/npc.h | 4 +- src/16F740.c | 2 +- src/39210_len_aa0.c | 309 +++- src/415D90.c | 1515 ++++++++++++++++- src/5B320.c | 8 +- src/EA0C10.c | 10 +- src/EA8AE0.c | 12 +- src/EB1170.c | 10 +- src/EB8E50.c | 4 +- src/EDBFE0.c | 4 +- src/EDC020.c | 21 +- src/EDE9C0.c | 4 +- src/EE65B0.c | 41 +- src/npc.c | 52 + src/world/area_dro/dro_02/9694C0.c | 295 +++- src/world/area_flo/flo_12/CC0E70.c | 12 +- src/world/area_flo/flo_14/CCB310.c | 14 +- src/world/area_hos/hos_01/A11020.c | 42 +- src/world/area_hos/hos_02/A16220.c | 11 +- src/world/area_hos/hos_02/A171F0.c | 5 +- src/world/area_hos/hos_03/A1B130.c | 16 +- src/world/area_hos/hos_04/A26ED0.c | 20 +- src/world/area_hos/hos_04/A27490.c | 5 +- src/world/area_hos/hos_04/A274B0.c | 118 +- src/world/area_hos/hos_04/A27A30.c | 20 +- src/world/area_hos/hos_04/A27AA0.c | 16 +- src/world/area_hos/hos_05/A2A240.c | 28 +- src/world/area_hos/hos_05/A2AA70.c | 9 +- src/world/area_hos/hos_05/A2EC30.c | 1 + src/world/area_hos/hos_06/A397F0.c | 21 +- src/world/area_hos/hos_06/A3A230.c | 21 +- src/world/area_iwa/iwa_10/91F5A0.c | 32 + src/world/area_jan/jan_02/B2C8A0.c | 21 +- src/world/area_jan/jan_03/B34BD0.c | 42 +- src/world/area_kkj/kkj_18/AF2FE0.c | 21 +- src/world/area_kkj/kkj_19/AF7C00.c | 10 +- src/world/area_kmr/kmr_02/8B0070.c | 25 +- src/world/area_kpa/kpa_81/A78510.c | 21 +- src/world/area_kpa/kpa_82/A7A550.c | 42 +- src/world/area_mac/mac_00/7EB340.c | 42 +- src/world/area_mac/mac_00/7ED280.c | 21 +- src/world/area_mac/mac_01/8017D0.c | 21 +- src/world/area_mac/mac_02/823BF0.c | 31 +- src/world/area_mac/mac_03/831B20.c | 21 +- src/world/area_mac/mac_04/843030.c | 21 +- src/world/area_mac/mac_05/852170.c | 42 +- src/world/area_mac/machi/7E7550.c | 6 +- src/world/area_nok/nok_01/9C53E0.c | 25 +- src/world/area_nok/nok_02/9D7020.c | 21 +- src/world/area_nok/nok_02/9D7AA0.c | 21 +- src/world/area_nok/nok_02/9DA8F0.c | 42 +- src/world/area_obk/obk_03/BC43F0.c | 21 +- src/world/area_omo/omo_05/DB22C0.c | 21 +- src/world/area_omo/omo_13/DE2710.c | 21 +- src/world/area_pra/pra_01/D4D060.c | 42 +- src/world/area_pra/pra_02/D50010.c | 21 +- src/world/area_pra/pra_09/D588B0.c | 42 +- src/world/area_pra/pra_13/D64600.c | 42 +- src/world/area_pra/pra_19/D6E9D0.c | 42 +- src/world/area_pra/pra_31/D7ED80.c | 42 +- src/world/area_sam/sam_01/CF7E80.c | 42 +- src/world/area_sam/sam_04/D138E0.c | 42 +- src/world/area_sam/sam_06/D203E0.c | 42 +- src/world/area_sbk/sbk_02/92A9A0.c | 12 +- src/world/area_sbk/sbk_02/sbk_02_3_npc.c | 12 +- src/world/area_sbk/sbk_30/93F5B0.c | 42 +- src/world/area_tik/tik_25/8A8600.c | 21 +- src/world/common/DeadUnkFunc1.inc.c | 4 +- tools/ignored_funcs.txt | 4 +- tools/sortsymz.py | 6 +- ver/us/asm/data/dead/EA3A80.data.s | 4 +- ver/us/asm/data/dead/EAA810.data.s | 4 +- ver/us/asm/data/dead/EB1920.data.s | 4 +- ver/us/asm/data/dead/EDC6D0.data.s | 2 +- .../data/world/area_hos/hos_06/A3C090.data.s | 4 +- .../data/world/area_hos/hos_06/A3DAB0.data.s | 2 +- .../data/world/area_iwa/iwa_10/9247B0.data.s | 81 + .../data/world/area_kkj/kkj_18/AF4BB0.data.s | 4 +- .../data/world/area_kkj/kkj_19/AF9460.data.s | 2 +- .../data/world/area_kmr/kmr_02/8B5640.data.s | 4 +- .../data/world/area_kmr/kmr_02/8C4A40.data.s | 4 +- .../data/world/area_kmr/kmr_11/8E0190.data.s | 4 +- .../data/world/area_mac/mac_00/7F0A20.data.s | 6 +- .../data/world/area_mac/mac_01/8091F0.data.s | 4 +- .../data/world/area_mac/mac_02/828F10.data.s | 6 +- .../data/world/area_mac/mac_03/837CB0.data.s | 4 +- .../data/world/area_mac/mac_04/8469B0.data.s | 2 +- .../data/world/area_mac/mac_05/857070.data.s | 6 +- .../data/world/area_nok/nok_01/9C89E0.data.s | 4 +- .../data/world/area_nok/nok_02/9DB6C0.data.s | 2 +- .../data/world/area_nok/nok_02/9DDE90.data.s | 4 +- .../data/world/area_nok/nok_02/9E9420.data.s | 4 +- .../data/world/area_sbk/sbk_02/92E220.data.s | 2 +- .../data/world/area_sbk/sbk_30/940DC0.data.s | 2 +- .../39210_len_aa0/func_8005DECC.s | 73 - .../39210_len_aa0/func_8005DFD4.s | 95 -- .../415D90/btl_state_update_player_menu.s | 128 +- .../EE65B0/func_80240504_EE6AB4.s | 194 --- .../9694C0/dro_02_func_8024240C_96B5CC.s | 734 -------- .../CCB310/flo_14_func_80240504_CCB814.s | 192 --- .../hos_01/A11020/func_80240AAC_A1132C.s | 29 - .../hos_01/A11020/func_80240B10_A11390.s | 25 - .../hos_01/A11020/func_80240B64_A113E4.s | 25 - .../hos_01/A11020/func_80240C08_A11488.s | 15 - .../hos_01/A11020/func_80240C84_A11504.s | 15 - .../hos_02/A16220/func_8024030C_A1652C.s | 85 - .../hos_02/A171F0/func_80240FD0_A171F0.s | 12 - .../hos_03/A1B130/func_80240928_A1BA28.s | 85 - .../hos_03/A1B130/func_80240A50_A1BB50.s | 12 - .../hos_04/A26ED0/func_80240000_A26ED0.s | 96 -- .../hos_04/A26ED0/func_80240154_A27024.s | 89 - .../hos_04/A27490/func_802405C0_A27490.s | 12 - .../hos_04/A274B0/func_80240654_A27524.s | 19 - .../hos_04/A274B0/func_80240694_A27564.s | 48 - .../hos_04/A274B0/func_80240734_A27604.s | 138 -- .../hos_04/A274B0/func_802408F8_A277C8.s | 52 - .../hos_04/A274B0/func_802409B0_A27880.s | 58 - .../hos_04/A274B0/func_80240A84_A27954.s | 60 - .../hos_04/A27A30/func_80240B60_A27A30.s | 34 - .../hos_04/A27AA0/func_80240E40_A27D10.s | 15 - .../hos_04/A27AA0/func_80240E6C_A27D3C.s | 13 - .../hos_05/A2A240/func_80240634_A2A874.s | 27 - .../hos_05/A2A240/func_80240690_A2A8D0.s | 118 -- .../hos_05/A2AA70/func_80240830_A2AA70.s | 24 - .../hos_06/A397F0/func_802406E0_A39BC0.s | 48 - .../hos_06/A3A230/func_80241008_A3A4E8.s | 48 - .../jan_02/B2C8A0/func_80241578_B2D9E8.s | 48 - .../jan_03/B34BD0/func_80241A64_B36634.s | 48 - .../jan_03/B34BD0/func_80241B00_B366D0.s | 48 - .../kmr_02/8B0070/func_802422F8_8B2368.s | 48 - .../kpa_81/A78510/func_802403A4_A78864.s | 48 - .../kpa_82/A7A550/func_80240308_A7A808.s | 48 - .../kpa_82/A7A550/func_802403A4_A7A8A4.s | 48 - .../mac_00/7EB340/func_8024197C_7EC68C.s | 48 - .../mac_00/7EB340/func_80241A18_7EC728.s | 48 - .../mac_00/7ED280/func_802437D0_7EE4E0.s | 48 - .../mac_01/8017D0/func_80243D60_8045E0.s | 48 - .../mac_02/823BF0/func_80242BA8_825E68.s | 48 - .../mac_03/831B20/func_802417FC_832FFC.s | 48 - .../mac_04/843030/func_802417AC_84437C.s | 48 - .../mac_05/852170/func_8024266C_8547DC.s | 48 - .../mac_05/852170/func_80242708_854878.s | 48 - .../nok_01/9C53E0/func_802420B4_9C7494.s | 48 - .../nok_02/9D7020/func_802406B0_9D76D0.s | 49 - .../nok_02/9D7AA0/func_80242C5C_9D9C7C.s | 48 - .../nok_02/9DA8F0/func_80243C78_9DAC98.s | 48 - .../nok_02/9DA8F0/func_80243D14_9DAD34.s | 48 - .../obk_03/BC43F0/func_80240540_BC47C0.s | 48 - .../omo_05/DB22C0/func_80242204_DB44C4.s | 48 - .../omo_13/DE2710/func_80240F8C_DE341C.s | 48 - .../pra_01/D4D060/func_80241238_D4E278.s | 48 - .../pra_01/D4D060/func_802412D4_D4E314.s | 48 - .../pra_02/D50010/func_80241274_D51264.s | 48 - .../pra_09/D588B0/func_802411D8_D59A68.s | 48 - .../pra_09/D588B0/func_80241274_D59B04.s | 48 - .../pra_13/D64600/func_802411D8_D657B8.s | 48 - .../pra_13/D64600/func_80241274_D65854.s | 48 - .../pra_19/D6E9D0/func_802411D8_D6FB88.s | 48 - .../pra_19/D6E9D0/func_80241274_D6FC24.s | 48 - .../pra_31/D7ED80/func_802402D8_D7F038.s | 48 - .../pra_31/D7ED80/func_80240374_D7F0D4.s | 48 - .../sam_01/CF7E80/func_802405C8_CF8138.s | 48 - .../sam_01/CF7E80/func_80240664_CF81D4.s | 48 - .../sam_04/D138E0/func_802405C8_D13B98.s | 48 - .../sam_04/D138E0/func_80240664_D13C34.s | 48 - .../sam_06/D203E0/func_80241E18_D21CA8.s | 48 - .../sam_06/D203E0/func_80241EB4_D21D44.s | 48 - .../sbk_30/93F5B0/func_802411AC_94075C.s | 48 - .../sbk_30/93F5B0/func_80241248_9407F8.s | 48 - .../tik_25/8A8600/func_80240680_8A8600.s | 15 - ver/us/symbol_addrs.txt | 52 +- ver/us/undefined_syms.txt | 65 +- 176 files changed, 3710 insertions(+), 5006 deletions(-) create mode 100644 src/world/area_iwa/iwa_10/91F5A0.c create mode 100644 ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s delete mode 100644 ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s delete mode 100644 ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s delete mode 100644 ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B64_A113E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A171F0/func_80240FD0_A171F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240680_8A8600.s diff --git a/include/common_structs.h b/include/common_structs.h index 9e84b047f6..8ee107cdf0 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -173,6 +173,25 @@ typedef struct NpcQuizmoBlur { /* 0x04 */ char unk_04[0x4]; } NpcQuizmoBlur; // size = 0x8; +typedef struct Unk2A4Part { + /* 0x00 */ s8 unk_00; + /* 0x01 */ char unk_01[0x3]; + /* 0x04 */ Vec3f pos; +} Unk2A4Part; // size = 0x10 + +typedef struct Unk2A4Blur { + /* 0x000 */ Unk2A4Part unk_00[40]; + /* 0x280 */ s32 partIdx; + /* 0x284 */ s32 unk_284; + /* 0x288 */ s32 unk_288; + /* 0x28C */ s32 npcID; + /* 0x290 */ s32* animIDs; + /* 0x294 */ f32 unk_294; + /* 0x298 */ f32 unk_298; + /* 0x29C */ f32 unk_29C; + /* 0x2A0 */ f32 unk_2A0; +} Unk2A4Blur; // size = 0x2A4 + typedef struct Npc { /* 0x000 */ s32 flags; /* 0x004 */ void (*onUpdate)(struct Npc*); ///< Run before anything else for this NPC in update_npcs() @@ -187,6 +206,7 @@ typedef struct Npc { NpcMotionBlur* motion; ///< Null unless flag 0x100000 is set. NpcChompBlur* chomp; NpcQuizmoBlur* quizmo; + Unk2A4Blur* unk2A4; } blur; /* 0x024 */ s32 spriteInstanceID; /* 0x028 */ AnimID currentAnim; @@ -910,7 +930,9 @@ typedef struct BattleStatus { /* 0x1A6 */ s8 currentTargetPart2; /* 0x1A7 */ s8 battlePhase; /* 0x1A8 */ s16 attackerActorID; - /* 0x1AA */ char unk_1AA[4]; + /* 0x1AA */ s16 unk_1AA; + /* 0x1AC */ s8 unk_1AC; + /* 0x1AD */ char unk_1AD; /* 0x1AE */ s16 submenuIcons[24]; /* icon IDs */ /* 0x1DE */ u8 submenuMoves[24]; /* move IDs */ /* 0x1F6 */ s8 submenuStatus[24]; ///< @see enum BattleSubmenuStatus diff --git a/include/dead.h b/include/dead.h index 8672fd1bbf..fdabaf04b9 100644 --- a/include/dead.h +++ b/include/dead.h @@ -5,6 +5,7 @@ #define evt_get_variable dead_evt_get_variable #define evt_set_variable dead_evt_set_variable #define evt_get_float_variable dead_evt_get_float_variable +#define sin_rad dead_sin_rad #define cos_rad dead_cos_rad #define evt_set_float_variable dead_evt_set_float_variable #define fx_sparkles dead_fx_sparkles @@ -71,7 +72,7 @@ #define sfx_play_sound_with_params dead_sfx_play_sound_with_params #define sfx_get_spatialized_sound_params dead_sfx_get_spatialized_sound_params #define npc_test_move_simple_without_slipping dead_npc_test_move_simple_without_slipping -#define func_8003D660 func_80041080 +#define func_8003D660 dead_func_8003D660 #define get_item_entity dead_get_item_entity #define gOverrideFlags dead_gOverrideFlags #define set_message_msg dead_set_message_msg @@ -112,5 +113,11 @@ #define osVirtualToPhysical dead_osVirtualToPhysical #define nuGfxZBuffer dead_nuGfxZBuffer #define nuGfxCfb_ptr dead_nuGfxCfb_ptr +#define guMtxF2L dead_guMtxF2L +#define mdl_get_copied_vertices dead_mdl_get_copied_vertices +#define mdl_get_copied_gfx dead_mdl_get_copied_gfx +#define gMatrixListPos dead_gMatrixListPos +#define gDisplayContext dead_gDisplayContext +#define fx_sun_undeclared fx_sun #endif diff --git a/include/enums.h b/include/enums.h index b4eb1f001d..e04ac7b749 100644 --- a/include/enums.h +++ b/include/enums.h @@ -784,6 +784,7 @@ enum SoundIDs { SOUND_1FF = 0x000001FF, SOUND_201 = 0x00000201, SOUND_202 = 0x00000202, + SOUND_203 = 0x00000203, SOUND_204 = 0x00000204, SOUND_205 = 0x00000205, SOUND_207 = 0x00000207, diff --git a/include/functions.h b/include/functions.h index af7d40d614..a2b28ff30e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -374,6 +374,7 @@ void btl_draw_upgrade_windows(s32); void btl_state_draw_celebration(void); void func_8024F7C8(void); +s32 func_80265D44(s32 animID); void func_80263E08(Actor*, ActorPart*, s32); void func_80266978(void); void func_80266B14(void); @@ -989,7 +990,7 @@ void set_max_SP(s8); void sync_status_menu(void); void create_cameras_a(void); void func_80045AC0(void); -void func_8005DECC(Npc*, s32, void* arg2, f32, f32, s32, s32); +void func_8005DECC(Npc*, s32, s32*, f32, f32, s32, s32); void func_8005DFD4(Npc*); void func_8005E12C(Npc*); void create_encounters(void); diff --git a/include/npc.h b/include/npc.h index 9d1e31e599..c446ad3350 100644 --- a/include/npc.h +++ b/include/npc.h @@ -358,7 +358,7 @@ typedef struct EncounterStatus { /* 0x010 */ char unk_10; /* 0x011 */ s8 allowFleeing; /* 0x012 */ s8 unk_12; - /* 0x013 */ u8 dropWhackaBump; + /* 0x013 */ s8 dropWhackaBump; /* 0x014 */ s32 songID; /* 0x018 */ s32 unk_18; /* 0x01C */ s8 numEncounters; /* number of encounters for current map (in list) */ @@ -565,7 +565,7 @@ void func_8003D788(Npc* npc, s32); void func_8003DA38(Npc* npc, s32); -s32 func_8003DC38(Npc*, s32); +void func_8003DC38(Npc* npc, s32); void func_8003DFA0(Npc* npc, s32); diff --git a/src/16F740.c b/src/16F740.c index a4d712e67b..6a8e7be7d4 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -2458,7 +2458,7 @@ void btl_state_update_change_partner(void) { case BATTLE_STATE2_UNK_3: if (!does_script_exist(battleStatus->controlScriptID)) { btl_delete_actor(partner); - playerData->currentPartner = battleStatus->unk_1AA[2]; + playerData->currentPartner = battleStatus->unk_1AC; load_partner_actor(); partner = battleStatus->partnerActor; partner->scale.x = 0.1f; diff --git a/src/39210_len_aa0.c b/src/39210_len_aa0.c index a62f1f9025..f04215f72b 100644 --- a/src/39210_len_aa0.c +++ b/src/39210_len_aa0.c @@ -1,20 +1,20 @@ #include "common.h" -void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* arg4) { +void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* outAirborne) { PlayerStatus* playerStatus = &gPlayerStatus; Npc* npc; *outX = 0.0f; *outY = 0.0f; *outZ = 0.0f; - *arg4 = FALSE; + *outAirborne = FALSE; if (npcID == NPC_SELF) { *outX = playerStatus->position.x; *outY = playerStatus->position.y; *outZ = playerStatus->position.z; if (playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING)) { - *arg4 = TRUE; + *outAirborne = TRUE; } } else { npc = get_npc_unsafe(npcID); @@ -22,14 +22,311 @@ void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* arg4) { *outY = npc->pos.y; *outZ = npc->pos.z; if (npc->flags & NPC_FLAG_JUMPING) { - *arg4 = TRUE; + *outAirborne = TRUE; } } } -INCLUDE_ASM(s32, "39210_len_aa0", func_8005DECC); +void func_8005DECC(Npc* npc, s32 arg1, s32* animIDs, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { + PlayerStatus* playerStatus = &gPlayerStatus; + Unk2A4Blur* blur; + s32 i; -INCLUDE_ASM(s32, "39210_len_aa0", func_8005DFD4); + npc->blur.unk2A4 = blur = heap_malloc(sizeof(*blur)); + ASSERT(blur != NULL); + for (i = 0; i < ARRAY_COUNT(blur->unk_00); i++) { + blur->unk_00[i].pos.x = playerStatus->position.x; + blur->unk_00[i].pos.y = playerStatus->position.y; + blur->unk_00[i].pos.z = playerStatus->position.z; + blur->unk_00[i].unk_00 = 0; + } + blur->partIdx = 0; + blur->unk_284 = 0; + blur->unk_288 = 0; + blur->npcID = arg1; + blur->animIDs = animIDs; + blur->unk_294 = arg3; + blur->unk_298 = arg4; + blur->unk_29C = arg5; + blur->unk_2A0 = arg6; + npc->currentAnim = blur->animIDs[4]; + npc->jumpVelocity = 0.0f; + npc->flags |= NPC_FLAG_GRAVITY; + npc->flags &= ~NPC_FLAG_100; + npc->collisionChannel = 0x10000; +} + +void func_8005DFD4(Npc* npc) { + Unk2A4Blur* blur = npc->blur.unk2A4; + f32 x, y, z; + s32 airborne; + s32 isAirborne; + Unk2A4Part* part; + + get_npc_pos(blur->npcID, &x, &y, &z, &airborne); + part = &blur->unk_00[blur->partIdx]; + isAirborne = airborne != FALSE; + + if (part->unk_00 != 0 && isAirborne) { + return; + } + + if (!isAirborne && dist2D(npc->pos.x, npc->pos.z, x, z) <= blur->unk_29C && part->unk_00 == 0) { + return; + } + + part = &blur->unk_00[blur->partIdx]; + if (part->pos.x != x || part->pos.y != y || part->pos.z != z) { + if (blur->unk_284 != blur->partIdx + 1) { + blur->partIdx++; + if (blur->partIdx >= ARRAY_COUNT(blur->unk_00)) { + blur->partIdx = 0; + } + part = &blur->unk_00[blur->partIdx]; + part->pos.x = x; + part->pos.y = y; + part->pos.z = z; + part->unk_00 = isAirborne; + } + } +} + +// float regalloc +#ifdef NON_MATCHING +void func_8005E12C(Npc* npc) { + Unk2A4Blur* blur = npc->blur.unk2A4; + f32 x, y, z; + s32 airborne; + f32 sp28; + f32 sp2C; + f32 sp30; + f32 dist; + Unk2A4Part* part; + f32 npcX, npcZ; + f32 partX, partY, partZ; + f32 theta; + f32 yaw; + + get_npc_pos(blur->npcID, &x, &y, &z, &airborne); + + switch (blur->unk_288) { + case 0: + npcX = npc->pos.x; + npcZ = npc->pos.z; + part = &blur->unk_00[blur->unk_284]; + partX = part->pos.x; + partZ = part->pos.z; + sp28 = npcX; + sp2C = npc->pos.y; + sp30 = npcZ; + npc->moveSpeed = blur->unk_294; + dist = dist2D(npcX, npcZ, x, z); + if (blur->unk_2A0 <= dist) { + npc->moveSpeed = blur->unk_298; + } + npc->currentAnim = blur->animIDs[5]; + if (!(npc->flags & NPC_FLAG_1000)) { + npc->currentAnim = blur->animIDs[2]; + } + + while (TRUE) { + dist = dist2D(sp28, sp30, partX, partZ); + yaw = atan2(sp28, sp30, partX, partZ); + if (npc->moveSpeed < dist) { + dist = dist2D(sp28, sp30, x, z); + if (blur->unk_2A0 < dist) { + break; + } + + if (blur->unk_29C < dist) { + npc->moveSpeed = dist - blur->unk_29C; + if (npc->moveSpeed > blur->unk_294) { + npc->moveSpeed = blur->unk_294; + } else { + npc->moveSpeed += 1.0; + } + break; + } + } + + if (blur->unk_284 == blur->partIdx) { + npc->moveSpeed = 0.0f; + yaw = npc->yaw; + npc->currentAnim = blur->animIDs[4]; + } else { + dist = dist2D(npc->pos.x, npc->pos.z, x, z); + if (dist <= blur->unk_29C) { + npc->moveSpeed = 0.0f; + yaw = npc->yaw; + npc->currentAnim = blur->animIDs[4]; + blur->unk_288 = 0xA; + } else { + blur->unk_284++; + if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) { + blur->unk_284 = 0; + } + part = &blur->unk_00[blur->unk_284]; + partX = part->pos.x; + partZ = part->pos.z; + if (npc->flags & NPC_FLAG_1000) { + if (part->unk_00 != 0) { + blur->unk_288 = 1; + break; + } + } + continue; + } + } + break; + } + + if (!(npc->flags & NPC_FLAG_1000)) { + npc->moveSpeed *= 0.5f; + } + npc->yaw = yaw; + npc_move_heading(npc, npc->moveSpeed, yaw); + if ((npc->flags & (NPC_FLAG_4000 | NPC_FLAG_1000)) == (NPC_FLAG_4000 | NPC_FLAG_1000)) { + blur->unk_288 = 1; + } + break; + case 1: + if (blur->unk_284 != blur->partIdx) { + blur->unk_284++; + if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) { + blur->unk_284 = 0; + } + part = &blur->unk_00[blur->unk_284]; + partX = part->pos.x; + partY = part->pos.y; + partZ = part->pos.z; + npc->moveToPos.x = partX; + npc->moveToPos.y = partY; + npc->moveToPos.z = partZ; + npc->duration = 0; + npc->jumpScale = 2.0f; + npc->moveSpeed = blur->unk_298; + npc->planarFlyDist = dist2D(npc->pos.x, npc->pos.z, partX, partZ); + npc->yaw = atan2(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z); + dist = npc->planarFlyDist; + sp2C = npc->moveToPos.y - npc->pos.y; + if (dist < sp2C) { + dist = sp2C; + } + if (dist < blur->unk_29C) { + npcX = npc->pos.x; + npcZ = npc->pos.z; + npc->jumpVelocity = 0.0f; + npc->flags |= NPC_FLAG_GRAVITY; + npc->yaw = atan2(npcX, npcZ, x, z); + blur->unk_288 = 0; + return; + } + npc->duration = dist / npc->moveSpeed; + if (npc->duration < 10) { + npc->duration = 10; + } + npc->moveSpeed = npc->planarFlyDist / npc->duration; + npc->jumpVelocity = (sp2C + (npc->jumpScale * npc->duration * npc->duration * 0.5f)) / npc->duration; + npc->currentAnim = blur->animIDs[1]; + npc->flags &= ~NPC_FLAG_GRAVITY; + blur->unk_288 = 2; + } + break; + case 2: + npc->jumpVelocity -= npc->jumpScale; + npc->pos.y += npc->jumpVelocity; + if (npc->jumpVelocity <= 0.0f) { + npc->currentAnim = blur->animIDs[2]; + } + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->jumpVelocity <= 0.0f) { + sp28 = npc->pos.x; + sp30 = npc->pos.z; + dist = fabsf(npc->jumpVelocity) + 8.0; + sp2C = npc->pos.y + dist; + if ((npc_raycast_down_sides(npc->collisionChannel, &sp28, &sp2C, &sp30, &dist) != 0) && ((f64) dist <= ((f64) fabsf(npc->jumpVelocity) + 8.0))) { + npc->currentAnim = blur->animIDs[3]; + npcX = sp28; + npcZ = sp30; + npc->jumpVelocity = 0.0f; + npc->pos.y = sp2C; + npc->flags |= NPC_FLAG_GRAVITY; + npc->yaw = atan2(npcX, npcZ, x, z); + blur->unk_288 = 0; + } + } + break; + case 10: + npcX = npc->pos.x; + npcZ = npc->pos.z; + part = &blur->unk_00[blur->unk_284]; + partX = part->pos.x; + partZ = part->pos.z; + sp28 = npcX; + sp2C = npc->pos.y; + sp30 = npcZ; + dist = dist2D(npcX, npcZ, x, z); + if (dist <= blur->unk_29C) { + break; + } + + while (TRUE) { + if (part->unk_00 != 0) { + break; + } + + theta = atan2(npc->pos.x, npc->pos.z, partX, partZ); + if (fabsf(get_clamped_angle_diff(theta, atan2(npc->pos.x, npc->pos.z, x, z))) < 90.0f) { + break; + } + + if (blur->unk_284 == blur->partIdx) { + break; + } + + blur->unk_284++; + if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) { + blur->unk_284 = 0; + } + part = &blur->unk_00[blur->unk_284]; + partX = part->pos.x; + partZ = part->pos.z; + continue; + } + + if (part->unk_00 == 0) { + blur->unk_288 = 0; + return; + } + + while (TRUE) { + if (part->unk_00 == 0) { + break; + } + + theta = atan2(npc->pos.x, npc->pos.z, partX, partZ); + if (fabsf(get_clamped_angle_diff(theta, atan2(npc->pos.x, npc->pos.z, x, z))) < 90.0f) { + break; + } + + if (blur->unk_284 == blur->partIdx) { + break; + } + + blur->unk_284++; + if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) { + blur->unk_284 = 0; + } + part = &blur->unk_00[blur->unk_284]; + partX = part->pos.x; + partZ = part->pos.z; + } + blur->unk_288 = 1; + break; + } +} +#else INCLUDE_ASM(s32, "39210_len_aa0", func_8005E12C); +#endif diff --git a/src/415D90.c b/src/415D90.c index 797a844c4b..43f18c7b49 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -1,6 +1,7 @@ #include "common.h" #include "battle/battle.h" #include "hud_element.h" +#include "pause/pause_common.h" #include "sprite/npc/Goompa.h" #include "sprite/npc/BattleGoombario.h" @@ -85,10 +86,6 @@ extern HudScript HES_StarBeamDisabled; extern HudScript HES_PeachBeam; extern HudScript HES_PeachBeamDisabled; -extern HudScript HES_MoveDiamond; -extern HudScript HES_MoveBlueOrb; -extern HudScript HES_MoveGreenOrb; -extern HudScript HES_MoveRedOrb; extern HudScript HES_MoveDiamondDisabled; extern HudScript HES_MoveBlueOrbDisabled; extern HudScript HES_MoveGreenOrbDisabled; @@ -100,7 +97,6 @@ extern HudScript HES_HandPointer; extern HudScript HES_HandPointDownLoop; extern HudScript HES_HandPointLeftLoop; -extern HudScript HES_FPCost; extern HudScript HES_FPCostReduced; extern HudScript HES_FPCostReducedTwice; extern HudScript HES_POWCost; @@ -121,29 +117,37 @@ s16 D_802AB340[] = { 28, 40 }; s16 D_802AB344[] = { 0, -2 }; -HudScript* battle_menu_JumpHudScripts[] = { - &HES_MenuBoots1Disabled, &HES_MenuBoots1Disabled, - &HES_MenuBoots1, &HES_MenuBoots1Disabled, - &HES_MenuBoots2, &HES_MenuBoots2Disabled, - &HES_MenuBoots3, &HES_MenuBoots3Disabled }; +IconHudScriptPair battle_menu_JumpHudScripts[] = { + { &HES_MenuBoots1Disabled, &HES_MenuBoots1Disabled }, + { &HES_MenuBoots1, &HES_MenuBoots1Disabled }, + { &HES_MenuBoots2, &HES_MenuBoots2Disabled }, + { &HES_MenuBoots3, &HES_MenuBoots3Disabled }, +}; -HudScript* battle_menu_HammerHudScripts[] = { - &HES_MenuHammer1Disabled, &HES_MenuHammer1Disabled, - &HES_MenuHammer1, &HES_MenuHammer1Disabled, - &HES_MenuHammer2, &HES_MenuHammer2Disabled, - &HES_MenuHammer3, &HES_MenuHammer3Disabled }; +IconHudScriptPair battle_menu_HammerHudScripts[] = { + { &HES_MenuHammer1Disabled, &HES_MenuHammer1Disabled }, + { &HES_MenuHammer1, &HES_MenuHammer1Disabled }, + { &HES_MenuHammer2, &HES_MenuHammer2Disabled }, + { &HES_MenuHammer3, &HES_MenuHammer3Disabled }, +}; -HudScript* battle_menu_ItemHudScripts[] = { &HES_MenuItem, &HES_MenuItemDisabled }; +IconHudScriptPair battle_menu_ItemHudScripts = { &HES_MenuItem, &HES_MenuItemDisabled }; -HudScript* battle_menu_StarPowerHudScripts[] = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; +IconHudScriptPair battle_menu_StarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; -HudScript* battle_menu_StarPowerMovesHudScripts[] = { - &HES_MenuStarPower, &HES_MenuStarPowerDisabled, &HES_Eldstar, &HES_EldstarDisabled, - &HES_Mamar, &HES_MamarDisabled, &HES_Skolar, &HES_SkolarDisabled, - &HES_Muskular, &HES_MuskularDisabled, &HES_Misstar, &HES_MisstarDisabled, - &HES_Klevar, &HES_KlevarDisabled, &HES_Kalmar, &HES_KalmarDisabled, - &HES_StarBeam, &HES_StarBeamDisabled, &HES_PeachBeam, &HES_PeachBeamDisabled, - &HES_MenuStarPower, &HES_MenuStarPowerDisabled, &HES_MenuStarPower, &HES_MenuStarPowerDisabled +IconHudScriptPair battle_menu_StarPowerMovesHudScripts[] = { + { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }, + { &HES_Eldstar, &HES_EldstarDisabled }, + { &HES_Mamar, &HES_MamarDisabled }, + { &HES_Skolar, &HES_SkolarDisabled }, + { &HES_Muskular, &HES_MuskularDisabled }, + { &HES_Misstar, &HES_MisstarDisabled }, + { &HES_Klevar, &HES_KlevarDisabled }, + { &HES_Kalmar, &HES_KalmarDisabled }, + { &HES_StarBeam, &HES_StarBeamDisabled }, + { &HES_PeachBeam, &HES_PeachBeamDisabled }, + { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }, + { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }, }; HudScript* battle_menu_PartnerHudScripts[] = { @@ -160,11 +164,11 @@ HudScript* battle_menu_DisabledPartnerHudScripts[] = { &HES_PartnerADisabled, &HES_PartnerADisabled, &HES_PartnerADisabled, &HES_PartnerADisabled }; -HudScript* battle_menu_StrategiesHudScript[] = { &HES_MenuStrategies, &HES_MenuStrategiesDisabled }; +IconHudScriptPair battle_menu_StrategiesHudScript = { &HES_MenuStrategies, &HES_MenuStrategiesDisabled }; -HudScript* battle_menu_DoNothingHudScripts[] = { &HES_MenuDoNothing, &HES_MenuDoNothingDisabled }; +IconHudScriptPair battle_menu_DoNothingHudScripts = { &HES_MenuDoNothing, &HES_MenuDoNothingDisabled }; -HudScript* battle_menu_FleeHudScripts[] = { &HES_MenuFlee, &HES_MenuFleeDisabled }; +IconHudScriptPair battle_menu_FleeHudScripts = { &HES_MenuFlee, &HES_MenuFleeDisabled }; // Jump, Hammer, Items, RunAway, Defense s32 battle_menu_leftJustfiedMessagesA[] = { MSG_Menus_0039, MSG_Menus_0038, MSG_Menus_003F, MSG_Menus_003B, MSG_Menus_0044 }; @@ -189,39 +193,37 @@ s32 battle_menu_centeredMessagesD[] = { MSG_Menus_004C, MSG_Menus_004E, MSG_Menu s32 D_802AB4F0[] = { 0x2, 0x1, 0x4, 0x6, 0x3, 0x5, 0x1A, 0x3, 0x34, 0x39, 0x31, 0x37 }; -// s8 D_802AB513 - AnimID battle_menu_partnerChooseMoveAnimations[] = { - [PARTNER_NONE] 0, - [PARTNER_GOOMBARIO] ANIM_BattleGoombario_Think, - [PARTNER_KOOPER] ANIM_BattleKooper_Think, - [PARTNER_BOMBETTE] ANIM_BattleBombette_Think, - [PARTNER_PARAKARRY] ANIM_BattleParakarry_Think, - [PARTNER_GOOMPA] ANIM_Goompa_Idle, - [PARTNER_WATT] ANIM_BattleWatt_Think, + [PARTNER_NONE] 0, + [PARTNER_GOOMBARIO] ANIM_BattleGoombario_Think, + [PARTNER_KOOPER] ANIM_BattleKooper_Think, + [PARTNER_BOMBETTE] ANIM_BattleBombette_Think, + [PARTNER_PARAKARRY] ANIM_BattleParakarry_Think, + [PARTNER_GOOMPA] ANIM_Goompa_Idle, + [PARTNER_WATT] ANIM_BattleWatt_Think, [PARTNER_SUSHIE] ANIM_BattleSushie_Think, [PARTNER_LAKILESTER] ANIM_BattleLakilester_Run, - [PARTNER_BOW] ANIM_BattleBow_Still, - [PARTNER_GOOMBARIA] 0, - [PARTNER_TWINK] 0, - 0x00000000, + [PARTNER_BOW] ANIM_BattleBow_Still, + [PARTNER_GOOMBARIA] 0, + [PARTNER_TWINK] 0, + 0x00000000, 0x00000000 }; AnimID D_802AB558[] = { - [PARTNER_NONE] 0, - [PARTNER_GOOMBARIO] ANIM_BattleGoombario_Walk, - [PARTNER_KOOPER] ANIM_BattleKooper_Walk, - [PARTNER_BOMBETTE] ANIM_BattleBombette_Walk, - [PARTNER_PARAKARRY] ANIM_BattleParakarry_Walk, - [PARTNER_GOOMPA] ANIM_Goompa_Walk, - [PARTNER_WATT] ANIM_BattleWatt_Walk, - [PARTNER_SUSHIE] ANIM_BattleSushie_Walk, + [PARTNER_NONE] 0, + [PARTNER_GOOMBARIO] ANIM_BattleGoombario_Walk, + [PARTNER_KOOPER] ANIM_BattleKooper_Walk, + [PARTNER_BOMBETTE] ANIM_BattleBombette_Walk, + [PARTNER_PARAKARRY] ANIM_BattleParakarry_Walk, + [PARTNER_GOOMPA] ANIM_Goompa_Walk, + [PARTNER_WATT] ANIM_BattleWatt_Walk, + [PARTNER_SUSHIE] ANIM_BattleSushie_Walk, [PARTNER_LAKILESTER] ANIM_BattleLakilester_Walk, - [PARTNER_BOW] ANIM_BattleBow_Walk, - [PARTNER_GOOMBARIA] 0, - [PARTNER_TWINK] 0, - 0x00000000, + [PARTNER_BOW] ANIM_BattleBow_Walk, + [PARTNER_GOOMBARIA] 0, + [PARTNER_TWINK] 0, + 0x00000000, 0x00000000 }; @@ -237,7 +239,7 @@ HudScript* battle_menu_PartnerMoveHudScripts[] = { &HES_Lakilester, &HES_LakilesterDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled, &HES_Bow, &HES_BowDisabled, &HES_MoveDiamond, &HES_MoveDiamondDisabled, &HES_MoveBlueOrb, &HES_MoveBlueOrbDisabled, &HES_MoveGreenOrb, &HES_MoveGreenOrbDisabled, &HES_MoveRedOrb, &HES_MoveRedOrbDisabled }; -HudScript* battle_menu_PeachStarPowerHudScripts[] = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; +IconHudScriptPair battle_menu_PeachStarPowerHudScripts = { &HES_MenuStarPower, &HES_MenuStarPowerDisabled }; // Focus s32 D_802AB728[] = { MSG_Menus_0055 }; @@ -257,16 +259,7 @@ BSS s32 D_802ACC64; BSS s32 D_802ACC68; BSS s32 D_802ACC6C; BSS s32 D_802ACC70[24]; -BSS s32 D_802ACCD0; -BSS s32 D_802ACCD4[0xC5]; // unused? -BSS s32 D_802ACFE8; -BSS s32 D_802ACFEC; -BSS s32 D_802ACFF0; -BSS s32 D_802ACFF4; -BSS s32 D_802ACFF8; -BSS s8 D_802ACFFC; -BSS s8 D_802ACFFD; -BSS s16 D_802ACFFE; // unused? +BSS PopupMenu D_802ACCD0; BSS s8 D_802AD000; BSS s8 D_802AD001; BSS s8 D_802AD002; @@ -371,8 +364,9 @@ BSS s16 D_802AD63E; BSS HudScript* D_802AD640[6]; BSS s32 D_802AD658[5]; // msg IDs BSS s32 D_802AD66C; -BSS char D_802AD670[3]; -BSS s8 D_802AD673; +BSS s8 D_802AD670[3]; // actually an s32 but sometimes the last byte is accessed? +//BSS char D_802AD671[0x2]; +BSS s8 D_802AD673; // TODO fix BSS s32 D_802AD674; // unused? BSS s32 D_802AD678[6]; BSS s32 D_802AD690[6]; @@ -380,6 +374,8 @@ BSS s32 D_802AD6A8[6]; BSS s32 D_802AD6C0[5]; BSS s32 D_802AD6D4; +void func_800F513C(PopupMenu* popup); + void func_802A3C98(s32 x, s32 y); void func_802A43DC(s32 arg0, s32 x, s32 y); void func_802A4448(s32 arg0, s32 x, s32 y); @@ -1837,7 +1833,7 @@ s32 func_802A4A54(void) { D_802AD608 = D_802AD605; } if (D_802AD605 >= D_802AD609) { - D_802AD608 = D_802AD605 - ((u8) D_802AD60A - 1); + D_802AD608 = D_802AD605 - (D_802AD60A - 1); } D_802AD609 = D_802AD608 + 6; if (D_802AD609 > D_802AD66C) { @@ -2128,6 +2124,9 @@ s32 can_btl_state_update_switch_to_player(void) { } } +extern s32 D_8008EEC0[]; +extern s32 D_8008EEF0[]; + s32 func_802A58D0(void) { BattleStatus* battleStatus = &gBattleStatus; Actor* partner = battleStatus->partnerActor; @@ -2171,7 +2170,1356 @@ s32 func_802A58D0(void) { return !partnerCantMove; } +// Some issue with the popup bss +#ifdef NON_MATCHING +void btl_state_update_player_menu(void) { + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; + Actor* player = battleStatus->playerActor; + Actor* partner = battleStatus->partnerActor; + IconHudScriptPair* hudScriptPair; + MoveData* moveData; + ItemData* itemData; + s32 partnerID; + s32 moveID; + s32 s00; + s32 s4; + s32 s_8; + s32 i; + s32 p; + + s32 var_s0; + + s32* temp_v1_12; + + s32 currentSubmenu; + s32 var_fp_2; + s32 s1; + s32 v0; + + switch (gBattleState2) { + case 0x0: + battleStatus->moveCategory = -1; + battleStatus->selectedMoveID = 0; + battleStatus->currentAttackElement = 0; + if (can_btl_state_update_switch_to_player()) { + btl_cam_use_preset(2); + btl_cam_move(0xA); + if (!(gBattleStatus.flags1 & 0x100000)) { + gBattleState2 = 0x12E; + } else { + partner->state.currentPos.x = partner->homePos.x; + partner->state.currentPos.z = partner->homePos.z; + partner->state.goalPos.x = player->homePos.x; + partner->state.goalPos.z = player->homePos.z; + partner->state.moveTime = 4; + partner->state.angle = 0.0f; + gBattleState2 = 0x12C; + } + break; + } else { + btl_set_state(0x16); + return; + } + break; + case 0x12C: + if (partner->state.moveTime != 0) { + partner->currentPos.x += (partner->state.goalPos.x - partner->currentPos.x) / partner->state.moveTime; + partner->currentPos.z += (partner->state.goalPos.z - partner->currentPos.z) / partner->state.moveTime; + player->currentPos.x += (partner->state.currentPos.x - player->currentPos.x) / partner->state.moveTime; + player->currentPos.z += (partner->state.currentPos.z - player->currentPos.z) / partner->state.moveTime; + } + partner->currentPos.z -= sin_rad(DEG_TO_RAD(partner->state.angle)) * 16.0f; + partner->yaw = clamp_angle(-partner->state.angle); + player->currentPos.z += sin_rad(DEG_TO_RAD(partner->state.angle)) * 16.0f; + player->yaw = clamp_angle(-partner->state.angle); + partner->state.angle += 90.0f; + if (partner->state.moveTime != 0) { + partner->state.moveTime--; + } else { + partner->currentPos.x = partner->state.goalPos.x; + partner->currentPos.z = partner->state.goalPos.z; + player->currentPos.x = partner->state.currentPos.x; + player->currentPos.z = partner->state.currentPos.z; + partner->homePos.x = partner->currentPos.x; + partner->homePos.z = partner->currentPos.z; + player->homePos.x = player->currentPos.x; + player->homePos.z = player->currentPos.z; + gBattleState2 = 0x12E; + gBattleStatus.flags1 &= ~0x100000; + } + break; + } + + switch (gBattleState2) { + case 0x12E: + gBattleStatus.flags1 |= 2; + player->flags &= ~0x4000000; + player->flags |= 0x08000000; + if (partner != NULL) { + partner->flags |= 0x04000000; + partner->flags |= 0x08000000; + } + func_80263268(); + func_80263300(); + btl_init_menu_boots(); + btl_init_menu_hammer(); + + if (player_team_is_ability_active(player, 0x15)) { + gBattleState2 = 0x64; + break; + } + + s4 = 0; + s_8 = 2; + if (battleStatus->unk_4C[0] < 0) { + battleStatus->unk_4C[0] = 0; + } + battle_menu_submenuIDs[0] = 7; + battle_menu_isEnabled[0] = 1; + main_battle_menu_JumpHudScripts[0] = battle_menu_StrategiesHudScript.enabled; + battle_menu_messageIDs[0] = battle_menu_centeredMessagesC[0]; + if (battleStatus->unk_83 != 2) { + + if (gBattleStatus.flags1 & 0x2000000) { + battle_menu_messageIDs[0] = 0x1d0054; // TODO + } + } else { + battle_menu_messageIDs[0] = 0x1d0054; + } + battle_menu_isMessageDisabled[s4] = 0; + if (!(battleStatus->menuDisableFlags & 0x80)) { + HudScript* temp = battle_menu_StrategiesHudScript.disabled; + battle_menu_isEnabled[s4] = 0; + main_battle_menu_JumpHudScripts[s4] = temp; + battle_menu_isMessageDisabled[s4] = 0x48; + } + if (battleStatus->unk_4C[0] == 7) { + s_8 = s4; + } + s4++; + if (battleStatus->menuStatus[0] >= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_ItemHudScripts.enabled; + battle_menu_submenuIDs[s4] = 2; + battle_menu_isEnabled[s4] = 1; + battle_menu_messageIDs[s4] = battle_menu_centeredMessagesB[0]; + + if(battleStatus->menuStatus[0] == 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_ItemHudScripts.disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x45; + } + + if (!(battleStatus->menuDisableFlags & 0x4)) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_ItemHudScripts.disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + + if (battleStatus->itemLossTurns >= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_ItemHudScripts.disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + + if (battleStatus->unk_4C[0] == 2) { + s_8 = s4; + } + + s4++; + } + main_battle_menu_JumpHudScripts[s4] = battle_menu_JumpHudScripts[playerData->bootsLevel + 1].enabled; + battle_menu_submenuIDs[s4] = 0; + battle_menu_isEnabled[s4] = 1; + battle_menu_messageIDs[s4] = battle_menu_centeredMessagesA[0]; + + if (battleStatus->menuStatus[1] <= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_JumpHudScripts[0].enabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x43; + } + if (!(battleStatus->menuDisableFlags & 0x1)) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_JumpHudScripts[0].disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + if (battleStatus->jumpLossTurns >= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_JumpHudScripts[0].disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + if (battleStatus->unk_4C[0] == 0) { + s_8 = s4; + } + s4++; + if (playerData->hammerLevel >= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_HammerHudScripts[playerData->hammerLevel + 1].disabled; + battle_menu_submenuIDs[s4] = 1; + battle_menu_isEnabled[s4] = 1; + battle_menu_messageIDs[s4] = battle_menu_centeredMessagesA[1]; + if (battleStatus->menuStatus[2] <= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_HammerHudScripts[0].enabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x44; + } + if (!(battleStatus->menuDisableFlags & 0x2)) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_HammerHudScripts[0].disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + if (battleStatus->hammerLossTurns >= 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_HammerHudScripts[0].disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + if (battleStatus->unk_4C[0] == 1) { + s_8 = s4; + } + s4++; + } + if (playerData->maxStarPower != 0) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_StarPowerHudScripts.enabled; + battle_menu_submenuIDs[s4] = 8; + battle_menu_isEnabled[s4] = 1; + battle_menu_messageIDs[s4] = battle_menu_centeredMessagesD[0]; + battle_menu_isMessageDisabled[s4] = 0; + if (!(battleStatus->menuDisableFlags & 0x100)) { + main_battle_menu_JumpHudScripts[s4] = battle_menu_StarPowerHudScripts.disabled; + battle_menu_isEnabled[s4] = 0; + battle_menu_isMessageDisabled[s4] = 0x48; + } + if (battleStatus->unk_4C[0] == 8) { + s_8 = s4; + } + s4++; + } + main_menu_numOptions = s4; + D_802AD0A8 = 0; + D_802AD0B0 = s_8; + D_802AD100 = 2 - s_8; + if (func_802A58D0() != 0) { + D_802AD104 = 1; + } else { + D_802AD104 = 0; + } + func_802A1000(); + D_802ACC60 = 8; + D_802ACC6C = 0; + gBattleState2 = 1; + break; + case 0x1: + if (battleStatus->hustleTurns != 0) { + set_animation(0, 0, 0x10027); + } else { + set_animation(0, 0, func_80265D44(0x1C)); + } + s00 = func_802A11B0(); + if (D_802ACC6C != 0) { + D_802ACC6C--; + } else if (!(gBattleStatus.flags1 & 0x02000000) && (gGameStatusPtr->pressedButtons[0] & 0x2000)) { + if ((func_802A58D0() != 0) && (battleStatus->hustleTurns != 1)) { + sfx_play_sound(0xF); + battleStatus->unk_4C[0] = battle_menu_submenuIDs[D_802AD002 + D_802AD06B]; + func_802A10B8(); + btl_set_state(0xB); + } else if ((partner != NULL) && !(partner->flags & 0x200000) && (battleStatus->hustleTurns != 1)) { + sfx_play_sound(0x21D); + gBattleState2 = 8; + } + break; + } + + if (D_802ACC60 == 0) { + if (s00 != 0) { + set_animation(0, 0, 0x10004); + battleStatus->currentSubmenu = battle_menu_submenuIDs[s00 - 1]; + battleStatus->unk_4C[0] = battleStatus->currentSubmenu; + + for (i = 0; i < ARRAY_COUNT(battleStatus->submenuMoves); i++) { + battleStatus->submenuMoves[i] = 0; + battleStatus->submenuIcons[0] = 0; // todo bug? + battleStatus->submenuStatus[i] = 0; + } + + switch (battleStatus->currentSubmenu) { + case 2: + battleStatus->submenuIcons[0] = 0x155; + battleStatus->submenuStatus[0] = 1; + battleStatus->submenuMoves[0] = D_802AB4F0[8]; + for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { + if (playerData->invItems[i] != 0) { + itemData = &gItemTable[playerData->invItems[i]]; + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = playerData->invItems[i]; + battleStatus->currentTargetListFlags = itemData->targetFlags; + player_create_target_list(player); + } + } + + s4 = 1; + for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) { + if (playerData->equippedBadges[i] != 0) { + moveID = gItemTable[playerData->equippedBadges[i]].moveID; + moveData = &gMoveTable[moveID]; + if (moveData->category == D_802AB4F0[battleStatus->currentSubmenu]) { + battleStatus->submenuMoves[s4] = moveID; + battleStatus->submenuIcons[s4] = playerData->equippedBadges[i]; + battleStatus->submenuStatus[s4] = 1; + if (playerData->curFP < moveData->costFP) { + battleStatus->submenuStatus[s4] = 0; + } + s4++; + } + } + } + + battleStatus->submenuMoveCount = s4; + if (s4 == 1) { + battleStatus->submenuMoveCount = 0; + } + break; + case 1: + btl_init_menu_hammer(); + if (battleStatus->submenuMoveCount == 1) { + battleStatus->submenuMoveCount = 0; + } + if (battleStatus->unk_83 == 2) { + battleStatus->submenuMoveCount = 0; + } + break; + case 0: + btl_init_menu_boots(); + if (battleStatus->submenuMoveCount == 1) { + battleStatus->submenuMoveCount = 0; + } + if (battleStatus->unk_83 == 2) { + battleStatus->submenuMoveCount = 0; + } + break; + case 8: + s4 = 1; + battleStatus->submenuMoves[0] = 0x77; + battleStatus->submenuIcons[0] = 0x155; + battleStatus->submenuStatus[0] = 1; + for (i = 0; i < playerData->maxStarPower; i++) { + moveData = &gMoveTable[120 + i]; + + battleStatus->submenuMoves[s4] = 120 + i; + battleStatus->submenuIcons[s4] = 0; + battleStatus->moveCategory = 8; + battleStatus->selectedItemID = i + 120; + battleStatus->currentTargetListFlags = moveData->flags; + player_create_target_list(player); + battleStatus->submenuStatus[s4] = 1; + if (player->targetListLength == 0) { + battleStatus->submenuStatus[s4] = -2; + } + if (playerData->specialBarsFilled / 256 < moveData->costFP) { + battleStatus->submenuStatus[s4] = 0; + } + if (gBattleStatus.flags2 & 0x1000) { + battleStatus->submenuStatus[s4] = -1; + } + s4++; + } + + if (playerData->starBeamLevel == 1) { + moveData = &gMoveTable[127]; + battleStatus->submenuMoves[s4] = 0x7F; + battleStatus->submenuIcons[s4] = 0; + battleStatus->moveCategory = 8; + battleStatus->selectedItemID = i + 0x78; + battleStatus->currentTargetListFlags = moveData->flags; + player_create_target_list(player); + battleStatus->submenuStatus[s4] = 1; + if (player->targetListLength == 0) { + battleStatus->submenuStatus[s4] = -2; + } + if (playerData->specialBarsFilled / 256 < moveData->costFP) { + battleStatus->submenuStatus[s4] = 0; + } + if (gBattleStatus.flags2 & 0x1000) { + battleStatus->submenuStatus[s4] = -1; + } + s4++; + } + + if (playerData->starBeamLevel == 2) { + moveData = &gMoveTable[0x80]; + battleStatus->submenuMoves[s4] = 0x80; + battleStatus->submenuIcons[s4] = 0; + battleStatus->moveCategory = 8; + battleStatus->selectedItemID = i + 120; + battleStatus->currentTargetListFlags = moveData->flags; + player_create_target_list(player); + battleStatus->submenuStatus[s4] = 1; + if (player->targetListLength == 0) { + battleStatus->submenuStatus[s4] = -2; + } + if (playerData->specialBarsFilled / 256 < moveData->costFP) { + battleStatus->submenuStatus[s4] = 0; + } + if (gBattleStatus.flags2 & 0x1000) { + battleStatus->submenuStatus[s4] = -1; + } + s4++; + } + battleStatus->submenuMoveCount = s4; + break; + } + currentSubmenu = battleStatus->currentSubmenu; + if (currentSubmenu == 8) { + gBattleState2 = 0x3C; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + break; + } + if (currentSubmenu == 7) { + if ((battleStatus->unk_83 == 2) || (gBattleStatus.flags1 & 0x02000000)) { + func_802A10B8(); + battleStatus->moveCategory = currentSubmenu; + battleStatus->selectedItemID = 0; + battleStatus->selectedMoveID = 0; + btl_set_state(0x12); + break; + } + gBattleState2 = 0xC8; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + break; + } + if (battleStatus->submenuMoveCount == 0) { + if (currentSubmenu == 2) { + gBattleState2 = 0x28; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + break; + } + gBattleState2 = 10; + break; + } + var_fp_2 = 0; + if (currentSubmenu == 0) { + if (battleStatus->unk_4C[1] < 0) { + battleStatus->unk_4C[1] = 0; + } + var_fp_2 = battleStatus->unk_4C[1]; + } + if (battleStatus->currentSubmenu == 1) { + if (battleStatus->unk_4C[2] < 0) { + battleStatus->unk_4C[2] = 0; + } + var_fp_2 = battleStatus->unk_4C[2]; + } + if (battleStatus->currentSubmenu == 2) { + if (battleStatus->unk_4C[3] < 0) { + battleStatus->unk_4C[3] = 0; + } + var_fp_2 = battleStatus->unk_4C[3]; + } + + for (i = 0; i < battleStatus->submenuMoveCount; i++) { + moveData = &gMoveTable[battleStatus->submenuMoves[i]]; + itemData = &gItemTable[battleStatus->submenuIcons[i]]; + hudScriptPair = &gItemHudScripts[itemData->hudElemID]; + + battle_menu_moveOptionCantUseTypes[i] = 0; + if (battleStatus->submenuStatus[i] == 0) { + battle_menu_moveOptionCantUseTypes[i] = 0; + } + if (battleStatus->submenuStatus[i] == -1) { + battleStatus->submenuStatus[i] = 0; + battle_menu_moveOptionCantUseTypes[i] = 0x48; + } + if (battleStatus->submenuStatus[i] == -2) { + battleStatus->submenuStatus[i] = 0; + battle_menu_moveOptionCantUseTypes[i] = 0x48; + } + if (battleStatus->submenuStatus[i] == -3) { + battleStatus->submenuStatus[i] = 0; + battle_menu_moveOptionCantUseTypes[i] = 0x54; + } + battle_menu_moveOptionIconScripts[i] = hudScriptPair->enabled; + if (battleStatus->submenuStatus[i] == 0) { + battle_menu_moveOptionIconScripts[i] = hudScriptPair->disabled; + } + + battle_menu_moveOptionDisplayCosts[i] = moveData->costFP; + battle_menu_moveOptionBPCosts[i] = moveData->costBP; + battle_menu_moveOptionSortPriorities[i] = 0; + battle_menu_moveOptionDisplayCostReductions[i] = 0; + battle_menu_moveOptionDisplayCostReductionColors[i] = 0; + + if (player_team_is_ability_active(player, 0x18)) { + battle_menu_moveOptionDisplayCostReductions[i] += player_team_is_ability_active(player, 0x18); + battle_menu_moveOptionDisplayCostReductionColors[i] = 1; + } + if (player_team_is_ability_active(player, 0x26)) { + battle_menu_moveOptionDisplayCostReductions[i] += 2 * player_team_is_ability_active(player, 0x26); + battle_menu_moveOptionDisplayCostReductionColors[i] = 2; + } + battle_menu_moveIndices[i] = i; + battle_menu_moveOptionsEnabled[i] = battleStatus->submenuStatus[i]; + battle_menu_moveOptionNames[i] = moveData->nameMsg; + battle_menu_moveOptionDescriptions[i] = moveData->shortDescMsg; + + } + battle_menu_hasSpiritsMenu = 0; + D_802AD4A8 = var_fp_2; + battle_menu_moveOptionCount = battleStatus->submenuMoveCount; + func_802A2684(); + gBattleState2 = 2; + break; + } + } else { + D_802ACC60--; + break; + } + break; + case 0x2: + s00 = func_802A2C84(); + if (s00 == -1) { + gBattleState2 = 7; + } else if (s00 == 0) { + } else if (s00 == 0xFF) { + func_802A1050(); + D_802ACC60 = 8; + D_802ACC6C = 4; + gBattleState2 = 1; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + battleStatus->unk_49 = battle_menu_moveIndices[s00 - 1]; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_49]; + if (battleStatus->currentSubmenu == 0) { + battleStatus->unk_4C[1] = battle_menu_moveOptionActive; + } + if (battleStatus->currentSubmenu == 1) { + battleStatus->unk_4C[2] = battle_menu_moveOptionActive; + } + if (battleStatus->currentSubmenu == 2) { + battleStatus->unk_4C[3] = battle_menu_moveOptionActive; + if (battleStatus->currentSubmenu == 2) { + gBattleState2 = 0x14; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + break; + } + } + func_802A27D0(); + func_802A1030(); + gBattleState2 = 3; + } + break; + case 0x3: + s00 = func_802A2C84(); + if ((battleStatus->currentButtonsPressed & 0x4000) && (s00 == 0)) { + func_802A2AB8(); + func_802A1098(); + gBattleState2 = 4; + break; + } + if (func_802A11B0() != 0) { + battleStatus->unk_6C = 5; + battleStatus->unk_6E = 6; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_49]; + battleStatus->currentTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->unk_49]].flags; + switch (battleStatus->currentSubmenu) { + case 0: + battleStatus->moveCategory = 0; + battleStatus->selectedItemID = playerData->bootsLevel; + btl_set_state(0x11); + break; + case 1: + battleStatus->moveCategory = 1; + battleStatus->selectedItemID = playerData->hammerLevel; + btl_set_state(0x11); + break; + case 4: + gBattleState2 = battleStatus->unk_6E; + btl_state_update_player_menu(); + battleStatus->moveCategory = 4; + btl_set_state(0x19); + break; + } + } + break; + case 0x4: + func_802A2C84(); + if (func_802A11B0() != 0) { + gBattleState2 = 2; + break; + } + break; + case 0x5: + func_802A2AB8(); + func_802A1098(); + gBattleState2 = 4; + break; + case 6: + func_802A27E4(); + func_802A10B8(); + break; + case 0x7: + if (func_802A2C84() != -1) { + gBattleState2 = 2; + break; + } + break; + case 0x8: + if (gBattleStatus.flags2 & 4) { + btl_show_variable_battle_message(0x50, 0x3C, 0); + } else { + btl_show_variable_battle_message(0x51, 0x3C, playerData->currentPartner); + } + D_802AD607 = 1; + gBattleState2 = 9; + break; + case 0x9: + if (!btl_is_popup_displayed()) { + D_802ACC6C = 4; + D_802AD607 = 0; + D_802ACC60 = 0; + gBattleState2 = 1; + break; + } + break; + case 0xA: + func_802A1030(); + gBattleState2 = 11; + break; + case 0xB: + s00 = func_802A11B0(); + if (battleStatus->currentButtonsPressed & 0x4000) { + if (s00 == 0) { + func_802A1078(); + gBattleState2 = 12; + break; + } + } else if (s00 == 0) { + break; + } + + battleStatus->unk_6C = 0xD; + battleStatus->unk_6E = 0xE; + switch (battleStatus->currentSubmenu) { + case 0: + battleStatus->moveCategory = 0; + battleStatus->selectedItemID = playerData->bootsLevel; + battleStatus->selectedMoveID = playerData->bootsLevel + 26; + battleStatus->currentTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; + btl_set_state(0x11); + break; + case 1: + battleStatus->moveCategory = 1; + battleStatus->selectedItemID = playerData->hammerLevel; + battleStatus->selectedMoveID = playerData->hammerLevel + 3; + battleStatus->currentTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; + btl_set_state(0x11); + break; + } + break; + case 0xC: + if (func_802A11B0() != 0) { + D_802ACC60 = 8; + D_802ACC6C = 4; + gBattleState2 = 1; + break; + } + break; + case 0xD: + func_802A1078(); + gBattleState2 = 12; + break; + case 0xE: + func_802A10B8(); + break; + case 0x14: + if (battleStatus->selectedMoveID == 0x35) { + battleStatus->itemUsesLeft = 2; + } + if (battleStatus->selectedMoveID == 0x36) { + battleStatus->itemUsesLeft = 3; + } + + p = 0; + for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { + if (playerData->invItems[i] != 0) { + itemData = &gItemTable[playerData->invItems[i]]; + hudScriptPair = &gItemHudScripts[itemData->hudElemID]; + if (itemData->typeFlags & 2) { + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = playerData->invItems[i]; + battleStatus->currentTargetListFlags = itemData->targetFlags; + player_create_target_list(player); + D_802ACCD0.ptrIcon[p] = hudScriptPair->enabled; + D_802ACCD0.userIndex[p] = playerData->invItems[i]; + D_802ACCD0.enabled[p] = TRUE; + D_802ACCD0.nameMsg[p] = itemData->nameMsg; + D_802ACCD0.descMsg[p] = itemData->shortDescMsg; + if (player->targetListLength == 0) { + D_802ACCD0.ptrIcon[p] = hudScriptPair->disabled; + D_802ACCD0.enabled[p] = FALSE; + } + p++; + } + } + } + + D_802ACCD0.unk_31C = 0; + D_802ACCD0.unk_320 = 0; + if (battleStatus->selectedMoveID == 0x35) { + D_802ACCD0.unk_31C = 1; + D_802ACCD0.unk_320 = battleStatus->itemUsesLeft; + } + if (battleStatus->selectedMoveID == 0x36) { + D_802ACCD0.unk_31C = 2; + D_802ACCD0.unk_320 = battleStatus->itemUsesLeft; + } + + if (battleStatus->unk_4C[4] < 0) { + battleStatus->unk_4C[4] = 0; + } + D_802ACCD0.popupType = 0; + D_802ACCD0.numEntries = p; + D_802ACCD0.initialPos = battleStatus->unk_4C[4]; + func_800F513C(&D_802ACCD0); + func_800F52BC(); + gBattleState2 = 0x15; + break; + case 0x15: + if (D_802ACCD0.result != 0) { + if (D_802ACCD0.result == 0xFF) { + func_802A2910(); + battleStatus->selectedMoveID = 0; + battleStatus->itemUsesLeft = 0; + gBattleState2 = 2; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + battleStatus->unk_6C = 0x18; + battleStatus->unk_6E = 0x19; + battleStatus->unk_1AA = D_802ACCD0.userIndex[D_802ACCD0.result - 1]; + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = battleStatus->unk_1AA; + battleStatus->currentTargetListFlags = gItemTable[battleStatus->selectedItemID].targetFlags | 0x8000; + battleStatus->currentAttackElement = 0; + battleStatus->unk_4C[4] = D_802ACCD0.result - 1; + hide_popup_menu(); + func_802A27D0(); + func_802A1030(); + gBattleState2 = 0x16; + } + } + break; + case 0x16: + if ((battleStatus->currentButtonsPressed & 0x4000) && (D_802ACCD0.result == 0)) { + func_800F16CC(); + func_802A2C58(); + func_802A1098(); + battleStatus->selectedMoveID = 0; + gBattleState2 = 0x17; + break; + } + func_802A2C84(); + if (func_802A11B0() != 0) { + btl_set_state(0x11); + break; + } + break; + case 0x17: + func_802A2C84(); + if (func_802A11B0() != 0) { + gBattleState2 = 0x15; + break; + } + break; + case 0x18: + func_800F16CC(); + func_802A2C58(); + func_802A1098(); + func_802A2C84(); + gBattleState2 = 0x17; + break; + case 0x19: + destroy_popup_menu(); + func_802A27E4(); + func_802A10B8(); + break; + case 0x28: + p = 0; + for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { + if (playerData->invItems[i] != 0) { + itemData = &gItemTable[playerData->invItems[i]]; + hudScriptPair = &gItemHudScripts[itemData->hudElemID]; + if (itemData->typeFlags & 2) { + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = playerData->invItems[i]; + battleStatus->currentTargetListFlags = itemData->targetFlags; + player_create_target_list(player); + D_802ACCD0.ptrIcon[p] = hudScriptPair->enabled; + D_802ACCD0.userIndex[p] = playerData->invItems[i]; + D_802ACCD0.enabled[p] = TRUE; + D_802ACCD0.nameMsg[p] = itemData->nameMsg; + D_802ACCD0.descMsg[p] = itemData->shortDescMsg; + if (player->targetListLength == 0) { + D_802ACCD0.ptrIcon[p] = hudScriptPair->disabled; + D_802ACCD0.enabled[p] = FALSE; + } + p++; + } + } + } + if (battleStatus->unk_4C[4] < 0) { + battleStatus->unk_4C[4] = 0; + } + D_802ACCD0.popupType = 0; + D_802ACCD0.numEntries = p; + D_802ACCD0.unk_31C = 0; + D_802ACCD0.unk_320 = 0; + D_802ACCD0.initialPos = battleStatus->unk_4C[4]; + func_800F513C(&D_802ACCD0); + func_800F52BC(); + gBattleState2 = 0x29; + break; + case 0x29: + if (D_802ACCD0.result != 0) { + if (D_802ACCD0.result == 0xff) { + func_802A1050(); + D_802ACC60 = 8; + D_802ACC6C = 4; + gBattleState2 = 1; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + battleStatus->unk_6C = 0x2C; + battleStatus->unk_6E = 0x2D; + battleStatus->unk_1AA = D_802ACCD0.userIndex[D_802ACCD0.result - 1]; + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = battleStatus->unk_1AA; + battleStatus->selectedMoveID = 0x34; + battleStatus->currentTargetListFlags = gItemTable[battleStatus->selectedItemID].targetFlags | 0x8000; + battleStatus->currentAttackElement = 0; + battleStatus->unk_4C[4] = D_802ACCD0.result - 1; + hide_popup_menu(); + func_802A1030(); + gBattleState2 = 0x2A; + } + } + break; + case 0x2A: + if ((battleStatus->currentButtonsPressed & 0x4000) && (D_802ACCD0.result == 0)) { + func_800F16CC(); + func_802A1098(); + gBattleState2 = 0x2B; + } else { + if (func_802A11B0() != 0) { + btl_set_state(0x11); + } + } + break; + case 0x2B: + if (func_802A11B0() != 0) { + gBattleState2 = 0x29; + } + break; + case 0x2C: + func_800F16CC(); + func_802A1098(); + gBattleState2 = 0x2B; + break; + case 0x2D: + destroy_popup_menu(); + func_802A10B8(); + break; + case 0x3C: + for (i = 0; i < battleStatus->submenuMoveCount; i++) { + moveData = &gMoveTable[battleStatus->submenuMoves[i]]; + + battle_menu_moveOptionCantUseTypes[i] = 0; + + if (battleStatus->submenuStatus[i] == 0) { + battle_menu_moveOptionCantUseTypes[i] = 0; + } + + if (battleStatus->submenuStatus[i] == -1) { + battleStatus->submenuStatus[i] = 0; + battle_menu_moveOptionCantUseTypes[i] = 0x48; + } + + if (battleStatus->submenuStatus[i] == -2) { + battleStatus->submenuStatus[i] = 0; + battle_menu_moveOptionCantUseTypes[i] = 0x48; + } + + if (!(battleStatus->unk_74 & (1 << i))) { + battleStatus->submenuStatus[i] = 0; + battle_menu_moveOptionCantUseTypes[i] = 0x48; + } + + battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[battleStatus->submenuMoves[i] - 0x77].enabled; + + if (battleStatus->submenuStatus[i] == 0) { + battle_menu_moveOptionIconScripts[i] = battle_menu_StarPowerMovesHudScripts[battleStatus->submenuMoves[i] - 0x77].disabled; + } + battle_menu_moveOptionDisplayCosts[i] = moveData->costFP; + battle_menu_moveOptionBPCosts[i] = moveData->costBP; + battle_menu_moveOptionSortPriorities[i] = 0; + battle_menu_moveIndices[i] = i; + battle_menu_moveOptionsEnabled[i] = battleStatus->submenuStatus[i]; + battle_menu_moveOptionNames[i] = moveData->nameMsg; + battle_menu_moveOptionDescriptions[i] = moveData->shortDescMsg; + battle_menu_moveOptionDisplayCostReductions[i] = 0; + battle_menu_moveOptionDisplayCostReductionColors[i] = 0; + } + if (battleStatus->unk_4C[6] < 0) { + battleStatus->unk_4C[6] = 0; + } + D_802AD4A8 = battleStatus->unk_4C[6]; + battle_menu_moveOptionCount = battleStatus->submenuMoveCount; + battle_menu_hasSpiritsMenu = 1; + func_802A2684(); + gBattleState2 = 0x3D; + break; + case 0x3D: + s00 = func_802A2C84(); + if (s00 == -1) { + gBattleState2 = 0x42; + } else if (s00 == 0) { + } else if (s00 == 0xff) { + func_802A1050(); + D_802ACC60 = 8; + D_802ACC6C = 4; + gBattleState2 = 1; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + battleStatus->unk_49 = battle_menu_moveIndices[s00 - 1]; + battleStatus->unk_4C[6] = battle_menu_moveOptionActive; + func_802A27D0(); + func_802A1030(); + gBattleState2 = 0x3e; + } + break; + case 0x3E: + s00 = func_802A2C84(); + if ((battleStatus->currentButtonsPressed & 0x4000) && (s00 == 0)) { + func_802A2AB8(); + func_802A1098(); + gBattleState2 = 0x3F; + } else if (func_802A11B0() != 0) { + battleStatus->unk_6C = 0x40; + battleStatus->unk_6E = 0x41; + battleStatus->moveCategory = 8; + battleStatus->selectedMoveID = battleStatus->submenuMoves[battleStatus->unk_49]; + battleStatus->currentTargetListFlags = gMoveTable[battleStatus->submenuMoves[battleStatus->unk_49]].flags; + battleStatus->selectedItemID = battleStatus->unk_49; + if ((playerData->starBeamLevel == 2) && (battleStatus->selectedItemID == 8)) { + battleStatus->selectedItemID++; + } + btl_set_state(0x11); + break; + } + break; + case 0x3F: + func_802A2C84(); + if (func_802A11B0() != 0) { + gBattleState2 = 0x3D; + } + break; + case 0x40: + func_802A2AB8(); + func_802A1098(); + gBattleState2 = 0x3F; + break; + case 0x41: + func_802A27E4(); + func_802A10B8(); + break; + case 0x42: + if (func_802A2C84() != -1) { + gBattleState2 = 0x3D; + } + break; + case 0x46: + if (can_btl_state_update_switch_to_player() == 0) { + battleStatus->itemUsesLeft = 1; + btl_set_state(0x16); + break; + } + + p = 0; + for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { + if (playerData->invItems[i] != 0) { + itemData = &gItemTable[ playerData->invItems[i]]; + hudScriptPair = &gItemHudScripts[itemData->hudElemID]; + if (itemData->typeFlags & 2) { + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = playerData->invItems[i]; + battleStatus->currentTargetListFlags = itemData->targetFlags; + player_create_target_list(player); + D_802ACCD0.ptrIcon[p] = hudScriptPair->enabled; + D_802ACCD0.userIndex[p] = playerData->invItems[i]; + D_802ACCD0.enabled[p] = TRUE; + D_802ACCD0.nameMsg[p] = itemData->nameMsg; + D_802ACCD0.descMsg[p] = itemData->shortDescMsg; + if (player->targetListLength == 0) { + D_802ACCD0.ptrIcon[p] = hudScriptPair->disabled; + D_802ACCD0.enabled[p] = FALSE; + } + p++; + } + } + } + + if (p == 0) { + battleStatus->itemUsesLeft = 1; + btl_set_state(0x16); + break; + } + D_802ACCD0.popupType = 0; + if (battleStatus->selectedMoveID == 0x35) { + D_802ACCD0.popupType = 100; + D_802ACCD0.unk_31C = 1; + D_802ACCD0.unk_320 = battleStatus->itemUsesLeft; + } + if (battleStatus->selectedMoveID == 0x36) { + D_802ACCD0.unk_31C = 2; + D_802ACCD0.popupType += 200; + D_802ACCD0.unk_320 = battleStatus->itemUsesLeft; + } + if (battleStatus->unk_4C[4] < 0) { + battleStatus->unk_4C[4] = 0; + } + D_802ACCD0.numEntries = p; + D_802ACCD0.initialPos = battleStatus->unk_4C[4]; + func_800F513C(&D_802ACCD0); + func_800F52BC(); + gBattleState2 = 0x47; + break; + case 0x47: + if (D_802ACCD0.result != 0) { + if (D_802ACCD0.result == 0xff) { + battleStatus->itemUsesLeft = 1; + btl_set_state(0x16); + } else { + battleStatus->unk_6C = 0x4a; + battleStatus->unk_6E = 0x4b; + battleStatus->unk_1AA = D_802ACCD0.userIndex[D_802ACCD0.result - 1]; + battleStatus->moveCategory = 2; + battleStatus->selectedItemID = battleStatus->unk_1AA; + battleStatus->currentTargetListFlags = gItemTable[battleStatus->selectedItemID].targetFlags | 0x8000; + battleStatus->currentAttackElement = 0; + battleStatus->unk_4C[4] = D_802ACCD0.result - 1; + hide_popup_menu(); + D_802ACC60 = 5; + gBattleState2 = 0x48; + } + } + break; + case 0x48: + if (D_802ACC60 == 0) { + btl_set_state(0x11); + break; + } + D_802ACC60--; + break; + case 0x49: + if (D_802ACC60 != 0) { + D_802ACC60--; + break; + } + gBattleState2 = 0x47; + break; + case 0x4A: + func_800F16CC(); + D_802ACC60 = 5; + gBattleState2 = 0x49; + break; + case 0x4B: + destroy_popup_menu(); + break; + case 0x64: + if (playerData->bootsLevel >= 0) { + battleStatus->currentTargetListFlags = gMoveTable[30].flags; + player_create_target_list(player); + s1 = player->targetListLength; + } else { + s1 = 0; + } + if (playerData->hammerLevel >= 0) { + battleStatus->currentTargetListFlags = gMoveTable[7].flags; + player_create_target_list(player); + v0 = player->targetListLength; + } else { + v0 = 0; + } + if (s1 <= 0 && v0 <= 0) { + battleStatus->moveCategory = 9; + battleStatus->unk_95 = 0; + btl_set_state(0x16); + break; + } + + var_s0 = 50; + if (s1 <= 0) { + var_s0 = 0; + } + if (v0 <= 0) { + var_s0 = 101; + } + if (rand_int(100) < var_s0) { + battleStatus->selectedMoveID = 0x1E; + battleStatus->moveCategory = 0; + battleStatus->currentTargetListFlags = gMoveTable[30].flags; + battleStatus->selectedItemID = playerData->bootsLevel; + player_create_target_list(player); + } else { + battleStatus->selectedMoveID = 7; + battleStatus->moveCategory = 1; + battleStatus->currentTargetListFlags = gMoveTable[7].flags; + battleStatus->selectedItemID = playerData->hammerLevel; + player_create_target_list(player); + } + btl_set_state(0x12); + break; + case 0xC8: + s4 = 0; + func_80263268(); + if (battleStatus->changePartnerAllowed >= 0) { + D_802AD678[s4] = 5; + D_802AD658[s4] = battle_menu_leftJustfiedMessagesB[0]; + D_802AD640[s4] = battle_menu_PartnerHudScripts[playerData->currentPartner]; + D_802AD690[s4] = 1; + D_802AD6C0[s4] = 0x1D00A1; + if (battleStatus->changePartnerAllowed <= 0) { + D_802AD640[s4] = battle_menu_DisabledPartnerHudScripts[playerData->currentPartner]; + D_802AD690[s4] = 0; + D_802AD6A8[s4] = 0; + } + s4 = 1; + } + D_802AD640[s4] = battle_menu_DoNothingHudScripts.enabled; + D_802AD678[s4] = 9; + D_802AD690[s4] = 1; + D_802AD658[s4] = battle_menu_leftJustfiedMessagesA[9]; // out of bounds TODO + D_802AD6C0[s4] = 0x1D00A2; + + s4++; + D_802AD640[s4] = battle_menu_FleeHudScripts.enabled; + D_802AD678[s4] = 3; + D_802AD690[s4] = 1; + D_802AD658[s4] = battle_menu_leftJustfiedMessagesA[3]; + D_802AD6C0[s4] = 0x1D00A3; + if (!(gBattleStatus.flags2 & 0x20)) { + D_802AD640[s4] = battle_menu_FleeHudScripts.disabled; + D_802AD690[s4] = 0; + D_802AD6A8[s4] = 1; + } + s4++; + + if (battleStatus->unk_4C[7] < 0) { + battleStatus->unk_4C[7] = 0; + } + D_802AD66C = s4; + D_802AD670 = battleStatus->unk_4C[7]; + func_802A45D8(); + gBattleState2 = 0xC9; + break; + case 0xC9: + s00 = func_802A4A54(); + if (s00 == -1) { + gBattleState2 = 0xcf; + } else if (s00 == 0) { + } else if (s00 == 0xff) { + func_802A1050(); + D_802ACC60 = 8; + D_802ACC6C = 4; + gBattleState2 = 1; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + battleStatus->currentSubmenu = D_802AD678[s00 - 1]; + battleStatus->unk_4C[7] = s00 - 1; + if (battleStatus->currentSubmenu == 5) { + gBattleState2 = 0x1e; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + func_802A4718(); + func_802A1030(); + gBattleState2 = 0xca; + } + } + break; + case 0xCA: + s00 = func_802A4A54(); + if ((battleStatus->currentButtonsPressed & 0x4000) && (s00 == 0)) { + func_802A48FC(); + func_802A1098(); + gBattleState2 = 0xCB; + break; + } + if (func_802A11B0() != 0) { + battleStatus->unk_6C = 0xCC; + battleStatus->unk_6E = 0xCD; + switch (battleStatus->currentSubmenu) { + case 3: + gBattleState2 = 0xCD; + btl_state_update_player_menu(); + battleStatus->moveCategory = 3; + battleStatus->selectedMoveID = 0x39; + btl_set_state(0x18); + break; + case 9: + battleStatus->hustleTurns = 0; + gBattleStatus.flags1 &= ~0x4000000; + gBattleState2 = battleStatus->unk_6E; + btl_state_update_player_menu(); + btl_set_state(0x16); + break; + case 4: + gBattleState2 = 0xCD; + btl_state_update_player_menu(); + battleStatus->selectedMoveID = 0x31; + battleStatus->moveCategory = 4; + btl_set_state(0x19); + break; + case 10: + gBattleState2 = 0xCD; + btl_state_update_player_menu(); + btl_set_state(0xB); + break; + } + } + break; + case 0xCB: + func_802A4A54(); + if (func_802A11B0() != 0) { + D_802ACC60 = 8; + D_802ACC6C = 4; + gBattleState2 = 1; + break; + } + break; + case 0xCC: + func_802A48FC(); + func_802A1098(); + gBattleState2 = 0xCB; + break; + case 0xCD: + func_802A472C(); + func_802A10B8(); + break; + case 0xCF: + if (func_802A4A54() != -1) { + gBattleState2 = 0xC9; + } + break; + case 0x1E: + p = 0; + for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) { + partnerID = D_8008EEC0[i]; + if (playerData->partners[partnerID].enabled) { + temp_v1_12 = gPartnerPopupProperties[partnerID]; + D_802ACCD0.ptrIcon[p] = battle_menu_PartnerHudScripts[partnerID]; + D_802ACCD0.userIndex[p] = partnerID; + D_802ACCD0.enabled[p] = TRUE; + D_802ACCD0.nameMsg[p] = temp_v1_12[0]; + D_802ACCD0.descMsg[p] = temp_v1_12[3]; + D_802ACCD0.value[p] = playerData->partners[partnerID].level; + if (playerData->currentPartner == partnerID) { + D_802ACCD0.enabled[p] = FALSE; + D_802ACCD0.ptrIcon[p] = battle_menu_DisabledPartnerHudScripts[partnerID]; + } + p++; + } + } + + if (battleStatus->unk_4C[5] < 0) { + battleStatus->unk_4C[5] = 0; + } + D_802ACCD0.popupType = 1; + D_802ACCD0.numEntries = p; + D_802ACCD0.initialPos = D_8008EEF0[playerData->currentPartner] - 1; + D_802ACCD0.unk_31C = 0; + D_802ACCD0.unk_320 = 0; + func_800F513C(&D_802ACCD0); + func_800F52BC(); + gBattleState2 = 0x1F; + break; + case 0x1F: + if (D_802ACCD0.result == -1) { + gBattleState2 = 0x24; + } else if (D_802ACCD0.result != 0) { + if (D_802ACCD0.result == 0xff) { + func_802A47E0(); + gBattleState2 = 0xC9; + btl_state_update_player_menu(); + btl_state_update_player_menu(); + } else { + battleStatus->unk_6C = 0x22; + battleStatus->unk_6E = 0x23; + battleStatus->unk_1AC = D_802ACCD0.userIndex[D_802ACCD0.result - 1]; + battleStatus->moveCategory = 5; + battleStatus->selectedMoveID = 0x37; + battleStatus->currentTargetListFlags = 2; + battleStatus->selectedItemID = battleStatus->unk_1AC; + battleStatus->unk_4C[5] = D_802ACCD0.result - 1; + hide_popup_menu(); + func_802A4718(); + func_802A1030(); + gBattleState2 = 0x20; + } + } + break; + case 0x20: + if ((battleStatus->currentButtonsPressed & 0x4000) && (D_802ACCD0.result == 0)) { + func_800F16CC(); + func_802A4A10(); + func_802A1098(); + gBattleState2 = 0x21; + break; + } + func_802A4A54(); + if (func_802A11B0() != 0) { + gBattleState2 = battleStatus->unk_6E; + btl_state_update_player_menu(); + btl_set_state(0x1D); + break; + } + break; + case 0x21: + func_802A4A54(); + if (func_802A11B0() != 0) { + gBattleState2 = 0x1F; + } + break; + case 0x22: + func_800F16CC(); + func_802A4A10(); + func_802A1098(); + gBattleState2 = 0x21; + break; + case 0x23: + destroy_popup_menu(); + func_802A472C(); + func_802A10B8(); + break; + case 0x24: + set_window_update(6, 2); + set_window_update(7, 2); + if (D_802ACCD0.result != -1) { + set_window_update(6, 9); + set_window_update(7, 9); + gBattleState2 = 0x1F; + } + break; + } +} +#else INCLUDE_ASM(s32, "415D90", btl_state_update_player_menu); +#endif void btl_state_draw_player_menu(void) { switch (gBattleState2) { @@ -2300,6 +3648,7 @@ void btl_state_update_peach_menu(void) { Actor* partner = battleStatus->partnerActor; s32 temp_s0_2; s32 phi_v0; + s32 s1; switch (gBattleState2) { case 0: @@ -2355,31 +3704,37 @@ void btl_state_update_peach_menu(void) { partner->flags |= 0x08000000; } + temp_s0_2 = 8; battleStatus->selectedMoveID = 0; - battle_menu_submenuIDs = 8; - battle_menu_isEnabled = TRUE; - battle_menu_isMessageDisabled = 0; - main_battle_menu_JumpHudScripts = battle_menu_PeachStarPowerHudScripts[0]; - battle_menu_messageIDs = D_802AB728[0]; + battle_menu_submenuIDs[0] = temp_s0_2; + battle_menu_isEnabled[0] = TRUE; + battle_menu_isMessageDisabled[0] = 0; + main_battle_menu_JumpHudScripts[0] = battle_menu_PeachStarPowerHudScripts.enabled; + battle_menu_messageIDs[0] = D_802AB728[0]; + s1 = 0; if (!(battleStatus->menuDisableFlags & 0x100)) { - battle_menu_isEnabled = FALSE; - battle_menu_isMessageDisabled = 0x48; - main_battle_menu_JumpHudScripts = battle_menu_PeachStarPowerHudScripts[1]; + battle_menu_isEnabled[0] = FALSE; + battle_menu_isMessageDisabled[0] = 0x48; + main_battle_menu_JumpHudScripts[0] = battle_menu_PeachStarPowerHudScripts.disabled; } + phi_v0 = 2; if (func_802A9B30()) { D_802AD104 = 1; - phi_v0 = 2 - 0; + phi_v0 = 2 - s1; main_menu_numOptions = 1; + D_802AD0A8 = 0; + D_802AD0B0 = 0; + D_802AD100 = phi_v0; } else { D_802AD104 = 0; - phi_v0 = 2 - 0; + phi_v0 = 2 - s1; main_menu_numOptions = 1; + D_802AD0A8 = 0; + D_802AD0B0 = 0; + D_802AD100 = phi_v0; } - D_802AD0A8 = 0; - D_802AD0B0 = 0; - D_802AD100 = phi_v0; func_802A1000(); D_802ACC60 = 8; gBattleState2 = 1; @@ -2566,7 +3921,7 @@ void btl_state_update_twink_menu(void) { battle_menu_isEnabled = TRUE; battle_menu_isMessageDisabled = 0; main_battle_menu_JumpHudScripts = battle_menu_TwinkStarPowerHudScripts[0]; - *battle_menu_messageIDs = *D_802AB734; + battle_menu_messageIDs[0] = *D_802AB734; if (!(battleStatus->menuDisableFlags & 0x100)) { battle_menu_isEnabled = FALSE; battle_menu_isMessageDisabled = 0x48; diff --git a/src/5B320.c b/src/5B320.c index ee6bfe1150..4bd511b8ee 100644 --- a/src/5B320.c +++ b/src/5B320.c @@ -155,13 +155,9 @@ s32 pad_after_item_hudscripts[] = { #include "item_entity_scripts.inc.c" -s32 D_8008EEC0[] = { -0, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000009, 0x00000006, 0x00000007, 0x00000008, 0x00000005, 0x0000000A, 0x0000000B -}; +s32 D_8008EEC0[] = { 0, 1, 2, 3, 4, 9, 6, 7, 8, 5, 10, 11 }; -s32 D_8008EEF0[] = { -0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000000, 0x00000006, 0x00000007, 0x00000008, 0x00000005, 0x00000000, 0x00000000 -}; +s32 D_8008EEF0[] = { 0, 1, 2, 3, 4, 0, 6, 7, 8, 5, 0, 0 }; const char D_800989A0[] = "なし"; diff --git a/src/EA0C10.c b/src/EA0C10.c index f41394a6f6..258717b8ac 100644 --- a/src/EA0C10.c +++ b/src/EA0C10.c @@ -8,7 +8,7 @@ const char ascii_EA6D70[] = "kzn_11"; const char ascii_EA6D78[] = "kzn_18"; -extern s32 D_802466D0[]; +extern s32 EA0C10_D_802466D0[]; void func_8004D8E0(DeadEnemy*); @@ -76,13 +76,13 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_802466D0[i] = ptr[i]; + EA0C10_D_802466D0[i] = ptr[i]; } - D_802466D0[i] = 0; + EA0C10_D_802466D0[i] = 0; } else { for (i = 0; i < 112; i++) { - D_802466D0[i] = i + 16; - D_802466D0[112] = 0; + EA0C10_D_802466D0[i] = i + 16; + EA0C10_D_802466D0[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/EA8AE0.c b/src/EA8AE0.c index 3e57d8509c..9926902520 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -3,11 +3,11 @@ #include "effects.h" #include "battle/battle.h" -// Copy of kzn_19 (C8DBB0.c) +// Copy of kzn_19 (kzn_19_3.npc.c) #define NAMESPACE EA8AE0 -extern s32 D_80248388[]; +extern s32 EA8AE0_D_80248388[]; extern s32 D_80248380; extern s32 D_80243DD8_EAC8B8; extern s32 D_80243DDC_EAC8BC; @@ -116,13 +116,13 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_80248388[i] = ptr[i]; + EA8AE0_D_80248388[i] = ptr[i]; } - D_80248388[i] = 0; + EA8AE0_D_80248388[i] = 0; } else { for (i = 0; i < 112; i++) { - D_80248388[i] = i + 16; - D_80248388[112] = 0; + EA8AE0_D_80248388[i] = i + 16; + EA8AE0_D_80248388[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/EB1170.c b/src/EB1170.c index f2f449395b..f4f277693d 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -8,7 +8,7 @@ extern s32 func_80059AC8(s32, s32); extern s32 D_802417E4_EB2644; extern s32 D_802417E8_EB2648; -extern s32 D_802442D0[]; +extern s32 EB1170_D_802442D0[]; extern s32 EB1170_LetterDelivery_SavedNpcAnim; extern s32 D_800B8DEC; @@ -54,13 +54,13 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_802442D0[i] = ptr[i]; + EB1170_D_802442D0[i] = ptr[i]; } - D_802442D0[i] = 0; + EB1170_D_802442D0[i] = 0; } else { for (i = 0; i < 112; i++) { - D_802442D0[i] = i + 16; - D_802442D0[112] = 0; + EB1170_D_802442D0[i] = i + 16; + EB1170_D_802442D0[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/EB8E50.c b/src/EB8E50.c index 29f900585b..0774682ffe 100644 --- a/src/EB8E50.c +++ b/src/EB8E50.c @@ -15,7 +15,9 @@ const char ascii_EC2028[] = "flo_09"; const char ascii_EC2030[] = "flo_08"; static const f64 rodata_alignment = 0.0; +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); + ApiStatus func_80240000_EB8E50(void) { - dead_fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/EDBFE0.c b/src/EDBFE0.c index 741f7edc57..594040b3e0 100644 --- a/src/EDBFE0.c +++ b/src/EDBFE0.c @@ -3,7 +3,9 @@ #define NAMESPACE ED8FE0 +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); + ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) { - dead_fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/EDC020.c b/src/EDC020.c index 11a212d707..4cdda32088 100644 --- a/src/EDC020.c +++ b/src/EDC020.c @@ -5,18 +5,7 @@ #define NAMESPACE EDC020 -extern s32 D_802429E0[]; -//extern s32** EDC020_varStash = NULL; - -/* -extern s32 D_80241850_EDD830 = { - 0x00000000, -}; - -extern s32 D_80241850_EDD834 = { - 0x00000000, -}; -*/ +extern s32 EDC020_D_802429E0[]; #include "common/foliage.inc.c" @@ -67,13 +56,13 @@ ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_802429E0[i] = ptr[i]; + EDC020_D_802429E0[i] = ptr[i]; } - D_802429E0[i] = 0; + EDC020_D_802429E0[i] = 0; } else { for (i = 0; i < 112; i++) { - D_802429E0[i] = i + 16; - D_802429E0[112] = 0; + EDC020_D_802429E0[i] = i + 16; + EDC020_D_802429E0[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/EDE9C0.c b/src/EDE9C0.c index 03aad4155d..a181e09a98 100644 --- a/src/EDE9C0.c +++ b/src/EDE9C0.c @@ -3,7 +3,9 @@ #define NAMESPACE EDE9C0 +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); + ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) { - dead_fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/src/EE65B0.c b/src/EE65B0.c index 312763be79..d78d463cb2 100644 --- a/src/EE65B0.c +++ b/src/EE65B0.c @@ -5,10 +5,14 @@ #define NAMESPACE EE65B0 +extern f32 D_80243B44_EEA0F4; + #include "world/common/atomic/TexturePan.inc.c" +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); + ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) { - dead_fx_sun(0, 0, 0, 0, 0, 0); + fx_sun_undeclared(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } @@ -43,6 +47,39 @@ ApiStatus func_8024046C_EE6A1C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "EE65B0", func_80240504_EE6AB4); +void func_80240504_EE6AB4(void) { + Matrix4f matrix; + Vtx* sp50; + Vtx* sp54; + s32 sp58; + s32 new_var; + + guMtxIdentF(matrix); + + matrix[0][0] = (sin_rad(D_80243B44_EEA0F4 / 11.0f) * 0.04) + 0.98; + matrix[0][1] = sin_rad(D_80243B44_EEA0F4 / 12.0f) * 0.04; + matrix[0][2] = cos_rad(D_80243B44_EEA0F4 / 13.0f) * 0.04; + + matrix[1][1] = (sin_rad(D_80243B44_EEA0F4 / 7.0f + 1.0f) * 0.04) + 0.98; + matrix[1][0] = sin_rad(D_80243B44_EEA0F4 / 14.0f) * 0.04; + matrix[1][2] = cos_rad(D_80243B44_EEA0F4 / 15.0f) * 0.04; + + matrix[2][2] = (sin_rad(D_80243B44_EEA0F4 * 0.25f + 2.0f) * 0.04) + 0.98; + matrix[2][0] = sin_rad(D_80243B44_EEA0F4 * 0.0625f) * 0.04; + matrix[2][1] = cos_rad(D_80243B44_EEA0F4 / 17.0f) * 0.04; + + guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]); + mdl_get_copied_vertices(0, &sp50, &sp54, &sp58); + + new_var = 0; + while (new_var); // TODO required to match + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(0)); + + D_80243B44_EEA0F4 += 1.0f; +} + INCLUDE_ASM(s32, "EE65B0", func_802407D4_EE6D84); diff --git a/src/npc.c b/src/npc.c index 4f0b99a98c..bb6229c19e 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1723,7 +1723,59 @@ void func_8003DA38(Npc* npc, s32 arg1) { INCLUDE_ASM(void, "npc", func_8003DA38, Npc* npc, s32 arg1); #endif +// floats suqqz +#ifdef NON_EQUIVALENT +void func_8003DC38(Npc* npc, s32 arg1) { + f32 temp_f0; + f32 xTemp; + f32 zTemp; + f32 yTemp; + f32 theta; + f32 sinTheta; + s32 i; + s32 var_v0; + f32 cosTheta; + + D_80077C2C += 0.1f; + if (arg1 == 2) { + fx_cloud_puff(npc->pos.x, (npc->pos.y + 14.0f) - 5.0f, npc->pos.z, D_80077C24); + + D_80077C24 = clamp_angle(D_80077C24 + 35.0f); + + for (i = 0; i < 4; i++) { + xTemp = rand_int(10) - 5; + zTemp = rand_int(10) - 5; + yTemp = -2.0f - (SQ(xTemp) + SQ(zTemp) / 5.0f); + D_80077C28 = 0; + theta = DEG_TO_RAD(clamp_angle(-npc->yaw + (i * 90))); + sinTheta = sin_rad(theta); + cosTheta = cos_rad(theta); + fx_cloud_trail( + 1, + npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp, + npc->pos.y + 15.5f + yTemp, + npc->pos.z + (npc->collisionRadius * cosTheta * -0.3f) + zTemp + ); + } + } else { + xTemp = rand_int(10) - 5; + zTemp = rand_int(10) - 5; + yTemp = -2.0f - (SQ(xTemp) + SQ(zTemp) / 5.0f); + D_80077C28 = 0; + theta = DEG_TO_RAD(clamp_angle(-npc->yaw)); + sinTheta = sin_rad(theta); + cosTheta = cos_rad(theta); + fx_cloud_trail( + 1, + npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp, + npc->pos.y + 15.5f + yTemp, + npc->pos.z + (npc->collisionRadius * cosTheta * -0.3f) + zTemp + ); + } +} +#else INCLUDE_ASM(s32, "npc", func_8003DC38); +#endif void func_8003DFA0(Npc* npc, s32 arg1) { if (D_80077C30++ >= 4) { diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 3675f8e6cd..e11257a27a 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -36,23 +36,23 @@ enum { // BSS -typedef struct { - s32 unk_00; - f32 unk_04; - f32 unk_08; - f32 unk_0C; - f32 unk_10; - f32 unk_14; - s32 unk_18; - s32 unk_1C; - s32 unk_20; +typedef struct D_8024F010_Struct { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ s32 unk_18; + /* 0x1C */ s32 unk_1C; + /* 0x20 */ s32 unk_20; } D_8024F010_Struct; // size = 0x24 -static s8 N(pad_D_8024EF80)[0x4]; +static f32 N(D_8024EF80); static f32 N(D_8024EF84); static s32 N(D_8024EF88); static s8 N(pad_D_8024EF8C)[0x4]; -static EffectInstance* N(D_8024EF90)[4]; // possibly bigger? +static EffectInstance* N(D_8024EF90)[4]; static s32 N(Quizmo_Worker); static s32 N(pad_D_8024EFA4); static s32 N(Quizmo_ScriptArray)[4]; @@ -2614,8 +2614,275 @@ void N(func_80242214_96B3D4)(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg *arg4 = clamp_angle(F010_ptr->unk_10); } -INCLUDE_ASM(void, "world/area_dro/dro_02/9694C0", dro_02_func_8024240C_96B5CC, Evt* script, - s32 isInitialCall); +void dro_02_func_8024240C_96B5CC(Evt* script, s32 isInitialCall) { + f32 sp18; + f32 sp1C; + f32 sp20; + f32 sp24; + f32 sp28; + f32 sp2C; + f32 sp30; + f32 sp34; + f32 sp38; + f32 sp3C; + f32 sp40; + f32 sp44; + f32 sp48; + f32 sp4C; + f32 sp50; + f32 sp54; + f32 sp58; + f32 sp5C; + f32 sp60; + f32 sp64; + f32 sp68; + f32 sp6C; + f32 sp70; + f32 sp74; + EffectInstance* effect; + EnergyInOutFXData* data; + s32 i, j; + + switch (evt_get_variable(N(D_8024EFCC), ArrayVar(9))) { + case 0: + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 1); + N(D_8024F010)[0].unk_00 = 1; + N(D_8024F010)[0].unk_04 = -200.0f; + N(D_8024F010)[0].unk_08 = 0.0f; + N(D_8024F010)[0].unk_0C = 0.0f; + N(D_8024F010)[0].unk_14 = 0.0f; + N(D_8024F010)[0].unk_1C = 12; + N(D_8024F010)[0].unk_20 = 2; + + N(D_8024F010)[1].unk_1C = 48; + N(D_8024F010)[2].unk_18 = 8; + N(D_8024F010)[2].unk_1C = 5; + N(D_8024F010)[0].unk_10 = 0.0f; + N(D_8024F010)[0].unk_18 = 1; + N(D_8024F010)[1].unk_00 = 1; + N(D_8024F010)[1].unk_08 = 0.0f; + N(D_8024F010)[1].unk_14 = 0.0f; + N(D_8024F010)[1].unk_10 = 0.0f; + N(D_8024F010)[1].unk_18 = 1; + N(D_8024F010)[1].unk_20 = 0; + N(D_8024F010)[2].unk_00 = 1; + N(D_8024F010)[2].unk_04 = 0.0f; + N(D_8024F010)[2].unk_14 = 0.0f; + N(D_8024F010)[2].unk_10 = 0.0f; + N(D_8024F010)[2].unk_20 = 4; + N(D_8024F010)[1].unk_04 = 200.0f; + N(D_8024F010)[1].unk_0C = 1.0f; + N(D_8024F010)[2].unk_08 = 200.0f; + N(D_8024F010)[2].unk_0C = 2.0f; + break; + case 1: + N(D_8024EF88)++; + N(D_8024F010)[0].unk_04 += 10.0f; + N(D_8024F010)[1].unk_04 += -10.0f; + N(D_8024F010)[2].unk_08 += -10.0f; + if (N(D_8024EF88) == 18) { + gPlayerStatus.position.y = -1000.0f; + } + if (N(D_8024EF88) == 20) { + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 2); + N(D_8024EF88) = 0; + } + break; + case 2: + N(D_8024F010)[0].unk_00 = 2; + N(D_8024F010)[1].unk_00 = 0; + N(D_8024F010)[2].unk_00 = 0; + N(D_8024F010)[0].unk_04 = 0.0f; + N(D_8024F010)[0].unk_08 = 0.0f; + N(D_8024F010)[0].unk_0C = 0; + break; + case 3: + N(D_8024F010)[0].unk_00 = 1; + N(D_8024F010)[1].unk_00 = 1; + N(D_8024F010)[2].unk_00 = 1; + N(D_8024EF88)++; + N(D_8024F010)[0].unk_04 -= 10.0f; + N(D_8024F010)[1].unk_04 += 10.0f; + if (N(D_8024EF88) == 10) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 4); + } + break; + case 4: + N(D_8024F010)[0].unk_08 = 0.0f; + N(D_8024F010)[0].unk_0C = 0; + N(D_8024F010)[1].unk_08 = 0.0f; + N(D_8024F010)[2].unk_04 = 0; + N(D_8024F010)[2].unk_08 = 0.0f; + N(D_8024F010)[0].unk_04 = -100.0f; + N(D_8024F010)[1].unk_04 = 100.0f; + N(D_8024F010)[1].unk_0C = 1.0f; + N(D_8024F010)[2].unk_0C = 2.0f; + N(D_8024EF88)++; + if (N(D_8024EF88) == 20) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 5); + sfx_play_sound_with_params(SOUND_203, 0, 0x18, 0); + } + break; + case 5: + N(D_8024F010)[1].unk_10 = 0.0f; + N(D_8024F010)[2].unk_10 = 0.0f; + N(D_8024F010)[0].unk_10 += 18.0f; + N(D_8024EF88)++; + if (N(D_8024EF88) == 8) { + N(func_80242214_96B3D4)(0, &sp18, &sp1C, &sp20, &sp24); + fx_sparkles(0, sp18, sp1C + 20.0f, sp20, 30.0f); + } + if (N(D_8024EF88) == 10) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 6); + sfx_play_sound_with_params(SOUND_203, 0, 0x40, 0); + } + break; + case 6: + N(D_8024F010)[1].unk_10 = 0.0f; + N(D_8024F010)[0].unk_10 += 18.0f; + N(D_8024F010)[2].unk_10 += 18.0f; + N(D_8024EF88)++; + if (N(D_8024EF88) == 8) { + N(func_80242214_96B3D4)(2, &sp28, &sp2C, &sp30, &sp34); + fx_sparkles(0, sp28, sp2C + 20.0f, sp30, 30.0f); + } + if (N(D_8024EF88) == 10) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 7); + sfx_play_sound_with_params(SOUND_203, 0, 0x68, 0); + } + break; + case 7: + N(D_8024F010)[0].unk_10 = 0.0f; + N(D_8024EF88)++; + N(D_8024F010)[1].unk_10 += 18.0f; + N(D_8024F010)[2].unk_10 += 18.0f; + if (N(D_8024EF88) == 8) { + N(func_80242214_96B3D4)(1, &sp38, &sp3C, &sp40, &sp44); + fx_sparkles(0, sp38, sp3C + 20.0f, sp40, 30.0f); + } + if (N(D_8024EF88) == 10) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 8); + } + break; + case 8: + N(D_8024F010)[0].unk_10 = 0.0f; + N(D_8024F010)[2].unk_10 = 0.0f; + N(D_8024F010)[1].unk_10 += 18.0f; + N(D_8024EF88)++; + if (N(D_8024EF88) == 10) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 9); + } + break; + case 9: + N(D_8024F010)[0].unk_08 = 0.0f; + N(D_8024F010)[0].unk_10 = 0.0f; + N(D_8024F010)[1].unk_08 = 0.0f; + N(D_8024F010)[1].unk_10 = 0.0f; + N(D_8024F010)[2].unk_04 = 0; + N(D_8024F010)[2].unk_08 = 0.0f; + N(D_8024F010)[2].unk_10 = 0.0f; + N(D_8024EF88)++; + N(D_8024F010)[0].unk_04 += 10.0f; + N(D_8024F010)[1].unk_04 -= 10.0f; + if (N(D_8024EF88) == 10) { + N(D_8024EF88) = 0; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 10); + return; + } + break; + case 10: + N(D_8024F010)[0].unk_00 = 3; + N(D_8024F010)[0].unk_18 = 8; + N(D_8024F010)[1].unk_00 = 0; + N(D_8024F010)[2].unk_00 = 0; + N(D_8024F010)[0].unk_1C = 0x11; + return; + case 11: + N(D_8024F010)[0].unk_00 = 4; + N(D_8024F010)[1].unk_00 = 5; + N(D_8024F010)[1].unk_18 = 8; + N(D_8024F010)[0].unk_04 = 0.0f; + N(D_8024F010)[0].unk_0C = 0; + N(D_8024F010)[1].unk_04 = 0.0f; + N(D_8024F010)[1].unk_0C = 0; + N(D_8024F010)[1].unk_1C = 10; + N(D_8024F010)[1].unk_20 = 0; + N(D_8024EF88) = 0; + N(D_8024F010)[0].unk_08 = 68.0f; + N(D_8024F010)[0].unk_10 = 180.0f; + N(D_8024F010)[1].unk_08 = 68.0f; + N(D_8024F010)[1].unk_10 = 180.0f; + evt_set_variable(N(D_8024EFCC), ArrayVar(9), 12); + N(D_8024EF80) = 0.0f; + N(D_8024EF84) = 1.0f; + + N(func_80242214_96B3D4)(1, &sp48, &sp4C, &sp50, &sp54); + + for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { + s32 i; + + N(D_8024EF90)[j] = fx_energy_in_out(2, sp48, sp4C + 20.0f, sp50, 8.0f, -1); + N(D_8024EF90)[j]->data.energyInOut->unk_28 = 215; + N(D_8024EF90)[j]->data.energyInOut->unk_2C = 55; + N(D_8024EF90)[j]->data.energyInOut->unk_30 = 255; + + for (i = 1; i < N(D_8024EF90)[j]->numParts; i++) { + N(D_8024EF90)[j]->data.energyInOut[i].unk_38 *= 0.1; + } + } + break; + case 12: + N(func_80242214_96B3D4)(1, &sp58, &sp5C, &sp60, &sp64); + + for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { + s32 i; + + N(D_8024EF90)[j]->data.energyInOut->pos.x = sp58; + N(D_8024EF90)[j]->data.energyInOut->pos.y = sp5C + 20.0f; + N(D_8024EF90)[j]->data.energyInOut->pos.z = sp60; + N(D_8024EF90)[j]->data.energyInOut->scale -= 0.1; + + if (N(D_8024EF90)[j]->data.energyInOut->scale < 0.1) { + N(D_8024EF90)[j]->data.energyInOut->scale = 0.1f; + } + + for (i = 1; i < N(D_8024EF90)[j]->numParts; i++, data++) { + N(D_8024EF90)[j]->data.energyInOut[i].unk_38 += 0.01; + } + } + + N(D_8024F010)[0].unk_08 += N(D_8024EF80); + N(D_8024F010)[1].unk_08 += N(D_8024EF84); + N(D_8024EF80) += 0.4; + N(D_8024EF84) -= 0.05; + N(D_8024EF88) += 1; + + if (N(D_8024F010)[1].unk_08 < -5.0f) { + N(D_8024F010)[1].unk_08 = -5.0f; + N(D_8024EF88) = 0; + evt_set_variable(dro_02_D_8024EFCC, ArrayVar(9), 13); + N(D_8024F010)[0].unk_00 = 0; + N(D_8024F010)[1].unk_00 = 0; + N(func_80242214_96B3D4)(1, &sp68, &sp6C, &sp70, &sp74); + fx_sparkles(0, sp68, sp6C + 20.0f, sp70, 30.0f); + sfx_play_sound(0x206); + + for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { + N(D_8024EF90)[j]->flags |= 0x10; + } + } + break; + case 13: + break; + } +} void N(func_80242EAC_96C06C)(Evt* script, s32 isInitialCall) { Matrix4f sp20; diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 5b539ca1b0..c1fb5fb696 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 s32 N(D_802429E0)[112]; +static s32 N(flo_12_D_802429E0)[112]; EntryList N(entryList) = { { 280.0f, 0.0f, 0.0f, 270.0f }, @@ -218,7 +218,7 @@ EvtScript N(80241858) = { EvtScript N(8024199C) = { EVT_CALL(N(func_8024064C_CC147C), LVar0) - EVT_BIND_PADLOCK(N(80241858), 0x10, 0, EVT_PTR(N(D_802429E0)), 0, 1) + EVT_BIND_PADLOCK(N(80241858), 0x10, 0, EVT_PTR(N(flo_12_D_802429E0)), 0, 1) EVT_CALL(N(func_802405C0_CC13F0), LVar0) EVT_RETURN EVT_END @@ -517,13 +517,13 @@ ApiStatus N(func_8024064C_CC147C)(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - N(D_802429E0)[i] = ptr[i]; + N(flo_12_D_802429E0)[i] = ptr[i]; } - N(D_802429E0)[i] = 0; + N(flo_12_D_802429E0)[i] = 0; } else { for (i = 0; i < 0x70; i++) { - N(D_802429E0)[i] = i + 16; - N(D_802429E0)[112] = 0; + N(flo_12_D_802429E0)[i] = i + 16; + N(flo_12_D_802429E0)[112] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index 7c231f6b69..4886d506fe 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -607,13 +607,12 @@ ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// graphics macros -#ifdef NON_EQUIVALENT void N(func_80240504_CCB814)(void) { Matrix4f matrix; Vtx* sp50; Vtx* sp54; s32 sp58; + s32 new_var; guMtxIdentF(matrix); @@ -630,16 +629,17 @@ void N(func_80240504_CCB814)(void) { matrix[2][1] = cos_rad(N(D_80243B14_CCEE24) / 17.0f) * 0.04; guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]); - mdl_get_copied_vertices(0, &sp50, &sp54, &sp58); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + + new_var = 0; + while (new_var); // TODO required to match + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(0)); N(D_80243B14_CCEE24) += 1.0f; } -#else -INCLUDE_ASM(void, "world/area_flo/flo_14/CCB310", flo_14_func_80240504_CCB814, void); -#endif void N(func_802407D4_CCBAE4)(void) { s32 i; diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index b4679b3ec2..054adaa1e6 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -6,11 +6,33 @@ extern u32 D_80241C30_A124B0; #include "world/common/atomic/TexturePan.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C); +ApiStatus func_80240AAC_A1132C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240B10_A11390); + effect->data.unk_75->unk_78 = 190.0f; + effect->data.unk_75->unk_7C = 220.0f; + effect->data.unk_75->unk_68 = 0.7f; + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240B64_A113E4); +ApiStatus func_80240B10_A11390(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); + + effect->data.unk_75->unk_78 = 170.0f; + effect->data.unk_75->unk_7C = 170.0f; + effect->data.unk_75->unk_68 = 2.0f; + return ApiStatus_DONE2; +} + +ApiStatus func_80240B64_A113E4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); + + effect->data.unk_75->unk_38 = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} void func_80240BB8_A11438(void) { gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, @@ -18,7 +40,12 @@ void func_80240BB8_A11438(void) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241C2C_A124AC); } -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C08_A11488); +ApiStatus func_80240C08_A11488(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + D_80241C2C_A124AC = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} void func_80240C34_A114B4(void) { gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, @@ -26,7 +53,12 @@ void func_80240C34_A114B4(void) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241C30_A124B0); } -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C84_A11504); +ApiStatus func_80240C84_A11504(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + D_80241C30_A124B0 = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} #include "world/common/SwitchToPartner.inc.c" diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c index b814ffa6d2..bf20764035 100644 --- a/src/world/area_hos/hos_02/A16220.c +++ b/src/world/area_hos/hos_02/A16220.c @@ -3,9 +3,18 @@ static char* N(exit_str_0) = "hos_01"; static char* N(exit_str_1) = "hos_03"; +extern u16 D_802433AC_A195CC; + #include "world/common/atomic/TexturePan.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C); +void func_8024030C_A1652C(void) { + f32 scale = ((sins(D_802433AC_A195CC) * (1 / 32768.0f)) * 0.5 * 0.5) + 1.05; + + D_802433AC_A195CC += 409; + guScale(&gDisplayContext->matrixStack[gMatrixListPos], scale, scale, scale); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); +} INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240434_A16654); diff --git a/src/world/area_hos/hos_02/A171F0.c b/src/world/area_hos/hos_02/A171F0.c index b92e86aeb0..d951fa7471 100644 --- a/src/world/area_hos/hos_02/A171F0.c +++ b/src/world/area_hos/hos_02/A171F0.c @@ -1,3 +1,6 @@ #include "hos_02.h" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A171F0", func_80240FD0_A171F0); +ApiStatus func_80240FD0_A171F0(Evt* script, s32 isInitialCall) { + script->varTable[0] = gGameStatusPtr->entryID; + return ApiStatus_DONE2; +} diff --git a/src/world/area_hos/hos_03/A1B130.c b/src/world/area_hos/hos_03/A1B130.c index a044229320..17bca541d5 100644 --- a/src/world/area_hos/hos_03/A1B130.c +++ b/src/world/area_hos/hos_03/A1B130.c @@ -1,5 +1,7 @@ #include "hos_03.h" +extern u16 D_80243BD4_A1ECD4; + #include "world/common/atomic/TexturePan.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C); @@ -8,6 +10,16 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024060C_A1B70C); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_802407E8_A1B8E8); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240928_A1BA28); +void func_80240928_A1BA28(void) { + f32 scale = ((sins(D_80243BD4_A1ECD4) * (1 / 32768.0f)) * 0.5 * 0.5) + 1.05; -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240A50_A1BB50); + D_80243BD4_A1ECD4 += 409; + guScale(&gDisplayContext->matrixStack[gMatrixListPos], scale, scale, scale); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); +} + +ApiStatus func_80240A50_A1BB50(Evt* script, s32 isInitialCall) { + script->varTable[0] = gGameStatusPtr->entryID; + return ApiStatus_DONE2; +} diff --git a/src/world/area_hos/hos_04/A26ED0.c b/src/world/area_hos/hos_04/A26ED0.c index 937c7781c4..f57da223e8 100644 --- a/src/world/area_hos/hos_04/A26ED0.c +++ b/src/world/area_hos/hos_04/A26ED0.c @@ -3,9 +3,25 @@ static char* N(exit_str_0) = "hos_03"; static char* N(exit_str_1) = "hos_05"; -INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0); +extern u16 D_802416F0_A285C0; -INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024); +void func_80240000_A26ED0(void) { + f32 temp_f0 = ((sin_rad(D_802416F0_A285C0 * (1 / 32.0f)) + 1.0f) * 0.25f) + 0.75; + + guScale(&gDisplayContext->matrixStack[gMatrixListPos], (temp_f0 * 0.3) + 0.5, temp_f0, (temp_f0 * 0.3) + 0.5); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + D_802416F0_A285C0++; +} + +void func_80240154_A27024(void) { + f64 t1 = (sin_rad(D_802416F0_A285C0 * (1 / 32.0f)) * 10.0f) + 1.5; + f64 t2 = sin_rad(D_802416F0_A285C0 * 0.25f) * 2.5; + + guTranslate(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, t1 + t2, 0.0f); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], + G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); +} #include "world/common/atomic/TexturePan.inc.c" diff --git a/src/world/area_hos/hos_04/A27490.c b/src/world/area_hos/hos_04/A27490.c index 67be4ebde9..893854a180 100644 --- a/src/world/area_hos/hos_04/A27490.c +++ b/src/world/area_hos/hos_04/A27490.c @@ -1,3 +1,6 @@ #include "hos_04.h" -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27490", func_802405C0_A27490); +ApiStatus func_802405C0_A27490(Evt* script, s32 isInitialCall) { + script->varTable[0] = gGameStatusPtr->entryID; + return ApiStatus_DONE2; +} diff --git a/src/world/area_hos/hos_04/A274B0.c b/src/world/area_hos/hos_04/A274B0.c index aeb6db0a5f..31f6bd6e1a 100644 --- a/src/world/area_hos/hos_04/A274B0.c +++ b/src/world/area_hos/hos_04/A274B0.c @@ -1,4 +1,14 @@ #include "hos_04.h" +#include "nu/nusys.h" + +extern f32 D_80241B54_A28A24; +extern f32 D_80241B74_A28A44; +extern f32 D_80241B7C_A28A4C; +extern s32 D_80241B80_A28A50; +extern s32 D_80241B84_A28A54; +extern s32 D_80241B88_A28A58; +extern f32 D_80243370; +extern f32 D_80243374; ApiStatus N(SetCamXXVfov)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -8,18 +18,114 @@ ApiStatus N(SetCamXXVfov)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240654_A27524); +ApiStatus func_80240654_A27524(Evt* script, s32 isInitialCall) { + if (gGameStatusPtr->creditsViewportMode < 5U) { + gGameStatusPtr->creditsViewportMode++; + state_init_intro(); + } + return ApiStatus_DONE1; +} ApiStatus func_8024068C_A2755C(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240694_A27564); +void func_80240694_A27564(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32* arg4) { + f32 temp_f2 = arg1 - arg2; -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240734_A27604); + if (arg1 - arg0 > 0.0f) { + if (temp_f2 < 0.0f) { + *arg4 = arg1; + } else if (arg3 < temp_f2) { + *arg4 += arg3; + } else { + *arg4 += temp_f2; + } + } else if (temp_f2 > 0.0f) { + *arg4 = arg1; + } else if (temp_f2 < -arg3) { + *arg4 -= arg3; + } else { + *arg4 += temp_f2; + } +} -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802408F8_A277C8); +void func_80240734_A27604(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5) { + f32 var_f12_2; -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802409B0_A27880); + if (arg3 > arg4) { + arg3 = arg4; + } -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240A84_A27954); + switch (arg0) { + case 1: + var_f12_2 = sin_deg((arg3 / arg4) * 90.0f); + break; + case 2: + if (arg3 < 30.0f) { + var_f12_2 = 0.0f; + } else { + var_f12_2 = sin_deg((((arg3 - 30.0f) / (arg4 - 30.0f)) * 90.0f) + -90.0f) + 1.0f; + } + break; + case 3: + var_f12_2 = (sin_deg(((arg3 / arg4) * 180.0f) - 90.0f) + 1.0f) * 0.5; + break; + case 4: + var_f12_2 = sin_deg(((arg3 / arg4) * 90.0f) - 90.0f) + 1.0f; + break; + case 5: + var_f12_2 = (2.0 * (sin_deg(((arg3 / arg4) * 60.0f) - 60.0f) + 0.8660254f)) / 1.7320507764816284; + break; + default: + var_f12_2 = arg3 / arg4; + break; + } + *arg5 = arg1 + ((arg2 - arg1) * var_f12_2); +} + +ApiStatus func_802408F8_A277C8(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[gCurrentCameraID]; + + if (nuGfxCfb_ptr == D_80241B80_A28A50) { + return ApiStatus_BLOCK; + } + + D_80241B80_A28A50 = nuGfxCfb_ptr; + func_80240694_A27564(700.0f, 300.0f, D_80241B7C_A28A4C, 1.2f, &D_80241B7C_A28A4C); + camera->panActive = TRUE; + camera->controlSettings.boomLength = D_80241B7C_A28A4C; + return ApiStatus_BLOCK; +} + +ApiStatus func_802409B0_A27880(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[gCurrentCameraID]; + + if (isInitialCall) { + D_80243370 = D_80241B54_A28A24; + } + func_80240734_A27604(1, D_80241B54_A28A24, 700.0f, D_80241B84_A28A54, 70.0f, &D_80243370); + camera->panActive = TRUE; + camera->controlSettings.boomLength = D_80243370; + D_80241B84_A28A54++; + if (D_80241B84_A28A54 < 70) { + return ApiStatus_BLOCK; + } + return ApiStatus_DONE1; +} + +ApiStatus func_80240A84_A27954(Evt* script, s32 isInitialCall) { + Camera* camera = &gCameras[gCurrentCameraID]; + + if (isInitialCall) { + D_80243374 = D_80241B74_A28A44; + } + func_80240734_A27604(5, D_80241B74_A28A44, -80.0f, D_80241B88_A28A58, 200.0f, &D_80243374); + camera->panActive = TRUE; + camera->controlSettings.viewPitch = D_80243374; + D_80241B88_A28A58++; + if (D_80241B88_A28A58 == 200) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} diff --git a/src/world/area_hos/hos_04/A27A30.c b/src/world/area_hos/hos_04/A27A30.c index 1516ee28b1..e8ea4f6e85 100644 --- a/src/world/area_hos/hos_04/A27A30.c +++ b/src/world/area_hos/hos_04/A27A30.c @@ -1,3 +1,21 @@ #include "hos_04.h" -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27A30", func_80240B60_A27A30); +ApiStatus func_80240B60_A27A30(Evt* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 16; + + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/area_hos/hos_04/A27AA0.c b/src/world/area_hos/hos_04/A27AA0.c index 33b51a8aee..9f58a8186b 100644 --- a/src/world/area_hos/hos_04/A27AA0.c +++ b/src/world/area_hos/hos_04/A27AA0.c @@ -1,7 +1,19 @@ #include "hos_04.h" +const char D_80243330_A2A200[] = "hos_20\0\0kpa_60\0\0hos_00\0\0osr_03\0\0hos_05"; + +extern s32 D_80243284_A2A154; + +void func_80240BD0_A27AA0(s32*); INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240BD0_A27AA0); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E40_A27D10); +ApiStatus func_80240E40_A27D10(Evt* script) { + Bytecode* args = script->ptrReadPos; -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E6C_A27D3C); + set_curtain_draw_callback((void (*)) evt_get_variable(script, *args++)); + return ApiStatus_DONE2; +} + +void func_80240E6C_A27D3C(void) { + func_80240BD0_A27AA0(&D_80243284_A2A154); +} diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c index 85e0776bda..28a2892fbd 100644 --- a/src/world/area_hos/hos_05/A2A240.c +++ b/src/world/area_hos/hos_05/A2A240.c @@ -18,6 +18,30 @@ ApiStatus N(AwaitScriptComplete)(Evt* script, s32 isInitialCall) { } } -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240634_A2A874); +ApiStatus func_80240634_A2A874(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 idx = evt_get_variable(script, *args++); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240690_A2A8D0); + script->varTable[idx] = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} + +ApiStatus func_80240690_A2A8D0(Evt* script, s32 isInitialCall) { + f32 vt2 = script->varTable[2]; + f32 temp_f20; + f32 temp_f26; + + script->varTable[2] = EVT_FLOAT(0); + script->varTable[3] = EVT_FLOAT(100); + script->varTable[4] = EVT_FLOAT(0); + + temp_f26 = (script->varTable[1] * 180.0f) / PI; + temp_f20 = (rand_int(10) / vt2) + 3.0f; + + script->varTable[10] = EVT_FLOAT_TO_FIXED(temp_f20 * cos_rad(temp_f26)); + script->varTable[11] = EVT_FLOAT_TO_FIXED(rand_int(15) + 5); + script->varTable[12] = EVT_FLOAT_TO_FIXED(temp_f20 * sin_rad(temp_f26)); + script->varTable[13] = EVT_FLOAT_TO_FIXED((f32)(rand_int(10) + 10) * -0.05); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_hos/hos_05/A2AA70.c b/src/world/area_hos/hos_05/A2AA70.c index a77ced93cc..315d5a0dd6 100644 --- a/src/world/area_hos/hos_05/A2AA70.c +++ b/src/world/area_hos/hos_05/A2AA70.c @@ -1,3 +1,10 @@ #include "hos_05.h" -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AA70", func_80240830_A2AA70); +ApiStatus func_80240830_A2AA70(Evt* script, s32 isInitialCall) { + gPlayerData.starBeamLevel = 1; + gPlayerData.curHP = gPlayerData.curMaxHP; + gPlayerData.curFP = gPlayerData.curMaxFP; + gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256; + sync_status_menu(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_hos/hos_05/A2EC30.c b/src/world/area_hos/hos_05/A2EC30.c index 2cdd117d03..a0133d1e48 100644 --- a/src/world/area_hos/hos_05/A2EC30.c +++ b/src/world/area_hos/hos_05/A2EC30.c @@ -4,6 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_802449F0_A2EC30); ApiStatus func_80244C60_A2EEA0(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; + void (*callback)(void) = (void (*)(void))evt_get_variable(script, *args++); set_curtain_draw_callback(callback); return ApiStatus_DONE2; diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 4a16cc5315..835fe021c5 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -20,7 +20,26 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0); +extern s32 hos_06_D_80246260[]; + +ApiStatus func_802406E0_A39BC0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + hos_06_D_80246260[i] = ptr[i]; + } + hos_06_D_80246260[i] = 0; + } else { + for (i = 0; i < 112; i++) { + hos_06_D_80246260[i] = i + 16; + hos_06_D_80246260[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index d2b12aaf9f..3aa8f1f686 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -8,7 +8,26 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8); +extern s32 hos_06_D_80246430[]; + +ApiStatus func_80241008_A3A4E8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + hos_06_D_80246430[i] = ptr[i]; + } + hos_06_D_80246430[i] = 0; + } else { + for (i = 0; i < 112; i++) { + hos_06_D_80246430[i] = i + 16; + hos_06_D_80246430[112] = 0; + } + } + return ApiStatus_DONE2; +} #define NAMESPACE dup_hos_06 #include "world/common/StashVars.inc.c" diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c new file mode 100644 index 0000000000..0205d0ee58 --- /dev/null +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -0,0 +1,32 @@ +#include "iwa_10.h" + +#include "world/common/util/ChangeNpcToPartner.inc.c" + +#include "world/common/GetNpcCollisionHeight.inc.c" + +#include "world/common/AddPlayerHandsOffset.inc.c" + +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0_91F950); + +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4); + +extern s32 iwa_10_D_80248480[]; + +ApiStatus func_8024146C_91F9DC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + iwa_10_D_80248480[i] = ptr[i]; + } + iwa_10_D_80248480[i] = 0; + } else { + for (i = 0; i < 112; i++) { + iwa_10_D_80248480[i] = i + 16; + iwa_10_D_80248480[112] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index ca08c2a5ca..7eb33dca58 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -12,7 +12,26 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8); +extern s32 D_80248760_jan_02[]; + +ApiStatus func_80241578_B2D9E8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80248760_jan_02[i] = ptr[i]; + } + D_80248760_jan_02[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80248760_jan_02[i] = i + 16; + D_80248760_jan_02[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 8e284c25f9..e6b3e201b0 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -27,9 +27,47 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634); +extern s32 D_8024FBA0[]; -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0); +ApiStatus func_80241A64_B36634(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_8024FBA0[i] = ptr[i]; + } + D_8024FBA0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_8024FBA0[i] = i + 16; + D_8024FBA0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_8024FD68[]; + +ApiStatus func_80241B00_B366D0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_8024FD68[i] = ptr[i]; + } + D_8024FD68[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_8024FD68[i] = i + 128; + D_8024FD68[91] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index 4997bd604d..f65cadec03 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -3,8 +3,7 @@ extern s32 D_80241F10_AF4BB0; extern s32 D_80241F14_AF4BB4; -extern s32 D_80244E78[]; -extern s32 tik_07_FlyingAI_JumpVels[]; +extern s32 kkj_18_D_80244E78[]; #include "world/common/GetNpcCollisionHeight.inc.c" @@ -40,6 +39,8 @@ ApiStatus func_802405C0_AF3260(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } +extern s32 kkj_18_D_80244CB0[]; + ApiStatus func_802405F8_AF3298(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32* ptr = (s32*)evt_get_variable(script, *args++); @@ -47,13 +48,13 @@ ApiStatus func_802405F8_AF3298(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - tik_07_FlyingAI_JumpVels[i] = ptr[i]; + kkj_18_D_80244CB0[i] = ptr[i]; } - tik_07_FlyingAI_JumpVels[i] = 0; + kkj_18_D_80244CB0[i] = 0; } else { for (i = 0; i < 112; i++) { - tik_07_FlyingAI_JumpVels[i] = i + 16; - tik_07_FlyingAI_JumpVels[112] = 0; + kkj_18_D_80244CB0[i] = i + 16; + kkj_18_D_80244CB0[112] = 0; } } @@ -67,13 +68,13 @@ ApiStatus func_80240694_AF3334(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_80244E78[i] = ptr[i]; + kkj_18_D_80244E78[i] = ptr[i]; } - D_80244E78[i] = 0; + kkj_18_D_80244E78[i] = 0; } else { for (i = 0; i < 91; i++) { - D_80244E78[i] = i + 128; - D_80244E78[91] = 0; + kkj_18_D_80244E78[i] = i + 128; + kkj_18_D_80244E78[91] = 0; } } diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 1b8d595ba2..550b726195 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -3,7 +3,7 @@ extern s32 D_80241B10_AF9460; extern s32 D_80241B14_AF9464; -extern s32 D_802461F0[]; +extern s32 kkj_19_D_802461F0[]; extern s32 D_802463B8_kkj_19[]; extern s32 D_8024652C; extern s32 D_80246530; @@ -63,13 +63,13 @@ ApiStatus func_80240568_AF7EB8(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_802461F0[i] = ptr[i]; + kkj_19_D_802461F0[i] = ptr[i]; } - D_802461F0[i] = 0; + kkj_19_D_802461F0[i] = 0; } else { for (i = 0; i < 112; i++) { - D_802461F0[i] = i + 16; - D_802461F0[112] = 0; + kkj_19_D_802461F0[i] = i + 16; + kkj_19_D_802461F0[112] = 0; } } diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index fa604058d8..b1ddb3b996 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -40,7 +40,26 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368); +extern s32 kmr_02_D_80257F58[]; + +ApiStatus func_802422F8_8B2368(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + kmr_02_D_80257F58[i] = ptr[i]; + } + kmr_02_D_80257F58[i] = 0; + } else { + for (i = 0; i < 112; i++) { + kmr_02_D_80257F58[i] = i + 16; + kmr_02_D_80257F58[112] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404); @@ -74,10 +93,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242BA8_8B2C18); #ifdef NON_MATCHING s32 func_80242BC0_8B2C30(Evt* script, s32 isInitialCall) { Bytecode* args; - + static u8 oldPrimR, oldPrimG, oldPrimB; static u8 oldEnvR, oldEnvG, oldEnvB; - + s32 newEnvR, newEnvB, newEnvG; s32 newPrimR, newPrimG, newPrimB; s32 duration; diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index 5504a0e542..fdec228855 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -42,4 +42,23 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790); INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802403A4_A78864); +extern s32 D_80242208[]; + +ApiStatus func_802403A4_A78864(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80242208[i] = ptr[i]; + } + D_80242208[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80242208[i] = i + 128; + D_80242208[91] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index 314acf5706..c668ed4f6a 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -17,6 +17,44 @@ ApiStatus func_802402D0_A7A7D0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_80240308_A7A808); +extern s32 D_80248F90[]; -INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802403A4_A7A8A4); +ApiStatus func_80240308_A7A808(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80248F90[i] = ptr[i]; + } + D_80248F90[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80248F90[i] = i + 16; + D_80248F90[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_80249158[]; + +ApiStatus func_802403A4_A7A8A4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80249158[i] = ptr[i]; + } + D_80249158[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80249158[i] = i + 128; + D_80249158[91] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 7988ae2d2d..ad8853594f 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -19,9 +19,47 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C); +extern s32 mac_00_D_80255BA0[]; -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); +ApiStatus func_8024197C_7EC68C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_00_D_80255BA0[i] = ptr[i]; + } + mac_00_D_80255BA0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + mac_00_D_80255BA0[i] = i + 16; + mac_00_D_80255BA0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 mac_00_D_80255D68[]; + +ApiStatus func_80241A18_7EC728(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_00_D_80255D68[i] = ptr[i]; + } + mac_00_D_80255D68[i] = 0; + } else { + for (i = 0; i < 91; i++) { + mac_00_D_80255D68[i] = i + 128; + mac_00_D_80255D68[91] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 238b9c14c8..543567aab0 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -24,7 +24,26 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); +extern s32 D_80255EE0[]; + +ApiStatus func_802437D0_7EE4E0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80255EE0[i] = ptr[i]; + } + D_80255EE0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80255EE0[i] = i + 16; + D_80255EE0[112] = 0; + } + } + return ApiStatus_DONE2; +} #define NAMESPACE dup_mac_00 extern s32 N(LetterDelivery_SavedNpcAnim); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 2509907f6d..1b87b16c3e 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -75,7 +75,26 @@ ApiStatus func_80243D28_8045A8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0); +extern s32 mac_01_D_80262A70[]; + +ApiStatus func_80243D60_8045E0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_01_D_80262A70[i] = ptr[i]; + } + mac_01_D_80262A70[i] = 0; + } else { + for (i = 0; i < 112; i++) { + mac_01_D_80262A70[i] = i + 16; + mac_01_D_80262A70[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 4468c3915e..44fcd892ba 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94); -extern s32 D_8024E570[]; +extern s32 mac_02_D_8024E570[]; ApiStatus func_80242B0C_825DCC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -51,19 +51,38 @@ ApiStatus func_80242B0C_825DCC(Evt* script, s32 isInitialCall) { if (ptr != NULL) { for (i = 0; ptr[i] != 0; i++) { - D_8024E570[i] = ptr[i]; + mac_02_D_8024E570[i] = ptr[i]; } - D_8024E570[i] = 0; + mac_02_D_8024E570[i] = 0; } else { for (i = 0; i < 112; i++) { - D_8024E570[i] = i + 16; - D_8024E570[112] = 0; + mac_02_D_8024E570[i] = i + 16; + mac_02_D_8024E570[112] = 0; } } return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242BA8_825E68); +extern s32 mac_02_D_8024E738[]; + +ApiStatus func_80242BA8_825E68(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_02_D_8024E738[i] = ptr[i]; + } + mac_02_D_8024E738[i] = 0; + } else { + for (i = 0; i < 91; i++) { + mac_02_D_8024E738[i] = i + 128; + mac_02_D_8024E738[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44_825F04); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 34aaf828b8..c6990948ad 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -21,7 +21,26 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC); +extern s32 mac_03_D_80251400[]; + +ApiStatus func_802417FC_832FFC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_03_D_80251400[i] = ptr[i]; + } + mac_03_D_80251400[i] = 0; + } else { + for (i = 0; i < 112; i++) { + mac_03_D_80251400[i] = i + 16; + mac_03_D_80251400[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 9fdeaebca7..9db7351a7e 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -19,7 +19,26 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC_84437C); +extern s32 mac_04_D_8024F5D0[]; + +ApiStatus func_802417AC_84437C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_04_D_8024F5D0[i] = ptr[i]; + } + mac_04_D_8024F5D0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + mac_04_D_8024F5D0[i] = i + 16; + mac_04_D_8024F5D0[112] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 1360ae07dc..721b634d29 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -31,9 +31,47 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC); +extern s32 mac_05_D_80252A00[]; -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878); +ApiStatus func_8024266C_8547DC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_05_D_80252A00[i] = ptr[i]; + } + mac_05_D_80252A00[i] = 0; + } else { + for (i = 0; i < 112; i++) { + mac_05_D_80252A00[i] = i + 16; + mac_05_D_80252A00[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 mac_05_D_80252BC8[]; + +ApiStatus func_80242708_854878(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + mac_05_D_80252BC8[i] = ptr[i]; + } + mac_05_D_80252BC8[i] = 0; + } else { + for (i = 0; i < 91; i++) { + mac_05_D_80252BC8[i] = i + 128; + mac_05_D_80252BC8[91] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_mac/machi/7E7550.c b/src/world/area_mac/machi/7E7550.c index 1833706859..eb6e920242 100644 --- a/src/world/area_mac/machi/7E7550.c +++ b/src/world/area_mac/machi/7E7550.c @@ -1,15 +1,15 @@ #include "machi.h" -extern s32 D_80241180_7E8520; +extern s32 D_80241180_7E8520[]; ApiStatus func_802401B0_7E7550(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID); if (rand_int(1000) < 500) { - func_8005DECC(npc, -1, &D_80241180_7E8520, + func_8005DECC(npc, -1, D_80241180_7E8520, rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 100); } else { - func_8005DECC(npc, rand_int(3) + 10, &D_80241180_7E8520, + func_8005DECC(npc, rand_int(3) + 10, D_80241180_7E8520, rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 10); } return ApiStatus_DONE2; diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 1cd4a0f961..3fc72f8e4f 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -47,7 +47,26 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); +extern s32 nok_01_D_80251C70[]; + +ApiStatus func_802420B4_9C7494(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + nok_01_D_80251C70[i] = ptr[i]; + } + nok_01_D_80251C70[i] = 0; + } else { + for (i = 0; i < 112; i++) { + nok_01_D_80251C70[i] = i + 16; + nok_01_D_80251C70[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" @@ -127,10 +146,10 @@ ApiStatus func_802428B8_9C7C98(Evt* script, s32 isInitialCall) { #ifdef NON_MATCHING ApiStatus func_802428D8_9C7CB8(Evt* script, s32 isInitialCall) { static s16 D_80250810_9D5BF0[] = { 0, 2, 1, 4 }; - + Bytecode* args = script->ptrReadPos; s32 index = evt_get_variable(script, *args++); - + snd_ambient_80055848(D_80250810_9D5BF0[index]); return ApiStatus_DONE2; } diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index d41f156505..72fa8a6f8c 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -25,4 +25,23 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802406B0_9D76D0); +extern s32 nok_02_D_802547D0[]; + +ApiStatus func_802406B0_9D76D0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + nok_02_D_802547D0[i] = ptr[i]; + } + nok_02_D_802547D0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + nok_02_D_802547D0[i] = i + 16; + nok_02_D_802547D0[112] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index f834bc89ce..7e09fc182b 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -23,7 +23,26 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C); +extern s32 nok_02_D_802549D0[]; + +ApiStatus func_80242C5C_9D9C7C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + nok_02_D_802549D0[i] = ptr[i]; + } + nok_02_D_802549D0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + nok_02_D_802549D0[i] = i + 16; + nok_02_D_802549D0[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index ae6bf9e33b..f133e5ad7d 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -14,9 +14,47 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78_9DAC98); +extern s32 nok_02_D_80254BA0[]; -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34); +ApiStatus func_80243C78_9DAC98(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + nok_02_D_80254BA0[i] = ptr[i]; + } + nok_02_D_80254BA0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + nok_02_D_80254BA0[i] = i + 16; + nok_02_D_80254BA0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 nok_02_D_80254D68[]; + +ApiStatus func_80243D14_9DAD34(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + nok_02_D_80254D68[i] = ptr[i]; + } + nok_02_D_80254D68[i] = 0; + } else { + for (i = 0; i < 91; i++) { + nok_02_D_80254D68[i] = i + 128; + nok_02_D_80254D68[91] = 0; + } + } + return ApiStatus_DONE2; +} #define NAMESPACE dup2_nok_02 #include "world/common/StashVars.inc.c" diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index a743b1a415..b2dce9431a 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -12,7 +12,26 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788); -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0); +extern s32 D_80243BE0[]; + +ApiStatus func_80240540_BC47C0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80243BE0[i] = ptr[i]; + } + D_80243BE0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80243BE0[i] = i + 16; + D_80243BE0[112] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 72028696f2..a234776c30 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -17,7 +17,26 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242204_DB44C4); +extern s32 D_80245650[]; + +ApiStatus func_80242204_DB44C4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80245650[i] = ptr[i]; + } + D_80245650[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80245650[i] = i + 128; + D_80245650[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802422A0_DB4560); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 8a6a072b4c..667b869f4a 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -31,6 +31,25 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F8C_DE341C); +extern s32 flo_10_npcSettings_80243220[]; + +ApiStatus func_80240F8C_DE341C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + flo_10_npcSettings_80243220[i] = ptr[i]; + } + flo_10_npcSettings_80243220[i] = 0; + } else { + for (i = 0; i < 91; i++) { + flo_10_npcSettings_80243220[i] = i + 128; + flo_10_npcSettings_80243220[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80241028_DE34B8); diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index d93d59ddf4..b7097a91e5 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -17,9 +17,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278); +extern s32 D_80242FB0[]; -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314); +ApiStatus func_80241238_D4E278(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80242FB0[i] = ptr[i]; + } + D_80242FB0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80242FB0[i] = i + 16; + D_80242FB0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 pra_01_80243178[]; + +ApiStatus func_802412D4_D4E314(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + pra_01_80243178[i] = ptr[i]; + } + pra_01_80243178[i] = 0; + } else { + for (i = 0; i < 91; i++) { + pra_01_80243178[i] = i + 128; + pra_01_80243178[91] = 0; + } + } + return ApiStatus_DONE2; +} ApiStatus PostChapter7StatUpdate(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index ee308a4eb9..75d2ccc6a1 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -12,7 +12,26 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411A0_D51190); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264); +extern s32 D_80243E88_846A58[]; + +ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80243E88_846A58[i] = ptr[i]; + } + D_80243E88_846A58[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80243E88_846A58[i] = i + 128; + D_80243E88_846A58[91] = 0; + } + } + return ApiStatus_DONE2; +} #include "world/common/SetEntityPositionF.inc.c" diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 29312ea722..ef5bcf1d5d 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -10,9 +10,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC); INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411A0_D59A30); -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411D8_D59A68); +extern s32 flo_18_shakeTree[]; -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241274_D59B04); +ApiStatus func_802411D8_D59A68(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + flo_18_shakeTree[i] = ptr[i]; + } + flo_18_shakeTree[i] = 0; + } else { + for (i = 0; i < 112; i++) { + flo_18_shakeTree[i] = i + 16; + flo_18_shakeTree[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_80246BE8[]; + +ApiStatus func_80241274_D59B04(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80246BE8[i] = ptr[i]; + } + D_80246BE8[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80246BE8[i] = i + 128; + D_80246BE8[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241310_D59BA0); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 8a9b9102c1..098b15d7f4 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -10,9 +10,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C); INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411A0_D65780); -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411D8_D657B8); +extern s32 D_80243720[]; -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241274_D65854); +ApiStatus func_802411D8_D657B8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80243720[i] = ptr[i]; + } + D_80243720[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80243720[i] = i + 16; + D_80243720[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 pra_13_802438E8[]; + +ApiStatus func_80241274_D65854(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + pra_13_802438E8[i] = ptr[i]; + } + pra_13_802438E8[i] = 0; + } else { + for (i = 0; i < 91; i++) { + pra_13_802438E8[i] = i + 128; + pra_13_802438E8[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241310_D658F0); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index ceeb9ede7e..1b77b829e0 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -10,9 +10,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC); INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411A0_D6FB50); -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411D8_D6FB88); +extern s32 D_802479F0[]; -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241274_D6FC24); +ApiStatus func_802411D8_D6FB88(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802479F0[i] = ptr[i]; + } + D_802479F0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_802479F0[i] = i + 16; + D_802479F0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_80247BB8_pra_19[]; + +ApiStatus func_80241274_D6FC24(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80247BB8_pra_19[i] = ptr[i]; + } + D_80247BB8_pra_19[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80247BB8_pra_19[i] = i + 128; + D_80247BB8_pra_19[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241310_D6FCC0); diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index 699ae48b4c..f78901fb78 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -8,9 +8,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402D8_D7F038); +extern s32 D_80247CA0[]; -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240374_D7F0D4); +ApiStatus func_802402D8_D7F038(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80247CA0[i] = ptr[i]; + } + D_80247CA0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_80247CA0[i] = i + 16; + D_80247CA0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_80247E68[]; + +ApiStatus func_80240374_D7F0D4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_80247E68[i] = ptr[i]; + } + D_80247E68[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_80247E68[i] = i + 128; + D_80247E68[91] = 0; + } + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240410_D7F170); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index e76fa831f9..56a8af36df 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -11,9 +11,47 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138); +extern s32 D_8024DBC0[]; -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4); +ApiStatus func_802405C8_CF8138(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_8024DBC0[i] = ptr[i]; + } + D_8024DBC0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_8024DBC0[i] = i + 16; + D_8024DBC0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_8024DD88[]; + +ApiStatus func_80240664_CF81D4(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_8024DD88[i] = ptr[i]; + } + D_8024DD88[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_8024DD88[i] = i + 128; + D_8024DD88[91] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(Quizmo_Worker); extern s32 N(Quizmo_AnswerResult); diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c index ca31a682fc..35574618c9 100644 --- a/src/world/area_sam/sam_04/D138E0.c +++ b/src/world/area_sam/sam_04/D138E0.c @@ -8,6 +8,44 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C); INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240590_D13B60); -INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_802405C8_D13B98); +extern s32 sam_04_80245210[]; -INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240664_D13C34); +ApiStatus func_802405C8_D13B98(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + sam_04_80245210[i] = ptr[i]; + } + sam_04_80245210[i] = 0; + } else { + for (i = 0; i < 112; i++) { + sam_04_80245210[i] = i + 16; + sam_04_80245210[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_802453D8[]; + +ApiStatus func_80240664_D13C34(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_802453D8[i] = ptr[i]; + } + D_802453D8[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_802453D8[i] = i + 128; + D_802453D8[91] = 0; + } + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index d9c5112c7f..58fe647a16 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -14,9 +14,47 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8); +extern s32 D_8024BEA0[]; -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); +ApiStatus func_80241E18_D21CA8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_8024BEA0[i] = ptr[i]; + } + D_8024BEA0[i] = 0; + } else { + for (i = 0; i < 112; i++) { + D_8024BEA0[i] = i + 16; + D_8024BEA0[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 D_8024C068[]; + +ApiStatus func_80241EB4_D21D44(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + D_8024C068[i] = ptr[i]; + } + D_8024C068[i] = 0; + } else { + for (i = 0; i < 91; i++) { + D_8024C068[i] = i + 128; + D_8024C068[91] = 0; + } + } + return ApiStatus_DONE2; +} #include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 912f0be96a..ee6358be20 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -23,7 +23,7 @@ API_CALLABLE(func_8024091C_92ABCC) { INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC); #endif -static s32 D_80245630[91]; +static s32 sbk_02_D_80245630[91]; extern s32 D_8024404C_92E2FC; extern s32 D_80244050_92E300; @@ -39,16 +39,16 @@ API_CALLABLE(func_802409A8_92AC58) { Bytecode* args = script->ptrReadPos; s32* buf = (s32*) evt_get_variable(script, *args++); s32 i; - + if (buf != NULL) { for (i = 0; *buf != NULL; i++) { - D_80245630[i] = *buf++; + sbk_02_D_80245630[i] = *buf++; } - D_80245630[i] = 0; + sbk_02_D_80245630[i] = 0; } else { for (i = 0; i <= 90; i++) { - D_80245630[i] = i + 0x80; - D_80245630[91] = 0; + sbk_02_D_80245630[i] = i + 0x80; + sbk_02_D_80245630[91] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c b/src/world/area_sbk/sbk_02/sbk_02_3_npc.c index 19a168e608..4b267cad36 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_3_npc.c @@ -25,7 +25,7 @@ API_CALLABLE(func_8024091C_92ABCC) { INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC); #endif -static s32 D_80245630[91]; +static s32 sbk_02_D_80245630[91]; extern s32 D_8024404C_92E2FC; extern s32 D_80244050_92E300; @@ -41,16 +41,16 @@ API_CALLABLE(func_802409A8_92AC58) { Bytecode* args = script->ptrReadPos; s32* buf = (s32*) evt_get_variable(script, *args++); s32 i; - + if (buf != NULL) { for (i = 0; *buf != NULL; i++) { - D_80245630[i] = *buf++; + sbk_02_D_80245630[i] = *buf++; } - D_80245630[i] = 0; + sbk_02_D_80245630[i] = 0; } else { for (i = 0; i <= 90; i++) { - D_80245630[i] = i + 0x80; - D_80245630[91] = 0; + sbk_02_D_80245630[i] = i + 0x80; + sbk_02_D_80245630[91] = 0; } } return ApiStatus_DONE2; diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 9cfa199277..bdb004465d 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -37,9 +37,47 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241120_9406D0); // SetLetterChoiceResult INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C); +extern s32 sbk_30_D_80244A50[]; -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8); +ApiStatus func_802411AC_94075C(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + sbk_30_D_80244A50[i] = ptr[i]; + } + sbk_30_D_80244A50[i] = 0; + } else { + for (i = 0; i < 112; i++) { + sbk_30_D_80244A50[i] = i + 16; + sbk_30_D_80244A50[112] = 0; + } + } + return ApiStatus_DONE2; +} + +extern s32 sbk_30_D_80244C18[]; + +ApiStatus func_80241248_9407F8(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32* ptr = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (ptr != NULL) { + for (i = 0; ptr[i] != 0; i++) { + sbk_30_D_80244C18[i] = ptr[i]; + } + sbk_30_D_80244C18[i] = 0; + } else { + for (i = 0; i < 91; i++) { + sbk_30_D_80244C18[i] = i + 128; + sbk_30_D_80244C18[91] = 0; + } + } + return ApiStatus_DONE2; +} extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_tik/tik_25/8A8600.c b/src/world/area_tik/tik_25/8A8600.c index 24b6899085..c706eb4983 100644 --- a/src/world/area_tik/tik_25/8A8600.c +++ b/src/world/area_tik/tik_25/8A8600.c @@ -1,7 +1,26 @@ #include "tik_25.h" +#include "entity.h" -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240680_8A8600); +ApiStatus func_80240680_8A8600(Evt* script, s32 isInitialCall) { + get_entity_by_index(script->varTable[0])->dataBuf.chest->gotItemDone = TRUE; + return ApiStatus_DONE2; +} #include "world/common/SetEntityPosition.inc.c" +// linker sym needed +#ifdef NON_MATCHING +ApiStatus func_80240770_8A86F0(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Entity* entity; + + entity = get_entity_by_index(evt_get_variable(script, *args++)); + if (entity == NULL) { + return ApiStatus_BLOCK; + } + play_model_animation(entity->virtualModelIndex, 0x1E4); + return ApiStatus_DONE2; +} +#else INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240770_8A86F0); +#endif diff --git a/src/world/common/DeadUnkFunc1.inc.c b/src/world/common/DeadUnkFunc1.inc.c index 5b5a87fd2c..52b1defeae 100644 --- a/src/world/common/DeadUnkFunc1.inc.c +++ b/src/world/common/DeadUnkFunc1.inc.c @@ -1,8 +1,8 @@ #include "common.h" -void dead_fx_sun(s32, s32, s32, s32, s32, s32); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); ApiStatus N(DeadUnkFunc1)(Evt* script, s32 isInitialCall) { - dead_fx_sun(1, 0, 0, 0, 0, 0); + fx_sun_undeclared(1, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 4b649526c5..6e149f8bdc 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -27,7 +27,6 @@ dead_sqrtf = 0x80067040; dead_npc_test_move_simple_with_slipping = 0x800E5304; dead_npc_raycast_down_sides = 0x800E423C; dead_is_point_within_region = 0x8004D0C4; -func_8004D8E0 = 0x8004D8E0; dead_rand_int = 0x8002ACEC; dead_get_npc_safe = 0x8003E534; // get_npc_safe dead_heap_malloc = 0x8002BFD4; @@ -45,6 +44,7 @@ dead_update_lerp = 0x8002B6A4; dead_fx_spirit_card = 0x80077930; dead_create_shadow_type = 0x8011AAB4; dead_dist3D = 0x8002B21C; +func_8004D8E0 = 0x8004D8E0; func_802E2A80 = 0x802E2A80; func_802E2B74 = 0x802E2B74; func_80128510 = 0x80128510; @@ -54,7 +54,7 @@ func_80059AC8 = 0x80059AC8; dead_get_entity_by_index = 0x80118BB0; dead_cos_rad = 0x8002B4C0; dead_fx_sun = 0x80077BD0; -func_80041080 = 0x80041080; +dead_func_8003D660 = 0x80041080; dead_set_max_SP = 0x800F1D9C; dead_sync_status_menu = 0x800F1730; dead_get_npc_by_index = 0x8003C43C; diff --git a/tools/sortsymz.py b/tools/sortsymz.py index 0a34d3d803..f1b09e297a 100755 --- a/tools/sortsymz.py +++ b/tools/sortsymz.py @@ -10,7 +10,11 @@ with open("tools/symz.txt") as f: for line in f.readlines(): if line.strip() and not line.startswith("//"): name, addr = line.strip().strip(";").split(" = ") - syms.append({"name": name, "address": int(addr, 0), "found_in": set(), "dead": False}) + try : + addr = int(addr, 0) + except ValueError: + continue + syms.append({"name": name, "address": addr, "found_in": set(), "dead": False}) # Search src for syms for root, dirs, files in os.walk("src"): diff --git a/ver/us/asm/data/dead/EA3A80.data.s b/ver/us/asm/data/dead/EA3A80.data.s index c9666b2e3b..dd6eeda160 100644 --- a/ver/us/asm/data/dead/EA3A80.data.s +++ b/ver/us/asm/data/dead/EA3A80.data.s @@ -108,7 +108,7 @@ dlabel D_802441BC_EA4ABC .word 0x00000000 dlabel D_802441C0_EA4AC0 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, EA0C10_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244354_EA4C54 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -117,7 +117,7 @@ dlabel D_802443D4_EA4CD4 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802446F8_EA4FF8 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, EA0C10_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244768_EA5068 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_802446F8_EA4FF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EAA810.data.s b/ver/us/asm/data/dead/EAA810.data.s index b045f44cbf..fd485dbf81 100644 --- a/ver/us/asm/data/dead/EAA810.data.s +++ b/ver/us/asm/data/dead/EAA810.data.s @@ -156,7 +156,7 @@ dlabel D_80243DDC_EAC8BC .word 0x00000000 dlabel D_80243DE0_EAC8C0 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, EA8AE0_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F74_EACA54 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -165,7 +165,7 @@ dlabel D_80243FF4_EACAD4 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244318_EACDF8 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, EA8AE0_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244388_EACE68 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80244318_EACDF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EB1920.data.s b/ver/us/asm/data/dead/EB1920.data.s index 8f85fae1f2..29f01f53fc 100644 --- a/ver/us/asm/data/dead/EB1920.data.s +++ b/ver/us/asm/data/dead/EB1920.data.s @@ -63,7 +63,7 @@ dlabel D_802417E8_EB2648 .word 0x00000000 dlabel D_802417EC_EB264C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, EB1170_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241980_EB27E0 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -72,7 +72,7 @@ dlabel D_80241A00_EB2860 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D24_EB2B84 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, EB1170_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241D94_EB2BF4 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80241D24_EB2B84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/dead/EDC6D0.data.s b/ver/us/asm/data/dead/EDC6D0.data.s index 07a79d9aa0..e0922e951c 100644 --- a/ver/us/asm/data/dead/EDC6D0.data.s +++ b/ver/us/asm/data/dead/EDC6D0.data.s @@ -48,7 +48,7 @@ dlabel D_80241858_EDD838 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EDC020_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024199C_EDD97C -.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, EDC020_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419EC_EDD9CC .word 0x0000001E, 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 0628497539..316167b967 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 @@ -21,7 +21,7 @@ dlabel D_80242C70_A3C150 .word 0x00000000 dlabel D_80242C74_A3C154 -.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, dup_hos_06_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_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, dup_hos_06_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_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E08_A3C2E8 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -30,7 +30,7 @@ dlabel D_80242E88_A3C368 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431AC_A3C68C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024321C_A3C6FC .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802431AC_A3C68C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80242C0C_A3C0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 61226a4eb8..d19abd8686 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 @@ -12,7 +12,7 @@ dlabel D_802445D8_A3DAB8 .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, hos_06_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_80240FD0_A3A4B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 +.word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, hos_06_D_80246430, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel dup_hos_06_varStash .word 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s new file mode 100644 index 0000000000..6f0ca3f254 --- /dev/null +++ b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s @@ -0,0 +1,81 @@ +.include "macro.inc" + +.section .data + +dlabel D_80246240_9247B0 +.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 + +dlabel D_8024626C_9247DC +.word 0x00000000 + +dlabel D_80246270_9247E0 +.word 0x00000000 + +dlabel D_80246274_9247E4 +.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, iwa_10_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_80241434_91F9A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_802463B8_924928 +.word 0x00000043, 0x00000002, func_8024146C_91F9DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80246274_9247E4, 0x00000010, 0x00000000, iwa_10_D_80248480, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802413E0_91F950, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000000D7, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D000E, 0x00000140, 0x00000096, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0x0000012C, 0xF24AB680, 0xF24A5480, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080022, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFE70, 0x000000D7, 0xFFFFFE02, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000040, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFE02, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE02, 0xFE363C82, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE70, 0xFE363C80, 0x00000037, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0x000000DC, 0xFD050F8A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010017, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0x000000E1, 0x00000000, 0xFE363C80, 0x000000E6, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0xFE363C80, 0x000000E6, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0x000000E6, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE84, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000006, NpcJump1, 0x00000004, 0xFE363C80, 0x000000D7, 0xFE363C82, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040005, 0x00000043, 0x00000006, NpcJump1, 0x00000004, 0xFE363C80, 0x000000D7, 0xFE363C82, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000162, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000006, NpcJump1, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x00000023, 0x000000FF, 0xF24AC080, 0xF24A4C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0011, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB9, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_802474F8_925A68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80246E80_9253F0 +.word 0x00000036, 0x00000054, 0x00000040, 0x00000000 + +dlabel D_80246E90_925400 +.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01FA, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E41, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E42, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E43, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xF24A7A80, 0xF24F2A80, 0xF24AC080, 0xF24A5280, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E80_9253F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000046, 0x00000001, D_802463B8_924928, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0012, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0015, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0017, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001C, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0013, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000027, 0x00000002, 0xF5DE01FA, 0x00000001, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0016, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040007, 0x00040001, 0x00000000, 0x000D0018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0019, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001A, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001D, 0x00000043, 0x00000003, iwa_10_ChangeNpcToPartner, 0x00000004, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80241510_91FA80, 0x00000044, 0x00000001, 0x8024187C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018C, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802418B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000D001E, 0x00000043, 0x00000002, AddKeyItem, 0x00000036, 0x00000043, 0x00000002, AddKeyItem, 0x00000054, 0x00000043, 0x00000002, AddKeyItem, 0x00000040, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_802474F8_925A68 +.word 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFD62, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFE1B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80247688_925BF8 +.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80246E90_925400, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB9, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFBA, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802474F8_925A68, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000004, D_80246240_9247B0, 0xC4188000, 0x43660000, 0xC3F28000, 0x00200D09, D_80247688_925BF8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040001, 0x00040002, 0x00040003, 0x00040003, 0x00040001, 0x00040001, 0x00040000, 0x00040000, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00000000, 0x00000000, 0x00000000, 0x001A0084 + +dlabel D_80247910_925E80 +.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 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, iwa_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, iwa_10_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, TranslateModel, 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, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 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, 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, iwa_10_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, iwa_10_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, iwa_10_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, iwa_10_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_80248274_9267E4 +.word 0x00000001, 0x00000010 + +dlabel D_8024827C_9267EC +.word 0x00000001, 0x00000157, 0xFFFFFCB9, 0x0000000F, 0x00000209, 0x00000006, 0xF8405E45, 0xFAA2B58A + +dlabel D_8024829C_92680C +.word 0x00000001, 0xFFFFFCB9, 0x0000000F, 0x00000209 + +dlabel D_802482AC_92681C +.word D_80248274_9267E4, D_8024827C_9267EC, D_8024829C_92680C, 0x00000000 + +dlabel D_802482BC_92682C +.word 0x00000001, 0x00000011 + +dlabel D_802482C4_926834 +.word 0x00000001, 0x00000157, 0xFFFFFD4D, 0x00000016, 0x00000180, 0x00000006, 0xF8405E46, 0xFAA2B58B + +dlabel D_802482E4_926854 +.word 0x00000001, 0xFFFFFD4D, 0x00000016, 0x00000180 + +dlabel D_802482F4_926864 +.word D_802482BC_92682C, D_802482C4_926834, D_802482E4_926854, 0x00000000 + +dlabel D_80248304_926874 +.word 0x00000001, 0x00000012 + +dlabel D_8024830C_92687C +.word 0x00000001, 0x00000157, 0xFFFFFC5C, 0x00000015, 0x00000195, 0x00000006, 0xF8405E47, 0xFAA2B58C + +dlabel D_8024832C_92689C +.word 0x00000001, 0xFFFFFC5C, 0x00000015, 0x00000195 + +dlabel D_8024833C_9268AC +.word D_80248304_926874, D_8024830C_92687C, D_8024832C_92689C, 0x00000000 + +dlabel D_8024834C_9268BC +.word 0x00000001, 0x00000013 + +dlabel D_80248354_9268C4 +.word 0x00000001, 0x000000AB, 0xFFFFFCE0, 0x00000017, 0x00000118, 0x00000006, 0x00000000, 0xFAA2B58D + +dlabel D_80248374_9268E4 +.word 0x00000001, 0xFFFFFCE0, 0x00000017, 0x00000118 + +dlabel D_80248384_9268F4 +.word D_8024834C_9268BC, D_80248354_9268C4, D_80248374_9268E4, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802482AC_92681C, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x0000005F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802482F4_926864, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x00000060, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024833C_9268AC, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x00000061, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80248384_9268F4, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x00000062, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s index 08d550382b..3866a12f29 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s @@ -9,10 +9,10 @@ dlabel D_80241F14_AF4BB4 .word 0x00000000 dlabel D_80241F18_AF4BB8 -.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, kkj_18_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_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, tik_07_FlyingAI_JumpVels, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kkj_18_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_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420AC_AF4D4C -.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, kkj_18_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_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kkj_18_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_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242230_AF4ED0 .word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s index fb5f18fa3a..4f5bd72812 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s @@ -9,7 +9,7 @@ dlabel D_80241B14_AF9464 .word 0x00000000 dlabel D_80241B18_AF9468 -.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, kkj_19_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_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kkj_19_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_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CAC_AF95FC .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, kkj_19_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_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 f5d9c8383f..f0d7ae2709 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 @@ -114,7 +114,7 @@ dlabel D_80247E34_8B7EA4 .word 0x00000000 dlabel D_80247E38_8B7EA8 -.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, kmr_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_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, kmr_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_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247FCC_8B803C .word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 @@ -147,7 +147,7 @@ dlabel D_802481D4_8B8244 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802484F8_8B8568 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248568_8B85D8 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802484F8_8B8568, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s index d69bfc6136..cae1a3279e 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s @@ -2,8 +2,8 @@ .section .data -dlabel D_802549D0_8C4A40 +dlabel kmr_02_D_802549D0_8C4A40 .word 0x00000043, 0x00000003, GotoMap, 0x80257F00, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80254A00_8C4A70 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block_WideX, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block_WideX, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, kmr_02_D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s index 6983ded0af..7da1934b06 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s @@ -5,7 +5,7 @@ dlabel D_80246090_8E0190 .word 0x00000000, 0x00000000, 0x00000000, 0x42C80000, 0x42480000, 0x00000000, 0x43480000, 0x43160000, 0x00000000, 0x437A0000, 0x43C80000, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcVar, 0x00000004, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000064, 0x000000B6, 0xFFFFFE9F, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000498, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x0000003B, 0xFFFFFF61, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFE8, 0xFFFFFF00, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000008, 0xFFFFFFFB, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x000000BE, 0xFFFFFE9F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x000000BE, 0xFFFFFE9F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D1A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_80246090_8E0190, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000018, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000295, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000046, 0x00000001, 0x80241C24, 0x00000002, 0x00000000, 0x00000001, 0x00000000 -dlabel D_80246430_8E0530 +dlabel hos_06_D_80246430 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 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, dup_kmr_11_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_kmr_11_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, TranslateModel, 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, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 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 dlabel D_80246790_8E0890 @@ -72,7 +72,7 @@ dlabel D_80246EC8_8E0FC8 .word D_80246E7C_8E0F7C, D_80246E84_8E0F84, D_80246E8C_8E0F8C, D_80246EAC_8E0FAC, 0x00000000 dlabel D_80246EDC_8E0FDC -.word 0x43A00000, 0x00000000, 0xC3F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DAC_8E0EAC, 0x00000047, 0x00000005, D_80246430_8E0530, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DD4_8E0ED4, 0x00000047, 0x00000005, D_80246430_8E0530, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DFC_8E0EFC, 0x00000047, 0x00000005, D_80246430_8E0530, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E58_8E0F58, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246E6C_8E0F6C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246EC8_8E0FC8, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246EDC_8E0FDC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x43A00000, 0x00000000, 0xC3F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DAC_8E0EAC, 0x00000047, 0x00000005, hos_06_D_80246430, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DD4_8E0ED4, 0x00000047, 0x00000005, hos_06_D_80246430, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DFC_8E0EFC, 0x00000047, 0x00000005, hos_06_D_80246430, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E58_8E0F58, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246E6C_8E0F6C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246EC8_8E0FC8, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246EDC_8E0FDC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247010_8E1110 .word 0x00000000, 0x00008AB5, 0x00000000, 0xC3A70000, 0xC38E8000, 0xC2EC0000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000000, 0x001C0000 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 4b73c62984..f24646fb64 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 @@ -93,13 +93,13 @@ dlabel D_802483F0_7F3100 .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, mac_00_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_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248534_7F3244 -.word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248584_7F3294 .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, mac_00_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_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802486B8_7F33C8 -.word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, mac_00_D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248708_7F3418 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -108,7 +108,7 @@ dlabel D_80248788_7F3498 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248AAC_7F37BC -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248B1C_7F382C .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80248AAC_7F37BC, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 8edad792b0..3753180cf9 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 @@ -198,7 +198,7 @@ dlabel D_8024D94C_80E1CC .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, mac_01_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_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DA90_80E310 -.word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DAE0_80E360 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -207,7 +207,7 @@ dlabel D_8024DB60_80E3E0 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DE84_80E704 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DEF4_80E774 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_01_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024DE84_80E704, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 e2b731b043..5af76b7eea 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 @@ -120,13 +120,13 @@ dlabel D_80248780_82BA40 .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, mac_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_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802488C4_82BB84 -.word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248914_82BBD4 .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, mac_02_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_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248A48_82BD08 -.word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, mac_02_D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248A98_82BD58 .word 0x0000008A, 0x0000008C, 0x0000008E, 0x00000095, 0x0000008B, 0x00000080, 0x000000AC, 0x0000009D, 0x0000009C, 0x000000A4, 0x000000A3, 0x000000A2, 0x00000094, 0x0000009F, 0x0000009E, 0x000000A0, 0x000000A5, 0x000000A6, 0x000000A7, 0x000000A8, 0x000000A9, 0x000000AA, 0x000000AB, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000008D, 0x000000A1, 0x00000093, 0xFFFFFFFF @@ -180,7 +180,7 @@ dlabel D_8024A234_82D4F4 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A558_82D818 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A5C8_82D888 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024A558_82D818, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 86012e9ca4..b4d5d7753a 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 @@ -105,7 +105,7 @@ dlabel D_80248C70_83A470 .word 0x00000000 dlabel D_80248C74_83A474 -.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, mac_03_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_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, mac_03_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_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248E08_83A608 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -114,7 +114,7 @@ dlabel D_80248E88_83A688 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802491AC_83A9AC -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024921C_83AA1C .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802491AC_83A9AC, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 537648059d..c65c459fd1 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 @@ -108,7 +108,7 @@ dlabel D_80246618_8491E8 .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, mac_04_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_80241774_844344, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024675C_84932C -.word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, mac_04_D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802467AC_84937C .word 0x00000043, 0x00000004, func_802D2884, 0xFFFFFE48, 0xFFFFFF6A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000026, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000007, MakeItemEntity, 0x00000021, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C84, 0xFFFFFF6A, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFE363C87, 0xFFFFFE48, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7880, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 c2b843db14..664732fb25 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 @@ -102,13 +102,13 @@ dlabel D_802476E0_859850 .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, mac_05_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_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247824_859994 -.word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247874_8599E4 .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, mac_05_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_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802479A8_859B18 -.word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, mac_05_D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802479F8_859B68 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -117,7 +117,7 @@ dlabel D_80247A78_859BE8 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247D9C_859F0C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247E0C_859F7C .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80247D9C_859F0C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 b346cd4577..e32b403afa 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 @@ -183,7 +183,7 @@ dlabel D_80248570_9CD950 .word 0x00000000 dlabel D_80248574_9CD954 -.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, nok_01_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_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, nok_01_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_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248708_9CDAE8 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -192,7 +192,7 @@ dlabel D_80248788_9CDB68 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248AAC_9CDE8C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80248B1C_9CDEFC .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80248AAC_9CDE8C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 873df06ffe..b79c70bd25 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 @@ -18,7 +18,7 @@ dlabel D_80245438_9DC458 .word 0x00000000 dlabel D_8024543C_9DC45C -.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, dup_nok_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_80240678_9D7698, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, dup_nok_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_80240678_9D7698, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, nok_02_D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802455D0_9DC5F0 .word 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80254600, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 e4f63f14a2..d6748a2cc8 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 @@ -120,7 +120,7 @@ dlabel D_802496F8_9E0718 .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, nok_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_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024983C_9E085C -.word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024988C_9E08AC .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -132,7 +132,7 @@ dlabel D_80249954_9E0974 .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, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249C78_9E0C98 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80249CE8_9E0D08 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80249C78_9E0C98, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 49fd6d1098..f9eb3a084f 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 @@ -12,13 +12,13 @@ dlabel D_80252408_9E9428 .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, dup2_nok_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_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8025254C_9E956C -.word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, nok_02_D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8025259C_9E95BC .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, dup2_nok_02_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_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 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 +.word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, nok_02_D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel dup2_nok_02_varStash .word 0x00000000 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 5f23be814a..abdf6d2938 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 @@ -18,7 +18,7 @@ dlabel D_80244054_92E304 .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, sbk_02_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_80240970_92AC20, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244188_92E438 -.word 0x00000043, 0x00000002, func_802409A8_92AC58, 0xFE363C80, 0x0000004E, 0x00000006, D_80244054_92E304, 0x00000010, 0x00000000, D_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_802409A8_92AC58, 0xFE363C80, 0x0000004E, 0x00000006, D_80244054_92E304, 0x00000010, 0x00000000, sbk_02_D_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel sbk_02_varStash .word 0x00000000 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 ab07205fe5..1e9b44cc11 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 @@ -57,7 +57,7 @@ dlabel D_802421A4_941754 .word 0x00000043, 0x00000002, func_802411AC_94075C, 0xFE363C80, 0x0000004E, 0x00000006, D_80242060_941610, 0x00000010, 0x00000000, btl_state_update_end_battle, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421F4_9417A4 -.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, sbk_30_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_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241248_9407F8, 0xFE363C80, 0x0000004E, 0x00000006, D_802421F4_9417A4, 0x00000010, 0x00000000, D_80244C18, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.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, sbk_30_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_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241248_9407F8, 0xFE363C80, 0x0000004E, 0x00000006, D_802421F4_9417A4, 0x00000010, 0x00000000, sbk_30_D_80244C18, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242378_941928 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_30_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s b/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s deleted file mode 100644 index 5a8ac098ee..0000000000 --- a/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005DECC -/* 392CC 8005DECC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 392D0 8005DED0 AFB10014 */ sw $s1, 0x14($sp) -/* 392D4 8005DED4 0080882D */ daddu $s1, $a0, $zero -/* 392D8 8005DED8 AFB20018 */ sw $s2, 0x18($sp) -/* 392DC 8005DEDC 00A0902D */ daddu $s2, $a1, $zero -/* 392E0 8005DEE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 392E4 8005DEE4 00C0982D */ daddu $s3, $a2, $zero -/* 392E8 8005DEE8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 392EC 8005DEEC 4487A000 */ mtc1 $a3, $f20 -/* 392F0 8005DEF0 240402A4 */ addiu $a0, $zero, 0x2a4 -/* 392F4 8005DEF4 AFBF0020 */ sw $ra, 0x20($sp) -/* 392F8 8005DEF8 0C00AB39 */ jal heap_malloc -/* 392FC 8005DEFC AFB00010 */ sw $s0, 0x10($sp) -/* 39300 8005DF00 0040202D */ daddu $a0, $v0, $zero -/* 39304 8005DF04 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 39308 8005DF08 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 3930C 8005DF0C 14800003 */ bnez $a0, .L8005DF1C -/* 39310 8005DF10 AE240020 */ sw $a0, 0x20($s1) -.L8005DF14: -/* 39314 8005DF14 080177C5 */ j .L8005DF14 -/* 39318 8005DF18 00000000 */ nop -.L8005DF1C: -/* 3931C 8005DF1C 0000282D */ daddu $a1, $zero, $zero -/* 39320 8005DF20 0080182D */ daddu $v1, $a0, $zero -.L8005DF24: -/* 39324 8005DF24 C6000028 */ lwc1 $f0, 0x28($s0) -/* 39328 8005DF28 E4600004 */ swc1 $f0, 4($v1) -/* 3932C 8005DF2C C600002C */ lwc1 $f0, 0x2c($s0) -/* 39330 8005DF30 24A50001 */ addiu $a1, $a1, 1 -/* 39334 8005DF34 E4600008 */ swc1 $f0, 8($v1) -/* 39338 8005DF38 C6000030 */ lwc1 $f0, 0x30($s0) -/* 3933C 8005DF3C 28A20028 */ slti $v0, $a1, 0x28 -/* 39340 8005DF40 A0600000 */ sb $zero, ($v1) -/* 39344 8005DF44 E460000C */ swc1 $f0, 0xc($v1) -/* 39348 8005DF48 1440FFF6 */ bnez $v0, .L8005DF24 -/* 3934C 8005DF4C 24630010 */ addiu $v1, $v1, 0x10 -/* 39350 8005DF50 AC800280 */ sw $zero, 0x280($a0) -/* 39354 8005DF54 AC800284 */ sw $zero, 0x284($a0) -/* 39358 8005DF58 AC800288 */ sw $zero, 0x288($a0) -/* 3935C 8005DF5C AC92028C */ sw $s2, 0x28c($a0) -/* 39360 8005DF60 AC930290 */ sw $s3, 0x290($a0) -/* 39364 8005DF64 E4940294 */ swc1 $f20, 0x294($a0) -/* 39368 8005DF68 C7A00040 */ lwc1 $f0, 0x40($sp) -/* 3936C 8005DF6C 0260102D */ daddu $v0, $s3, $zero -/* 39370 8005DF70 E4800298 */ swc1 $f0, 0x298($a0) -/* 39374 8005DF74 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 39378 8005DF78 46800020 */ cvt.s.w $f0, $f0 -/* 3937C 8005DF7C E480029C */ swc1 $f0, 0x29c($a0) -/* 39380 8005DF80 C7A00048 */ lwc1 $f0, 0x48($sp) -/* 39384 8005DF84 46800020 */ cvt.s.w $f0, $f0 -/* 39388 8005DF88 E48002A0 */ swc1 $f0, 0x2a0($a0) -/* 3938C 8005DF8C 8C440010 */ lw $a0, 0x10($v0) -/* 39390 8005DF90 8E220000 */ lw $v0, ($s1) -/* 39394 8005DF94 2403FEFF */ addiu $v1, $zero, -0x101 -/* 39398 8005DF98 AE20001C */ sw $zero, 0x1c($s1) -/* 3939C 8005DF9C 34420200 */ ori $v0, $v0, 0x200 -/* 393A0 8005DFA0 00431024 */ and $v0, $v0, $v1 -/* 393A4 8005DFA4 AE220000 */ sw $v0, ($s1) -/* 393A8 8005DFA8 3C020001 */ lui $v0, 1 -/* 393AC 8005DFAC AE220080 */ sw $v0, 0x80($s1) -/* 393B0 8005DFB0 AE240028 */ sw $a0, 0x28($s1) -/* 393B4 8005DFB4 8FBF0020 */ lw $ra, 0x20($sp) -/* 393B8 8005DFB8 8FB3001C */ lw $s3, 0x1c($sp) -/* 393BC 8005DFBC 8FB20018 */ lw $s2, 0x18($sp) -/* 393C0 8005DFC0 8FB10014 */ lw $s1, 0x14($sp) -/* 393C4 8005DFC4 8FB00010 */ lw $s0, 0x10($sp) -/* 393C8 8005DFC8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 393CC 8005DFCC 03E00008 */ jr $ra -/* 393D0 8005DFD0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s b/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s deleted file mode 100644 index 368d54b4ea..0000000000 --- a/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005DFD4 -/* 393D4 8005DFD4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 393D8 8005DFD8 AFB20030 */ sw $s2, 0x30($sp) -/* 393DC 8005DFDC 0080902D */ daddu $s2, $a0, $zero -/* 393E0 8005DFE0 27A6001C */ addiu $a2, $sp, 0x1c -/* 393E4 8005DFE4 27A70020 */ addiu $a3, $sp, 0x20 -/* 393E8 8005DFE8 AFBF0038 */ sw $ra, 0x38($sp) -/* 393EC 8005DFEC AFB30034 */ sw $s3, 0x34($sp) -/* 393F0 8005DFF0 AFB1002C */ sw $s1, 0x2c($sp) -/* 393F4 8005DFF4 AFB00028 */ sw $s0, 0x28($sp) -/* 393F8 8005DFF8 8E510020 */ lw $s1, 0x20($s2) -/* 393FC 8005DFFC 27A20024 */ addiu $v0, $sp, 0x24 -/* 39400 8005E000 AFA20010 */ sw $v0, 0x10($sp) -/* 39404 8005E004 8E24028C */ lw $a0, 0x28c($s1) -/* 39408 8005E008 0C017784 */ jal get_npc_pos -/* 3940C 8005E00C 27A50018 */ addiu $a1, $sp, 0x18 -/* 39410 8005E010 8E220280 */ lw $v0, 0x280($s1) -/* 39414 8005E014 00021100 */ sll $v0, $v0, 4 -/* 39418 8005E018 02228021 */ addu $s0, $s1, $v0 -/* 3941C 8005E01C 8FA20024 */ lw $v0, 0x24($sp) -/* 39420 8005E020 82030000 */ lb $v1, ($s0) -/* 39424 8005E024 10600003 */ beqz $v1, .L8005E034 -/* 39428 8005E028 0002982B */ sltu $s3, $zero, $v0 -/* 3942C 8005E02C 16600038 */ bnez $s3, .L8005E110 -/* 39430 8005E030 00000000 */ nop -.L8005E034: -/* 39434 8005E034 1660000E */ bnez $s3, .L8005E070 -/* 39438 8005E038 00000000 */ nop -/* 3943C 8005E03C 8FA60018 */ lw $a2, 0x18($sp) -/* 39440 8005E040 8FA70020 */ lw $a3, 0x20($sp) -/* 39444 8005E044 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 39448 8005E048 0C00A7B5 */ jal dist2D -/* 3944C 8005E04C C64E0040 */ lwc1 $f14, 0x40($s2) -/* 39450 8005E050 C622029C */ lwc1 $f2, 0x29c($s1) -/* 39454 8005E054 4602003E */ c.le.s $f0, $f2 -/* 39458 8005E058 00000000 */ nop -/* 3945C 8005E05C 45000004 */ bc1f .L8005E070 -/* 39460 8005E060 00000000 */ nop -/* 39464 8005E064 82020000 */ lb $v0, ($s0) -/* 39468 8005E068 10400029 */ beqz $v0, .L8005E110 -/* 3946C 8005E06C 00000000 */ nop -.L8005E070: -/* 39470 8005E070 8E220280 */ lw $v0, 0x280($s1) -/* 39474 8005E074 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 39478 8005E078 00021100 */ sll $v0, $v0, 4 -/* 3947C 8005E07C 02228021 */ addu $s0, $s1, $v0 -/* 39480 8005E080 C6020004 */ lwc1 $f2, 4($s0) -/* 39484 8005E084 46001032 */ c.eq.s $f2, $f0 -/* 39488 8005E088 00000000 */ nop -/* 3948C 8005E08C 4500000D */ bc1f .L8005E0C4 -/* 39490 8005E090 00000000 */ nop -/* 39494 8005E094 C6020008 */ lwc1 $f2, 8($s0) -/* 39498 8005E098 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 3949C 8005E09C 46001032 */ c.eq.s $f2, $f0 -/* 394A0 8005E0A0 00000000 */ nop -/* 394A4 8005E0A4 45000007 */ bc1f .L8005E0C4 -/* 394A8 8005E0A8 00000000 */ nop -/* 394AC 8005E0AC C602000C */ lwc1 $f2, 0xc($s0) -/* 394B0 8005E0B0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 394B4 8005E0B4 46001032 */ c.eq.s $f2, $f0 -/* 394B8 8005E0B8 00000000 */ nop -/* 394BC 8005E0BC 45010014 */ bc1t .L8005E110 -/* 394C0 8005E0C0 00000000 */ nop -.L8005E0C4: -/* 394C4 8005E0C4 8E220280 */ lw $v0, 0x280($s1) -/* 394C8 8005E0C8 8E230284 */ lw $v1, 0x284($s1) -/* 394CC 8005E0CC 24420001 */ addiu $v0, $v0, 1 -/* 394D0 8005E0D0 1062000F */ beq $v1, $v0, .L8005E110 -/* 394D4 8005E0D4 00000000 */ nop -/* 394D8 8005E0D8 AE220280 */ sw $v0, 0x280($s1) -/* 394DC 8005E0DC 28420028 */ slti $v0, $v0, 0x28 -/* 394E0 8005E0E0 50400001 */ beql $v0, $zero, .L8005E0E8 -/* 394E4 8005E0E4 AE200280 */ sw $zero, 0x280($s1) -.L8005E0E8: -/* 394E8 8005E0E8 8E220280 */ lw $v0, 0x280($s1) -/* 394EC 8005E0EC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 394F0 8005E0F0 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 394F4 8005E0F4 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 394F8 8005E0F8 00021100 */ sll $v0, $v0, 4 -/* 394FC 8005E0FC 02228021 */ addu $s0, $s1, $v0 -/* 39500 8005E100 E6000004 */ swc1 $f0, 4($s0) -/* 39504 8005E104 E6020008 */ swc1 $f2, 8($s0) -/* 39508 8005E108 E604000C */ swc1 $f4, 0xc($s0) -/* 3950C 8005E10C A2130000 */ sb $s3, ($s0) -.L8005E110: -/* 39510 8005E110 8FBF0038 */ lw $ra, 0x38($sp) -/* 39514 8005E114 8FB30034 */ lw $s3, 0x34($sp) -/* 39518 8005E118 8FB20030 */ lw $s2, 0x30($sp) -/* 3951C 8005E11C 8FB1002C */ lw $s1, 0x2c($sp) -/* 39520 8005E120 8FB00028 */ lw $s0, 0x28($sp) -/* 39524 8005E124 03E00008 */ jr $ra -/* 39528 8005E128 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s b/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s index d0841c1bb5..2d683007df 100644 --- a/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s +++ b/ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s @@ -1474,30 +1474,30 @@ glabel btl_state_update_player_menu /* 41BC0C 802A6E7C 2A62000A */ slti $v0, $s3, 0xa /* 41BC10 802A6E80 1440FFD5 */ bnez $v0, .L802A6DD8 /* 41BC14 802A6E84 26520002 */ addiu $s2, $s2, 2 -/* 41BC18 802A6E88 3C01802B */ lui $at, %hi(D_802ACFEC) -/* 41BC1C 802A6E8C AC20CFEC */ sw $zero, %lo(D_802ACFEC)($at) -/* 41BC20 802A6E90 3C01802B */ lui $at, %hi(D_802ACFF0) -/* 41BC24 802A6E94 AC20CFF0 */ sw $zero, %lo(D_802ACFF0)($at) +/* 41BC18 802A6E88 3C01802B */ lui $at, %hi(D_802ACCD0+0x31C) +/* 41BC1C 802A6E8C AC20CFEC */ sw $zero, %lo(D_802ACCD0+0x31C)($at) +/* 41BC20 802A6E90 3C01802B */ lui $at, %hi(D_802ACCD0+0x320) +/* 41BC24 802A6E94 AC20CFF0 */ sw $zero, %lo(D_802ACCD0+0x320)($at) /* 41BC28 802A6E98 86C3017C */ lh $v1, 0x17c($s6) /* 41BC2C 802A6E9C 24020035 */ addiu $v0, $zero, 0x35 /* 41BC30 802A6EA0 14620009 */ bne $v1, $v0, .L802A6EC8 /* 41BC34 802A6EA4 24020036 */ addiu $v0, $zero, 0x36 /* 41BC38 802A6EA8 82C30088 */ lb $v1, 0x88($s6) /* 41BC3C 802A6EAC 24020001 */ addiu $v0, $zero, 1 -/* 41BC40 802A6EB0 3C01802B */ lui $at, %hi(D_802ACFEC) -/* 41BC44 802A6EB4 AC22CFEC */ sw $v0, %lo(D_802ACFEC)($at) -/* 41BC48 802A6EB8 3C01802B */ lui $at, %hi(D_802ACFF0) -/* 41BC4C 802A6EBC AC23CFF0 */ sw $v1, %lo(D_802ACFF0)($at) +/* 41BC40 802A6EB0 3C01802B */ lui $at, %hi(D_802ACCD0+0x31C) +/* 41BC44 802A6EB4 AC22CFEC */ sw $v0, %lo(D_802ACCD0+0x31C)($at) +/* 41BC48 802A6EB8 3C01802B */ lui $at, %hi(D_802ACCD0+0x320) +/* 41BC4C 802A6EBC AC23CFF0 */ sw $v1, %lo(D_802ACCD0+0x320)($at) /* 41BC50 802A6EC0 86C3017C */ lh $v1, 0x17c($s6) /* 41BC54 802A6EC4 24020036 */ addiu $v0, $zero, 0x36 .L802A6EC8: /* 41BC58 802A6EC8 14620006 */ bne $v1, $v0, .L802A6EE4 /* 41BC5C 802A6ECC 24020002 */ addiu $v0, $zero, 2 /* 41BC60 802A6ED0 82C30088 */ lb $v1, 0x88($s6) -/* 41BC64 802A6ED4 3C01802B */ lui $at, %hi(D_802ACFEC) -/* 41BC68 802A6ED8 AC22CFEC */ sw $v0, %lo(D_802ACFEC)($at) -/* 41BC6C 802A6EDC 3C01802B */ lui $at, %hi(D_802ACFF0) -/* 41BC70 802A6EE0 AC23CFF0 */ sw $v1, %lo(D_802ACFF0)($at) +/* 41BC64 802A6ED4 3C01802B */ lui $at, %hi(D_802ACCD0+0x31C) +/* 41BC68 802A6ED8 AC22CFEC */ sw $v0, %lo(D_802ACCD0+0x31C)($at) +/* 41BC6C 802A6EDC 3C01802B */ lui $at, %hi(D_802ACCD0+0x320) +/* 41BC70 802A6EE0 AC23CFF0 */ sw $v1, %lo(D_802ACCD0+0x320)($at) .L802A6EE4: /* 41BC74 802A6EE4 82C20050 */ lb $v0, 0x50($s6) /* 41BC78 802A6EE8 04420001 */ bltzl $v0, .L802A6EF0 @@ -1515,8 +1515,8 @@ glabel btl_state_update_player_menu /* 41BCA4 802A6F14 080AA04F */ j .L802A813C /* 41BCA8 802A6F18 24020015 */ addiu $v0, $zero, 0x15 .L802A6F1C_41BCAC: -/* 41BCAC 802A6F1C 3C03802B */ lui $v1, %hi(D_802ACFFC) -/* 41BCB0 802A6F20 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) +/* 41BCAC 802A6F1C 3C03802B */ lui $v1, %hi(D_802ACCD0+0x32C) +/* 41BCB0 802A6F20 8463CFFC */ lh $v1, %lo(D_802ACCD0+0x32C)($v1) /* 41BCB4 802A6F24 10600487 */ beqz $v1, .L802A8144_41CED4 /* 41BCB8 802A6F28 240200FF */ addiu $v0, $zero, 0xff /* 41BCBC 802A6F2C 14620007 */ bne $v1, $v0, .L802A6F4C @@ -1530,8 +1530,8 @@ glabel btl_state_update_player_menu .L802A6F4C: /* 41BCDC 802A6F4C 24030019 */ addiu $v1, $zero, 0x19 /* 41BCE0 802A6F50 A6C2006C */ sh $v0, 0x6c($s6) -/* 41BCE4 802A6F54 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41BCE8 802A6F58 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41BCE4 802A6F54 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41BCE8 802A6F58 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41BCEC 802A6F5C 3C0E802B */ lui $t6, %hi(D_802ACCD0) /* 41BCF0 802A6F60 25CECCD0 */ addiu $t6, $t6, %lo(D_802ACCD0) /* 41BCF4 802A6F64 A6C3006E */ sh $v1, 0x6e($s6) @@ -1548,8 +1548,8 @@ glabel btl_state_update_player_menu /* 41BD20 802A6F90 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41BD24 802A6F94 00621821 */ addu $v1, $v1, $v0 /* 41BD28 802A6F98 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) -/* 41BD2C 802A6F9C 3C02802B */ lui $v0, %hi(D_802ACFFD) -/* 41BD30 802A6FA0 9042CFFD */ lbu $v0, %lo(D_802ACFFD)($v0) +/* 41BD2C 802A6F9C 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32D) +/* 41BD30 802A6FA0 9042CFFD */ lbu $v0, %lo(D_802ACCD0+0x32D)($v0) /* 41BD34 802A6FA4 AEC00188 */ sw $zero, 0x188($s6) /* 41BD38 802A6FA8 2442FFFF */ addiu $v0, $v0, -1 /* 41BD3C 802A6FAC 34638000 */ ori $v1, $v1, 0x8000 @@ -1567,8 +1567,8 @@ glabel btl_state_update_player_menu /* 41BD68 802A6FD8 30424000 */ andi $v0, $v0, 0x4000 /* 41BD6C 802A6FDC 1040000E */ beqz $v0, .L802A7018 /* 41BD70 802A6FE0 00000000 */ nop -/* 41BD74 802A6FE4 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41BD78 802A6FE8 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41BD74 802A6FE4 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41BD78 802A6FE8 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41BD7C 802A6FEC 1440000A */ bnez $v0, .L802A7018 /* 41BD80 802A6FF0 00000000 */ nop /* 41BD84 802A6FF4 0C03C5B3 */ jal func_800F16CC @@ -1688,8 +1688,8 @@ glabel btl_state_update_player_menu /* 41BF20 802A7190 080AA04F */ j .L802A813C /* 41BF24 802A7194 24020029 */ addiu $v0, $zero, 0x29 .L802A7198_41BF28: -/* 41BF28 802A7198 3C03802B */ lui $v1, %hi(D_802ACFFC) -/* 41BF2C 802A719C 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) +/* 41BF28 802A7198 3C03802B */ lui $v1, %hi(D_802ACCD0+0x32C) +/* 41BF2C 802A719C 8463CFFC */ lh $v1, %lo(D_802ACCD0+0x32C)($v1) /* 41BF30 802A71A0 106003E8 */ beqz $v1, .L802A8144_41CED4 /* 41BF34 802A71A4 240200FF */ addiu $v0, $zero, 0xff /* 41BF38 802A71A8 5462000B */ bnel $v1, $v0, .L802A71D8 @@ -1707,8 +1707,8 @@ glabel btl_state_update_player_menu .L802A71D8: /* 41BF68 802A71D8 2403002D */ addiu $v1, $zero, 0x2d /* 41BF6C 802A71DC A6C2006C */ sh $v0, 0x6c($s6) -/* 41BF70 802A71E0 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41BF74 802A71E4 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41BF70 802A71E0 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41BF74 802A71E4 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41BF78 802A71E8 3C0E802B */ lui $t6, %hi(D_802ACCD0) /* 41BF7C 802A71EC 25CECCD0 */ addiu $t6, $t6, %lo(D_802ACCD0) /* 41BF80 802A71F0 A6C3006E */ sh $v1, 0x6e($s6) @@ -1728,8 +1728,8 @@ glabel btl_state_update_player_menu /* 41BFB8 802A7228 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41BFBC 802A722C 00621821 */ addu $v1, $v1, $v0 /* 41BFC0 802A7230 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) -/* 41BFC4 802A7234 3C02802B */ lui $v0, %hi(D_802ACFFD) -/* 41BFC8 802A7238 9042CFFD */ lbu $v0, %lo(D_802ACFFD)($v0) +/* 41BFC4 802A7234 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32D) +/* 41BFC8 802A7238 9042CFFD */ lbu $v0, %lo(D_802ACCD0+0x32D)($v0) /* 41BFCC 802A723C AEC00188 */ sw $zero, 0x188($s6) /* 41BFD0 802A7240 2442FFFF */ addiu $v0, $v0, -1 /* 41BFD4 802A7244 34638000 */ ori $v1, $v1, 0x8000 @@ -1745,8 +1745,8 @@ glabel btl_state_update_player_menu /* 41BFF8 802A7268 30424000 */ andi $v0, $v0, 0x4000 /* 41BFFC 802A726C 1040FF6C */ beqz $v0, .L802A7020 /* 41C000 802A7270 00000000 */ nop -/* 41C004 802A7274 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41C008 802A7278 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41C004 802A7274 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41C008 802A7278 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41C00C 802A727C 1440FF68 */ bnez $v0, .L802A7020 /* 41C010 802A7280 00000000 */ nop /* 41C014 802A7284 0C03C5B3 */ jal func_800F16CC @@ -2083,35 +2083,35 @@ glabel btl_state_update_player_menu /* 41C4D4 802A7744 080A9F5D */ j .L802A7D74 /* 41C4D8 802A7748 A2C20088 */ sb $v0, 0x88($s6) .L802A774C: -/* 41C4DC 802A774C 3C01802B */ lui $at, %hi(D_802ACFE8) -/* 41C4E0 802A7750 AC20CFE8 */ sw $zero, %lo(D_802ACFE8)($at) +/* 41C4DC 802A774C 3C01802B */ lui $at, %hi(D_802ACCD0+0x318) +/* 41C4E0 802A7750 AC20CFE8 */ sw $zero, %lo(D_802ACCD0+0x318)($at) /* 41C4E4 802A7754 86C3017C */ lh $v1, 0x17c($s6) /* 41C4E8 802A7758 1462000C */ bne $v1, $v0, .L802A778C /* 41C4EC 802A775C 24020036 */ addiu $v0, $zero, 0x36 /* 41C4F0 802A7760 24020064 */ addiu $v0, $zero, 0x64 -/* 41C4F4 802A7764 3C01802B */ lui $at, %hi(D_802ACFE8) -/* 41C4F8 802A7768 AC22CFE8 */ sw $v0, %lo(D_802ACFE8)($at) +/* 41C4F4 802A7764 3C01802B */ lui $at, %hi(D_802ACCD0+0x318) +/* 41C4F8 802A7768 AC22CFE8 */ sw $v0, %lo(D_802ACCD0+0x318)($at) /* 41C4FC 802A776C 82C30088 */ lb $v1, 0x88($s6) /* 41C500 802A7770 24020001 */ addiu $v0, $zero, 1 -/* 41C504 802A7774 3C01802B */ lui $at, %hi(D_802ACFEC) -/* 41C508 802A7778 AC22CFEC */ sw $v0, %lo(D_802ACFEC)($at) -/* 41C50C 802A777C 3C01802B */ lui $at, %hi(D_802ACFF0) -/* 41C510 802A7780 AC23CFF0 */ sw $v1, %lo(D_802ACFF0)($at) +/* 41C504 802A7774 3C01802B */ lui $at, %hi(D_802ACCD0+0x31C) +/* 41C508 802A7778 AC22CFEC */ sw $v0, %lo(D_802ACCD0+0x31C)($at) +/* 41C50C 802A777C 3C01802B */ lui $at, %hi(D_802ACCD0+0x320) +/* 41C510 802A7780 AC23CFF0 */ sw $v1, %lo(D_802ACCD0+0x320)($at) /* 41C514 802A7784 86C3017C */ lh $v1, 0x17c($s6) /* 41C518 802A7788 24020036 */ addiu $v0, $zero, 0x36 .L802A778C: /* 41C51C 802A778C 1462000B */ bne $v1, $v0, .L802A77BC /* 41C520 802A7790 24020002 */ addiu $v0, $zero, 2 -/* 41C524 802A7794 3C01802B */ lui $at, %hi(D_802ACFEC) -/* 41C528 802A7798 AC22CFEC */ sw $v0, %lo(D_802ACFEC)($at) -/* 41C52C 802A779C 3C02802B */ lui $v0, %hi(D_802ACFE8) -/* 41C530 802A77A0 8C42CFE8 */ lw $v0, %lo(D_802ACFE8)($v0) +/* 41C524 802A7794 3C01802B */ lui $at, %hi(D_802ACCD0+0x31C) +/* 41C528 802A7798 AC22CFEC */ sw $v0, %lo(D_802ACCD0+0x31C)($at) +/* 41C52C 802A779C 3C02802B */ lui $v0, %hi(D_802ACCD0+0x318) +/* 41C530 802A77A0 8C42CFE8 */ lw $v0, %lo(D_802ACCD0+0x318)($v0) /* 41C534 802A77A4 82C30088 */ lb $v1, 0x88($s6) /* 41C538 802A77A8 244200C8 */ addiu $v0, $v0, 0xc8 -/* 41C53C 802A77AC 3C01802B */ lui $at, %hi(D_802ACFE8) -/* 41C540 802A77B0 AC22CFE8 */ sw $v0, %lo(D_802ACFE8)($at) -/* 41C544 802A77B4 3C01802B */ lui $at, %hi(D_802ACFF0) -/* 41C548 802A77B8 AC23CFF0 */ sw $v1, %lo(D_802ACFF0)($at) +/* 41C53C 802A77AC 3C01802B */ lui $at, %hi(D_802ACCD0+0x318) +/* 41C540 802A77B0 AC22CFE8 */ sw $v0, %lo(D_802ACCD0+0x318)($at) +/* 41C544 802A77B4 3C01802B */ lui $at, %hi(D_802ACCD0+0x320) +/* 41C548 802A77B8 AC23CFF0 */ sw $v1, %lo(D_802ACCD0+0x320)($at) .L802A77BC: /* 41C54C 802A77BC 82C20050 */ lb $v0, 0x50($s6) /* 41C550 802A77C0 04420001 */ bltzl $v0, .L802A77C8 @@ -2128,8 +2128,8 @@ glabel btl_state_update_player_menu /* 41C578 802A77E8 080AA04F */ j .L802A813C /* 41C57C 802A77EC 24020047 */ addiu $v0, $zero, 0x47 .L802A77F0_41C580: -/* 41C580 802A77F0 3C03802B */ lui $v1, %hi(D_802ACFFC) -/* 41C584 802A77F4 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) +/* 41C580 802A77F0 3C03802B */ lui $v1, %hi(D_802ACCD0+0x32C) +/* 41C584 802A77F4 8463CFFC */ lh $v1, %lo(D_802ACCD0+0x32C)($v1) /* 41C588 802A77F8 10600252 */ beqz $v1, .L802A8144_41CED4 /* 41C58C 802A77FC 240200FF */ addiu $v0, $zero, 0xff /* 41C590 802A7800 14620004 */ bne $v1, $v0, .L802A7814 @@ -2140,8 +2140,8 @@ glabel btl_state_update_player_menu .L802A7814: /* 41C5A4 802A7814 2403004B */ addiu $v1, $zero, 0x4b /* 41C5A8 802A7818 A6C2006C */ sh $v0, 0x6c($s6) -/* 41C5AC 802A781C 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41C5B0 802A7820 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41C5AC 802A781C 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41C5B0 802A7820 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41C5B4 802A7824 3C0E802B */ lui $t6, %hi(D_802ACCD0) /* 41C5B8 802A7828 25CECCD0 */ addiu $t6, $t6, %lo(D_802ACCD0) /* 41C5BC 802A782C A6C3006E */ sh $v1, 0x6e($s6) @@ -2158,8 +2158,8 @@ glabel btl_state_update_player_menu /* 41C5E8 802A7858 3C038008 */ lui $v1, %hi(gItemTable+0x8) /* 41C5EC 802A785C 00621821 */ addu $v1, $v1, $v0 /* 41C5F0 802A7860 8C6378E8 */ lw $v1, %lo(gItemTable+0x8)($v1) -/* 41C5F4 802A7864 3C02802B */ lui $v0, %hi(D_802ACFFD) -/* 41C5F8 802A7868 9042CFFD */ lbu $v0, %lo(D_802ACFFD)($v0) +/* 41C5F4 802A7864 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32D) +/* 41C5F8 802A7868 9042CFFD */ lbu $v0, %lo(D_802ACCD0+0x32D)($v0) /* 41C5FC 802A786C AEC00188 */ sw $zero, 0x188($s6) /* 41C600 802A7870 2442FFFF */ addiu $v0, $v0, -1 /* 41C604 802A7874 34638000 */ ori $v1, $v1, 0x8000 @@ -2625,10 +2625,10 @@ glabel btl_state_update_player_menu .L802A7F00: /* 41CC90 802A7F00 82A30012 */ lb $v1, 0x12($s5) /* 41CC94 802A7F04 24020001 */ addiu $v0, $zero, 1 -/* 41CC98 802A7F08 3C01802B */ lui $at, %hi(D_802ACFE8) -/* 41CC9C 802A7F0C AC22CFE8 */ sw $v0, %lo(D_802ACFE8)($at) -/* 41CCA0 802A7F10 3C01802B */ lui $at, %hi(D_802ACFF4) -/* 41CCA4 802A7F14 AC34CFF4 */ sw $s4, %lo(D_802ACFF4)($at) +/* 41CC98 802A7F08 3C01802B */ lui $at, %hi(D_802ACCD0+0x318) +/* 41CC9C 802A7F0C AC22CFE8 */ sw $v0, %lo(D_802ACCD0+0x318)($at) +/* 41CCA0 802A7F10 3C01802B */ lui $at, %hi(D_802ACCD0+0x324) +/* 41CCA4 802A7F14 AC34CFF4 */ sw $s4, %lo(D_802ACCD0+0x324)($at) /* 41CCA8 802A7F18 00031880 */ sll $v1, $v1, 2 /* 41CCAC 802A7F1C 3C028009 */ lui $v0, %hi(D_8008EEF0) /* 41CCB0 802A7F20 00431021 */ addu $v0, $v0, $v1 @@ -2645,8 +2645,8 @@ glabel btl_state_update_player_menu /* 41CCDC 802A7F4C 080AA04F */ j .L802A813C /* 41CCE0 802A7F50 2402001F */ addiu $v0, $zero, 0x1f .L802A7F54_41CCE4: -/* 41CCE4 802A7F54 3C03802B */ lui $v1, %hi(D_802ACFFC) -/* 41CCE8 802A7F58 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) +/* 41CCE4 802A7F54 3C03802B */ lui $v1, %hi(D_802ACCD0+0x32C) +/* 41CCE8 802A7F58 8463CFFC */ lh $v1, %lo(D_802ACCD0+0x32C)($v1) /* 41CCEC 802A7F5C 2402FFFF */ addiu $v0, $zero, -1 /* 41CCF0 802A7F60 10620076 */ beq $v1, $v0, .L802A813C /* 41CCF4 802A7F64 24020024 */ addiu $v0, $zero, 0x24 @@ -2669,8 +2669,8 @@ glabel btl_state_update_player_menu .L802A7FA4: /* 41CD34 802A7FA4 24030023 */ addiu $v1, $zero, 0x23 /* 41CD38 802A7FA8 A6C2006C */ sh $v0, 0x6c($s6) -/* 41CD3C 802A7FAC 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41CD40 802A7FB0 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41CD3C 802A7FAC 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41CD40 802A7FB0 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41CD44 802A7FB4 3C0E802B */ lui $t6, %hi(D_802ACCD0) /* 41CD48 802A7FB8 25CECCD0 */ addiu $t6, $t6, %lo(D_802ACCD0) /* 41CD4C 802A7FBC A6C3006E */ sh $v1, 0x6e($s6) @@ -2686,8 +2686,8 @@ glabel btl_state_update_player_menu /* 41CD74 802A7FE4 AEC20184 */ sw $v0, 0x184($s6) /* 41CD78 802A7FE8 A2C301AC */ sb $v1, 0x1ac($s6) /* 41CD7C 802A7FEC 00031E00 */ sll $v1, $v1, 0x18 -/* 41CD80 802A7FF0 3C02802B */ lui $v0, %hi(D_802ACFFD) -/* 41CD84 802A7FF4 9042CFFD */ lbu $v0, %lo(D_802ACFFD)($v0) +/* 41CD80 802A7FF0 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32D) +/* 41CD84 802A7FF4 9042CFFD */ lbu $v0, %lo(D_802ACCD0+0x32D)($v0) /* 41CD88 802A7FF8 00031E03 */ sra $v1, $v1, 0x18 /* 41CD8C 802A7FFC A6C3017A */ sh $v1, 0x17a($s6) /* 41CD90 802A8000 2442FFFF */ addiu $v0, $v0, -1 @@ -2704,8 +2704,8 @@ glabel btl_state_update_player_menu /* 41CDB8 802A8028 30424000 */ andi $v0, $v0, 0x4000 /* 41CDBC 802A802C 1040000D */ beqz $v0, .L802A8064 /* 41CDC0 802A8030 00000000 */ nop -/* 41CDC4 802A8034 3C02802B */ lui $v0, %hi(D_802ACFFC) -/* 41CDC8 802A8038 8442CFFC */ lh $v0, %lo(D_802ACFFC)($v0) +/* 41CDC4 802A8034 3C02802B */ lui $v0, %hi(D_802ACCD0+0x32C) +/* 41CDC8 802A8038 8442CFFC */ lh $v0, %lo(D_802ACCD0+0x32C)($v0) /* 41CDCC 802A803C 14400009 */ bnez $v0, .L802A8064 /* 41CDD0 802A8040 00000000 */ nop /* 41CDD4 802A8044 0C03C5B3 */ jal func_800F16CC @@ -2765,8 +2765,8 @@ glabel btl_state_update_player_menu /* 41CE94 802A8104 24040007 */ addiu $a0, $zero, 7 /* 41CE98 802A8108 0C051F9F */ jal set_window_update /* 41CE9C 802A810C 24050002 */ addiu $a1, $zero, 2 -/* 41CEA0 802A8110 3C03802B */ lui $v1, %hi(D_802ACFFC) -/* 41CEA4 802A8114 8463CFFC */ lh $v1, %lo(D_802ACFFC)($v1) +/* 41CEA0 802A8110 3C03802B */ lui $v1, %hi(D_802ACCD0+0x32C) +/* 41CEA4 802A8114 8463CFFC */ lh $v1, %lo(D_802ACCD0+0x32C)($v1) /* 41CEA8 802A8118 2402FFFF */ addiu $v0, $zero, -1 /* 41CEAC 802A811C 10620009 */ beq $v1, $v0, .L802A8144_41CED4 /* 41CEB0 802A8120 24040006 */ addiu $a0, $zero, 6 diff --git a/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s b/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s deleted file mode 100644 index e54b113023..0000000000 --- a/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s +++ /dev/null @@ -1,194 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80245350_EEB900 -.double 0.04 - -dlabel D_80245358_EEB908 -.double 0.98 - -.section .text - -glabel func_80240504_EE6AB4 -/* EE6AB4 80240504 27BDFF88 */ addiu $sp, $sp, -0x78 -/* EE6AB8 80240508 AFBF0064 */ sw $ra, 0x64($sp) -/* EE6ABC 8024050C AFB00060 */ sw $s0, 0x60($sp) -/* EE6AC0 80240510 F7B60070 */ sdc1 $f22, 0x70($sp) -/* EE6AC4 80240514 F7B40068 */ sdc1 $f20, 0x68($sp) -/* EE6AC8 80240518 0C01B198 */ jal __osGetCause -/* EE6ACC 8024051C 27A40010 */ addiu $a0, $sp, 0x10 -/* EE6AD0 80240520 3C108024 */ lui $s0, %hi(D_80243B44_EEA0F4) -/* EE6AD4 80240524 26103B44 */ addiu $s0, $s0, %lo(D_80243B44_EEA0F4) -/* EE6AD8 80240528 C6000000 */ lwc1 $f0, ($s0) -/* EE6ADC 8024052C 3C014130 */ lui $at, 0x4130 -/* EE6AE0 80240530 44816000 */ mtc1 $at, $f12 -/* EE6AE4 80240534 0C00AD17 */ jal func_8002B45C -/* EE6AE8 80240538 460C0303 */ div.s $f12, $f0, $f12 -/* EE6AEC 8024053C 3C018024 */ lui $at, %hi(D_80245350_EEB900) -/* EE6AF0 80240540 D4345350 */ ldc1 $f20, %lo(D_80245350_EEB900)($at) -/* EE6AF4 80240544 46000021 */ cvt.d.s $f0, $f0 -/* EE6AF8 80240548 46340002 */ mul.d $f0, $f0, $f20 -/* EE6AFC 8024054C 00000000 */ nop -/* EE6B00 80240550 3C018024 */ lui $at, %hi(D_80245358_EEB908) -/* EE6B04 80240554 D4365358 */ ldc1 $f22, %lo(D_80245358_EEB908)($at) -/* EE6B08 80240558 C6020000 */ lwc1 $f2, ($s0) -/* EE6B0C 8024055C 3C014140 */ lui $at, 0x4140 -/* EE6B10 80240560 44816000 */ mtc1 $at, $f12 -/* EE6B14 80240564 46360000 */ add.d $f0, $f0, $f22 -/* EE6B18 80240568 460C1303 */ div.s $f12, $f2, $f12 -/* EE6B1C 8024056C 46200020 */ cvt.s.d $f0, $f0 -/* EE6B20 80240570 0C00AD17 */ jal func_8002B45C -/* EE6B24 80240574 E7A00010 */ swc1 $f0, 0x10($sp) -/* EE6B28 80240578 46000021 */ cvt.d.s $f0, $f0 -/* EE6B2C 8024057C 46340002 */ mul.d $f0, $f0, $f20 -/* EE6B30 80240580 00000000 */ nop -/* EE6B34 80240584 C6020000 */ lwc1 $f2, ($s0) -/* EE6B38 80240588 3C014150 */ lui $at, 0x4150 -/* EE6B3C 8024058C 44816000 */ mtc1 $at, $f12 -/* EE6B40 80240590 00000000 */ nop -/* EE6B44 80240594 460C1303 */ div.s $f12, $f2, $f12 -/* EE6B48 80240598 46200020 */ cvt.s.d $f0, $f0 -/* EE6B4C 8024059C 0C00AD30 */ jal dead_cos_rad -/* EE6B50 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* EE6B54 802405A4 46000021 */ cvt.d.s $f0, $f0 -/* EE6B58 802405A8 46340002 */ mul.d $f0, $f0, $f20 -/* EE6B5C 802405AC 00000000 */ nop -/* EE6B60 802405B0 C60C0000 */ lwc1 $f12, ($s0) -/* EE6B64 802405B4 3C0140E0 */ lui $at, 0x40e0 -/* EE6B68 802405B8 44811000 */ mtc1 $at, $f2 -/* EE6B6C 802405BC 3C013F80 */ lui $at, 0x3f80 -/* EE6B70 802405C0 44812000 */ mtc1 $at, $f4 -/* EE6B74 802405C4 46026303 */ div.s $f12, $f12, $f2 -/* EE6B78 802405C8 46046300 */ add.s $f12, $f12, $f4 -/* EE6B7C 802405CC 46200020 */ cvt.s.d $f0, $f0 -/* EE6B80 802405D0 0C00AD17 */ jal func_8002B45C -/* EE6B84 802405D4 E7A00018 */ swc1 $f0, 0x18($sp) -/* EE6B88 802405D8 46000021 */ cvt.d.s $f0, $f0 -/* EE6B8C 802405DC 46340002 */ mul.d $f0, $f0, $f20 -/* EE6B90 802405E0 00000000 */ nop -/* EE6B94 802405E4 C6020000 */ lwc1 $f2, ($s0) -/* EE6B98 802405E8 3C014160 */ lui $at, 0x4160 -/* EE6B9C 802405EC 44816000 */ mtc1 $at, $f12 -/* EE6BA0 802405F0 46360000 */ add.d $f0, $f0, $f22 -/* EE6BA4 802405F4 460C1303 */ div.s $f12, $f2, $f12 -/* EE6BA8 802405F8 46200020 */ cvt.s.d $f0, $f0 -/* EE6BAC 802405FC 0C00AD17 */ jal func_8002B45C -/* EE6BB0 80240600 E7A00024 */ swc1 $f0, 0x24($sp) -/* EE6BB4 80240604 46000021 */ cvt.d.s $f0, $f0 -/* EE6BB8 80240608 46340002 */ mul.d $f0, $f0, $f20 -/* EE6BBC 8024060C 00000000 */ nop -/* EE6BC0 80240610 C6020000 */ lwc1 $f2, ($s0) -/* EE6BC4 80240614 3C014170 */ lui $at, 0x4170 -/* EE6BC8 80240618 44816000 */ mtc1 $at, $f12 -/* EE6BCC 8024061C 00000000 */ nop -/* EE6BD0 80240620 460C1303 */ div.s $f12, $f2, $f12 -/* EE6BD4 80240624 46200020 */ cvt.s.d $f0, $f0 -/* EE6BD8 80240628 0C00AD30 */ jal dead_cos_rad -/* EE6BDC 8024062C E7A00020 */ swc1 $f0, 0x20($sp) -/* EE6BE0 80240630 46000021 */ cvt.d.s $f0, $f0 -/* EE6BE4 80240634 46340002 */ mul.d $f0, $f0, $f20 -/* EE6BE8 80240638 00000000 */ nop -/* EE6BEC 8024063C C60C0000 */ lwc1 $f12, ($s0) -/* EE6BF0 80240640 3C013E80 */ lui $at, 0x3e80 -/* EE6BF4 80240644 44811000 */ mtc1 $at, $f2 -/* EE6BF8 80240648 00000000 */ nop -/* EE6BFC 8024064C 46026302 */ mul.s $f12, $f12, $f2 -/* EE6C00 80240650 00000000 */ nop -/* EE6C04 80240654 3C014000 */ lui $at, 0x4000 -/* EE6C08 80240658 44811000 */ mtc1 $at, $f2 -/* EE6C0C 8024065C 00000000 */ nop -/* EE6C10 80240660 46026300 */ add.s $f12, $f12, $f2 -/* EE6C14 80240664 46200020 */ cvt.s.d $f0, $f0 -/* EE6C18 80240668 0C00AD17 */ jal func_8002B45C -/* EE6C1C 8024066C E7A00028 */ swc1 $f0, 0x28($sp) -/* EE6C20 80240670 46000021 */ cvt.d.s $f0, $f0 -/* EE6C24 80240674 46340002 */ mul.d $f0, $f0, $f20 -/* EE6C28 80240678 00000000 */ nop -/* EE6C2C 8024067C C6020000 */ lwc1 $f2, ($s0) -/* EE6C30 80240680 3C013D80 */ lui $at, 0x3d80 -/* EE6C34 80240684 44816000 */ mtc1 $at, $f12 -/* EE6C38 80240688 00000000 */ nop -/* EE6C3C 8024068C 460C1302 */ mul.s $f12, $f2, $f12 -/* EE6C40 80240690 00000000 */ nop -/* EE6C44 80240694 46360000 */ add.d $f0, $f0, $f22 -/* EE6C48 80240698 46200020 */ cvt.s.d $f0, $f0 -/* EE6C4C 8024069C 0C00AD17 */ jal func_8002B45C -/* EE6C50 802406A0 E7A00038 */ swc1 $f0, 0x38($sp) -/* EE6C54 802406A4 46000021 */ cvt.d.s $f0, $f0 -/* EE6C58 802406A8 46340002 */ mul.d $f0, $f0, $f20 -/* EE6C5C 802406AC 00000000 */ nop -/* EE6C60 802406B0 C6020000 */ lwc1 $f2, ($s0) -/* EE6C64 802406B4 3C014188 */ lui $at, 0x4188 -/* EE6C68 802406B8 44816000 */ mtc1 $at, $f12 -/* EE6C6C 802406BC 00000000 */ nop -/* EE6C70 802406C0 460C1303 */ div.s $f12, $f2, $f12 -/* EE6C74 802406C4 46200020 */ cvt.s.d $f0, $f0 -/* EE6C78 802406C8 0C00AD30 */ jal dead_cos_rad -/* EE6C7C 802406CC E7A00030 */ swc1 $f0, 0x30($sp) -/* EE6C80 802406D0 3C030001 */ lui $v1, 1 -/* EE6C84 802406D4 46000021 */ cvt.d.s $f0, $f0 -/* EE6C88 802406D8 46340002 */ mul.d $f0, $f0, $f20 -/* EE6C8C 802406DC 00000000 */ nop -/* EE6C90 802406E0 34631630 */ ori $v1, $v1, 0x1630 -/* EE6C94 802406E4 27A40010 */ addiu $a0, $sp, 0x10 -/* EE6C98 802406E8 3C058008 */ lui $a1, %hi(D_80079540) -/* EE6C9C 802406EC 94A59540 */ lhu $a1, %lo(D_80079540)($a1) -/* EE6CA0 802406F0 3C02800A */ lui $v0, %hi(D_800A15CC) -/* EE6CA4 802406F4 8C4215CC */ lw $v0, %lo(D_800A15CC)($v0) -/* EE6CA8 802406F8 00052980 */ sll $a1, $a1, 6 -/* EE6CAC 802406FC 00A32821 */ addu $a1, $a1, $v1 -/* EE6CB0 80240700 00452821 */ addu $a1, $v0, $a1 -/* EE6CB4 80240704 46200020 */ cvt.s.d $f0, $f0 -/* EE6CB8 80240708 0C01B1B0 */ jal __osSpDeviceBusy -/* EE6CBC 8024070C E7A00034 */ swc1 $f0, 0x34($sp) -/* EE6CC0 80240710 0000202D */ daddu $a0, $zero, $zero -/* EE6CC4 80240714 27A50050 */ addiu $a1, $sp, 0x50 -/* EE6CC8 80240718 27A60054 */ addiu $a2, $sp, 0x54 -/* EE6CCC 8024071C 0C0499BE */ jal func_801266F8 -/* EE6CD0 80240720 27A70058 */ addiu $a3, $sp, 0x58 -/* EE6CD4 80240724 3C03DA38 */ lui $v1, 0xda38 -/* EE6CD8 80240728 34630001 */ ori $v1, $v1, 1 -/* EE6CDC 8024072C 3C080001 */ lui $t0, 1 -/* EE6CE0 80240730 35081630 */ ori $t0, $t0, 0x1630 -/* EE6CE4 80240734 3C06800A */ lui $a2, %hi(D_800A15C4) -/* EE6CE8 80240738 24C615C4 */ addiu $a2, $a2, %lo(D_800A15C4) -/* EE6CEC 8024073C 0000202D */ daddu $a0, $zero, $zero -/* EE6CF0 80240740 3C058008 */ lui $a1, %hi(D_80079540) -/* EE6CF4 80240744 24A59540 */ addiu $a1, $a1, %lo(D_80079540) -/* EE6CF8 80240748 8CD00000 */ lw $s0, ($a2) -/* EE6CFC 8024074C 94A20000 */ lhu $v0, ($a1) -/* EE6D00 80240750 0200382D */ daddu $a3, $s0, $zero -/* EE6D04 80240754 26100008 */ addiu $s0, $s0, 8 -/* EE6D08 80240758 ACD00000 */ sw $s0, ($a2) -/* EE6D0C 8024075C ACE30000 */ sw $v1, ($a3) -/* EE6D10 80240760 24430001 */ addiu $v1, $v0, 1 -/* EE6D14 80240764 3042FFFF */ andi $v0, $v0, 0xffff -/* EE6D18 80240768 00021180 */ sll $v0, $v0, 6 -/* EE6D1C 8024076C A4A30000 */ sh $v1, ($a1) -/* EE6D20 80240770 3C03800A */ lui $v1, %hi(D_800A15CC) -/* EE6D24 80240774 8C6315CC */ lw $v1, %lo(D_800A15CC)($v1) -/* EE6D28 80240778 00481021 */ addu $v0, $v0, $t0 -/* EE6D2C 8024077C 00621821 */ addu $v1, $v1, $v0 -/* EE6D30 80240780 26020008 */ addiu $v0, $s0, 8 -/* EE6D34 80240784 ACE30004 */ sw $v1, 4($a3) -/* EE6D38 80240788 ACC20000 */ sw $v0, ($a2) -/* EE6D3C 8024078C 3C02DE00 */ lui $v0, 0xde00 -/* EE6D40 80240790 0C0499CD */ jal func_80126734 -/* EE6D44 80240794 AE020000 */ sw $v0, ($s0) -/* EE6D48 80240798 3C038024 */ lui $v1, %hi(D_80243B44_EEA0F4) -/* EE6D4C 8024079C 24633B44 */ addiu $v1, $v1, %lo(D_80243B44_EEA0F4) -/* EE6D50 802407A0 C4600000 */ lwc1 $f0, ($v1) -/* EE6D54 802407A4 3C013F80 */ lui $at, 0x3f80 -/* EE6D58 802407A8 44811000 */ mtc1 $at, $f2 -/* EE6D5C 802407AC 00000000 */ nop -/* EE6D60 802407B0 46020000 */ add.s $f0, $f0, $f2 -/* EE6D64 802407B4 AE020004 */ sw $v0, 4($s0) -/* EE6D68 802407B8 E4600000 */ swc1 $f0, ($v1) -/* EE6D6C 802407BC 8FBF0064 */ lw $ra, 0x64($sp) -/* EE6D70 802407C0 8FB00060 */ lw $s0, 0x60($sp) -/* EE6D74 802407C4 D7B60070 */ ldc1 $f22, 0x70($sp) -/* EE6D78 802407C8 D7B40068 */ ldc1 $f20, 0x68($sp) -/* EE6D7C 802407CC 03E00008 */ jr $ra -/* EE6D80 802407D0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s deleted file mode 100644 index 649d0736b1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s +++ /dev/null @@ -1,734 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8024EF20_9780E0 -.word .L80242458_96B618, .L8024252C_96B6EC, .L802425CC_96B78C, .L802425F4_96B7B4, .L80242660_96B820, .L802426F4_96B8B4, .L802427C4_96B984, .L802428A8_96BA68, .L80242978_96BB38, .L802429D0_96BB90, .L80242A54_96BC14, .L80242A80_96BC40, .L80242C2C_96BDEC, .L80242E94_96C054 - -dlabel D_8024EF58_978118 -.double 0.1 - -dlabel D_8024EF60_978120 -.double 0.1 - -dlabel D_8024EF68_978128 -.double 0.01 - -dlabel D_8024EF70_978130 -.double 0.4 - -dlabel D_8024EF78_978138 -.double 0.05 - -.section .text - -glabel dro_02_func_8024240C_96B5CC -/* 96B5CC 8024240C 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 96B5D0 80242410 3C05F4AC */ lui $a1, 0xf4ac -/* 96B5D4 80242414 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96B5D8 80242418 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B5DC 8024241C AFBF0080 */ sw $ra, 0x80($sp) -/* 96B5E0 80242420 AFB1007C */ sw $s1, 0x7c($sp) -/* 96B5E4 80242424 AFB00078 */ sw $s0, 0x78($sp) -/* 96B5E8 80242428 F7B40088 */ sdc1 $f20, 0x88($sp) -/* 96B5EC 8024242C 0C0B1EAF */ jal evt_get_variable -/* 96B5F0 80242430 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B5F4 80242434 0040182D */ daddu $v1, $v0, $zero -/* 96B5F8 80242438 2C62000E */ sltiu $v0, $v1, 0xe -/* 96B5FC 8024243C 10400295 */ beqz $v0, .L80242E94_96C054 -/* 96B600 80242440 00031080 */ sll $v0, $v1, 2 -/* 96B604 80242444 3C018025 */ lui $at, %hi(jtbl_8024EF20_9780E0) -/* 96B608 80242448 00220821 */ addu $at, $at, $v0 -/* 96B60C 8024244C 8C22EF20 */ lw $v0, %lo(jtbl_8024EF20_9780E0)($at) -/* 96B610 80242450 00400008 */ jr $v0 -/* 96B614 80242454 00000000 */ nop -.L80242458_96B618: -/* 96B618 80242458 3C05F4AC */ lui $a1, 0xf4ac -/* 96B61C 8024245C 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B620 80242460 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96B624 80242464 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B628 80242468 3C018025 */ lui $at, %hi(D_8024EF88) -/* 96B62C 8024246C AC20EF88 */ sw $zero, %lo(D_8024EF88)($at) -/* 96B630 80242470 0C0B2026 */ jal evt_set_variable -/* 96B634 80242474 24060001 */ addiu $a2, $zero, 1 -/* 96B638 80242478 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96B63C 8024247C 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96B640 80242480 24040001 */ addiu $a0, $zero, 1 -/* 96B644 80242484 3C01C348 */ lui $at, 0xc348 -/* 96B648 80242488 44811000 */ mtc1 $at, $f2 -/* 96B64C 8024248C 3C014348 */ lui $at, 0x4348 -/* 96B650 80242490 44810000 */ mtc1 $at, $f0 -/* 96B654 80242494 3C013F80 */ lui $at, 0x3f80 -/* 96B658 80242498 44812000 */ mtc1 $at, $f4 -/* 96B65C 8024249C 3C014000 */ lui $at, 0x4000 -/* 96B660 802424A0 44813000 */ mtc1 $at, $f6 -/* 96B664 802424A4 2403000C */ addiu $v1, $zero, 0xc -/* 96B668 802424A8 AC43001C */ sw $v1, 0x1c($v0) -/* 96B66C 802424AC 24030002 */ addiu $v1, $zero, 2 -/* 96B670 802424B0 AC430020 */ sw $v1, 0x20($v0) -/* 96B674 802424B4 24030030 */ addiu $v1, $zero, 0x30 -/* 96B678 802424B8 AC430040 */ sw $v1, 0x40($v0) -/* 96B67C 802424BC 24030008 */ addiu $v1, $zero, 8 -/* 96B680 802424C0 AC430060 */ sw $v1, 0x60($v0) -/* 96B684 802424C4 24030005 */ addiu $v1, $zero, 5 -/* 96B688 802424C8 AC430064 */ sw $v1, 0x64($v0) -/* 96B68C 802424CC 24030004 */ addiu $v1, $zero, 4 -/* 96B690 802424D0 AC440000 */ sw $a0, ($v0) -/* 96B694 802424D4 AC400008 */ sw $zero, 8($v0) -/* 96B698 802424D8 AC40000C */ sw $zero, 0xc($v0) -/* 96B69C 802424DC AC400014 */ sw $zero, 0x14($v0) -/* 96B6A0 802424E0 AC400010 */ sw $zero, 0x10($v0) -/* 96B6A4 802424E4 AC440018 */ sw $a0, 0x18($v0) -/* 96B6A8 802424E8 AC440024 */ sw $a0, 0x24($v0) -/* 96B6AC 802424EC AC40002C */ sw $zero, 0x2c($v0) -/* 96B6B0 802424F0 AC400038 */ sw $zero, 0x38($v0) -/* 96B6B4 802424F4 AC400034 */ sw $zero, 0x34($v0) -/* 96B6B8 802424F8 AC44003C */ sw $a0, 0x3c($v0) -/* 96B6BC 802424FC AC400044 */ sw $zero, 0x44($v0) -/* 96B6C0 80242500 AC440048 */ sw $a0, 0x48($v0) -/* 96B6C4 80242504 AC40004C */ sw $zero, 0x4c($v0) -/* 96B6C8 80242508 AC40005C */ sw $zero, 0x5c($v0) -/* 96B6CC 8024250C AC400058 */ sw $zero, 0x58($v0) -/* 96B6D0 80242510 AC430068 */ sw $v1, 0x68($v0) -/* 96B6D4 80242514 E4420004 */ swc1 $f2, 4($v0) -/* 96B6D8 80242518 E4400028 */ swc1 $f0, 0x28($v0) -/* 96B6DC 8024251C E4440030 */ swc1 $f4, 0x30($v0) -/* 96B6E0 80242520 E4400050 */ swc1 $f0, 0x50($v0) -/* 96B6E4 80242524 08090BA5 */ j .L80242E94_96C054 -/* 96B6E8 80242528 E4460054 */ swc1 $f6, 0x54($v0) -.L8024252C_96B6EC: -/* 96B6EC 8024252C 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96B6F0 80242530 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96B6F4 80242534 3C108025 */ lui $s0, %hi(D_8024EF88) -/* 96B6F8 80242538 2610EF88 */ addiu $s0, $s0, %lo(D_8024EF88) -/* 96B6FC 8024253C C4440004 */ lwc1 $f4, 4($v0) -/* 96B700 80242540 3C014120 */ lui $at, 0x4120 -/* 96B704 80242544 44810000 */ mtc1 $at, $f0 -/* 96B708 80242548 C4420028 */ lwc1 $f2, 0x28($v0) -/* 96B70C 8024254C 46002100 */ add.s $f4, $f4, $f0 -/* 96B710 80242550 3C01C120 */ lui $at, 0xc120 -/* 96B714 80242554 44813000 */ mtc1 $at, $f6 -/* 96B718 80242558 8E030000 */ lw $v1, ($s0) -/* 96B71C 8024255C 46061080 */ add.s $f2, $f2, $f6 -/* 96B720 80242560 C4400050 */ lwc1 $f0, 0x50($v0) -/* 96B724 80242564 24630001 */ addiu $v1, $v1, 1 -/* 96B728 80242568 AE030000 */ sw $v1, ($s0) -/* 96B72C 8024256C 46060000 */ add.s $f0, $f0, $f6 -/* 96B730 80242570 E4440004 */ swc1 $f4, 4($v0) -/* 96B734 80242574 E4420028 */ swc1 $f2, 0x28($v0) -/* 96B738 80242578 E4400050 */ swc1 $f0, 0x50($v0) -/* 96B73C 8024257C 24020012 */ addiu $v0, $zero, 0x12 -/* 96B740 80242580 14620006 */ bne $v1, $v0, .L8024259C -/* 96B744 80242584 00000000 */ nop -/* 96B748 80242588 3C01C47A */ lui $at, 0xc47a -/* 96B74C 8024258C 44810000 */ mtc1 $at, $f0 -/* 96B750 80242590 00000000 */ nop -/* 96B754 80242594 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) -/* 96B758 80242598 E420EFF4 */ swc1 $f0, %lo(gPlayerStatus+0x2C)($at) -.L8024259C: -/* 96B75C 8024259C 8E030000 */ lw $v1, ($s0) -/* 96B760 802425A0 24020014 */ addiu $v0, $zero, 0x14 -/* 96B764 802425A4 1462023B */ bne $v1, $v0, .L80242E94_96C054 -/* 96B768 802425A8 00000000 */ nop -/* 96B76C 802425AC 3C05F4AC */ lui $a1, 0xf4ac -/* 96B770 802425B0 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B774 802425B4 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96B778 802425B8 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B77C 802425BC 0C0B2026 */ jal evt_set_variable -/* 96B780 802425C0 24060002 */ addiu $a2, $zero, 2 -/* 96B784 802425C4 08090BA5 */ j .L80242E94_96C054 -/* 96B788 802425C8 AE000000 */ sw $zero, ($s0) -.L802425CC_96B78C: -/* 96B78C 802425CC 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96B790 802425D0 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96B794 802425D4 24030002 */ addiu $v1, $zero, 2 -/* 96B798 802425D8 AC430000 */ sw $v1, ($v0) -/* 96B79C 802425DC AC400024 */ sw $zero, 0x24($v0) -/* 96B7A0 802425E0 AC400048 */ sw $zero, 0x48($v0) -/* 96B7A4 802425E4 AC400004 */ sw $zero, 4($v0) -/* 96B7A8 802425E8 AC400008 */ sw $zero, 8($v0) -/* 96B7AC 802425EC 08090BA5 */ j .L80242E94_96C054 -/* 96B7B0 802425F0 AC40000C */ sw $zero, 0xc($v0) -.L802425F4_96B7B4: -/* 96B7B4 802425F4 3C038025 */ lui $v1, %hi(D_8024F010) -/* 96B7B8 802425F8 2463F010 */ addiu $v1, $v1, %lo(D_8024F010) -/* 96B7BC 802425FC 24020001 */ addiu $v0, $zero, 1 -/* 96B7C0 80242600 C4620004 */ lwc1 $f2, 4($v1) -/* 96B7C4 80242604 3C014120 */ lui $at, 0x4120 -/* 96B7C8 80242608 44812000 */ mtc1 $at, $f4 -/* 96B7CC 8024260C 3C078025 */ lui $a3, %hi(D_8024EF88) -/* 96B7D0 80242610 24E7EF88 */ addiu $a3, $a3, %lo(D_8024EF88) -/* 96B7D4 80242614 AC620000 */ sw $v0, ($v1) -/* 96B7D8 80242618 AC620024 */ sw $v0, 0x24($v1) -/* 96B7DC 8024261C AC620048 */ sw $v0, 0x48($v1) -/* 96B7E0 80242620 8CE40000 */ lw $a0, ($a3) -/* 96B7E4 80242624 C4600028 */ lwc1 $f0, 0x28($v1) -/* 96B7E8 80242628 46041081 */ sub.s $f2, $f2, $f4 -/* 96B7EC 8024262C 00822021 */ addu $a0, $a0, $v0 -/* 96B7F0 80242630 2402000A */ addiu $v0, $zero, 0xa -/* 96B7F4 80242634 46040000 */ add.s $f0, $f0, $f4 -/* 96B7F8 80242638 ACE40000 */ sw $a0, ($a3) -/* 96B7FC 8024263C E4620004 */ swc1 $f2, 4($v1) -/* 96B800 80242640 14820214 */ bne $a0, $v0, .L80242E94_96C054 -/* 96B804 80242644 E4600028 */ swc1 $f0, 0x28($v1) -/* 96B808 80242648 3C05F4AC */ lui $a1, 0xf4ac -/* 96B80C 8024264C 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B810 80242650 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96B814 80242654 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B818 80242658 08090A91 */ j .L80242A44 -/* 96B81C 8024265C 24060004 */ addiu $a2, $zero, 4 -.L80242660_96B820: -/* 96B820 80242660 3C078025 */ lui $a3, %hi(D_8024EF88) -/* 96B824 80242664 24E7EF88 */ addiu $a3, $a3, %lo(D_8024EF88) -/* 96B828 80242668 3C01C2C8 */ lui $at, 0xc2c8 -/* 96B82C 8024266C 44810000 */ mtc1 $at, $f0 -/* 96B830 80242670 3C0142C8 */ lui $at, 0x42c8 -/* 96B834 80242674 44811000 */ mtc1 $at, $f2 -/* 96B838 80242678 3C013F80 */ lui $at, 0x3f80 -/* 96B83C 8024267C 44812000 */ mtc1 $at, $f4 -/* 96B840 80242680 3C014000 */ lui $at, 0x4000 -/* 96B844 80242684 44813000 */ mtc1 $at, $f6 -/* 96B848 80242688 8CE30000 */ lw $v1, ($a3) -/* 96B84C 8024268C 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96B850 80242690 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96B854 80242694 AC400008 */ sw $zero, 8($v0) -/* 96B858 80242698 AC40000C */ sw $zero, 0xc($v0) -/* 96B85C 8024269C AC40002C */ sw $zero, 0x2c($v0) -/* 96B860 802426A0 AC40004C */ sw $zero, 0x4c($v0) -/* 96B864 802426A4 AC400050 */ sw $zero, 0x50($v0) -/* 96B868 802426A8 24630001 */ addiu $v1, $v1, 1 -/* 96B86C 802426AC E4400004 */ swc1 $f0, 4($v0) -/* 96B870 802426B0 E4420028 */ swc1 $f2, 0x28($v0) -/* 96B874 802426B4 E4440030 */ swc1 $f4, 0x30($v0) -/* 96B878 802426B8 E4460054 */ swc1 $f6, 0x54($v0) -/* 96B87C 802426BC 24020014 */ addiu $v0, $zero, 0x14 -/* 96B880 802426C0 146201F4 */ bne $v1, $v0, .L80242E94_96C054 -/* 96B884 802426C4 ACE30000 */ sw $v1, ($a3) -/* 96B888 802426C8 3C05F4AC */ lui $a1, 0xf4ac -/* 96B88C 802426CC 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B890 802426D0 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96B894 802426D4 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B898 802426D8 24060005 */ addiu $a2, $zero, 5 -/* 96B89C 802426DC 0C0B2026 */ jal evt_set_variable -/* 96B8A0 802426E0 ACE00000 */ sw $zero, ($a3) -/* 96B8A4 802426E4 24040203 */ addiu $a0, $zero, 0x203 -/* 96B8A8 802426E8 0000282D */ daddu $a1, $zero, $zero -/* 96B8AC 802426EC 08090A26 */ j .L80242898 -/* 96B8B0 802426F0 24060018 */ addiu $a2, $zero, 0x18 -.L802426F4_96B8B4: -/* 96B8B4 802426F4 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96B8B8 802426F8 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96B8BC 802426FC C4400010 */ lwc1 $f0, 0x10($v0) -/* 96B8C0 80242700 3C014190 */ lui $at, 0x4190 -/* 96B8C4 80242704 44811000 */ mtc1 $at, $f2 -/* 96B8C8 80242708 3C108025 */ lui $s0, %hi(D_8024EF88) -/* 96B8CC 8024270C 2610EF88 */ addiu $s0, $s0, %lo(D_8024EF88) -/* 96B8D0 80242710 AC400034 */ sw $zero, 0x34($v0) -/* 96B8D4 80242714 AC400058 */ sw $zero, 0x58($v0) -/* 96B8D8 80242718 8E030000 */ lw $v1, ($s0) -/* 96B8DC 8024271C 46020000 */ add.s $f0, $f0, $f2 -/* 96B8E0 80242720 24630001 */ addiu $v1, $v1, 1 -/* 96B8E4 80242724 AE030000 */ sw $v1, ($s0) -/* 96B8E8 80242728 E4400010 */ swc1 $f0, 0x10($v0) -/* 96B8EC 8024272C 24020008 */ addiu $v0, $zero, 8 -/* 96B8F0 80242730 14620016 */ bne $v1, $v0, .L8024278C -/* 96B8F4 80242734 0000202D */ daddu $a0, $zero, $zero -/* 96B8F8 80242738 27A50018 */ addiu $a1, $sp, 0x18 -/* 96B8FC 8024273C 27A6001C */ addiu $a2, $sp, 0x1c -/* 96B900 80242740 27A70020 */ addiu $a3, $sp, 0x20 -/* 96B904 80242744 27A20024 */ addiu $v0, $sp, 0x24 -/* 96B908 80242748 0C090885 */ jal dro_02_func_80242214_96B3D4 -/* 96B90C 8024274C AFA20010 */ sw $v0, 0x10($sp) -/* 96B910 80242750 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 96B914 80242754 3C0141A0 */ lui $at, 0x41a0 -/* 96B918 80242758 44810000 */ mtc1 $at, $f0 -/* 96B91C 8024275C 00000000 */ nop -/* 96B920 80242760 46001080 */ add.s $f2, $f2, $f0 -/* 96B924 80242764 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 96B928 80242768 44050000 */ mfc1 $a1, $f0 -/* 96B92C 8024276C 44061000 */ mfc1 $a2, $f2 -/* 96B930 80242770 C7A20020 */ lwc1 $f2, 0x20($sp) -/* 96B934 80242774 3C0141F0 */ lui $at, 0x41f0 -/* 96B938 80242778 44810000 */ mtc1 $at, $f0 -/* 96B93C 8024277C 44071000 */ mfc1 $a3, $f2 -/* 96B940 80242780 0000202D */ daddu $a0, $zero, $zero -/* 96B944 80242784 0C01BFBC */ jal fx_sparkles -/* 96B948 80242788 E7A00010 */ swc1 $f0, 0x10($sp) -.L8024278C: -/* 96B94C 8024278C 8E030000 */ lw $v1, ($s0) -/* 96B950 80242790 2402000A */ addiu $v0, $zero, 0xa -/* 96B954 80242794 146201BF */ bne $v1, $v0, .L80242E94_96C054 -/* 96B958 80242798 24060006 */ addiu $a2, $zero, 6 -/* 96B95C 8024279C 3C05F4AC */ lui $a1, 0xf4ac -/* 96B960 802427A0 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B964 802427A4 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96B968 802427A8 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96B96C 802427AC 0C0B2026 */ jal evt_set_variable -/* 96B970 802427B0 AE000000 */ sw $zero, ($s0) -/* 96B974 802427B4 24040203 */ addiu $a0, $zero, 0x203 -/* 96B978 802427B8 0000282D */ daddu $a1, $zero, $zero -/* 96B97C 802427BC 08090A26 */ j .L80242898 -/* 96B980 802427C0 24060040 */ addiu $a2, $zero, 0x40 -.L802427C4_96B984: -/* 96B984 802427C4 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96B988 802427C8 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96B98C 802427CC C4420010 */ lwc1 $f2, 0x10($v0) -/* 96B990 802427D0 3C014190 */ lui $at, 0x4190 -/* 96B994 802427D4 44812000 */ mtc1 $at, $f4 -/* 96B998 802427D8 3C108025 */ lui $s0, %hi(D_8024EF88) -/* 96B99C 802427DC 2610EF88 */ addiu $s0, $s0, %lo(D_8024EF88) -/* 96B9A0 802427E0 AC400034 */ sw $zero, 0x34($v0) -/* 96B9A4 802427E4 8E030000 */ lw $v1, ($s0) -/* 96B9A8 802427E8 46041080 */ add.s $f2, $f2, $f4 -/* 96B9AC 802427EC C4400058 */ lwc1 $f0, 0x58($v0) -/* 96B9B0 802427F0 24630001 */ addiu $v1, $v1, 1 -/* 96B9B4 802427F4 46040000 */ add.s $f0, $f0, $f4 -/* 96B9B8 802427F8 AE030000 */ sw $v1, ($s0) -/* 96B9BC 802427FC E4420010 */ swc1 $f2, 0x10($v0) -/* 96B9C0 80242800 E4400058 */ swc1 $f0, 0x58($v0) -/* 96B9C4 80242804 24020008 */ addiu $v0, $zero, 8 -/* 96B9C8 80242808 14620016 */ bne $v1, $v0, .L80242864 -/* 96B9CC 8024280C 24040002 */ addiu $a0, $zero, 2 -/* 96B9D0 80242810 27A50028 */ addiu $a1, $sp, 0x28 -/* 96B9D4 80242814 27A6002C */ addiu $a2, $sp, 0x2c -/* 96B9D8 80242818 27A70030 */ addiu $a3, $sp, 0x30 -/* 96B9DC 8024281C 27A20034 */ addiu $v0, $sp, 0x34 -/* 96B9E0 80242820 0C090885 */ jal dro_02_func_80242214_96B3D4 -/* 96B9E4 80242824 AFA20010 */ sw $v0, 0x10($sp) -/* 96B9E8 80242828 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 96B9EC 8024282C 3C0141A0 */ lui $at, 0x41a0 -/* 96B9F0 80242830 44810000 */ mtc1 $at, $f0 -/* 96B9F4 80242834 00000000 */ nop -/* 96B9F8 80242838 46001080 */ add.s $f2, $f2, $f0 -/* 96B9FC 8024283C C7A00028 */ lwc1 $f0, 0x28($sp) -/* 96BA00 80242840 44050000 */ mfc1 $a1, $f0 -/* 96BA04 80242844 44061000 */ mfc1 $a2, $f2 -/* 96BA08 80242848 C7A20030 */ lwc1 $f2, 0x30($sp) -/* 96BA0C 8024284C 3C0141F0 */ lui $at, 0x41f0 -/* 96BA10 80242850 44810000 */ mtc1 $at, $f0 -/* 96BA14 80242854 44071000 */ mfc1 $a3, $f2 -/* 96BA18 80242858 0000202D */ daddu $a0, $zero, $zero -/* 96BA1C 8024285C 0C01BFBC */ jal fx_sparkles -/* 96BA20 80242860 E7A00010 */ swc1 $f0, 0x10($sp) -.L80242864: -/* 96BA24 80242864 8E030000 */ lw $v1, ($s0) -/* 96BA28 80242868 2402000A */ addiu $v0, $zero, 0xa -/* 96BA2C 8024286C 14620189 */ bne $v1, $v0, .L80242E94_96C054 -/* 96BA30 80242870 24060007 */ addiu $a2, $zero, 7 -/* 96BA34 80242874 3C05F4AC */ lui $a1, 0xf4ac -/* 96BA38 80242878 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BA3C 8024287C 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96BA40 80242880 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BA44 80242884 0C0B2026 */ jal evt_set_variable -/* 96BA48 80242888 AE000000 */ sw $zero, ($s0) -/* 96BA4C 8024288C 24040203 */ addiu $a0, $zero, 0x203 -/* 96BA50 80242890 0000282D */ daddu $a1, $zero, $zero -/* 96BA54 80242894 24060068 */ addiu $a2, $zero, 0x68 -.L80242898: -/* 96BA58 80242898 0C0526AE */ jal sfx_play_sound_with_params -/* 96BA5C 8024289C 00A0382D */ daddu $a3, $a1, $zero -/* 96BA60 802428A0 08090BA5 */ j .L80242E94_96C054 -/* 96BA64 802428A4 00000000 */ nop -.L802428A8_96BA68: -/* 96BA68 802428A8 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96BA6C 802428AC 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96BA70 802428B0 C4420034 */ lwc1 $f2, 0x34($v0) -/* 96BA74 802428B4 3C014190 */ lui $at, 0x4190 -/* 96BA78 802428B8 44812000 */ mtc1 $at, $f4 -/* 96BA7C 802428BC 3C108025 */ lui $s0, %hi(D_8024EF88) -/* 96BA80 802428C0 2610EF88 */ addiu $s0, $s0, %lo(D_8024EF88) -/* 96BA84 802428C4 AC400010 */ sw $zero, 0x10($v0) -/* 96BA88 802428C8 8E030000 */ lw $v1, ($s0) -/* 96BA8C 802428CC 46041080 */ add.s $f2, $f2, $f4 -/* 96BA90 802428D0 C4400058 */ lwc1 $f0, 0x58($v0) -/* 96BA94 802428D4 24630001 */ addiu $v1, $v1, 1 -/* 96BA98 802428D8 46040000 */ add.s $f0, $f0, $f4 -/* 96BA9C 802428DC AE030000 */ sw $v1, ($s0) -/* 96BAA0 802428E0 E4420034 */ swc1 $f2, 0x34($v0) -/* 96BAA4 802428E4 E4400058 */ swc1 $f0, 0x58($v0) -/* 96BAA8 802428E8 24020008 */ addiu $v0, $zero, 8 -/* 96BAAC 802428EC 14620016 */ bne $v1, $v0, .L80242948 -/* 96BAB0 802428F0 24040001 */ addiu $a0, $zero, 1 -/* 96BAB4 802428F4 27A50038 */ addiu $a1, $sp, 0x38 -/* 96BAB8 802428F8 27A6003C */ addiu $a2, $sp, 0x3c -/* 96BABC 802428FC 27A70040 */ addiu $a3, $sp, 0x40 -/* 96BAC0 80242900 27A20044 */ addiu $v0, $sp, 0x44 -/* 96BAC4 80242904 0C090885 */ jal dro_02_func_80242214_96B3D4 -/* 96BAC8 80242908 AFA20010 */ sw $v0, 0x10($sp) -/* 96BACC 8024290C C7A2003C */ lwc1 $f2, 0x3c($sp) -/* 96BAD0 80242910 3C0141A0 */ lui $at, 0x41a0 -/* 96BAD4 80242914 44810000 */ mtc1 $at, $f0 -/* 96BAD8 80242918 00000000 */ nop -/* 96BADC 8024291C 46001080 */ add.s $f2, $f2, $f0 -/* 96BAE0 80242920 C7A00038 */ lwc1 $f0, 0x38($sp) -/* 96BAE4 80242924 44050000 */ mfc1 $a1, $f0 -/* 96BAE8 80242928 44061000 */ mfc1 $a2, $f2 -/* 96BAEC 8024292C C7A20040 */ lwc1 $f2, 0x40($sp) -/* 96BAF0 80242930 3C0141F0 */ lui $at, 0x41f0 -/* 96BAF4 80242934 44810000 */ mtc1 $at, $f0 -/* 96BAF8 80242938 44071000 */ mfc1 $a3, $f2 -/* 96BAFC 8024293C 0000202D */ daddu $a0, $zero, $zero -/* 96BB00 80242940 0C01BFBC */ jal fx_sparkles -/* 96BB04 80242944 E7A00010 */ swc1 $f0, 0x10($sp) -.L80242948: -/* 96BB08 80242948 8E030000 */ lw $v1, ($s0) -/* 96BB0C 8024294C 2402000A */ addiu $v0, $zero, 0xa -/* 96BB10 80242950 14620150 */ bne $v1, $v0, .L80242E94_96C054 -/* 96BB14 80242954 24060008 */ addiu $a2, $zero, 8 -/* 96BB18 80242958 3C05F4AC */ lui $a1, 0xf4ac -/* 96BB1C 8024295C 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BB20 80242960 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96BB24 80242964 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BB28 80242968 0C0B2026 */ jal evt_set_variable -/* 96BB2C 8024296C AE000000 */ sw $zero, ($s0) -/* 96BB30 80242970 08090BA5 */ j .L80242E94_96C054 -/* 96BB34 80242974 00000000 */ nop -.L80242978_96BB38: -/* 96BB38 80242978 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96BB3C 8024297C 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96BB40 80242980 C4400034 */ lwc1 $f0, 0x34($v0) -/* 96BB44 80242984 3C014190 */ lui $at, 0x4190 -/* 96BB48 80242988 44811000 */ mtc1 $at, $f2 -/* 96BB4C 8024298C 3C078025 */ lui $a3, %hi(D_8024EF88) -/* 96BB50 80242990 24E7EF88 */ addiu $a3, $a3, %lo(D_8024EF88) -/* 96BB54 80242994 AC400010 */ sw $zero, 0x10($v0) -/* 96BB58 80242998 AC400058 */ sw $zero, 0x58($v0) -/* 96BB5C 8024299C 8CE30000 */ lw $v1, ($a3) -/* 96BB60 802429A0 46020000 */ add.s $f0, $f0, $f2 -/* 96BB64 802429A4 24630001 */ addiu $v1, $v1, 1 -/* 96BB68 802429A8 ACE30000 */ sw $v1, ($a3) -/* 96BB6C 802429AC E4400034 */ swc1 $f0, 0x34($v0) -/* 96BB70 802429B0 2402000A */ addiu $v0, $zero, 0xa -/* 96BB74 802429B4 14620137 */ bne $v1, $v0, .L80242E94_96C054 -/* 96BB78 802429B8 24060009 */ addiu $a2, $zero, 9 -/* 96BB7C 802429BC 3C05F4AC */ lui $a1, 0xf4ac -/* 96BB80 802429C0 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96BB84 802429C4 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BB88 802429C8 08090A91 */ j .L80242A44 -/* 96BB8C 802429CC 34A5D489 */ ori $a1, $a1, 0xd489 -.L802429D0_96BB90: -/* 96BB90 802429D0 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96BB94 802429D4 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96BB98 802429D8 C4420004 */ lwc1 $f2, 4($v0) -/* 96BB9C 802429DC 3C014120 */ lui $at, 0x4120 -/* 96BBA0 802429E0 44812000 */ mtc1 $at, $f4 -/* 96BBA4 802429E4 3C078025 */ lui $a3, %hi(D_8024EF88) -/* 96BBA8 802429E8 24E7EF88 */ addiu $a3, $a3, %lo(D_8024EF88) -/* 96BBAC 802429EC AC400008 */ sw $zero, 8($v0) -/* 96BBB0 802429F0 AC400010 */ sw $zero, 0x10($v0) -/* 96BBB4 802429F4 AC40002C */ sw $zero, 0x2c($v0) -/* 96BBB8 802429F8 AC400034 */ sw $zero, 0x34($v0) -/* 96BBBC 802429FC AC40004C */ sw $zero, 0x4c($v0) -/* 96BBC0 80242A00 AC400050 */ sw $zero, 0x50($v0) -/* 96BBC4 80242A04 AC400058 */ sw $zero, 0x58($v0) -/* 96BBC8 80242A08 8CE30000 */ lw $v1, ($a3) -/* 96BBCC 80242A0C 46041080 */ add.s $f2, $f2, $f4 -/* 96BBD0 80242A10 C4400028 */ lwc1 $f0, 0x28($v0) -/* 96BBD4 80242A14 24630001 */ addiu $v1, $v1, 1 -/* 96BBD8 80242A18 46040001 */ sub.s $f0, $f0, $f4 -/* 96BBDC 80242A1C ACE30000 */ sw $v1, ($a3) -/* 96BBE0 80242A20 E4420004 */ swc1 $f2, 4($v0) -/* 96BBE4 80242A24 E4400028 */ swc1 $f0, 0x28($v0) -/* 96BBE8 80242A28 2402000A */ addiu $v0, $zero, 0xa -/* 96BBEC 80242A2C 14620119 */ bne $v1, $v0, .L80242E94_96C054 -/* 96BBF0 80242A30 0040302D */ daddu $a2, $v0, $zero -/* 96BBF4 80242A34 3C05F4AC */ lui $a1, 0xf4ac -/* 96BBF8 80242A38 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BBFC 80242A3C 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96BC00 80242A40 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -.L80242A44: -/* 96BC04 80242A44 0C0B2026 */ jal evt_set_variable -/* 96BC08 80242A48 ACE00000 */ sw $zero, ($a3) -/* 96BC0C 80242A4C 08090BA5 */ j .L80242E94_96C054 -/* 96BC10 80242A50 00000000 */ nop -.L80242A54_96BC14: -/* 96BC14 80242A54 3C038025 */ lui $v1, %hi(D_8024F010) -/* 96BC18 80242A58 2463F010 */ addiu $v1, $v1, %lo(D_8024F010) -/* 96BC1C 80242A5C 24020003 */ addiu $v0, $zero, 3 -/* 96BC20 80242A60 AC620000 */ sw $v0, ($v1) -/* 96BC24 80242A64 24020008 */ addiu $v0, $zero, 8 -/* 96BC28 80242A68 AC620018 */ sw $v0, 0x18($v1) -/* 96BC2C 80242A6C 24020011 */ addiu $v0, $zero, 0x11 -/* 96BC30 80242A70 AC600024 */ sw $zero, 0x24($v1) -/* 96BC34 80242A74 AC600048 */ sw $zero, 0x48($v1) -/* 96BC38 80242A78 08090BA5 */ j .L80242E94_96C054 -/* 96BC3C 80242A7C AC62001C */ sw $v0, 0x1c($v1) -.L80242A80_96BC40: -/* 96BC40 80242A80 3C05F4AC */ lui $a1, 0xf4ac -/* 96BC44 80242A84 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BC48 80242A88 2406000C */ addiu $a2, $zero, 0xc -/* 96BC4C 80242A8C 3C118025 */ lui $s1, %hi(D_8024EF90) -/* 96BC50 80242A90 2631EF90 */ addiu $s1, $s1, %lo(D_8024EF90) -/* 96BC54 80242A94 0220802D */ daddu $s0, $s1, $zero -/* 96BC58 80242A98 3C028025 */ lui $v0, %hi(D_8024F010) -/* 96BC5C 80242A9C 2442F010 */ addiu $v0, $v0, %lo(D_8024F010) -/* 96BC60 80242AA0 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96BC64 80242AA4 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BC68 80242AA8 3C018025 */ lui $at, %hi(D_8024EF58_978118) -/* 96BC6C 80242AAC D434EF58 */ ldc1 $f20, %lo(D_8024EF58_978118)($at) -/* 96BC70 80242AB0 3C014288 */ lui $at, 0x4288 -/* 96BC74 80242AB4 44810000 */ mtc1 $at, $f0 -/* 96BC78 80242AB8 3C014334 */ lui $at, 0x4334 -/* 96BC7C 80242ABC 44811000 */ mtc1 $at, $f2 -/* 96BC80 80242AC0 24030004 */ addiu $v1, $zero, 4 -/* 96BC84 80242AC4 AC430000 */ sw $v1, ($v0) -/* 96BC88 80242AC8 24030005 */ addiu $v1, $zero, 5 -/* 96BC8C 80242ACC AC430024 */ sw $v1, 0x24($v0) -/* 96BC90 80242AD0 24030008 */ addiu $v1, $zero, 8 -/* 96BC94 80242AD4 AC43003C */ sw $v1, 0x3c($v0) -/* 96BC98 80242AD8 2403000A */ addiu $v1, $zero, 0xa -/* 96BC9C 80242ADC AC400004 */ sw $zero, 4($v0) -/* 96BCA0 80242AE0 AC40000C */ sw $zero, 0xc($v0) -/* 96BCA4 80242AE4 AC400028 */ sw $zero, 0x28($v0) -/* 96BCA8 80242AE8 AC400030 */ sw $zero, 0x30($v0) -/* 96BCAC 80242AEC AC430040 */ sw $v1, 0x40($v0) -/* 96BCB0 80242AF0 AC400044 */ sw $zero, 0x44($v0) -/* 96BCB4 80242AF4 3C018025 */ lui $at, %hi(D_8024EF88) -/* 96BCB8 80242AF8 AC20EF88 */ sw $zero, %lo(D_8024EF88)($at) -/* 96BCBC 80242AFC E4400008 */ swc1 $f0, 8($v0) -/* 96BCC0 80242B00 E4420010 */ swc1 $f2, 0x10($v0) -/* 96BCC4 80242B04 E440002C */ swc1 $f0, 0x2c($v0) -/* 96BCC8 80242B08 0C0B2026 */ jal evt_set_variable -/* 96BCCC 80242B0C E4420034 */ swc1 $f2, 0x34($v0) -/* 96BCD0 80242B10 24040001 */ addiu $a0, $zero, 1 -/* 96BCD4 80242B14 27A50048 */ addiu $a1, $sp, 0x48 -/* 96BCD8 80242B18 27A6004C */ addiu $a2, $sp, 0x4c -/* 96BCDC 80242B1C 3C013F80 */ lui $at, 0x3f80 -/* 96BCE0 80242B20 44810000 */ mtc1 $at, $f0 -/* 96BCE4 80242B24 27A20054 */ addiu $v0, $sp, 0x54 -/* 96BCE8 80242B28 3C018025 */ lui $at, %hi(dro_02_pad_D_8024EF80) -/* 96BCEC 80242B2C AC20EF80 */ sw $zero, %lo(dro_02_pad_D_8024EF80)($at) -/* 96BCF0 80242B30 AFA20010 */ sw $v0, 0x10($sp) -/* 96BCF4 80242B34 3C018025 */ lui $at, %hi(D_8024EF84) -/* 96BCF8 80242B38 E420EF84 */ swc1 $f0, %lo(D_8024EF84)($at) -/* 96BCFC 80242B3C 0C090885 */ jal dro_02_func_80242214_96B3D4 -/* 96BD00 80242B40 27A70050 */ addiu $a3, $sp, 0x50 -.L80242B44: -/* 96BD04 80242B44 C7A2004C */ lwc1 $f2, 0x4c($sp) -/* 96BD08 80242B48 3C0141A0 */ lui $at, 0x41a0 -/* 96BD0C 80242B4C 44810000 */ mtc1 $at, $f0 -/* 96BD10 80242B50 00000000 */ nop -/* 96BD14 80242B54 46001080 */ add.s $f2, $f2, $f0 -/* 96BD18 80242B58 C7A00048 */ lwc1 $f0, 0x48($sp) -/* 96BD1C 80242B5C 24040002 */ addiu $a0, $zero, 2 -/* 96BD20 80242B60 44050000 */ mfc1 $a1, $f0 -/* 96BD24 80242B64 44061000 */ mfc1 $a2, $f2 -/* 96BD28 80242B68 C7A20050 */ lwc1 $f2, 0x50($sp) -/* 96BD2C 80242B6C 3C014100 */ lui $at, 0x4100 -/* 96BD30 80242B70 44810000 */ mtc1 $at, $f0 -/* 96BD34 80242B74 44071000 */ mfc1 $a3, $f2 -/* 96BD38 80242B78 2402FFFF */ addiu $v0, $zero, -1 -/* 96BD3C 80242B7C AFA20014 */ sw $v0, 0x14($sp) -/* 96BD40 80242B80 0C01C82C */ jal fx_energy_in_out -/* 96BD44 80242B84 E7A00010 */ swc1 $f0, 0x10($sp) -/* 96BD48 80242B88 AE020000 */ sw $v0, ($s0) -/* 96BD4C 80242B8C 8C43000C */ lw $v1, 0xc($v0) -/* 96BD50 80242B90 240200D7 */ addiu $v0, $zero, 0xd7 -/* 96BD54 80242B94 AC620028 */ sw $v0, 0x28($v1) -/* 96BD58 80242B98 8E020000 */ lw $v0, ($s0) -/* 96BD5C 80242B9C 8C43000C */ lw $v1, 0xc($v0) -/* 96BD60 80242BA0 24020037 */ addiu $v0, $zero, 0x37 -/* 96BD64 80242BA4 AC62002C */ sw $v0, 0x2c($v1) -/* 96BD68 80242BA8 8E020000 */ lw $v0, ($s0) -/* 96BD6C 80242BAC 8C43000C */ lw $v1, 0xc($v0) -/* 96BD70 80242BB0 240200FF */ addiu $v0, $zero, 0xff -/* 96BD74 80242BB4 AC620030 */ sw $v0, 0x30($v1) -/* 96BD78 80242BB8 8E020000 */ lw $v0, ($s0) -/* 96BD7C 80242BBC 8C420008 */ lw $v0, 8($v0) -/* 96BD80 80242BC0 24040001 */ addiu $a0, $zero, 1 -/* 96BD84 80242BC4 0082102A */ slt $v0, $a0, $v0 -/* 96BD88 80242BC8 50400012 */ beql $v0, $zero, .L80242C14 -/* 96BD8C 80242BCC 26100004 */ addiu $s0, $s0, 4 -/* 96BD90 80242BD0 24030048 */ addiu $v1, $zero, 0x48 -.L80242BD4: -/* 96BD94 80242BD4 8E020000 */ lw $v0, ($s0) -/* 96BD98 80242BD8 8C42000C */ lw $v0, 0xc($v0) -/* 96BD9C 80242BDC 00621021 */ addu $v0, $v1, $v0 -/* 96BDA0 80242BE0 C4400038 */ lwc1 $f0, 0x38($v0) -/* 96BDA4 80242BE4 46000021 */ cvt.d.s $f0, $f0 -/* 96BDA8 80242BE8 46340002 */ mul.d $f0, $f0, $f20 -/* 96BDAC 80242BEC 00000000 */ nop -/* 96BDB0 80242BF0 46200020 */ cvt.s.d $f0, $f0 -/* 96BDB4 80242BF4 E4400038 */ swc1 $f0, 0x38($v0) -/* 96BDB8 80242BF8 8E020000 */ lw $v0, ($s0) -/* 96BDBC 80242BFC 24840001 */ addiu $a0, $a0, 1 -/* 96BDC0 80242C00 8C420008 */ lw $v0, 8($v0) -/* 96BDC4 80242C04 0082102A */ slt $v0, $a0, $v0 -/* 96BDC8 80242C08 1440FFF2 */ bnez $v0, .L80242BD4 -/* 96BDCC 80242C0C 24630048 */ addiu $v1, $v1, 0x48 -/* 96BDD0 80242C10 26100004 */ addiu $s0, $s0, 4 -.L80242C14: -/* 96BDD4 80242C14 26220010 */ addiu $v0, $s1, 0x10 -/* 96BDD8 80242C18 0202102A */ slt $v0, $s0, $v0 -/* 96BDDC 80242C1C 1040009D */ beqz $v0, .L80242E94_96C054 -/* 96BDE0 80242C20 00000000 */ nop -/* 96BDE4 80242C24 08090AD1 */ j .L80242B44 -/* 96BDE8 80242C28 00000000 */ nop -.L80242C2C_96BDEC: -/* 96BDEC 80242C2C 24040001 */ addiu $a0, $zero, 1 -/* 96BDF0 80242C30 27A50058 */ addiu $a1, $sp, 0x58 -/* 96BDF4 80242C34 27A6005C */ addiu $a2, $sp, 0x5c -/* 96BDF8 80242C38 27A70060 */ addiu $a3, $sp, 0x60 -/* 96BDFC 80242C3C 27A20064 */ addiu $v0, $sp, 0x64 -/* 96BE00 80242C40 0C090885 */ jal dro_02_func_80242214_96B3D4 -/* 96BE04 80242C44 AFA20010 */ sw $v0, 0x10($sp) -/* 96BE08 80242C48 3C028025 */ lui $v0, %hi(D_8024EF90) -/* 96BE0C 80242C4C 2442EF90 */ addiu $v0, $v0, %lo(D_8024EF90) -/* 96BE10 80242C50 0040282D */ daddu $a1, $v0, $zero -/* 96BE14 80242C54 24A70010 */ addiu $a3, $a1, 0x10 -/* 96BE18 80242C58 C7AA0058 */ lwc1 $f10, 0x58($sp) -/* 96BE1C 80242C5C C7A80060 */ lwc1 $f8, 0x60($sp) -/* 96BE20 80242C60 3C018025 */ lui $at, %hi(D_8024EF60_978120) -/* 96BE24 80242C64 D424EF60 */ ldc1 $f4, %lo(D_8024EF60_978120)($at) -/* 96BE28 80242C68 3C013DCC */ lui $at, 0x3dcc -/* 96BE2C 80242C6C 3421CCCD */ ori $at, $at, 0xcccd -/* 96BE30 80242C70 44816000 */ mtc1 $at, $f12 -/* 96BE34 80242C74 C7A2005C */ lwc1 $f2, 0x5c($sp) -/* 96BE38 80242C78 3C0141A0 */ lui $at, 0x41a0 -/* 96BE3C 80242C7C 44810000 */ mtc1 $at, $f0 -/* 96BE40 80242C80 3C018025 */ lui $at, %hi(D_8024EF68_978128) -/* 96BE44 80242C84 D426EF68 */ ldc1 $f6, %lo(D_8024EF68_978128)($at) -/* 96BE48 80242C88 46001080 */ add.s $f2, $f2, $f0 -.L80242C8C: -/* 96BE4C 80242C8C 8CA20000 */ lw $v0, ($a1) -/* 96BE50 80242C90 8C42000C */ lw $v0, 0xc($v0) -/* 96BE54 80242C94 E44A0004 */ swc1 $f10, 4($v0) -/* 96BE58 80242C98 8CA20000 */ lw $v0, ($a1) -/* 96BE5C 80242C9C 8C42000C */ lw $v0, 0xc($v0) -/* 96BE60 80242CA0 E4420008 */ swc1 $f2, 8($v0) -/* 96BE64 80242CA4 8CA20000 */ lw $v0, ($a1) -/* 96BE68 80242CA8 8C42000C */ lw $v0, 0xc($v0) -/* 96BE6C 80242CAC E448000C */ swc1 $f8, 0xc($v0) -/* 96BE70 80242CB0 8CA20000 */ lw $v0, ($a1) -/* 96BE74 80242CB4 8C42000C */ lw $v0, 0xc($v0) -/* 96BE78 80242CB8 C4400034 */ lwc1 $f0, 0x34($v0) -/* 96BE7C 80242CBC 46000021 */ cvt.d.s $f0, $f0 -/* 96BE80 80242CC0 46240001 */ sub.d $f0, $f0, $f4 -/* 96BE84 80242CC4 46200020 */ cvt.s.d $f0, $f0 -/* 96BE88 80242CC8 E4400034 */ swc1 $f0, 0x34($v0) -/* 96BE8C 80242CCC 8CA20000 */ lw $v0, ($a1) -/* 96BE90 80242CD0 8C42000C */ lw $v0, 0xc($v0) -/* 96BE94 80242CD4 C4400034 */ lwc1 $f0, 0x34($v0) -/* 96BE98 80242CD8 46000021 */ cvt.d.s $f0, $f0 -/* 96BE9C 80242CDC 4624003C */ c.lt.d $f0, $f4 -/* 96BEA0 80242CE0 00000000 */ nop -/* 96BEA4 80242CE4 45030001 */ bc1tl .L80242CEC -/* 96BEA8 80242CE8 E44C0034 */ swc1 $f12, 0x34($v0) -.L80242CEC: -/* 96BEAC 80242CEC 8CA20000 */ lw $v0, ($a1) -/* 96BEB0 80242CF0 8C420008 */ lw $v0, 8($v0) -/* 96BEB4 80242CF4 24040001 */ addiu $a0, $zero, 1 -/* 96BEB8 80242CF8 0082102A */ slt $v0, $a0, $v0 -/* 96BEBC 80242CFC 50400012 */ beql $v0, $zero, .L80242D48 -/* 96BEC0 80242D00 24A50004 */ addiu $a1, $a1, 4 -/* 96BEC4 80242D04 00A0302D */ daddu $a2, $a1, $zero -/* 96BEC8 80242D08 24030048 */ addiu $v1, $zero, 0x48 -.L80242D0C: -/* 96BECC 80242D0C 8CC20000 */ lw $v0, ($a2) -/* 96BED0 80242D10 8C42000C */ lw $v0, 0xc($v0) -/* 96BED4 80242D14 00621021 */ addu $v0, $v1, $v0 -/* 96BED8 80242D18 C4400038 */ lwc1 $f0, 0x38($v0) -/* 96BEDC 80242D1C 46000021 */ cvt.d.s $f0, $f0 -/* 96BEE0 80242D20 46260000 */ add.d $f0, $f0, $f6 -/* 96BEE4 80242D24 46200020 */ cvt.s.d $f0, $f0 -/* 96BEE8 80242D28 E4400038 */ swc1 $f0, 0x38($v0) -/* 96BEEC 80242D2C 8CC20000 */ lw $v0, ($a2) -/* 96BEF0 80242D30 24840001 */ addiu $a0, $a0, 1 -/* 96BEF4 80242D34 8C420008 */ lw $v0, 8($v0) -/* 96BEF8 80242D38 0082102A */ slt $v0, $a0, $v0 -/* 96BEFC 80242D3C 1440FFF3 */ bnez $v0, .L80242D0C -/* 96BF00 80242D40 24630048 */ addiu $v1, $v1, 0x48 -/* 96BF04 80242D44 24A50004 */ addiu $a1, $a1, 4 -.L80242D48: -/* 96BF08 80242D48 00A7102A */ slt $v0, $a1, $a3 -/* 96BF0C 80242D4C 1440FFCF */ bnez $v0, .L80242C8C -/* 96BF10 80242D50 00000000 */ nop -/* 96BF14 80242D54 3C108025 */ lui $s0, %hi(D_8024F010) -/* 96BF18 80242D58 2610F010 */ addiu $s0, $s0, %lo(D_8024F010) -/* 96BF1C 80242D5C 3C048025 */ lui $a0, %hi(dro_02_pad_D_8024EF80) -/* 96BF20 80242D60 2484EF80 */ addiu $a0, $a0, %lo(dro_02_pad_D_8024EF80) -/* 96BF24 80242D64 3C038025 */ lui $v1, %hi(D_8024EF84) -/* 96BF28 80242D68 2463EF84 */ addiu $v1, $v1, %lo(D_8024EF84) -/* 96BF2C 80242D6C 3C078025 */ lui $a3, %hi(D_8024EF88) -/* 96BF30 80242D70 24E7EF88 */ addiu $a3, $a3, %lo(D_8024EF88) -/* 96BF34 80242D74 C6060008 */ lwc1 $f6, 8($s0) -/* 96BF38 80242D78 C4820000 */ lwc1 $f2, ($a0) -/* 96BF3C 80242D7C C604002C */ lwc1 $f4, 0x2c($s0) -/* 96BF40 80242D80 C4600000 */ lwc1 $f0, ($v1) -/* 96BF44 80242D84 46023180 */ add.s $f6, $f6, $f2 -/* 96BF48 80242D88 8CE20000 */ lw $v0, ($a3) -/* 96BF4C 80242D8C 3C01C0A0 */ lui $at, 0xc0a0 -/* 96BF50 80242D90 44814000 */ mtc1 $at, $f8 -/* 96BF54 80242D94 46002100 */ add.s $f4, $f4, $f0 -/* 96BF58 80242D98 24420001 */ addiu $v0, $v0, 1 -/* 96BF5C 80242D9C ACE20000 */ sw $v0, ($a3) -/* 96BF60 80242DA0 4608203C */ c.lt.s $f4, $f8 -/* 96BF64 80242DA4 E604002C */ swc1 $f4, 0x2c($s0) -/* 96BF68 80242DA8 3C018025 */ lui $at, %hi(D_8024EF70_978130) -/* 96BF6C 80242DAC D424EF70 */ ldc1 $f4, %lo(D_8024EF70_978130)($at) -/* 96BF70 80242DB0 460010A1 */ cvt.d.s $f2, $f2 -/* 96BF74 80242DB4 46241080 */ add.d $f2, $f2, $f4 -/* 96BF78 80242DB8 3C018025 */ lui $at, %hi(D_8024EF78_978138) -/* 96BF7C 80242DBC D424EF78 */ ldc1 $f4, %lo(D_8024EF78_978138)($at) -/* 96BF80 80242DC0 46000021 */ cvt.d.s $f0, $f0 -/* 96BF84 80242DC4 E6060008 */ swc1 $f6, 8($s0) -/* 96BF88 80242DC8 46240001 */ sub.d $f0, $f0, $f4 -/* 96BF8C 80242DCC 462010A0 */ cvt.s.d $f2, $f2 -/* 96BF90 80242DD0 E4820000 */ swc1 $f2, ($a0) -/* 96BF94 80242DD4 46200020 */ cvt.s.d $f0, $f0 -/* 96BF98 80242DD8 4500002E */ bc1f .L80242E94_96C054 -/* 96BF9C 80242DDC E4600000 */ swc1 $f0, ($v1) -/* 96BFA0 80242DE0 3C05F4AC */ lui $a1, 0xf4ac -/* 96BFA4 80242DE4 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BFA8 80242DE8 3C048025 */ lui $a0, %hi(D_8024EFCC) -/* 96BFAC 80242DEC 8C84EFCC */ lw $a0, %lo(D_8024EFCC)($a0) -/* 96BFB0 80242DF0 2406000D */ addiu $a2, $zero, 0xd -/* 96BFB4 80242DF4 E608002C */ swc1 $f8, 0x2c($s0) -/* 96BFB8 80242DF8 0C0B2026 */ jal evt_set_variable -/* 96BFBC 80242DFC ACE00000 */ sw $zero, ($a3) -/* 96BFC0 80242E00 24040001 */ addiu $a0, $zero, 1 -/* 96BFC4 80242E04 27A50068 */ addiu $a1, $sp, 0x68 -/* 96BFC8 80242E08 27A6006C */ addiu $a2, $sp, 0x6c -/* 96BFCC 80242E0C 27A70070 */ addiu $a3, $sp, 0x70 -/* 96BFD0 80242E10 27A20074 */ addiu $v0, $sp, 0x74 -/* 96BFD4 80242E14 AE000000 */ sw $zero, ($s0) -/* 96BFD8 80242E18 AE000024 */ sw $zero, 0x24($s0) -/* 96BFDC 80242E1C 0C090885 */ jal dro_02_func_80242214_96B3D4 -/* 96BFE0 80242E20 AFA20010 */ sw $v0, 0x10($sp) -/* 96BFE4 80242E24 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* 96BFE8 80242E28 3C0141A0 */ lui $at, 0x41a0 -/* 96BFEC 80242E2C 44810000 */ mtc1 $at, $f0 -/* 96BFF0 80242E30 00000000 */ nop -/* 96BFF4 80242E34 46001080 */ add.s $f2, $f2, $f0 -/* 96BFF8 80242E38 C7A00068 */ lwc1 $f0, 0x68($sp) -/* 96BFFC 80242E3C 44050000 */ mfc1 $a1, $f0 -/* 96C000 80242E40 44061000 */ mfc1 $a2, $f2 -/* 96C004 80242E44 C7A20070 */ lwc1 $f2, 0x70($sp) -/* 96C008 80242E48 3C0141F0 */ lui $at, 0x41f0 -/* 96C00C 80242E4C 44810000 */ mtc1 $at, $f0 -/* 96C010 80242E50 44071000 */ mfc1 $a3, $f2 -/* 96C014 80242E54 0000202D */ daddu $a0, $zero, $zero -/* 96C018 80242E58 0C01BFBC */ jal fx_sparkles -/* 96C01C 80242E5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 96C020 80242E60 0C05272D */ jal sfx_play_sound -/* 96C024 80242E64 24040206 */ addiu $a0, $zero, 0x206 -/* 96C028 80242E68 0000282D */ daddu $a1, $zero, $zero -/* 96C02C 80242E6C 3C048025 */ lui $a0, %hi(D_8024EF90) -/* 96C030 80242E70 2484EF90 */ addiu $a0, $a0, %lo(D_8024EF90) -.L80242E74: -/* 96C034 80242E74 8C820000 */ lw $v0, ($a0) -/* 96C038 80242E78 8C430000 */ lw $v1, ($v0) -/* 96C03C 80242E7C 24A50001 */ addiu $a1, $a1, 1 -/* 96C040 80242E80 34630010 */ ori $v1, $v1, 0x10 -/* 96C044 80242E84 AC430000 */ sw $v1, ($v0) -/* 96C048 80242E88 28A20004 */ slti $v0, $a1, 4 -/* 96C04C 80242E8C 1440FFF9 */ bnez $v0, .L80242E74 -/* 96C050 80242E90 24840004 */ addiu $a0, $a0, 4 -.L80242E94_96C054: -/* 96C054 80242E94 8FBF0080 */ lw $ra, 0x80($sp) -/* 96C058 80242E98 8FB1007C */ lw $s1, 0x7c($sp) -/* 96C05C 80242E9C 8FB00078 */ lw $s0, 0x78($sp) -/* 96C060 80242EA0 D7B40088 */ ldc1 $f20, 0x88($sp) -/* 96C064 80242EA4 03E00008 */ jr $ra -/* 96C068 80242EA8 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s deleted file mode 100644 index 543c0f57a1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCB310/flo_14_func_80240504_CCB814.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata -dlabel flo_14_D_80245320_CD0630 -.double 0.04 - -dlabel flo_14_D_80245328_CD0638 -.double 0.98 - -.section .text -glabel flo_14_func_80240504_CCB814 -/* CCB814 80240504 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CCB818 80240508 AFBF0064 */ sw $ra, 0x64($sp) -/* CCB81C 8024050C AFB00060 */ sw $s0, 0x60($sp) -/* CCB820 80240510 F7B60070 */ sdc1 $f22, 0x70($sp) -/* CCB824 80240514 F7B40068 */ sdc1 $f20, 0x68($sp) -/* CCB828 80240518 0C019D28 */ jal guMtxIdentF -/* CCB82C 8024051C 27A40010 */ addiu $a0, $sp, 0x10 -/* CCB830 80240520 3C108024 */ lui $s0, %hi(flo_14_D_80243B14_CCEE24) -/* CCB834 80240524 26103B14 */ addiu $s0, $s0, %lo(flo_14_D_80243B14_CCEE24) -/* CCB838 80240528 C6000000 */ lwc1 $f0, ($s0) -/* CCB83C 8024052C 3C014130 */ lui $at, 0x4130 -/* CCB840 80240530 44816000 */ mtc1 $at, $f12 -/* CCB844 80240534 0C00A85B */ jal sin_rad -/* CCB848 80240538 460C0303 */ div.s $f12, $f0, $f12 -/* CCB84C 8024053C 3C018024 */ lui $at, %hi(flo_14_D_80245320_CD0630) -/* CCB850 80240540 D4345320 */ ldc1 $f20, %lo(flo_14_D_80245320_CD0630)($at) -/* CCB854 80240544 46000021 */ cvt.d.s $f0, $f0 -/* CCB858 80240548 46340002 */ mul.d $f0, $f0, $f20 -/* CCB85C 8024054C 00000000 */ nop -/* CCB860 80240550 3C018024 */ lui $at, %hi(flo_14_D_80245328_CD0638) -/* CCB864 80240554 D4365328 */ ldc1 $f22, %lo(flo_14_D_80245328_CD0638)($at) -/* CCB868 80240558 C6020000 */ lwc1 $f2, ($s0) -/* CCB86C 8024055C 3C014140 */ lui $at, 0x4140 -/* CCB870 80240560 44816000 */ mtc1 $at, $f12 -/* CCB874 80240564 46360000 */ add.d $f0, $f0, $f22 -/* CCB878 80240568 460C1303 */ div.s $f12, $f2, $f12 -/* CCB87C 8024056C 46200020 */ cvt.s.d $f0, $f0 -/* CCB880 80240570 0C00A85B */ jal sin_rad -/* CCB884 80240574 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCB888 80240578 46000021 */ cvt.d.s $f0, $f0 -/* CCB88C 8024057C 46340002 */ mul.d $f0, $f0, $f20 -/* CCB890 80240580 00000000 */ nop -/* CCB894 80240584 C6020000 */ lwc1 $f2, ($s0) -/* CCB898 80240588 3C014150 */ lui $at, 0x4150 -/* CCB89C 8024058C 44816000 */ mtc1 $at, $f12 -/* CCB8A0 80240590 00000000 */ nop -/* CCB8A4 80240594 460C1303 */ div.s $f12, $f2, $f12 -/* CCB8A8 80240598 46200020 */ cvt.s.d $f0, $f0 -/* CCB8AC 8024059C 0C00A874 */ jal cos_rad -/* CCB8B0 802405A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* CCB8B4 802405A4 46000021 */ cvt.d.s $f0, $f0 -/* CCB8B8 802405A8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB8BC 802405AC 00000000 */ nop -/* CCB8C0 802405B0 C60C0000 */ lwc1 $f12, ($s0) -/* CCB8C4 802405B4 3C0140E0 */ lui $at, 0x40e0 -/* CCB8C8 802405B8 44811000 */ mtc1 $at, $f2 -/* CCB8CC 802405BC 3C013F80 */ lui $at, 0x3f80 -/* CCB8D0 802405C0 44812000 */ mtc1 $at, $f4 -/* CCB8D4 802405C4 46026303 */ div.s $f12, $f12, $f2 -/* CCB8D8 802405C8 46046300 */ add.s $f12, $f12, $f4 -/* CCB8DC 802405CC 46200020 */ cvt.s.d $f0, $f0 -/* CCB8E0 802405D0 0C00A85B */ jal sin_rad -/* CCB8E4 802405D4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCB8E8 802405D8 46000021 */ cvt.d.s $f0, $f0 -/* CCB8EC 802405DC 46340002 */ mul.d $f0, $f0, $f20 -/* CCB8F0 802405E0 00000000 */ nop -/* CCB8F4 802405E4 C6020000 */ lwc1 $f2, ($s0) -/* CCB8F8 802405E8 3C014160 */ lui $at, 0x4160 -/* CCB8FC 802405EC 44816000 */ mtc1 $at, $f12 -/* CCB900 802405F0 46360000 */ add.d $f0, $f0, $f22 -/* CCB904 802405F4 460C1303 */ div.s $f12, $f2, $f12 -/* CCB908 802405F8 46200020 */ cvt.s.d $f0, $f0 -/* CCB90C 802405FC 0C00A85B */ jal sin_rad -/* CCB910 80240600 E7A00024 */ swc1 $f0, 0x24($sp) -/* CCB914 80240604 46000021 */ cvt.d.s $f0, $f0 -/* CCB918 80240608 46340002 */ mul.d $f0, $f0, $f20 -/* CCB91C 8024060C 00000000 */ nop -/* CCB920 80240610 C6020000 */ lwc1 $f2, ($s0) -/* CCB924 80240614 3C014170 */ lui $at, 0x4170 -/* CCB928 80240618 44816000 */ mtc1 $at, $f12 -/* CCB92C 8024061C 00000000 */ nop -/* CCB930 80240620 460C1303 */ div.s $f12, $f2, $f12 -/* CCB934 80240624 46200020 */ cvt.s.d $f0, $f0 -/* CCB938 80240628 0C00A874 */ jal cos_rad -/* CCB93C 8024062C E7A00020 */ swc1 $f0, 0x20($sp) -/* CCB940 80240630 46000021 */ cvt.d.s $f0, $f0 -/* CCB944 80240634 46340002 */ mul.d $f0, $f0, $f20 -/* CCB948 80240638 00000000 */ nop -/* CCB94C 8024063C C60C0000 */ lwc1 $f12, ($s0) -/* CCB950 80240640 3C013E80 */ lui $at, 0x3e80 -/* CCB954 80240644 44811000 */ mtc1 $at, $f2 -/* CCB958 80240648 00000000 */ nop -/* CCB95C 8024064C 46026302 */ mul.s $f12, $f12, $f2 -/* CCB960 80240650 00000000 */ nop -/* CCB964 80240654 3C014000 */ lui $at, 0x4000 -/* CCB968 80240658 44811000 */ mtc1 $at, $f2 -/* CCB96C 8024065C 00000000 */ nop -/* CCB970 80240660 46026300 */ add.s $f12, $f12, $f2 -/* CCB974 80240664 46200020 */ cvt.s.d $f0, $f0 -/* CCB978 80240668 0C00A85B */ jal sin_rad -/* CCB97C 8024066C E7A00028 */ swc1 $f0, 0x28($sp) -/* CCB980 80240670 46000021 */ cvt.d.s $f0, $f0 -/* CCB984 80240674 46340002 */ mul.d $f0, $f0, $f20 -/* CCB988 80240678 00000000 */ nop -/* CCB98C 8024067C C6020000 */ lwc1 $f2, ($s0) -/* CCB990 80240680 3C013D80 */ lui $at, 0x3d80 -/* CCB994 80240684 44816000 */ mtc1 $at, $f12 -/* CCB998 80240688 00000000 */ nop -/* CCB99C 8024068C 460C1302 */ mul.s $f12, $f2, $f12 -/* CCB9A0 80240690 00000000 */ nop -/* CCB9A4 80240694 46360000 */ add.d $f0, $f0, $f22 -/* CCB9A8 80240698 46200020 */ cvt.s.d $f0, $f0 -/* CCB9AC 8024069C 0C00A85B */ jal sin_rad -/* CCB9B0 802406A0 E7A00038 */ swc1 $f0, 0x38($sp) -/* CCB9B4 802406A4 46000021 */ cvt.d.s $f0, $f0 -/* CCB9B8 802406A8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB9BC 802406AC 00000000 */ nop -/* CCB9C0 802406B0 C6020000 */ lwc1 $f2, ($s0) -/* CCB9C4 802406B4 3C014188 */ lui $at, 0x4188 -/* CCB9C8 802406B8 44816000 */ mtc1 $at, $f12 -/* CCB9CC 802406BC 00000000 */ nop -/* CCB9D0 802406C0 460C1303 */ div.s $f12, $f2, $f12 -/* CCB9D4 802406C4 46200020 */ cvt.s.d $f0, $f0 -/* CCB9D8 802406C8 0C00A874 */ jal cos_rad -/* CCB9DC 802406CC E7A00030 */ swc1 $f0, 0x30($sp) -/* CCB9E0 802406D0 3C030001 */ lui $v1, 1 -/* CCB9E4 802406D4 46000021 */ cvt.d.s $f0, $f0 -/* CCB9E8 802406D8 46340002 */ mul.d $f0, $f0, $f20 -/* CCB9EC 802406DC 00000000 */ nop -/* CCB9F0 802406E0 34631630 */ ori $v1, $v1, 0x1630 -/* CCB9F4 802406E4 27A40010 */ addiu $a0, $sp, 0x10 -/* CCB9F8 802406E8 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* CCB9FC 802406EC 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) -/* CCBA00 802406F0 3C02800A */ lui $v0, %hi(gDisplayContext) -/* CCBA04 802406F4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* CCBA08 802406F8 00052980 */ sll $a1, $a1, 6 -/* CCBA0C 802406FC 00A32821 */ addu $a1, $a1, $v1 -/* CCBA10 80240700 00452821 */ addu $a1, $v0, $a1 -/* CCBA14 80240704 46200020 */ cvt.s.d $f0, $f0 -/* CCBA18 80240708 0C019D40 */ jal guMtxF2L -/* CCBA1C 8024070C E7A00034 */ swc1 $f0, 0x34($sp) -/* CCBA20 80240710 0000202D */ daddu $a0, $zero, $zero -/* CCBA24 80240714 27A50050 */ addiu $a1, $sp, 0x50 -/* CCBA28 80240718 27A60054 */ addiu $a2, $sp, 0x54 -/* CCBA2C 8024071C 0C0470AC */ jal mdl_get_copied_vertices -/* CCBA30 80240720 27A70058 */ addiu $a3, $sp, 0x58 -/* CCBA34 80240724 3C03DA38 */ lui $v1, 0xda38 -/* CCBA38 80240728 34630001 */ ori $v1, $v1, 1 -/* CCBA3C 8024072C 3C080001 */ lui $t0, 1 -/* CCBA40 80240730 35081630 */ ori $t0, $t0, 0x1630 -/* CCBA44 80240734 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* CCBA48 80240738 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* CCBA4C 8024073C 0000202D */ daddu $a0, $zero, $zero -/* CCBA50 80240740 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* CCBA54 80240744 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) -/* CCBA58 80240748 8CD00000 */ lw $s0, ($a2) -/* CCBA5C 8024074C 94A20000 */ lhu $v0, ($a1) -/* CCBA60 80240750 0200382D */ daddu $a3, $s0, $zero -/* CCBA64 80240754 26100008 */ addiu $s0, $s0, 8 -/* CCBA68 80240758 ACD00000 */ sw $s0, ($a2) -/* CCBA6C 8024075C ACE30000 */ sw $v1, ($a3) -/* CCBA70 80240760 24430001 */ addiu $v1, $v0, 1 -/* CCBA74 80240764 3042FFFF */ andi $v0, $v0, 0xffff -/* CCBA78 80240768 00021180 */ sll $v0, $v0, 6 -/* CCBA7C 8024076C A4A30000 */ sh $v1, ($a1) -/* CCBA80 80240770 3C03800A */ lui $v1, %hi(gDisplayContext) -/* CCBA84 80240774 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* CCBA88 80240778 00481021 */ addu $v0, $v0, $t0 -/* CCBA8C 8024077C 00621821 */ addu $v1, $v1, $v0 -/* CCBA90 80240780 26020008 */ addiu $v0, $s0, 8 -/* CCBA94 80240784 ACE30004 */ sw $v1, 4($a3) -/* CCBA98 80240788 ACC20000 */ sw $v0, ($a2) -/* CCBA9C 8024078C 3C02DE00 */ lui $v0, 0xde00 -/* CCBAA0 80240790 0C0470BB */ jal mdl_get_copied_gfx -/* CCBAA4 80240794 AE020000 */ sw $v0, ($s0) -/* CCBAA8 80240798 3C038024 */ lui $v1, %hi(flo_14_D_80243B14_CCEE24) -/* CCBAAC 8024079C 24633B14 */ addiu $v1, $v1, %lo(flo_14_D_80243B14_CCEE24) -/* CCBAB0 802407A0 C4600000 */ lwc1 $f0, ($v1) -/* CCBAB4 802407A4 3C013F80 */ lui $at, 0x3f80 -/* CCBAB8 802407A8 44811000 */ mtc1 $at, $f2 -/* CCBABC 802407AC 00000000 */ nop -/* CCBAC0 802407B0 46020000 */ add.s $f0, $f0, $f2 -/* CCBAC4 802407B4 AE020004 */ sw $v0, 4($s0) -/* CCBAC8 802407B8 E4600000 */ swc1 $f0, ($v1) -/* CCBACC 802407BC 8FBF0064 */ lw $ra, 0x64($sp) -/* CCBAD0 802407C0 8FB00060 */ lw $s0, 0x60($sp) -/* CCBAD4 802407C4 D7B60070 */ ldc1 $f22, 0x70($sp) -/* CCBAD8 802407C8 D7B40068 */ ldc1 $f20, 0x68($sp) -/* CCBADC 802407CC 03E00008 */ jr $ra -/* CCBAE0 802407D0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s deleted file mode 100644 index 3a021e1853..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240AAC_A1132C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_A1132C -/* A1132C 80240AAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11330 80240AB0 AFBF0010 */ sw $ra, 0x10($sp) -/* A11334 80240AB4 8C82000C */ lw $v0, 0xc($a0) -/* A11338 80240AB8 0C0B1EAF */ jal evt_get_variable -/* A1133C 80240ABC 8C450000 */ lw $a1, ($v0) -/* A11340 80240AC0 8C43000C */ lw $v1, 0xc($v0) -/* A11344 80240AC4 3C01433E */ lui $at, 0x433e -/* A11348 80240AC8 44810000 */ mtc1 $at, $f0 -/* A1134C 80240ACC 00000000 */ nop -/* A11350 80240AD0 E4600078 */ swc1 $f0, 0x78($v1) -/* A11354 80240AD4 8C43000C */ lw $v1, 0xc($v0) -/* A11358 80240AD8 3C01435C */ lui $at, 0x435c -/* A1135C 80240ADC 44810000 */ mtc1 $at, $f0 -/* A11360 80240AE0 00000000 */ nop -/* A11364 80240AE4 E460007C */ swc1 $f0, 0x7c($v1) -/* A11368 80240AE8 8C43000C */ lw $v1, 0xc($v0) -/* A1136C 80240AEC 3C013F33 */ lui $at, 0x3f33 -/* A11370 80240AF0 34213333 */ ori $at, $at, 0x3333 -/* A11374 80240AF4 44810000 */ mtc1 $at, $f0 -/* A11378 80240AF8 00000000 */ nop -/* A1137C 80240AFC E4600068 */ swc1 $f0, 0x68($v1) -/* A11380 80240B00 8FBF0010 */ lw $ra, 0x10($sp) -/* A11384 80240B04 24020002 */ addiu $v0, $zero, 2 -/* A11388 80240B08 03E00008 */ jr $ra -/* A1138C 80240B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s deleted file mode 100644 index 1b16957f97..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B10_A11390.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B10_A11390 -/* A11390 80240B10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11394 80240B14 AFBF0010 */ sw $ra, 0x10($sp) -/* A11398 80240B18 8C82000C */ lw $v0, 0xc($a0) -/* A1139C 80240B1C 0C0B1EAF */ jal evt_get_variable -/* A113A0 80240B20 8C450000 */ lw $a1, ($v0) -/* A113A4 80240B24 8C43000C */ lw $v1, 0xc($v0) -/* A113A8 80240B28 3C01432A */ lui $at, 0x432a -/* A113AC 80240B2C 44810000 */ mtc1 $at, $f0 -/* A113B0 80240B30 00000000 */ nop -/* A113B4 80240B34 E4600078 */ swc1 $f0, 0x78($v1) -/* A113B8 80240B38 8C43000C */ lw $v1, 0xc($v0) -/* A113BC 80240B3C E460007C */ swc1 $f0, 0x7c($v1) -/* A113C0 80240B40 8C43000C */ lw $v1, 0xc($v0) -/* A113C4 80240B44 3C014000 */ lui $at, 0x4000 -/* A113C8 80240B48 44810000 */ mtc1 $at, $f0 -/* A113CC 80240B4C 00000000 */ nop -/* A113D0 80240B50 E4600068 */ swc1 $f0, 0x68($v1) -/* A113D4 80240B54 8FBF0010 */ lw $ra, 0x10($sp) -/* A113D8 80240B58 24020002 */ addiu $v0, $zero, 2 -/* A113DC 80240B5C 03E00008 */ jr $ra -/* A113E0 80240B60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B64_A113E4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B64_A113E4.s deleted file mode 100644 index be595be67e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240B64_A113E4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B64_A113E4 -/* A113E4 80240B64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A113E8 80240B68 AFB10014 */ sw $s1, 0x14($sp) -/* A113EC 80240B6C 0080882D */ daddu $s1, $a0, $zero -/* A113F0 80240B70 AFBF0018 */ sw $ra, 0x18($sp) -/* A113F4 80240B74 AFB00010 */ sw $s0, 0x10($sp) -/* A113F8 80240B78 8E30000C */ lw $s0, 0xc($s1) -/* A113FC 80240B7C 8E050000 */ lw $a1, ($s0) -/* A11400 80240B80 0C0B1EAF */ jal evt_get_variable -/* A11404 80240B84 26100004 */ addiu $s0, $s0, 4 -/* A11408 80240B88 0220202D */ daddu $a0, $s1, $zero -/* A1140C 80240B8C 8E050000 */ lw $a1, ($s0) -/* A11410 80240B90 0C0B1EAF */ jal evt_get_variable -/* A11414 80240B94 0040802D */ daddu $s0, $v0, $zero -/* A11418 80240B98 8E03000C */ lw $v1, 0xc($s0) -/* A1141C 80240B9C AC620038 */ sw $v0, 0x38($v1) -/* A11420 80240BA0 8FBF0018 */ lw $ra, 0x18($sp) -/* A11424 80240BA4 8FB10014 */ lw $s1, 0x14($sp) -/* A11428 80240BA8 8FB00010 */ lw $s0, 0x10($sp) -/* A1142C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* A11430 80240BB0 03E00008 */ jr $ra -/* A11434 80240BB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s deleted file mode 100644 index e7b3a0c7be..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C08_A11488 -/* A11488 80240C08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1148C 80240C0C AFBF0010 */ sw $ra, 0x10($sp) -/* A11490 80240C10 8C82000C */ lw $v0, 0xc($a0) -/* A11494 80240C14 0C0B1EAF */ jal evt_get_variable -/* A11498 80240C18 8C450000 */ lw $a1, ($v0) -/* A1149C 80240C1C 8FBF0010 */ lw $ra, 0x10($sp) -/* A114A0 80240C20 3C018024 */ lui $at, %hi(D_80241C2C_A124AC) -/* A114A4 80240C24 AC221C2C */ sw $v0, %lo(D_80241C2C_A124AC)($at) -/* A114A8 80240C28 24020002 */ addiu $v0, $zero, 2 -/* A114AC 80240C2C 03E00008 */ jr $ra -/* A114B0 80240C30 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s deleted file mode 100644 index 7714666da5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C84_A11504 -/* A11504 80240C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11508 80240C88 AFBF0010 */ sw $ra, 0x10($sp) -/* A1150C 80240C8C 8C82000C */ lw $v0, 0xc($a0) -/* A11510 80240C90 0C0B1EAF */ jal evt_get_variable -/* A11514 80240C94 8C450000 */ lw $a1, ($v0) -/* A11518 80240C98 8FBF0010 */ lw $ra, 0x10($sp) -/* A1151C 80240C9C 3C018024 */ lui $at, %hi(D_80241C30_A124B0) -/* A11520 80240CA0 AC221C30 */ sw $v0, %lo(D_80241C30_A124B0)($at) -/* A11524 80240CA4 24020002 */ addiu $v0, $zero, 2 -/* A11528 80240CA8 03E00008 */ jr $ra -/* A1152C 80240CAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s deleted file mode 100644 index 7baf66c522..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244DE0_A1B000 -.double 1.05 - -.section .text - -glabel func_8024030C_A1652C -/* A1652C 8024030C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A16530 80240310 AFB10014 */ sw $s1, 0x14($sp) -/* A16534 80240314 3C118024 */ lui $s1, %hi(D_802433AC_A195CC) -/* A16538 80240318 263133AC */ addiu $s1, $s1, %lo(D_802433AC_A195CC) -/* A1653C 8024031C AFBF0020 */ sw $ra, 0x20($sp) -/* A16540 80240320 AFB3001C */ sw $s3, 0x1c($sp) -/* A16544 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* A16548 80240328 AFB00010 */ sw $s0, 0x10($sp) -/* A1654C 8024032C 96240000 */ lhu $a0, ($s1) -/* A16550 80240330 0C01917C */ jal sins -/* A16554 80240334 3C130001 */ lui $s3, 1 -/* A16558 80240338 00021400 */ sll $v0, $v0, 0x10 -/* A1655C 8024033C 00021403 */ sra $v0, $v0, 0x10 -/* A16560 80240340 3C013800 */ lui $at, 0x3800 -/* A16564 80240344 44811000 */ mtc1 $at, $f2 -/* A16568 80240348 44820000 */ mtc1 $v0, $f0 -/* A1656C 8024034C 00000000 */ nop -/* A16570 80240350 46800020 */ cvt.s.w $f0, $f0 -/* A16574 80240354 46020002 */ mul.s $f0, $f0, $f2 -/* A16578 80240358 00000000 */ nop -/* A1657C 8024035C 3C013FE0 */ lui $at, 0x3fe0 -/* A16580 80240360 44811800 */ mtc1 $at, $f3 -/* A16584 80240364 44801000 */ mtc1 $zero, $f2 -/* A16588 80240368 46000021 */ cvt.d.s $f0, $f0 -/* A1658C 8024036C 46220002 */ mul.d $f0, $f0, $f2 -/* A16590 80240370 00000000 */ nop -/* A16594 80240374 36731630 */ ori $s3, $s3, 0x1630 -/* A16598 80240378 46220002 */ mul.d $f0, $f0, $f2 -/* A1659C 8024037C 00000000 */ nop -/* A165A0 80240380 3C12800A */ lui $s2, %hi(gDisplayContext) -/* A165A4 80240384 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) -/* A165A8 80240388 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* A165AC 8024038C 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* A165B0 80240390 96040000 */ lhu $a0, ($s0) -/* A165B4 80240394 8E420000 */ lw $v0, ($s2) -/* A165B8 80240398 00042180 */ sll $a0, $a0, 6 -/* A165BC 8024039C 3C018024 */ lui $at, %hi(D_80244DE0_A1B000) -/* A165C0 802403A0 D4224DE0 */ ldc1 $f2, %lo(D_80244DE0_A1B000)($at) -/* A165C4 802403A4 00932021 */ addu $a0, $a0, $s3 -/* A165C8 802403A8 46220000 */ add.d $f0, $f0, $f2 -/* A165CC 802403AC 00442021 */ addu $a0, $v0, $a0 -/* A165D0 802403B0 96220000 */ lhu $v0, ($s1) -/* A165D4 802403B4 46200020 */ cvt.s.d $f0, $f0 -/* A165D8 802403B8 44050000 */ mfc1 $a1, $f0 -/* A165DC 802403BC 24420199 */ addiu $v0, $v0, 0x199 -/* A165E0 802403C0 A6220000 */ sh $v0, ($s1) -/* A165E4 802403C4 00A0302D */ daddu $a2, $a1, $zero -/* A165E8 802403C8 0C019DC0 */ jal guScale -/* A165EC 802403CC 00A0382D */ daddu $a3, $a1, $zero -/* A165F0 802403D0 3C05DA38 */ lui $a1, 0xda38 -/* A165F4 802403D4 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* A165F8 802403D8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* A165FC 802403DC 34A50001 */ ori $a1, $a1, 1 -/* A16600 802403E0 8C830000 */ lw $v1, ($a0) -/* A16604 802403E4 96020000 */ lhu $v0, ($s0) -/* A16608 802403E8 0060302D */ daddu $a2, $v1, $zero -/* A1660C 802403EC 24630008 */ addiu $v1, $v1, 8 -/* A16610 802403F0 AC830000 */ sw $v1, ($a0) -/* A16614 802403F4 24430001 */ addiu $v1, $v0, 1 -/* A16618 802403F8 3042FFFF */ andi $v0, $v0, 0xffff -/* A1661C 802403FC 00021180 */ sll $v0, $v0, 6 -/* A16620 80240400 ACC50000 */ sw $a1, ($a2) -/* A16624 80240404 A6030000 */ sh $v1, ($s0) -/* A16628 80240408 8E430000 */ lw $v1, ($s2) -/* A1662C 8024040C 00531021 */ addu $v0, $v0, $s3 -/* A16630 80240410 00621821 */ addu $v1, $v1, $v0 -/* A16634 80240414 ACC30004 */ sw $v1, 4($a2) -/* A16638 80240418 8FBF0020 */ lw $ra, 0x20($sp) -/* A1663C 8024041C 8FB3001C */ lw $s3, 0x1c($sp) -/* A16640 80240420 8FB20018 */ lw $s2, 0x18($sp) -/* A16644 80240424 8FB10014 */ lw $s1, 0x14($sp) -/* A16648 80240428 8FB00010 */ lw $s0, 0x10($sp) -/* A1664C 8024042C 03E00008 */ jr $ra -/* A16650 80240430 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A171F0/func_80240FD0_A171F0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A171F0/func_80240FD0_A171F0.s deleted file mode 100644 index 578c91130b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A171F0/func_80240FD0_A171F0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD0_A171F0 -/* A171F0 80240FD0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A171F4 80240FD4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A171F8 80240FD8 8442008E */ lh $v0, 0x8e($v0) -/* A171FC 80240FDC AC820084 */ sw $v0, 0x84($a0) -/* A17200 80240FE0 03E00008 */ jr $ra -/* A17204 80240FE4 24020002 */ addiu $v0, $zero, 2 -/* A17208 80240FE8 00000000 */ nop -/* A1720C 80240FEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s deleted file mode 100644 index 7db6f7558f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024BD60_A26E60 -.double 1.05, 0.0 - -.section .text - -glabel func_80240928_A1BA28 -/* A1BA28 80240928 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1BA2C 8024092C AFB10014 */ sw $s1, 0x14($sp) -/* A1BA30 80240930 3C118024 */ lui $s1, %hi(D_80243BD4_A1ECD4) -/* A1BA34 80240934 26313BD4 */ addiu $s1, $s1, %lo(D_80243BD4_A1ECD4) -/* A1BA38 80240938 AFBF0020 */ sw $ra, 0x20($sp) -/* A1BA3C 8024093C AFB3001C */ sw $s3, 0x1c($sp) -/* A1BA40 80240940 AFB20018 */ sw $s2, 0x18($sp) -/* A1BA44 80240944 AFB00010 */ sw $s0, 0x10($sp) -/* A1BA48 80240948 96240000 */ lhu $a0, ($s1) -/* A1BA4C 8024094C 0C01917C */ jal sins -/* A1BA50 80240950 3C130001 */ lui $s3, 1 -/* A1BA54 80240954 00021400 */ sll $v0, $v0, 0x10 -/* A1BA58 80240958 00021403 */ sra $v0, $v0, 0x10 -/* A1BA5C 8024095C 3C013800 */ lui $at, 0x3800 -/* A1BA60 80240960 44811000 */ mtc1 $at, $f2 -/* A1BA64 80240964 44820000 */ mtc1 $v0, $f0 -/* A1BA68 80240968 00000000 */ nop -/* A1BA6C 8024096C 46800020 */ cvt.s.w $f0, $f0 -/* A1BA70 80240970 46020002 */ mul.s $f0, $f0, $f2 -/* A1BA74 80240974 00000000 */ nop -/* A1BA78 80240978 3C013FE0 */ lui $at, 0x3fe0 -/* A1BA7C 8024097C 44811800 */ mtc1 $at, $f3 -/* A1BA80 80240980 44801000 */ mtc1 $zero, $f2 -/* A1BA84 80240984 46000021 */ cvt.d.s $f0, $f0 -/* A1BA88 80240988 46220002 */ mul.d $f0, $f0, $f2 -/* A1BA8C 8024098C 00000000 */ nop -/* A1BA90 80240990 36731630 */ ori $s3, $s3, 0x1630 -/* A1BA94 80240994 46220002 */ mul.d $f0, $f0, $f2 -/* A1BA98 80240998 00000000 */ nop -/* A1BA9C 8024099C 3C12800A */ lui $s2, %hi(gDisplayContext) -/* A1BAA0 802409A0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) -/* A1BAA4 802409A4 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* A1BAA8 802409A8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* A1BAAC 802409AC 96040000 */ lhu $a0, ($s0) -/* A1BAB0 802409B0 8E420000 */ lw $v0, ($s2) -/* A1BAB4 802409B4 00042180 */ sll $a0, $a0, 6 -/* A1BAB8 802409B8 3C018025 */ lui $at, %hi(D_8024BD60_A26E60) -/* A1BABC 802409BC D422BD60 */ ldc1 $f2, %lo(D_8024BD60_A26E60)($at) -/* A1BAC0 802409C0 00932021 */ addu $a0, $a0, $s3 -/* A1BAC4 802409C4 46220000 */ add.d $f0, $f0, $f2 -/* A1BAC8 802409C8 00442021 */ addu $a0, $v0, $a0 -/* A1BACC 802409CC 96220000 */ lhu $v0, ($s1) -/* A1BAD0 802409D0 46200020 */ cvt.s.d $f0, $f0 -/* A1BAD4 802409D4 44050000 */ mfc1 $a1, $f0 -/* A1BAD8 802409D8 24420199 */ addiu $v0, $v0, 0x199 -/* A1BADC 802409DC A6220000 */ sh $v0, ($s1) -/* A1BAE0 802409E0 00A0302D */ daddu $a2, $a1, $zero -/* A1BAE4 802409E4 0C019DC0 */ jal guScale -/* A1BAE8 802409E8 00A0382D */ daddu $a3, $a1, $zero -/* A1BAEC 802409EC 3C05DA38 */ lui $a1, 0xda38 -/* A1BAF0 802409F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* A1BAF4 802409F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* A1BAF8 802409F8 34A50001 */ ori $a1, $a1, 1 -/* A1BAFC 802409FC 8C830000 */ lw $v1, ($a0) -/* A1BB00 80240A00 96020000 */ lhu $v0, ($s0) -/* A1BB04 80240A04 0060302D */ daddu $a2, $v1, $zero -/* A1BB08 80240A08 24630008 */ addiu $v1, $v1, 8 -/* A1BB0C 80240A0C AC830000 */ sw $v1, ($a0) -/* A1BB10 80240A10 24430001 */ addiu $v1, $v0, 1 -/* A1BB14 80240A14 3042FFFF */ andi $v0, $v0, 0xffff -/* A1BB18 80240A18 00021180 */ sll $v0, $v0, 6 -/* A1BB1C 80240A1C ACC50000 */ sw $a1, ($a2) -/* A1BB20 80240A20 A6030000 */ sh $v1, ($s0) -/* A1BB24 80240A24 8E430000 */ lw $v1, ($s2) -/* A1BB28 80240A28 00531021 */ addu $v0, $v0, $s3 -/* A1BB2C 80240A2C 00621821 */ addu $v1, $v1, $v0 -/* A1BB30 80240A30 ACC30004 */ sw $v1, 4($a2) -/* A1BB34 80240A34 8FBF0020 */ lw $ra, 0x20($sp) -/* A1BB38 80240A38 8FB3001C */ lw $s3, 0x1c($sp) -/* A1BB3C 80240A3C 8FB20018 */ lw $s2, 0x18($sp) -/* A1BB40 80240A40 8FB10014 */ lw $s1, 0x14($sp) -/* A1BB44 80240A44 8FB00010 */ lw $s0, 0x10($sp) -/* A1BB48 80240A48 03E00008 */ jr $ra -/* A1BB4C 80240A4C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s deleted file mode 100644 index df3c3914e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A50_A1BB50 -/* A1BB50 80240A50 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A1BB54 80240A54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A1BB58 80240A58 8442008E */ lh $v0, 0x8e($v0) -/* A1BB5C 80240A5C AC820084 */ sw $v0, 0x84($a0) -/* A1BB60 80240A60 03E00008 */ jr $ra -/* A1BB64 80240A64 24020002 */ addiu $v0, $zero, 2 -/* A1BB68 80240A68 00000000 */ nop -/* A1BB6C 80240A6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s deleted file mode 100644 index 188cd789dd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80243300_A2A1D0 -.double 0.3, 0.0 - -.section .text - -glabel func_80240000_A26ED0 -/* A26ED0 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A26ED4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* A26ED8 80240008 3C118024 */ lui $s1, %hi(D_802416F0_A285C0) -/* A26EDC 8024000C 263116F0 */ addiu $s1, $s1, %lo(D_802416F0_A285C0) -/* A26EE0 80240010 AFBF0020 */ sw $ra, 0x20($sp) -/* A26EE4 80240014 AFB3001C */ sw $s3, 0x1c($sp) -/* A26EE8 80240018 AFB20018 */ sw $s2, 0x18($sp) -/* A26EEC 8024001C AFB00010 */ sw $s0, 0x10($sp) -/* A26EF0 80240020 96220000 */ lhu $v0, ($s1) -/* A26EF4 80240024 3C013D00 */ lui $at, 0x3d00 -/* A26EF8 80240028 44810000 */ mtc1 $at, $f0 -/* A26EFC 8024002C 44826000 */ mtc1 $v0, $f12 -/* A26F00 80240030 00000000 */ nop -/* A26F04 80240034 46806320 */ cvt.s.w $f12, $f12 -/* A26F08 80240038 46006302 */ mul.s $f12, $f12, $f0 -/* A26F0C 8024003C 00000000 */ nop -/* A26F10 80240040 0C00A85B */ jal sin_rad -/* A26F14 80240044 3C130001 */ lui $s3, 1 -/* A26F18 80240048 3C013F80 */ lui $at, 0x3f80 -/* A26F1C 8024004C 44811000 */ mtc1 $at, $f2 -/* A26F20 80240050 00000000 */ nop -/* A26F24 80240054 46020000 */ add.s $f0, $f0, $f2 -/* A26F28 80240058 3C013E80 */ lui $at, 0x3e80 -/* A26F2C 8024005C 44811000 */ mtc1 $at, $f2 -/* A26F30 80240060 00000000 */ nop -/* A26F34 80240064 46020002 */ mul.s $f0, $f0, $f2 -/* A26F38 80240068 00000000 */ nop -/* A26F3C 8024006C 3C013FE8 */ lui $at, 0x3fe8 -/* A26F40 80240070 44811800 */ mtc1 $at, $f3 -/* A26F44 80240074 44801000 */ mtc1 $zero, $f2 -/* A26F48 80240078 46000021 */ cvt.d.s $f0, $f0 -/* A26F4C 8024007C 46220000 */ add.d $f0, $f0, $f2 -/* A26F50 80240080 3C018024 */ lui $at, %hi(D_80243300_A2A1D0) -/* A26F54 80240084 D4243300 */ ldc1 $f4, %lo(D_80243300_A2A1D0)($at) -/* A26F58 80240088 46200020 */ cvt.s.d $f0, $f0 -/* A26F5C 8024008C 460000A1 */ cvt.d.s $f2, $f0 -/* A26F60 80240090 46241082 */ mul.d $f2, $f2, $f4 -/* A26F64 80240094 00000000 */ nop -/* A26F68 80240098 36731630 */ ori $s3, $s3, 0x1630 -/* A26F6C 8024009C 3C12800A */ lui $s2, %hi(gDisplayContext) -/* A26F70 802400A0 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) -/* A26F74 802400A4 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* A26F78 802400A8 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* A26F7C 802400AC 96040000 */ lhu $a0, ($s0) -/* A26F80 802400B0 8E420000 */ lw $v0, ($s2) -/* A26F84 802400B4 3C013FE0 */ lui $at, 0x3fe0 -/* A26F88 802400B8 44812800 */ mtc1 $at, $f5 -/* A26F8C 802400BC 44802000 */ mtc1 $zero, $f4 -/* A26F90 802400C0 00042180 */ sll $a0, $a0, 6 -/* A26F94 802400C4 46241080 */ add.d $f2, $f2, $f4 -/* A26F98 802400C8 00932021 */ addu $a0, $a0, $s3 -/* A26F9C 802400CC 00442021 */ addu $a0, $v0, $a0 -/* A26FA0 802400D0 462010A0 */ cvt.s.d $f2, $f2 -/* A26FA4 802400D4 44051000 */ mfc1 $a1, $f2 -/* A26FA8 802400D8 44060000 */ mfc1 $a2, $f0 -/* A26FAC 802400DC 0C019DC0 */ jal guScale -/* A26FB0 802400E0 00A0382D */ daddu $a3, $a1, $zero -/* A26FB4 802400E4 3C05DA38 */ lui $a1, 0xda38 -/* A26FB8 802400E8 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* A26FBC 802400EC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* A26FC0 802400F0 34A50001 */ ori $a1, $a1, 1 -/* A26FC4 802400F4 8C820000 */ lw $v0, ($a0) -/* A26FC8 802400F8 96030000 */ lhu $v1, ($s0) -/* A26FCC 802400FC 0040302D */ daddu $a2, $v0, $zero -/* A26FD0 80240100 24420008 */ addiu $v0, $v0, 8 -/* A26FD4 80240104 AC820000 */ sw $v0, ($a0) -/* A26FD8 80240108 24620001 */ addiu $v0, $v1, 1 -/* A26FDC 8024010C 3063FFFF */ andi $v1, $v1, 0xffff -/* A26FE0 80240110 00031980 */ sll $v1, $v1, 6 -/* A26FE4 80240114 00731821 */ addu $v1, $v1, $s3 -/* A26FE8 80240118 ACC50000 */ sw $a1, ($a2) -/* A26FEC 8024011C A6020000 */ sh $v0, ($s0) -/* A26FF0 80240120 8E420000 */ lw $v0, ($s2) -/* A26FF4 80240124 96240000 */ lhu $a0, ($s1) -/* A26FF8 80240128 00431021 */ addu $v0, $v0, $v1 -/* A26FFC 8024012C 24840001 */ addiu $a0, $a0, 1 -/* A27000 80240130 ACC20004 */ sw $v0, 4($a2) -/* A27004 80240134 A6240000 */ sh $a0, ($s1) -/* A27008 80240138 8FBF0020 */ lw $ra, 0x20($sp) -/* A2700C 8024013C 8FB3001C */ lw $s3, 0x1c($sp) -/* A27010 80240140 8FB20018 */ lw $s2, 0x18($sp) -/* A27014 80240144 8FB10014 */ lw $s1, 0x14($sp) -/* A27018 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* A2701C 8024014C 03E00008 */ jr $ra -/* A27020 80240150 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s deleted file mode 100644 index 8530e8e53f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154_A27024 -/* A27024 80240154 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27028 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* A2702C 8024015C 3C108024 */ lui $s0, %hi(D_802416F0_A285C0) -/* A27030 80240160 261016F0 */ addiu $s0, $s0, %lo(D_802416F0_A285C0) -/* A27034 80240164 AFBF001C */ sw $ra, 0x1c($sp) -/* A27038 80240168 AFB20018 */ sw $s2, 0x18($sp) -/* A2703C 8024016C AFB10014 */ sw $s1, 0x14($sp) -/* A27040 80240170 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A27044 80240174 96020000 */ lhu $v0, ($s0) -/* A27048 80240178 3C013D00 */ lui $at, 0x3d00 -/* A2704C 8024017C 44810000 */ mtc1 $at, $f0 -/* A27050 80240180 44826000 */ mtc1 $v0, $f12 -/* A27054 80240184 00000000 */ nop -/* A27058 80240188 46806320 */ cvt.s.w $f12, $f12 -/* A2705C 8024018C 46006302 */ mul.s $f12, $f12, $f0 -/* A27060 80240190 00000000 */ nop -/* A27064 80240194 0C00A85B */ jal sin_rad -/* A27068 80240198 3C120001 */ lui $s2, 1 -/* A2706C 8024019C 3C014120 */ lui $at, 0x4120 -/* A27070 802401A0 44811000 */ mtc1 $at, $f2 -/* A27074 802401A4 00000000 */ nop -/* A27078 802401A8 46020502 */ mul.s $f20, $f0, $f2 -/* A2707C 802401AC 00000000 */ nop -/* A27080 802401B0 96020000 */ lhu $v0, ($s0) -/* A27084 802401B4 3C013E80 */ lui $at, 0x3e80 -/* A27088 802401B8 44810000 */ mtc1 $at, $f0 -/* A2708C 802401BC 44826000 */ mtc1 $v0, $f12 -/* A27090 802401C0 00000000 */ nop -/* A27094 802401C4 46806320 */ cvt.s.w $f12, $f12 -/* A27098 802401C8 46006302 */ mul.s $f12, $f12, $f0 -/* A2709C 802401CC 00000000 */ nop -/* A270A0 802401D0 36521630 */ ori $s2, $s2, 0x1630 -/* A270A4 802401D4 3C013FF8 */ lui $at, 0x3ff8 -/* A270A8 802401D8 44810800 */ mtc1 $at, $f1 -/* A270AC 802401DC 44800000 */ mtc1 $zero, $f0 -/* A270B0 802401E0 4600A521 */ cvt.d.s $f20, $f20 -/* A270B4 802401E4 0C00A85B */ jal sin_rad -/* A270B8 802401E8 4620A500 */ add.d $f20, $f20, $f0 -/* A270BC 802401EC 3C014004 */ lui $at, 0x4004 -/* A270C0 802401F0 44811800 */ mtc1 $at, $f3 -/* A270C4 802401F4 44801000 */ mtc1 $zero, $f2 -/* A270C8 802401F8 46000021 */ cvt.d.s $f0, $f0 -/* A270CC 802401FC 46220002 */ mul.d $f0, $f0, $f2 -/* A270D0 80240200 00000000 */ nop -/* A270D4 80240204 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* A270D8 80240208 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* A270DC 8024020C 3C11800A */ lui $s1, %hi(gDisplayContext) -/* A270E0 80240210 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* A270E4 80240214 96040000 */ lhu $a0, ($s0) -/* A270E8 80240218 8E220000 */ lw $v0, ($s1) -/* A270EC 8024021C 00042180 */ sll $a0, $a0, 6 -/* A270F0 80240220 00922021 */ addu $a0, $a0, $s2 -/* A270F4 80240224 44801000 */ mtc1 $zero, $f2 -/* A270F8 80240228 4620A500 */ add.d $f20, $f20, $f0 -/* A270FC 8024022C 00442021 */ addu $a0, $v0, $a0 -/* A27100 80240230 44051000 */ mfc1 $a1, $f2 -/* A27104 80240234 4620A520 */ cvt.s.d $f20, $f20 -/* A27108 80240238 4406A000 */ mfc1 $a2, $f20 -/* A2710C 8024023C 0C019E08 */ jal guTranslate -/* A27110 80240240 00A0382D */ daddu $a3, $a1, $zero -/* A27114 80240244 3C05DA38 */ lui $a1, 0xda38 -/* A27118 80240248 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* A2711C 8024024C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* A27120 80240250 34A50001 */ ori $a1, $a1, 1 -/* A27124 80240254 8C830000 */ lw $v1, ($a0) -/* A27128 80240258 96020000 */ lhu $v0, ($s0) -/* A2712C 8024025C 0060302D */ daddu $a2, $v1, $zero -/* A27130 80240260 24630008 */ addiu $v1, $v1, 8 -/* A27134 80240264 AC830000 */ sw $v1, ($a0) -/* A27138 80240268 24430001 */ addiu $v1, $v0, 1 -/* A2713C 8024026C 3042FFFF */ andi $v0, $v0, 0xffff -/* A27140 80240270 00021180 */ sll $v0, $v0, 6 -/* A27144 80240274 ACC50000 */ sw $a1, ($a2) -/* A27148 80240278 A6030000 */ sh $v1, ($s0) -/* A2714C 8024027C 8E230000 */ lw $v1, ($s1) -/* A27150 80240280 00521021 */ addu $v0, $v0, $s2 -/* A27154 80240284 00621821 */ addu $v1, $v1, $v0 -/* A27158 80240288 ACC30004 */ sw $v1, 4($a2) -/* A2715C 8024028C 8FBF001C */ lw $ra, 0x1c($sp) -/* A27160 80240290 8FB20018 */ lw $s2, 0x18($sp) -/* A27164 80240294 8FB10014 */ lw $s1, 0x14($sp) -/* A27168 80240298 8FB00010 */ lw $s0, 0x10($sp) -/* A2716C 8024029C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A27170 802402A0 03E00008 */ jr $ra -/* A27174 802402A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s deleted file mode 100644 index 0c8170f39e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C0_A27490 -/* A27490 802405C0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A27494 802405C4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A27498 802405C8 8442008E */ lh $v0, 0x8e($v0) -/* A2749C 802405CC AC820084 */ sw $v0, 0x84($a0) -/* A274A0 802405D0 03E00008 */ jr $ra -/* A274A4 802405D4 24020002 */ addiu $v0, $zero, 2 -/* A274A8 802405D8 00000000 */ nop -/* A274AC 802405DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s deleted file mode 100644 index effc40d0d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240654_A27524 -/* A27524 80240654 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* A27528 80240658 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* A2752C 8024065C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27530 80240660 AFBF0010 */ sw $ra, 0x10($sp) -/* A27534 80240664 908300A8 */ lbu $v1, 0xa8($a0) -/* A27538 80240668 2C620005 */ sltiu $v0, $v1, 5 -/* A2753C 8024066C 10400003 */ beqz $v0, .L8024067C -/* A27540 80240670 24620001 */ addiu $v0, $v1, 1 -/* A27544 80240674 0C00D994 */ jal state_init_intro -/* A27548 80240678 A08200A8 */ sb $v0, 0xa8($a0) -.L8024067C: -/* A2754C 8024067C 8FBF0010 */ lw $ra, 0x10($sp) -/* A27550 80240680 24020001 */ addiu $v0, $zero, 1 -/* A27554 80240684 03E00008 */ jr $ra -/* A27558 80240688 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s deleted file mode 100644 index 7780504bf1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240694_A27564.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240694_A27564 -/* A27564 80240694 460C7301 */ sub.s $f12, $f14, $f12 -/* A27568 80240698 44863000 */ mtc1 $a2, $f6 -/* A2756C 8024069C 44800000 */ mtc1 $zero, $f0 -/* A27570 802406A0 44872000 */ mtc1 $a3, $f4 -/* A27574 802406A4 8FA20010 */ lw $v0, 0x10($sp) -/* A27578 802406A8 460C003C */ c.lt.s $f0, $f12 -/* A2757C 802406AC 00000000 */ nop -/* A27580 802406B0 4500000F */ bc1f .L802406F0 -/* A27584 802406B4 46067081 */ sub.s $f2, $f14, $f6 -/* A27588 802406B8 4600103C */ c.lt.s $f2, $f0 -/* A2758C 802406BC 00000000 */ nop -/* A27590 802406C0 45000003 */ bc1f .L802406D0 -/* A27594 802406C4 00000000 */ nop -.L802406C8: -/* A27598 802406C8 03E00008 */ jr $ra -/* A2759C 802406CC E44E0000 */ swc1 $f14, ($v0) -.L802406D0: -/* A275A0 802406D0 4602203C */ c.lt.s $f4, $f2 -/* A275A4 802406D4 00000000 */ nop -/* A275A8 802406D8 45000012 */ bc1f .L80240724 -/* A275AC 802406DC 00000000 */ nop -/* A275B0 802406E0 C4400000 */ lwc1 $f0, ($v0) -/* A275B4 802406E4 46040000 */ add.s $f0, $f0, $f4 -/* A275B8 802406E8 03E00008 */ jr $ra -/* A275BC 802406EC E4400000 */ swc1 $f0, ($v0) -.L802406F0: -/* A275C0 802406F0 4602003C */ c.lt.s $f0, $f2 -/* A275C4 802406F4 00000000 */ nop -/* A275C8 802406F8 4501FFF3 */ bc1t .L802406C8 -/* A275CC 802406FC 00000000 */ nop -/* A275D0 80240700 46002007 */ neg.s $f0, $f4 -/* A275D4 80240704 4600103C */ c.lt.s $f2, $f0 -/* A275D8 80240708 00000000 */ nop -/* A275DC 8024070C 45000005 */ bc1f .L80240724 -/* A275E0 80240710 00000000 */ nop -/* A275E4 80240714 C4400000 */ lwc1 $f0, ($v0) -/* A275E8 80240718 46040001 */ sub.s $f0, $f0, $f4 -/* A275EC 8024071C 03E00008 */ jr $ra -/* A275F0 80240720 E4400000 */ swc1 $f0, ($v0) -.L80240724: -/* A275F4 80240724 C4400000 */ lwc1 $f0, ($v0) -/* A275F8 80240728 46020000 */ add.s $f0, $f0, $f2 -/* A275FC 8024072C 03E00008 */ jr $ra -/* A27600 80240730 E4400000 */ swc1 $f0, ($v0) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s deleted file mode 100644 index 929a0172fb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s +++ /dev/null @@ -1,138 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80243310_A2A1E0 -.word .L80240788_A27658, .L802407A8_A27678, .L802407F8_A276C8, .L8024084C_A2771C, .L8024087C_A2774C, 0 - -dlabel D_80243328_A2A1F8 -.double 1.7320507764816284, 1.1479345624872949e+195, 3.3657388592555755e+209, 1.1479345581362125e+195, 7.370960555125578e+228, 1.1479345581787035e+195 - -.section .text - -glabel func_80240734_A27604 -/* A27604 80240734 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27608 80240738 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A2760C 8024073C 4485A000 */ mtc1 $a1, $f20 -/* A27610 80240740 F7B60020 */ sdc1 $f22, 0x20($sp) -/* A27614 80240744 4486B000 */ mtc1 $a2, $f22 -/* A27618 80240748 44876000 */ mtc1 $a3, $f12 -/* A2761C 8024074C C7A20038 */ lwc1 $f2, 0x38($sp) -/* A27620 80240750 460C103C */ c.lt.s $f2, $f12 -/* A27624 80240754 00000000 */ nop -/* A27628 80240758 45000002 */ bc1f .L80240764 -/* A2762C 8024075C AFBF0010 */ sw $ra, 0x10($sp) -/* A27630 80240760 46001306 */ mov.s $f12, $f2 -.L80240764: -/* A27634 80240764 2484FFFF */ addiu $a0, $a0, -1 -/* A27638 80240768 2C820005 */ sltiu $v0, $a0, 5 -/* A2763C 8024076C 10400056 */ beqz $v0, .L802408C8 -/* A27640 80240770 00041080 */ sll $v0, $a0, 2 -/* A27644 80240774 3C018024 */ lui $at, %hi(jtbl_80243310_A2A1E0) -/* A27648 80240778 00220821 */ addu $at, $at, $v0 -/* A2764C 8024077C 8C223310 */ lw $v0, %lo(jtbl_80243310_A2A1E0)($at) -/* A27650 80240780 00400008 */ jr $v0 -/* A27654 80240784 00000000 */ nop -.L80240788_A27658: -/* A27658 80240788 3C0142B4 */ lui $at, 0x42b4 -/* A2765C 8024078C 44810000 */ mtc1 $at, $f0 -/* A27660 80240790 46026303 */ div.s $f12, $f12, $f2 -/* A27664 80240794 46006302 */ mul.s $f12, $f12, $f0 -/* A27668 80240798 0C00A8BB */ jal sin_deg -/* A2766C 8024079C 00000000 */ nop -/* A27670 802407A0 08090233 */ j .L802408CC -/* A27674 802407A4 46000306 */ mov.s $f12, $f0 -.L802407A8_A27678: -/* A27678 802407A8 3C0141F0 */ lui $at, 0x41f0 -/* A2767C 802407AC 44810000 */ mtc1 $at, $f0 -/* A27680 802407B0 00000000 */ nop -/* A27684 802407B4 4600603C */ c.lt.s $f12, $f0 -/* A27688 802407B8 00000000 */ nop -/* A2768C 802407BC 45020004 */ bc1fl .L802407D0 -/* A27690 802407C0 46006301 */ sub.s $f12, $f12, $f0 -/* A27694 802407C4 44806000 */ mtc1 $zero, $f12 -/* A27698 802407C8 08090234 */ j .L802408D0 -/* A2769C 802407CC 4614B001 */ sub.s $f0, $f22, $f20 -.L802407D0: -/* A276A0 802407D0 46001001 */ sub.s $f0, $f2, $f0 -/* A276A4 802407D4 3C0142B4 */ lui $at, 0x42b4 -/* A276A8 802407D8 44811000 */ mtc1 $at, $f2 -/* A276AC 802407DC 46006303 */ div.s $f12, $f12, $f0 -/* A276B0 802407E0 46026302 */ mul.s $f12, $f12, $f2 -/* A276B4 802407E4 00000000 */ nop -/* A276B8 802407E8 3C01C2B4 */ lui $at, 0xc2b4 -/* A276BC 802407EC 44810000 */ mtc1 $at, $f0 -/* A276C0 802407F0 08090219 */ j .L80240864 -/* A276C4 802407F4 46006300 */ add.s $f12, $f12, $f0 -.L802407F8_A276C8: -/* A276C8 802407F8 3C014334 */ lui $at, 0x4334 -/* A276CC 802407FC 44810000 */ mtc1 $at, $f0 -/* A276D0 80240800 46026303 */ div.s $f12, $f12, $f2 -/* A276D4 80240804 46006302 */ mul.s $f12, $f12, $f0 -/* A276D8 80240808 00000000 */ nop -/* A276DC 8024080C 3C0142B4 */ lui $at, 0x42b4 -/* A276E0 80240810 44810000 */ mtc1 $at, $f0 -/* A276E4 80240814 0C00A8BB */ jal sin_deg -/* A276E8 80240818 46006301 */ sub.s $f12, $f12, $f0 -/* A276EC 8024081C 3C013F80 */ lui $at, 0x3f80 -/* A276F0 80240820 44811000 */ mtc1 $at, $f2 -/* A276F4 80240824 00000000 */ nop -/* A276F8 80240828 46020000 */ add.s $f0, $f0, $f2 -/* A276FC 8024082C 3C013FE0 */ lui $at, 0x3fe0 -/* A27700 80240830 44811800 */ mtc1 $at, $f3 -/* A27704 80240834 44801000 */ mtc1 $zero, $f2 -/* A27708 80240838 46000021 */ cvt.d.s $f0, $f0 -/* A2770C 8024083C 46220002 */ mul.d $f0, $f0, $f2 -/* A27710 80240840 00000000 */ nop -/* A27714 80240844 08090233 */ j .L802408CC -/* A27718 80240848 46200320 */ cvt.s.d $f12, $f0 -.L8024084C_A2771C: -/* A2771C 8024084C 3C0142B4 */ lui $at, 0x42b4 -/* A27720 80240850 44810000 */ mtc1 $at, $f0 -/* A27724 80240854 46026303 */ div.s $f12, $f12, $f2 -/* A27728 80240858 46006302 */ mul.s $f12, $f12, $f0 -/* A2772C 8024085C 00000000 */ nop -/* A27730 80240860 46006301 */ sub.s $f12, $f12, $f0 -.L80240864: -/* A27734 80240864 0C00A8BB */ jal sin_deg -/* A27738 80240868 00000000 */ nop -/* A2773C 8024086C 3C013F80 */ lui $at, 0x3f80 -/* A27740 80240870 44811000 */ mtc1 $at, $f2 -/* A27744 80240874 08090233 */ j .L802408CC -/* A27748 80240878 46020300 */ add.s $f12, $f0, $f2 -.L8024087C_A2774C: -/* A2774C 8024087C 3C014270 */ lui $at, 0x4270 -/* A27750 80240880 44810000 */ mtc1 $at, $f0 -/* A27754 80240884 46026303 */ div.s $f12, $f12, $f2 -/* A27758 80240888 46006302 */ mul.s $f12, $f12, $f0 -/* A2775C 8024088C 00000000 */ nop -/* A27760 80240890 0C00A8BB */ jal sin_deg -/* A27764 80240894 46006301 */ sub.s $f12, $f12, $f0 -/* A27768 80240898 3C013F5D */ lui $at, 0x3f5d -/* A2776C 8024089C 3421B3D7 */ ori $at, $at, 0xb3d7 -/* A27770 802408A0 44811000 */ mtc1 $at, $f2 -/* A27774 802408A4 00000000 */ nop -/* A27778 802408A8 46020000 */ add.s $f0, $f0, $f2 -/* A2777C 802408AC 46000021 */ cvt.d.s $f0, $f0 -/* A27780 802408B0 46200000 */ add.d $f0, $f0, $f0 -/* A27784 802408B4 3C018024 */ lui $at, %hi(D_80243328_A2A1F8) -/* A27788 802408B8 D4223328 */ ldc1 $f2, %lo(D_80243328_A2A1F8)($at) -/* A2778C 802408BC 46220003 */ div.d $f0, $f0, $f2 -/* A27790 802408C0 08090233 */ j .L802408CC -/* A27794 802408C4 46200320 */ cvt.s.d $f12, $f0 -.L802408C8: -/* A27798 802408C8 46026303 */ div.s $f12, $f12, $f2 -.L802408CC: -/* A2779C 802408CC 4614B001 */ sub.s $f0, $f22, $f20 -.L802408D0: -/* A277A0 802408D0 460C0002 */ mul.s $f0, $f0, $f12 -/* A277A4 802408D4 00000000 */ nop -/* A277A8 802408D8 4600A000 */ add.s $f0, $f20, $f0 -/* A277AC 802408DC 8FA2003C */ lw $v0, 0x3c($sp) -/* A277B0 802408E0 E4400000 */ swc1 $f0, ($v0) -/* A277B4 802408E4 8FBF0010 */ lw $ra, 0x10($sp) -/* A277B8 802408E8 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A277BC 802408EC D7B40018 */ ldc1 $f20, 0x18($sp) -/* A277C0 802408F0 03E00008 */ jr $ra -/* A277C4 802408F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s deleted file mode 100644 index 5f0a81ef45..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8_A277C8 -/* A277C8 802408F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A277CC 802408FC 3C04800B */ lui $a0, %hi(gCameras) -/* A277D0 80240900 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A277D4 80240904 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A277D8 80240908 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A277DC 8024090C 3C05800A */ lui $a1, %hi(nuGfxCfb_ptr) -/* A277E0 80240910 8CA5A64C */ lw $a1, %lo(nuGfxCfb_ptr)($a1) -/* A277E4 80240914 3C088024 */ lui $t0, %hi(D_80241B80_A28A50) -/* A277E8 80240918 25081B80 */ addiu $t0, $t0, %lo(D_80241B80_A28A50) -/* A277EC 8024091C AFBF0020 */ sw $ra, 0x20($sp) -/* A277F0 80240920 AFB1001C */ sw $s1, 0x1c($sp) -/* A277F4 80240924 AFB00018 */ sw $s0, 0x18($sp) -/* A277F8 80240928 00031080 */ sll $v0, $v1, 2 -/* A277FC 8024092C 00431021 */ addu $v0, $v0, $v1 -/* A27800 80240930 00021080 */ sll $v0, $v0, 2 -/* A27804 80240934 00431023 */ subu $v0, $v0, $v1 -/* A27808 80240938 000218C0 */ sll $v1, $v0, 3 -/* A2780C 8024093C 00431021 */ addu $v0, $v0, $v1 -/* A27810 80240940 000210C0 */ sll $v0, $v0, 3 -/* A27814 80240944 8D030000 */ lw $v1, ($t0) -/* A27818 80240948 10A30013 */ beq $a1, $v1, .L80240998 -/* A2781C 8024094C 00448821 */ addu $s1, $v0, $a0 -/* A27820 80240950 3C108024 */ lui $s0, %hi(D_80241B7C_A28A4C) -/* A27824 80240954 26101B7C */ addiu $s0, $s0, %lo(D_80241B7C_A28A4C) -/* A27828 80240958 3C01442F */ lui $at, 0x442f -/* A2782C 8024095C 44816000 */ mtc1 $at, $f12 -/* A27830 80240960 3C014396 */ lui $at, 0x4396 -/* A27834 80240964 44817000 */ mtc1 $at, $f14 -/* A27838 80240968 8E060000 */ lw $a2, ($s0) -/* A2783C 8024096C 3C073F99 */ lui $a3, 0x3f99 -/* A27840 80240970 34E7999A */ ori $a3, $a3, 0x999a -/* A27844 80240974 AD050000 */ sw $a1, ($t0) -/* A27848 80240978 0C0901A5 */ jal func_80240694_A27564 -/* A2784C 8024097C AFB00010 */ sw $s0, 0x10($sp) -/* A27850 80240980 0000102D */ daddu $v0, $zero, $zero -/* A27854 80240984 C6000000 */ lwc1 $f0, ($s0) -/* A27858 80240988 24030001 */ addiu $v1, $zero, 1 -/* A2785C 8024098C A6230506 */ sh $v1, 0x506($s1) -/* A27860 80240990 08090267 */ j .L8024099C -/* A27864 80240994 E62004DC */ swc1 $f0, 0x4dc($s1) -.L80240998: -/* A27868 80240998 0000102D */ daddu $v0, $zero, $zero -.L8024099C: -/* A2786C 8024099C 8FBF0020 */ lw $ra, 0x20($sp) -/* A27870 802409A0 8FB1001C */ lw $s1, 0x1c($sp) -/* A27874 802409A4 8FB00018 */ lw $s0, 0x18($sp) -/* A27878 802409A8 03E00008 */ jr $ra -/* A2787C 802409AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s deleted file mode 100644 index c23e75e2f3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409B0_A27880 -/* A27880 802409B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27884 802409B4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A27888 802409B8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2788C 802409BC 3C04800B */ lui $a0, %hi(gCameras) -/* A27890 802409C0 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A27894 802409C4 AFBF0024 */ sw $ra, 0x24($sp) -/* A27898 802409C8 AFB20020 */ sw $s2, 0x20($sp) -/* A2789C 802409CC AFB1001C */ sw $s1, 0x1c($sp) -/* A278A0 802409D0 AFB00018 */ sw $s0, 0x18($sp) -/* A278A4 802409D4 00031080 */ sll $v0, $v1, 2 -/* A278A8 802409D8 00431021 */ addu $v0, $v0, $v1 -/* A278AC 802409DC 00021080 */ sll $v0, $v0, 2 -/* A278B0 802409E0 00431023 */ subu $v0, $v0, $v1 -/* A278B4 802409E4 000218C0 */ sll $v1, $v0, 3 -/* A278B8 802409E8 00431021 */ addu $v0, $v0, $v1 -/* A278BC 802409EC 000210C0 */ sll $v0, $v0, 3 -/* A278C0 802409F0 10A00005 */ beqz $a1, .L80240A08 -/* A278C4 802409F4 00449021 */ addu $s2, $v0, $a0 -/* A278C8 802409F8 3C018024 */ lui $at, %hi(D_80241B54_A28A24) -/* A278CC 802409FC C4201B54 */ lwc1 $f0, %lo(D_80241B54_A28A24)($at) -/* A278D0 80240A00 3C018024 */ lui $at, %hi(func_80243370_8B33E0) -/* A278D4 80240A04 E4203370 */ swc1 $f0, %lo(func_80243370_8B33E0)($at) -.L80240A08: -/* A278D8 80240A08 3C118024 */ lui $s1, %hi(func_80243370_8B33E0) -/* A278DC 80240A0C 26313370 */ addiu $s1, $s1, %lo(func_80243370_8B33E0) -/* A278E0 80240A10 3C01428C */ lui $at, 0x428c -/* A278E4 80240A14 44810000 */ mtc1 $at, $f0 -/* A278E8 80240A18 3C058024 */ lui $a1, %hi(D_80241B54_A28A24) -/* A278EC 80240A1C 8CA51B54 */ lw $a1, %lo(D_80241B54_A28A24)($a1) -/* A278F0 80240A20 3C06442F */ lui $a2, 0x442f -/* A278F4 80240A24 3C108024 */ lui $s0, %hi(D_80241B84_A28A54) -/* A278F8 80240A28 26101B84 */ addiu $s0, $s0, %lo(D_80241B84_A28A54) -/* A278FC 80240A2C AFB10014 */ sw $s1, 0x14($sp) -/* A27900 80240A30 E7A00010 */ swc1 $f0, 0x10($sp) -/* A27904 80240A34 C6000000 */ lwc1 $f0, ($s0) -/* A27908 80240A38 46800020 */ cvt.s.w $f0, $f0 -/* A2790C 80240A3C 44070000 */ mfc1 $a3, $f0 -/* A27910 80240A40 0C0901CD */ jal func_80240734_A27604 -/* A27914 80240A44 24040001 */ addiu $a0, $zero, 1 -/* A27918 80240A48 C6200000 */ lwc1 $f0, ($s1) -/* A2791C 80240A4C 8E020000 */ lw $v0, ($s0) -/* A27920 80240A50 24030001 */ addiu $v1, $zero, 1 -/* A27924 80240A54 A6430506 */ sh $v1, 0x506($s2) -/* A27928 80240A58 24420001 */ addiu $v0, $v0, 1 -/* A2792C 80240A5C E64004DC */ swc1 $f0, 0x4dc($s2) -/* A27930 80240A60 AE020000 */ sw $v0, ($s0) -/* A27934 80240A64 28420046 */ slti $v0, $v0, 0x46 -/* A27938 80240A68 8FBF0024 */ lw $ra, 0x24($sp) -/* A2793C 80240A6C 8FB20020 */ lw $s2, 0x20($sp) -/* A27940 80240A70 8FB1001C */ lw $s1, 0x1c($sp) -/* A27944 80240A74 8FB00018 */ lw $s0, 0x18($sp) -/* A27948 80240A78 38420001 */ xori $v0, $v0, 1 -/* A2794C 80240A7C 03E00008 */ jr $ra -/* A27950 80240A80 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s deleted file mode 100644 index 699c8e5043..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A84_A27954 -/* A27954 80240A84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27958 80240A88 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2795C 80240A8C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A27960 80240A90 3C04800B */ lui $a0, %hi(gCameras) -/* A27964 80240A94 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A27968 80240A98 AFBF0024 */ sw $ra, 0x24($sp) -/* A2796C 80240A9C AFB20020 */ sw $s2, 0x20($sp) -/* A27970 80240AA0 AFB1001C */ sw $s1, 0x1c($sp) -/* A27974 80240AA4 AFB00018 */ sw $s0, 0x18($sp) -/* A27978 80240AA8 00031080 */ sll $v0, $v1, 2 -/* A2797C 80240AAC 00431021 */ addu $v0, $v0, $v1 -/* A27980 80240AB0 00021080 */ sll $v0, $v0, 2 -/* A27984 80240AB4 00431023 */ subu $v0, $v0, $v1 -/* A27988 80240AB8 000218C0 */ sll $v1, $v0, 3 -/* A2798C 80240ABC 00431021 */ addu $v0, $v0, $v1 -/* A27990 80240AC0 000210C0 */ sll $v0, $v0, 3 -/* A27994 80240AC4 10A00005 */ beqz $a1, .L80240ADC -/* A27998 80240AC8 00449021 */ addu $s2, $v0, $a0 -/* A2799C 80240ACC 3C018024 */ lui $at, %hi(D_80241B74_A28A44) -/* A279A0 80240AD0 C4201B74 */ lwc1 $f0, %lo(D_80241B74_A28A44)($at) -/* A279A4 80240AD4 3C018024 */ lui $at, %hi(D_80243374) -/* A279A8 80240AD8 E4203374 */ swc1 $f0, %lo(D_80243374)($at) -.L80240ADC: -/* A279AC 80240ADC 3C118024 */ lui $s1, %hi(D_80243374) -/* A279B0 80240AE0 26313374 */ addiu $s1, $s1, %lo(D_80243374) -/* A279B4 80240AE4 3C014348 */ lui $at, 0x4348 -/* A279B8 80240AE8 44810000 */ mtc1 $at, $f0 -/* A279BC 80240AEC 3C058024 */ lui $a1, %hi(D_80241B74_A28A44) -/* A279C0 80240AF0 8CA51B74 */ lw $a1, %lo(D_80241B74_A28A44)($a1) -/* A279C4 80240AF4 3C06C2A0 */ lui $a2, 0xc2a0 -/* A279C8 80240AF8 3C108024 */ lui $s0, %hi(D_80241B88_A28A58) -/* A279CC 80240AFC 26101B88 */ addiu $s0, $s0, %lo(D_80241B88_A28A58) -/* A279D0 80240B00 AFB10014 */ sw $s1, 0x14($sp) -/* A279D4 80240B04 E7A00010 */ swc1 $f0, 0x10($sp) -/* A279D8 80240B08 C6000000 */ lwc1 $f0, ($s0) -/* A279DC 80240B0C 46800020 */ cvt.s.w $f0, $f0 -/* A279E0 80240B10 44070000 */ mfc1 $a3, $f0 -/* A279E4 80240B14 0C0901CD */ jal func_80240734_A27604 -/* A279E8 80240B18 24040005 */ addiu $a0, $zero, 5 -/* A279EC 80240B1C C6200000 */ lwc1 $f0, ($s1) -/* A279F0 80240B20 8E020000 */ lw $v0, ($s0) -/* A279F4 80240B24 24030001 */ addiu $v1, $zero, 1 -/* A279F8 80240B28 A6430506 */ sh $v1, 0x506($s2) -/* A279FC 80240B2C 24420001 */ addiu $v0, $v0, 1 -/* A27A00 80240B30 E64004FC */ swc1 $f0, 0x4fc($s2) -/* A27A04 80240B34 AE020000 */ sw $v0, ($s0) -/* A27A08 80240B38 384200C8 */ xori $v0, $v0, 0xc8 -/* A27A0C 80240B3C 2C420001 */ sltiu $v0, $v0, 1 -/* A27A10 80240B40 8FBF0024 */ lw $ra, 0x24($sp) -/* A27A14 80240B44 8FB20020 */ lw $s2, 0x20($sp) -/* A27A18 80240B48 8FB1001C */ lw $s1, 0x1c($sp) -/* A27A1C 80240B4C 8FB00018 */ lw $s0, 0x18($sp) -/* A27A20 80240B50 00021040 */ sll $v0, $v0, 1 -/* A27A24 80240B54 03E00008 */ jr $ra -/* A27A28 80240B58 27BD0028 */ addiu $sp, $sp, 0x28 -/* A27A2C 80240B5C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s deleted file mode 100644 index 4a1934b9a0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B60_A27A30 -/* A27A30 80240B60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27A34 80240B64 AFB00010 */ sw $s0, 0x10($sp) -/* A27A38 80240B68 0080802D */ daddu $s0, $a0, $zero -/* A27A3C 80240B6C 10A00002 */ beqz $a1, .L80240B78 -/* A27A40 80240B70 AFBF0014 */ sw $ra, 0x14($sp) -/* A27A44 80240B74 AE000074 */ sw $zero, 0x74($s0) -.L80240B78: -/* A27A48 80240B78 8E020074 */ lw $v0, 0x74($s0) -/* A27A4C 80240B7C 24420010 */ addiu $v0, $v0, 0x10 -/* A27A50 80240B80 AE020074 */ sw $v0, 0x74($s0) -/* A27A54 80240B84 28420100 */ slti $v0, $v0, 0x100 -/* A27A58 80240B88 14400002 */ bnez $v0, .L80240B94 -/* A27A5C 80240B8C 240200FF */ addiu $v0, $zero, 0xff -/* A27A60 80240B90 AE020074 */ sw $v0, 0x74($s0) -.L80240B94: -/* A27A64 80240B94 C6000074 */ lwc1 $f0, 0x74($s0) -/* A27A68 80240B98 46800020 */ cvt.s.w $f0, $f0 -/* A27A6C 80240B9C 44050000 */ mfc1 $a1, $f0 -/* A27A70 80240BA0 0C04DF62 */ jal set_screen_overlay_params_front -/* A27A74 80240BA4 0000202D */ daddu $a0, $zero, $zero -/* A27A78 80240BA8 8E020074 */ lw $v0, 0x74($s0) -/* A27A7C 80240BAC 8FBF0014 */ lw $ra, 0x14($sp) -/* A27A80 80240BB0 8FB00010 */ lw $s0, 0x10($sp) -/* A27A84 80240BB4 384200FF */ xori $v0, $v0, 0xff -/* A27A88 80240BB8 2C420001 */ sltiu $v0, $v0, 1 -/* A27A8C 80240BBC 00021040 */ sll $v0, $v0, 1 -/* A27A90 80240BC0 03E00008 */ jr $ra -/* A27A94 80240BC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* A27A98 80240BC8 00000000 */ nop -/* A27A9C 80240BCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s deleted file mode 100644 index 1e7568f200..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E40_A27D10 -/* A27D10 80240E40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27D14 80240E44 AFBF0010 */ sw $ra, 0x10($sp) -/* A27D18 80240E48 8C82000C */ lw $v0, 0xc($a0) -/* A27D1C 80240E4C 0C0B1EAF */ jal evt_get_variable -/* A27D20 80240E50 8C450000 */ lw $a1, ($v0) -/* A27D24 80240E54 0C00AFC1 */ jal set_curtain_draw_callback -/* A27D28 80240E58 0040202D */ daddu $a0, $v0, $zero -/* A27D2C 80240E5C 8FBF0010 */ lw $ra, 0x10($sp) -/* A27D30 80240E60 24020002 */ addiu $v0, $zero, 2 -/* A27D34 80240E64 03E00008 */ jr $ra -/* A27D38 80240E68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s deleted file mode 100644 index c89232100c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E6C_A27D3C -/* A27D3C 80240E6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27D40 80240E70 3C048024 */ lui $a0, %hi(D_80243284_A2A154) -/* A27D44 80240E74 24843284 */ addiu $a0, $a0, %lo(D_80243284_A2A154) -/* A27D48 80240E78 AFBF0010 */ sw $ra, 0x10($sp) -/* A27D4C 80240E7C 0C0902F4 */ jal func_80240BD0_A27AA0 -/* A27D50 80240E80 00000000 */ nop -/* A27D54 80240E84 8FBF0010 */ lw $ra, 0x10($sp) -/* A27D58 80240E88 03E00008 */ jr $ra -/* A27D5C 80240E8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s deleted file mode 100644 index cc540c922d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240634_A2A874 -/* A2A874 80240634 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2A878 80240638 AFB10014 */ sw $s1, 0x14($sp) -/* A2A87C 8024063C 0080882D */ daddu $s1, $a0, $zero -/* A2A880 80240640 AFBF0018 */ sw $ra, 0x18($sp) -/* A2A884 80240644 AFB00010 */ sw $s0, 0x10($sp) -/* A2A888 80240648 8E30000C */ lw $s0, 0xc($s1) -/* A2A88C 8024064C 8E050000 */ lw $a1, ($s0) -/* A2A890 80240650 0C0B1EAF */ jal evt_get_variable -/* A2A894 80240654 26100004 */ addiu $s0, $s0, 4 -/* A2A898 80240658 0220202D */ daddu $a0, $s1, $zero -/* A2A89C 8024065C 8E050000 */ lw $a1, ($s0) -/* A2A8A0 80240660 0C0B210B */ jal evt_get_float_variable -/* A2A8A4 80240664 0040802D */ daddu $s0, $v0, $zero -/* A2A8A8 80240668 00108080 */ sll $s0, $s0, 2 -/* A2A8AC 8024066C 02308821 */ addu $s1, $s1, $s0 -/* A2A8B0 80240670 4600008D */ trunc.w.s $f2, $f0 -/* A2A8B4 80240674 E6220084 */ swc1 $f2, 0x84($s1) -/* A2A8B8 80240678 8FBF0018 */ lw $ra, 0x18($sp) -/* A2A8BC 8024067C 8FB10014 */ lw $s1, 0x14($sp) -/* A2A8C0 80240680 8FB00010 */ lw $s0, 0x10($sp) -/* A2A8C4 80240684 24020002 */ addiu $v0, $zero, 2 -/* A2A8C8 80240688 03E00008 */ jr $ra -/* A2A8CC 8024068C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s deleted file mode 100644 index 5144ffaf2b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8024F1D0_A39410 -.double -0.05 - -dlabel D_8024F1D8_A39418 -.double -230000000.0 - -.section .text - -glabel func_80240690_A2A8D0 -/* A2A8D0 80240690 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A2A8D4 80240694 AFB00010 */ sw $s0, 0x10($sp) -/* A2A8D8 80240698 0080802D */ daddu $s0, $a0, $zero -/* A2A8DC 8024069C 3C02F24A */ lui $v0, 0xf24a -/* A2A8E0 802406A0 34427A80 */ ori $v0, $v0, 0x7a80 -/* A2A8E4 802406A4 3C03F24C */ lui $v1, 0xf24c -/* A2A8E8 802406A8 34630A80 */ ori $v1, $v1, 0xa80 -/* A2A8EC 802406AC 2404000A */ addiu $a0, $zero, 0xa -/* A2A8F0 802406B0 AFBF0014 */ sw $ra, 0x14($sp) -/* A2A8F4 802406B4 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* A2A8F8 802406B8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* A2A8FC 802406BC F7B60020 */ sdc1 $f22, 0x20($sp) -/* A2A900 802406C0 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A2A904 802406C4 C61A0088 */ lwc1 $f26, 0x88($s0) -/* A2A908 802406C8 4680D6A0 */ cvt.s.w $f26, $f26 -/* A2A90C 802406CC 3C014334 */ lui $at, 0x4334 -/* A2A910 802406D0 44810000 */ mtc1 $at, $f0 -/* A2A914 802406D4 3C014049 */ lui $at, 0x4049 -/* A2A918 802406D8 34210FD8 */ ori $at, $at, 0xfd8 -/* A2A91C 802406DC 44811000 */ mtc1 $at, $f2 -/* A2A920 802406E0 4600D682 */ mul.s $f26, $f26, $f0 -/* A2A924 802406E4 00000000 */ nop -/* A2A928 802406E8 C616008C */ lwc1 $f22, 0x8c($s0) -/* A2A92C 802406EC 4680B5A0 */ cvt.s.w $f22, $f22 -/* A2A930 802406F0 AE02008C */ sw $v0, 0x8c($s0) -/* A2A934 802406F4 AE030090 */ sw $v1, 0x90($s0) -/* A2A938 802406F8 AE020094 */ sw $v0, 0x94($s0) -/* A2A93C 802406FC 0C00A67F */ jal rand_int -/* A2A940 80240700 4602D683 */ div.s $f26, $f26, $f2 -/* A2A944 80240704 4482A000 */ mtc1 $v0, $f20 -/* A2A948 80240708 00000000 */ nop -/* A2A94C 8024070C 4680A520 */ cvt.s.w $f20, $f20 -/* A2A950 80240710 3C014040 */ lui $at, 0x4040 -/* A2A954 80240714 44810000 */ mtc1 $at, $f0 -/* A2A958 80240718 4616A503 */ div.s $f20, $f20, $f22 -/* A2A95C 8024071C 4600A500 */ add.s $f20, $f20, $f0 -/* A2A960 80240720 0C00A874 */ jal cos_rad -/* A2A964 80240724 4600D306 */ mov.s $f12, $f26 -/* A2A968 80240728 4600A002 */ mul.s $f0, $f20, $f0 -/* A2A96C 8024072C 00000000 */ nop -/* A2A970 80240730 3C014480 */ lui $at, 0x4480 -/* A2A974 80240734 4481C000 */ mtc1 $at, $f24 -/* A2A978 80240738 00000000 */ nop -/* A2A97C 8024073C 46180002 */ mul.s $f0, $f0, $f24 -/* A2A980 80240740 00000000 */ nop -/* A2A984 80240744 3C01CD5B */ lui $at, 0xcd5b -/* A2A988 80240748 34215858 */ ori $at, $at, 0x5858 -/* A2A98C 8024074C 4481B000 */ mtc1 $at, $f22 -/* A2A990 80240750 00000000 */ nop -/* A2A994 80240754 46160000 */ add.s $f0, $f0, $f22 -/* A2A998 80240758 4600010D */ trunc.w.s $f4, $f0 -/* A2A99C 8024075C E60400AC */ swc1 $f4, 0xac($s0) -/* A2A9A0 80240760 0C00A67F */ jal rand_int -/* A2A9A4 80240764 2404000F */ addiu $a0, $zero, 0xf -/* A2A9A8 80240768 24420005 */ addiu $v0, $v0, 5 -/* A2A9AC 8024076C 44820000 */ mtc1 $v0, $f0 -/* A2A9B0 80240770 00000000 */ nop -/* A2A9B4 80240774 46800020 */ cvt.s.w $f0, $f0 -/* A2A9B8 80240778 46180002 */ mul.s $f0, $f0, $f24 -/* A2A9BC 8024077C 00000000 */ nop -/* A2A9C0 80240780 46160000 */ add.s $f0, $f0, $f22 -/* A2A9C4 80240784 4600010D */ trunc.w.s $f4, $f0 -/* A2A9C8 80240788 E60400B0 */ swc1 $f4, 0xb0($s0) -/* A2A9CC 8024078C 0C00A85B */ jal sin_rad -/* A2A9D0 80240790 4600D306 */ mov.s $f12, $f26 -/* A2A9D4 80240794 4600A502 */ mul.s $f20, $f20, $f0 -/* A2A9D8 80240798 00000000 */ nop -/* A2A9DC 8024079C 4618A502 */ mul.s $f20, $f20, $f24 -/* A2A9E0 802407A0 00000000 */ nop -/* A2A9E4 802407A4 4616A500 */ add.s $f20, $f20, $f22 -/* A2A9E8 802407A8 4600A10D */ trunc.w.s $f4, $f20 -/* A2A9EC 802407AC E60400B4 */ swc1 $f4, 0xb4($s0) -/* A2A9F0 802407B0 0C00A67F */ jal rand_int -/* A2A9F4 802407B4 2404000A */ addiu $a0, $zero, 0xa -/* A2A9F8 802407B8 2442000A */ addiu $v0, $v0, 0xa -/* A2A9FC 802407BC 44820000 */ mtc1 $v0, $f0 -/* A2AA00 802407C0 00000000 */ nop -/* A2AA04 802407C4 46800020 */ cvt.s.w $f0, $f0 -/* A2AA08 802407C8 3C018025 */ lui $at, %hi(D_8024F1D0_A39410) -/* A2AA0C 802407CC D422F1D0 */ ldc1 $f2, %lo(D_8024F1D0_A39410)($at) -/* A2AA10 802407D0 46000021 */ cvt.d.s $f0, $f0 -/* A2AA14 802407D4 46220002 */ mul.d $f0, $f0, $f2 -/* A2AA18 802407D8 00000000 */ nop -/* A2AA1C 802407DC 3C014090 */ lui $at, 0x4090 -/* A2AA20 802407E0 44811800 */ mtc1 $at, $f3 -/* A2AA24 802407E4 44801000 */ mtc1 $zero, $f2 -/* A2AA28 802407E8 00000000 */ nop -/* A2AA2C 802407EC 46220002 */ mul.d $f0, $f0, $f2 -/* A2AA30 802407F0 00000000 */ nop -/* A2AA34 802407F4 3C018025 */ lui $at, %hi(D_8024F1D8_A39418) -/* A2AA38 802407F8 D422F1D8 */ ldc1 $f2, %lo(D_8024F1D8_A39418)($at) -/* A2AA3C 802407FC 46220000 */ add.d $f0, $f0, $f2 -/* A2AA40 80240800 4620010D */ trunc.w.d $f4, $f0 -/* A2AA44 80240804 E60400B8 */ swc1 $f4, 0xb8($s0) -/* A2AA48 80240808 8FBF0014 */ lw $ra, 0x14($sp) -/* A2AA4C 8024080C 8FB00010 */ lw $s0, 0x10($sp) -/* A2AA50 80240810 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* A2AA54 80240814 D7B80028 */ ldc1 $f24, 0x28($sp) -/* A2AA58 80240818 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A2AA5C 8024081C D7B40018 */ ldc1 $f20, 0x18($sp) -/* A2AA60 80240820 24020002 */ addiu $v0, $zero, 2 -/* A2AA64 80240824 03E00008 */ jr $ra -/* A2AA68 80240828 27BD0038 */ addiu $sp, $sp, 0x38 -/* A2AA6C 8024082C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s deleted file mode 100644 index f6d47608a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_A2AA70 -/* A2AA70 80240830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2AA74 80240834 3C028011 */ lui $v0, %hi(gPlayerData) -/* A2AA78 80240838 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* A2AA7C 8024083C AFBF0010 */ sw $ra, 0x10($sp) -/* A2AA80 80240840 90450003 */ lbu $a1, 3($v0) -/* A2AA84 80240844 90460006 */ lbu $a2, 6($v0) -/* A2AA88 80240848 8044028E */ lb $a0, 0x28e($v0) -/* A2AA8C 8024084C 24030001 */ addiu $v1, $zero, 1 -/* A2AA90 80240850 A0430292 */ sb $v1, 0x292($v0) -/* A2AA94 80240854 00042200 */ sll $a0, $a0, 8 -/* A2AA98 80240858 A0450002 */ sb $a1, 2($v0) -/* A2AA9C 8024085C A0460005 */ sb $a2, 5($v0) -/* A2AAA0 80240860 0C03A6DB */ jal sync_status_menu -/* A2AAA4 80240864 A4440290 */ sh $a0, 0x290($v0) -/* A2AAA8 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* A2AAAC 8024086C 24020002 */ addiu $v0, $zero, 2 -/* A2AAB0 80240870 03E00008 */ jr $ra -/* A2AAB4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2AAB8 80240878 00000000 */ nop -/* A2AABC 8024087C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s deleted file mode 100644 index 0b2ca2ea68..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_A39BC0 -/* A39BC0 802406E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39BC4 802406E4 AFBF0010 */ sw $ra, 0x10($sp) -/* A39BC8 802406E8 8C82000C */ lw $v0, 0xc($a0) -/* A39BCC 802406EC 0C0B1EAF */ jal evt_get_variable -/* A39BD0 802406F0 8C450000 */ lw $a1, ($v0) -/* A39BD4 802406F4 0040182D */ daddu $v1, $v0, $zero -/* A39BD8 802406F8 10600012 */ beqz $v1, .L80240744 -/* A39BDC 802406FC 0000202D */ daddu $a0, $zero, $zero -/* A39BE0 80240700 8C620000 */ lw $v0, ($v1) -/* A39BE4 80240704 5040000A */ beql $v0, $zero, .L80240730 -/* A39BE8 80240708 00041080 */ sll $v0, $a0, 2 -/* A39BEC 8024070C 3C058024 */ lui $a1, %hi(D_80246260) -/* A39BF0 80240710 24A56260 */ addiu $a1, $a1, %lo(D_80246260) -.L80240714: -/* A39BF4 80240714 24630004 */ addiu $v1, $v1, 4 -/* A39BF8 80240718 24840001 */ addiu $a0, $a0, 1 -/* A39BFC 8024071C ACA20000 */ sw $v0, ($a1) -/* A39C00 80240720 8C620000 */ lw $v0, ($v1) -/* A39C04 80240724 1440FFFB */ bnez $v0, .L80240714 -/* A39C08 80240728 24A50004 */ addiu $a1, $a1, 4 -/* A39C0C 8024072C 00041080 */ sll $v0, $a0, 2 -.L80240730: -/* A39C10 80240730 3C018024 */ lui $at, %hi(D_80246260) -/* A39C14 80240734 00220821 */ addu $at, $at, $v0 -/* A39C18 80240738 AC206260 */ sw $zero, %lo(D_80246260)($at) -/* A39C1C 8024073C 080901DB */ j .L8024076C -/* A39C20 80240740 00000000 */ nop -.L80240744: -/* A39C24 80240744 3C038024 */ lui $v1, %hi(D_80246260) -/* A39C28 80240748 24636260 */ addiu $v1, $v1, %lo(D_80246260) -/* A39C2C 8024074C 0060282D */ daddu $a1, $v1, $zero -.L80240750: -/* A39C30 80240750 24820010 */ addiu $v0, $a0, 0x10 -/* A39C34 80240754 AC620000 */ sw $v0, ($v1) -/* A39C38 80240758 24630004 */ addiu $v1, $v1, 4 -/* A39C3C 8024075C 24840001 */ addiu $a0, $a0, 1 -/* A39C40 80240760 28820070 */ slti $v0, $a0, 0x70 -/* A39C44 80240764 1440FFFA */ bnez $v0, .L80240750 -/* A39C48 80240768 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024076C: -/* A39C4C 8024076C 8FBF0010 */ lw $ra, 0x10($sp) -/* A39C50 80240770 24020002 */ addiu $v0, $zero, 2 -/* A39C54 80240774 03E00008 */ jr $ra -/* A39C58 80240778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s deleted file mode 100644 index df3307d93c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241008_A3A4E8 -/* A3A4E8 80241008 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3A4EC 8024100C AFBF0010 */ sw $ra, 0x10($sp) -/* A3A4F0 80241010 8C82000C */ lw $v0, 0xc($a0) -/* A3A4F4 80241014 0C0B1EAF */ jal evt_get_variable -/* A3A4F8 80241018 8C450000 */ lw $a1, ($v0) -/* A3A4FC 8024101C 0040182D */ daddu $v1, $v0, $zero -/* A3A500 80241020 10600012 */ beqz $v1, .L8024106C -/* A3A504 80241024 0000202D */ daddu $a0, $zero, $zero -/* A3A508 80241028 8C620000 */ lw $v0, ($v1) -/* A3A50C 8024102C 5040000A */ beql $v0, $zero, .L80241058 -/* A3A510 80241030 00041080 */ sll $v0, $a0, 2 -/* A3A514 80241034 3C058024 */ lui $a1, %hi(D_80246430_8E0530) -/* A3A518 80241038 24A56430 */ addiu $a1, $a1, %lo(D_80246430_8E0530) -.L8024103C: -/* A3A51C 8024103C 24630004 */ addiu $v1, $v1, 4 -/* A3A520 80241040 24840001 */ addiu $a0, $a0, 1 -/* A3A524 80241044 ACA20000 */ sw $v0, ($a1) -/* A3A528 80241048 8C620000 */ lw $v0, ($v1) -/* A3A52C 8024104C 1440FFFB */ bnez $v0, .L8024103C -/* A3A530 80241050 24A50004 */ addiu $a1, $a1, 4 -/* A3A534 80241054 00041080 */ sll $v0, $a0, 2 -.L80241058: -/* A3A538 80241058 3C018024 */ lui $at, %hi(D_80246430_8E0530) -/* A3A53C 8024105C 00220821 */ addu $at, $at, $v0 -/* A3A540 80241060 AC206430 */ sw $zero, %lo(D_80246430_8E0530)($at) -/* A3A544 80241064 08090425 */ j .L80241094 -/* A3A548 80241068 00000000 */ nop -.L8024106C: -/* A3A54C 8024106C 3C038024 */ lui $v1, %hi(D_80246430_8E0530) -/* A3A550 80241070 24636430 */ addiu $v1, $v1, %lo(D_80246430_8E0530) -/* A3A554 80241074 0060282D */ daddu $a1, $v1, $zero -.L80241078: -/* A3A558 80241078 24820010 */ addiu $v0, $a0, 0x10 -/* A3A55C 8024107C AC620000 */ sw $v0, ($v1) -/* A3A560 80241080 24630004 */ addiu $v1, $v1, 4 -/* A3A564 80241084 24840001 */ addiu $a0, $a0, 1 -/* A3A568 80241088 28820070 */ slti $v0, $a0, 0x70 -/* A3A56C 8024108C 1440FFFA */ bnez $v0, .L80241078 -/* A3A570 80241090 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241094: -/* A3A574 80241094 8FBF0010 */ lw $ra, 0x10($sp) -/* A3A578 80241098 24020002 */ addiu $v0, $zero, 2 -/* A3A57C 8024109C 03E00008 */ jr $ra -/* A3A580 802410A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s deleted file mode 100644 index 6d1b90571e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241578_B2D9E8 -/* B2D9E8 80241578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2D9EC 8024157C AFBF0010 */ sw $ra, 0x10($sp) -/* B2D9F0 80241580 8C82000C */ lw $v0, 0xc($a0) -/* B2D9F4 80241584 0C0B1EAF */ jal evt_get_variable -/* B2D9F8 80241588 8C450000 */ lw $a1, ($v0) -/* B2D9FC 8024158C 0040182D */ daddu $v1, $v0, $zero -/* B2DA00 80241590 10600012 */ beqz $v1, .L802415DC -/* B2DA04 80241594 0000202D */ daddu $a0, $zero, $zero -/* B2DA08 80241598 8C620000 */ lw $v0, ($v1) -/* B2DA0C 8024159C 5040000A */ beql $v0, $zero, .L802415C8 -/* B2DA10 802415A0 00041080 */ sll $v0, $a0, 2 -/* B2DA14 802415A4 3C058025 */ lui $a1, %hi(D_80248760_jan_02) -/* B2DA18 802415A8 24A58760 */ addiu $a1, $a1, %lo(D_80248760_jan_02) -.L802415AC: -/* B2DA1C 802415AC 24630004 */ addiu $v1, $v1, 4 -/* B2DA20 802415B0 24840001 */ addiu $a0, $a0, 1 -/* B2DA24 802415B4 ACA20000 */ sw $v0, ($a1) -/* B2DA28 802415B8 8C620000 */ lw $v0, ($v1) -/* B2DA2C 802415BC 1440FFFB */ bnez $v0, .L802415AC -/* B2DA30 802415C0 24A50004 */ addiu $a1, $a1, 4 -/* B2DA34 802415C4 00041080 */ sll $v0, $a0, 2 -.L802415C8: -/* B2DA38 802415C8 3C018025 */ lui $at, %hi(D_80248760_jan_02) -/* B2DA3C 802415CC 00220821 */ addu $at, $at, $v0 -/* B2DA40 802415D0 AC208760 */ sw $zero, %lo(D_80248760_jan_02)($at) -/* B2DA44 802415D4 08090581 */ j .L80241604 -/* B2DA48 802415D8 00000000 */ nop -.L802415DC: -/* B2DA4C 802415DC 3C038025 */ lui $v1, %hi(D_80248760_jan_02) -/* B2DA50 802415E0 24638760 */ addiu $v1, $v1, %lo(D_80248760_jan_02) -/* B2DA54 802415E4 0060282D */ daddu $a1, $v1, $zero -.L802415E8: -/* B2DA58 802415E8 24820010 */ addiu $v0, $a0, 0x10 -/* B2DA5C 802415EC AC620000 */ sw $v0, ($v1) -/* B2DA60 802415F0 24630004 */ addiu $v1, $v1, 4 -/* B2DA64 802415F4 24840001 */ addiu $a0, $a0, 1 -/* B2DA68 802415F8 28820070 */ slti $v0, $a0, 0x70 -/* B2DA6C 802415FC 1440FFFA */ bnez $v0, .L802415E8 -/* B2DA70 80241600 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241604: -/* B2DA74 80241604 8FBF0010 */ lw $ra, 0x10($sp) -/* B2DA78 80241608 24020002 */ addiu $v0, $zero, 2 -/* B2DA7C 8024160C 03E00008 */ jr $ra -/* B2DA80 80241610 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s deleted file mode 100644 index 450067297c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A64_B36634 -/* B36634 80241A64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36638 80241A68 AFBF0010 */ sw $ra, 0x10($sp) -/* B3663C 80241A6C 8C82000C */ lw $v0, 0xc($a0) -/* B36640 80241A70 0C0B1EAF */ jal evt_get_variable -/* B36644 80241A74 8C450000 */ lw $a1, ($v0) -/* B36648 80241A78 0040182D */ daddu $v1, $v0, $zero -/* B3664C 80241A7C 10600012 */ beqz $v1, .L80241AC8 -/* B36650 80241A80 0000202D */ daddu $a0, $zero, $zero -/* B36654 80241A84 8C620000 */ lw $v0, ($v1) -/* B36658 80241A88 5040000A */ beql $v0, $zero, .L80241AB4 -/* B3665C 80241A8C 00041080 */ sll $v0, $a0, 2 -/* B36660 80241A90 3C058025 */ lui $a1, %hi(D_8024FBA0) -/* B36664 80241A94 24A5FBA0 */ addiu $a1, $a1, %lo(D_8024FBA0) -.L80241A98: -/* B36668 80241A98 24630004 */ addiu $v1, $v1, 4 -/* B3666C 80241A9C 24840001 */ addiu $a0, $a0, 1 -/* B36670 80241AA0 ACA20000 */ sw $v0, ($a1) -/* B36674 80241AA4 8C620000 */ lw $v0, ($v1) -/* B36678 80241AA8 1440FFFB */ bnez $v0, .L80241A98 -/* B3667C 80241AAC 24A50004 */ addiu $a1, $a1, 4 -/* B36680 80241AB0 00041080 */ sll $v0, $a0, 2 -.L80241AB4: -/* B36684 80241AB4 3C018025 */ lui $at, %hi(D_8024FBA0) -/* B36688 80241AB8 00220821 */ addu $at, $at, $v0 -/* B3668C 80241ABC AC20FBA0 */ sw $zero, %lo(D_8024FBA0)($at) -/* B36690 80241AC0 080906BC */ j .L80241AF0 -/* B36694 80241AC4 00000000 */ nop -.L80241AC8: -/* B36698 80241AC8 3C038025 */ lui $v1, %hi(D_8024FBA0) -/* B3669C 80241ACC 2463FBA0 */ addiu $v1, $v1, %lo(D_8024FBA0) -/* B366A0 80241AD0 0060282D */ daddu $a1, $v1, $zero -.L80241AD4: -/* B366A4 80241AD4 24820010 */ addiu $v0, $a0, 0x10 -/* B366A8 80241AD8 AC620000 */ sw $v0, ($v1) -/* B366AC 80241ADC 24630004 */ addiu $v1, $v1, 4 -/* B366B0 80241AE0 24840001 */ addiu $a0, $a0, 1 -/* B366B4 80241AE4 28820070 */ slti $v0, $a0, 0x70 -/* B366B8 80241AE8 1440FFFA */ bnez $v0, .L80241AD4 -/* B366BC 80241AEC ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241AF0: -/* B366C0 80241AF0 8FBF0010 */ lw $ra, 0x10($sp) -/* B366C4 80241AF4 24020002 */ addiu $v0, $zero, 2 -/* B366C8 80241AF8 03E00008 */ jr $ra -/* B366CC 80241AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s deleted file mode 100644 index b1cb55f715..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B00_B366D0 -/* B366D0 80241B00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B366D4 80241B04 AFBF0010 */ sw $ra, 0x10($sp) -/* B366D8 80241B08 8C82000C */ lw $v0, 0xc($a0) -/* B366DC 80241B0C 0C0B1EAF */ jal evt_get_variable -/* B366E0 80241B10 8C450000 */ lw $a1, ($v0) -/* B366E4 80241B14 0040182D */ daddu $v1, $v0, $zero -/* B366E8 80241B18 10600012 */ beqz $v1, .L80241B64 -/* B366EC 80241B1C 0000202D */ daddu $a0, $zero, $zero -/* B366F0 80241B20 8C620000 */ lw $v0, ($v1) -/* B366F4 80241B24 5040000A */ beql $v0, $zero, .L80241B50 -/* B366F8 80241B28 00041080 */ sll $v0, $a0, 2 -/* B366FC 80241B2C 3C058025 */ lui $a1, %hi(D_8024FD68) -/* B36700 80241B30 24A5FD68 */ addiu $a1, $a1, %lo(D_8024FD68) -.L80241B34: -/* B36704 80241B34 24630004 */ addiu $v1, $v1, 4 -/* B36708 80241B38 24840001 */ addiu $a0, $a0, 1 -/* B3670C 80241B3C ACA20000 */ sw $v0, ($a1) -/* B36710 80241B40 8C620000 */ lw $v0, ($v1) -/* B36714 80241B44 1440FFFB */ bnez $v0, .L80241B34 -/* B36718 80241B48 24A50004 */ addiu $a1, $a1, 4 -/* B3671C 80241B4C 00041080 */ sll $v0, $a0, 2 -.L80241B50: -/* B36720 80241B50 3C018025 */ lui $at, %hi(D_8024FD68) -/* B36724 80241B54 00220821 */ addu $at, $at, $v0 -/* B36728 80241B58 AC20FD68 */ sw $zero, %lo(D_8024FD68)($at) -/* B3672C 80241B5C 080906E3 */ j .L80241B8C -/* B36730 80241B60 00000000 */ nop -.L80241B64: -/* B36734 80241B64 3C038025 */ lui $v1, %hi(D_8024FD68) -/* B36738 80241B68 2463FD68 */ addiu $v1, $v1, %lo(D_8024FD68) -/* B3673C 80241B6C 0060282D */ daddu $a1, $v1, $zero -.L80241B70: -/* B36740 80241B70 24820080 */ addiu $v0, $a0, 0x80 -/* B36744 80241B74 AC620000 */ sw $v0, ($v1) -/* B36748 80241B78 24630004 */ addiu $v1, $v1, 4 -/* B3674C 80241B7C 24840001 */ addiu $a0, $a0, 1 -/* B36750 80241B80 2882005B */ slti $v0, $a0, 0x5b -/* B36754 80241B84 1440FFFA */ bnez $v0, .L80241B70 -/* B36758 80241B88 ACA0016C */ sw $zero, 0x16c($a1) -.L80241B8C: -/* B3675C 80241B8C 8FBF0010 */ lw $ra, 0x10($sp) -/* B36760 80241B90 24020002 */ addiu $v0, $zero, 2 -/* B36764 80241B94 03E00008 */ jr $ra -/* B36768 80241B98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s deleted file mode 100644 index 8d767ff3f8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F8_8B2368 -/* 8B2368 802422F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B236C 802422FC AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2370 80242300 8C82000C */ lw $v0, 0xc($a0) -/* 8B2374 80242304 0C0B1EAF */ jal evt_get_variable -/* 8B2378 80242308 8C450000 */ lw $a1, ($v0) -/* 8B237C 8024230C 0040182D */ daddu $v1, $v0, $zero -/* 8B2380 80242310 10600012 */ beqz $v1, .L8024235C -/* 8B2384 80242314 0000202D */ daddu $a0, $zero, $zero -/* 8B2388 80242318 8C620000 */ lw $v0, ($v1) -/* 8B238C 8024231C 5040000A */ beql $v0, $zero, .L80242348 -/* 8B2390 80242320 00041080 */ sll $v0, $a0, 2 -/* 8B2394 80242324 3C058025 */ lui $a1, %hi(D_80257F58) -/* 8B2398 80242328 24A57F58 */ addiu $a1, $a1, %lo(D_80257F58) -.L8024232C: -/* 8B239C 8024232C 24630004 */ addiu $v1, $v1, 4 -/* 8B23A0 80242330 24840001 */ addiu $a0, $a0, 1 -/* 8B23A4 80242334 ACA20000 */ sw $v0, ($a1) -/* 8B23A8 80242338 8C620000 */ lw $v0, ($v1) -/* 8B23AC 8024233C 1440FFFB */ bnez $v0, .L8024232C -/* 8B23B0 80242340 24A50004 */ addiu $a1, $a1, 4 -/* 8B23B4 80242344 00041080 */ sll $v0, $a0, 2 -.L80242348: -/* 8B23B8 80242348 3C018025 */ lui $at, %hi(D_80257F58) -/* 8B23BC 8024234C 00220821 */ addu $at, $at, $v0 -/* 8B23C0 80242350 AC207F58 */ sw $zero, %lo(D_80257F58)($at) -/* 8B23C4 80242354 080908E1 */ j .L80242384 -/* 8B23C8 80242358 00000000 */ nop -.L8024235C: -/* 8B23CC 8024235C 3C038025 */ lui $v1, %hi(D_80257F58) -/* 8B23D0 80242360 24637F58 */ addiu $v1, $v1, %lo(D_80257F58) -/* 8B23D4 80242364 0060282D */ daddu $a1, $v1, $zero -.L80242368: -/* 8B23D8 80242368 24820010 */ addiu $v0, $a0, 0x10 -/* 8B23DC 8024236C AC620000 */ sw $v0, ($v1) -/* 8B23E0 80242370 24630004 */ addiu $v1, $v1, 4 -/* 8B23E4 80242374 24840001 */ addiu $a0, $a0, 1 -/* 8B23E8 80242378 28820070 */ slti $v0, $a0, 0x70 -/* 8B23EC 8024237C 1440FFFA */ bnez $v0, .L80242368 -/* 8B23F0 80242380 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242384: -/* 8B23F4 80242384 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B23F8 80242388 24020002 */ addiu $v0, $zero, 2 -/* 8B23FC 8024238C 03E00008 */ jr $ra -/* 8B2400 80242390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s deleted file mode 100644 index 6cb3c5cdae..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A4_A78864 -/* A78864 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A78868 802403A8 AFBF0010 */ sw $ra, 0x10($sp) -/* A7886C 802403AC 8C82000C */ lw $v0, 0xc($a0) -/* A78870 802403B0 0C0B1EAF */ jal evt_get_variable -/* A78874 802403B4 8C450000 */ lw $a1, ($v0) -/* A78878 802403B8 0040182D */ daddu $v1, $v0, $zero -/* A7887C 802403BC 10600012 */ beqz $v1, .L80240408 -/* A78880 802403C0 0000202D */ daddu $a0, $zero, $zero -/* A78884 802403C4 8C620000 */ lw $v0, ($v1) -/* A78888 802403C8 5040000A */ beql $v0, $zero, .L802403F4 -/* A7888C 802403CC 00041080 */ sll $v0, $a0, 2 -/* A78890 802403D0 3C058024 */ lui $a1, %hi(D_80242208) -/* A78894 802403D4 24A52208 */ addiu $a1, $a1, %lo(D_80242208) -.L802403D8: -/* A78898 802403D8 24630004 */ addiu $v1, $v1, 4 -/* A7889C 802403DC 24840001 */ addiu $a0, $a0, 1 -/* A788A0 802403E0 ACA20000 */ sw $v0, ($a1) -/* A788A4 802403E4 8C620000 */ lw $v0, ($v1) -/* A788A8 802403E8 1440FFFB */ bnez $v0, .L802403D8 -/* A788AC 802403EC 24A50004 */ addiu $a1, $a1, 4 -/* A788B0 802403F0 00041080 */ sll $v0, $a0, 2 -.L802403F4: -/* A788B4 802403F4 3C018024 */ lui $at, %hi(D_80242208) -/* A788B8 802403F8 00220821 */ addu $at, $at, $v0 -/* A788BC 802403FC AC202208 */ sw $zero, %lo(D_80242208)($at) -/* A788C0 80240400 0809010C */ j .L80240430 -/* A788C4 80240404 00000000 */ nop -.L80240408: -/* A788C8 80240408 3C038024 */ lui $v1, %hi(D_80242208) -/* A788CC 8024040C 24632208 */ addiu $v1, $v1, %lo(D_80242208) -/* A788D0 80240410 0060282D */ daddu $a1, $v1, $zero -.L80240414: -/* A788D4 80240414 24820080 */ addiu $v0, $a0, 0x80 -/* A788D8 80240418 AC620000 */ sw $v0, ($v1) -/* A788DC 8024041C 24630004 */ addiu $v1, $v1, 4 -/* A788E0 80240420 24840001 */ addiu $a0, $a0, 1 -/* A788E4 80240424 2882005B */ slti $v0, $a0, 0x5b -/* A788E8 80240428 1440FFFA */ bnez $v0, .L80240414 -/* A788EC 8024042C ACA0016C */ sw $zero, 0x16c($a1) -.L80240430: -/* A788F0 80240430 8FBF0010 */ lw $ra, 0x10($sp) -/* A788F4 80240434 24020002 */ addiu $v0, $zero, 2 -/* A788F8 80240438 03E00008 */ jr $ra -/* A788FC 8024043C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s deleted file mode 100644 index 35ef2fe28d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240308_A7A808 -/* A7A808 80240308 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A80C 8024030C AFBF0010 */ sw $ra, 0x10($sp) -/* A7A810 80240310 8C82000C */ lw $v0, 0xc($a0) -/* A7A814 80240314 0C0B1EAF */ jal evt_get_variable -/* A7A818 80240318 8C450000 */ lw $a1, ($v0) -/* A7A81C 8024031C 0040182D */ daddu $v1, $v0, $zero -/* A7A820 80240320 10600012 */ beqz $v1, .L8024036C -/* A7A824 80240324 0000202D */ daddu $a0, $zero, $zero -/* A7A828 80240328 8C620000 */ lw $v0, ($v1) -/* A7A82C 8024032C 5040000A */ beql $v0, $zero, .L80240358 -/* A7A830 80240330 00041080 */ sll $v0, $a0, 2 -/* A7A834 80240334 3C058025 */ lui $a1, %hi(D_80248F90) -/* A7A838 80240338 24A58F90 */ addiu $a1, $a1, %lo(D_80248F90) -.L8024033C: -/* A7A83C 8024033C 24630004 */ addiu $v1, $v1, 4 -/* A7A840 80240340 24840001 */ addiu $a0, $a0, 1 -/* A7A844 80240344 ACA20000 */ sw $v0, ($a1) -/* A7A848 80240348 8C620000 */ lw $v0, ($v1) -/* A7A84C 8024034C 1440FFFB */ bnez $v0, .L8024033C -/* A7A850 80240350 24A50004 */ addiu $a1, $a1, 4 -/* A7A854 80240354 00041080 */ sll $v0, $a0, 2 -.L80240358: -/* A7A858 80240358 3C018025 */ lui $at, %hi(D_80248F90) -/* A7A85C 8024035C 00220821 */ addu $at, $at, $v0 -/* A7A860 80240360 AC208F90 */ sw $zero, %lo(D_80248F90)($at) -/* A7A864 80240364 080900E5 */ j .L80240394 -/* A7A868 80240368 00000000 */ nop -.L8024036C: -/* A7A86C 8024036C 3C038025 */ lui $v1, %hi(D_80248F90) -/* A7A870 80240370 24638F90 */ addiu $v1, $v1, %lo(D_80248F90) -/* A7A874 80240374 0060282D */ daddu $a1, $v1, $zero -.L80240378: -/* A7A878 80240378 24820010 */ addiu $v0, $a0, 0x10 -/* A7A87C 8024037C AC620000 */ sw $v0, ($v1) -/* A7A880 80240380 24630004 */ addiu $v1, $v1, 4 -/* A7A884 80240384 24840001 */ addiu $a0, $a0, 1 -/* A7A888 80240388 28820070 */ slti $v0, $a0, 0x70 -/* A7A88C 8024038C 1440FFFA */ bnez $v0, .L80240378 -/* A7A890 80240390 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240394: -/* A7A894 80240394 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A898 80240398 24020002 */ addiu $v0, $zero, 2 -/* A7A89C 8024039C 03E00008 */ jr $ra -/* A7A8A0 802403A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s deleted file mode 100644 index 8b6469be07..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A4_A7A8A4 -/* A7A8A4 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7A8A8 802403A8 AFBF0010 */ sw $ra, 0x10($sp) -/* A7A8AC 802403AC 8C82000C */ lw $v0, 0xc($a0) -/* A7A8B0 802403B0 0C0B1EAF */ jal evt_get_variable -/* A7A8B4 802403B4 8C450000 */ lw $a1, ($v0) -/* A7A8B8 802403B8 0040182D */ daddu $v1, $v0, $zero -/* A7A8BC 802403BC 10600012 */ beqz $v1, .L80240408 -/* A7A8C0 802403C0 0000202D */ daddu $a0, $zero, $zero -/* A7A8C4 802403C4 8C620000 */ lw $v0, ($v1) -/* A7A8C8 802403C8 5040000A */ beql $v0, $zero, .L802403F4 -/* A7A8CC 802403CC 00041080 */ sll $v0, $a0, 2 -/* A7A8D0 802403D0 3C058025 */ lui $a1, %hi(D_80249158) -/* A7A8D4 802403D4 24A59158 */ addiu $a1, $a1, %lo(D_80249158) -.L802403D8: -/* A7A8D8 802403D8 24630004 */ addiu $v1, $v1, 4 -/* A7A8DC 802403DC 24840001 */ addiu $a0, $a0, 1 -/* A7A8E0 802403E0 ACA20000 */ sw $v0, ($a1) -/* A7A8E4 802403E4 8C620000 */ lw $v0, ($v1) -/* A7A8E8 802403E8 1440FFFB */ bnez $v0, .L802403D8 -/* A7A8EC 802403EC 24A50004 */ addiu $a1, $a1, 4 -/* A7A8F0 802403F0 00041080 */ sll $v0, $a0, 2 -.L802403F4: -/* A7A8F4 802403F4 3C018025 */ lui $at, %hi(D_80249158) -/* A7A8F8 802403F8 00220821 */ addu $at, $at, $v0 -/* A7A8FC 802403FC AC209158 */ sw $zero, %lo(D_80249158)($at) -/* A7A900 80240400 0809010C */ j .L80240430 -/* A7A904 80240404 00000000 */ nop -.L80240408: -/* A7A908 80240408 3C038025 */ lui $v1, %hi(D_80249158) -/* A7A90C 8024040C 24639158 */ addiu $v1, $v1, %lo(D_80249158) -/* A7A910 80240410 0060282D */ daddu $a1, $v1, $zero -.L80240414: -/* A7A914 80240414 24820080 */ addiu $v0, $a0, 0x80 -/* A7A918 80240418 AC620000 */ sw $v0, ($v1) -/* A7A91C 8024041C 24630004 */ addiu $v1, $v1, 4 -/* A7A920 80240420 24840001 */ addiu $a0, $a0, 1 -/* A7A924 80240424 2882005B */ slti $v0, $a0, 0x5b -/* A7A928 80240428 1440FFFA */ bnez $v0, .L80240414 -/* A7A92C 8024042C ACA0016C */ sw $zero, 0x16c($a1) -.L80240430: -/* A7A930 80240430 8FBF0010 */ lw $ra, 0x10($sp) -/* A7A934 80240434 24020002 */ addiu $v0, $zero, 2 -/* A7A938 80240438 03E00008 */ jr $ra -/* A7A93C 8024043C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s deleted file mode 100644 index 0c3e8f6e3f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024197C_7EC68C -/* 7EC68C 8024197C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC690 80241980 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC694 80241984 8C82000C */ lw $v0, 0xc($a0) -/* 7EC698 80241988 0C0B1EAF */ jal evt_get_variable -/* 7EC69C 8024198C 8C450000 */ lw $a1, ($v0) -/* 7EC6A0 80241990 0040182D */ daddu $v1, $v0, $zero -/* 7EC6A4 80241994 10600012 */ beqz $v1, .L802419E0 -/* 7EC6A8 80241998 0000202D */ daddu $a0, $zero, $zero -/* 7EC6AC 8024199C 8C620000 */ lw $v0, ($v1) -/* 7EC6B0 802419A0 5040000A */ beql $v0, $zero, .L802419CC -/* 7EC6B4 802419A4 00041080 */ sll $v0, $a0, 2 -/* 7EC6B8 802419A8 3C058025 */ lui $a1, %hi(D_80255BA0) -/* 7EC6BC 802419AC 24A55BA0 */ addiu $a1, $a1, %lo(D_80255BA0) -.L802419B0: -/* 7EC6C0 802419B0 24630004 */ addiu $v1, $v1, 4 -/* 7EC6C4 802419B4 24840001 */ addiu $a0, $a0, 1 -/* 7EC6C8 802419B8 ACA20000 */ sw $v0, ($a1) -/* 7EC6CC 802419BC 8C620000 */ lw $v0, ($v1) -/* 7EC6D0 802419C0 1440FFFB */ bnez $v0, .L802419B0 -/* 7EC6D4 802419C4 24A50004 */ addiu $a1, $a1, 4 -/* 7EC6D8 802419C8 00041080 */ sll $v0, $a0, 2 -.L802419CC: -/* 7EC6DC 802419CC 3C018025 */ lui $at, %hi(D_80255BA0) -/* 7EC6E0 802419D0 00220821 */ addu $at, $at, $v0 -/* 7EC6E4 802419D4 AC205BA0 */ sw $zero, %lo(D_80255BA0)($at) -/* 7EC6E8 802419D8 08090682 */ j .L80241A08 -/* 7EC6EC 802419DC 00000000 */ nop -.L802419E0: -/* 7EC6F0 802419E0 3C038025 */ lui $v1, %hi(D_80255BA0) -/* 7EC6F4 802419E4 24635BA0 */ addiu $v1, $v1, %lo(D_80255BA0) -/* 7EC6F8 802419E8 0060282D */ daddu $a1, $v1, $zero -.L802419EC: -/* 7EC6FC 802419EC 24820010 */ addiu $v0, $a0, 0x10 -/* 7EC700 802419F0 AC620000 */ sw $v0, ($v1) -/* 7EC704 802419F4 24630004 */ addiu $v1, $v1, 4 -/* 7EC708 802419F8 24840001 */ addiu $a0, $a0, 1 -/* 7EC70C 802419FC 28820070 */ slti $v0, $a0, 0x70 -/* 7EC710 80241A00 1440FFFA */ bnez $v0, .L802419EC -/* 7EC714 80241A04 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241A08: -/* 7EC718 80241A08 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC71C 80241A0C 24020002 */ addiu $v0, $zero, 2 -/* 7EC720 80241A10 03E00008 */ jr $ra -/* 7EC724 80241A14 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s deleted file mode 100644 index 645249dc69..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A18_7EC728 -/* 7EC728 80241A18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC72C 80241A1C AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC730 80241A20 8C82000C */ lw $v0, 0xc($a0) -/* 7EC734 80241A24 0C0B1EAF */ jal evt_get_variable -/* 7EC738 80241A28 8C450000 */ lw $a1, ($v0) -/* 7EC73C 80241A2C 0040182D */ daddu $v1, $v0, $zero -/* 7EC740 80241A30 10600012 */ beqz $v1, .L80241A7C -/* 7EC744 80241A34 0000202D */ daddu $a0, $zero, $zero -/* 7EC748 80241A38 8C620000 */ lw $v0, ($v1) -/* 7EC74C 80241A3C 5040000A */ beql $v0, $zero, .L80241A68 -/* 7EC750 80241A40 00041080 */ sll $v0, $a0, 2 -/* 7EC754 80241A44 3C058025 */ lui $a1, %hi(D_80255D68) -/* 7EC758 80241A48 24A55D68 */ addiu $a1, $a1, %lo(D_80255D68) -.L80241A4C: -/* 7EC75C 80241A4C 24630004 */ addiu $v1, $v1, 4 -/* 7EC760 80241A50 24840001 */ addiu $a0, $a0, 1 -/* 7EC764 80241A54 ACA20000 */ sw $v0, ($a1) -/* 7EC768 80241A58 8C620000 */ lw $v0, ($v1) -/* 7EC76C 80241A5C 1440FFFB */ bnez $v0, .L80241A4C -/* 7EC770 80241A60 24A50004 */ addiu $a1, $a1, 4 -/* 7EC774 80241A64 00041080 */ sll $v0, $a0, 2 -.L80241A68: -/* 7EC778 80241A68 3C018025 */ lui $at, %hi(D_80255D68) -/* 7EC77C 80241A6C 00220821 */ addu $at, $at, $v0 -/* 7EC780 80241A70 AC205D68 */ sw $zero, %lo(D_80255D68)($at) -/* 7EC784 80241A74 080906A9 */ j .L80241AA4 -/* 7EC788 80241A78 00000000 */ nop -.L80241A7C: -/* 7EC78C 80241A7C 3C038025 */ lui $v1, %hi(D_80255D68) -/* 7EC790 80241A80 24635D68 */ addiu $v1, $v1, %lo(D_80255D68) -/* 7EC794 80241A84 0060282D */ daddu $a1, $v1, $zero -.L80241A88: -/* 7EC798 80241A88 24820080 */ addiu $v0, $a0, 0x80 -/* 7EC79C 80241A8C AC620000 */ sw $v0, ($v1) -/* 7EC7A0 80241A90 24630004 */ addiu $v1, $v1, 4 -/* 7EC7A4 80241A94 24840001 */ addiu $a0, $a0, 1 -/* 7EC7A8 80241A98 2882005B */ slti $v0, $a0, 0x5b -/* 7EC7AC 80241A9C 1440FFFA */ bnez $v0, .L80241A88 -/* 7EC7B0 80241AA0 ACA0016C */ sw $zero, 0x16c($a1) -.L80241AA4: -/* 7EC7B4 80241AA4 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC7B8 80241AA8 24020002 */ addiu $v0, $zero, 2 -/* 7EC7BC 80241AAC 03E00008 */ jr $ra -/* 7EC7C0 80241AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s deleted file mode 100644 index fa8eaa1f6d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437D0_7EE4E0 -/* 7EE4E0 802437D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE4E4 802437D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE4E8 802437D8 8C82000C */ lw $v0, 0xc($a0) -/* 7EE4EC 802437DC 0C0B1EAF */ jal evt_get_variable -/* 7EE4F0 802437E0 8C450000 */ lw $a1, ($v0) -/* 7EE4F4 802437E4 0040182D */ daddu $v1, $v0, $zero -/* 7EE4F8 802437E8 10600012 */ beqz $v1, .L80243834 -/* 7EE4FC 802437EC 0000202D */ daddu $a0, $zero, $zero -/* 7EE500 802437F0 8C620000 */ lw $v0, ($v1) -/* 7EE504 802437F4 5040000A */ beql $v0, $zero, .L80243820 -/* 7EE508 802437F8 00041080 */ sll $v0, $a0, 2 -/* 7EE50C 802437FC 3C058025 */ lui $a1, %hi(D_80255EE0) -/* 7EE510 80243800 24A55EE0 */ addiu $a1, $a1, %lo(D_80255EE0) -.L80243804: -/* 7EE514 80243804 24630004 */ addiu $v1, $v1, 4 -/* 7EE518 80243808 24840001 */ addiu $a0, $a0, 1 -/* 7EE51C 8024380C ACA20000 */ sw $v0, ($a1) -/* 7EE520 80243810 8C620000 */ lw $v0, ($v1) -/* 7EE524 80243814 1440FFFB */ bnez $v0, .L80243804 -/* 7EE528 80243818 24A50004 */ addiu $a1, $a1, 4 -/* 7EE52C 8024381C 00041080 */ sll $v0, $a0, 2 -.L80243820: -/* 7EE530 80243820 3C018025 */ lui $at, %hi(D_80255EE0) -/* 7EE534 80243824 00220821 */ addu $at, $at, $v0 -/* 7EE538 80243828 AC205EE0 */ sw $zero, %lo(D_80255EE0)($at) -/* 7EE53C 8024382C 08090E17 */ j .L8024385C -/* 7EE540 80243830 00000000 */ nop -.L80243834: -/* 7EE544 80243834 3C038025 */ lui $v1, %hi(D_80255EE0) -/* 7EE548 80243838 24635EE0 */ addiu $v1, $v1, %lo(D_80255EE0) -/* 7EE54C 8024383C 0060282D */ daddu $a1, $v1, $zero -.L80243840: -/* 7EE550 80243840 24820010 */ addiu $v0, $a0, 0x10 -/* 7EE554 80243844 AC620000 */ sw $v0, ($v1) -/* 7EE558 80243848 24630004 */ addiu $v1, $v1, 4 -/* 7EE55C 8024384C 24840001 */ addiu $a0, $a0, 1 -/* 7EE560 80243850 28820070 */ slti $v0, $a0, 0x70 -/* 7EE564 80243854 1440FFFA */ bnez $v0, .L80243840 -/* 7EE568 80243858 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024385C: -/* 7EE56C 8024385C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EE570 80243860 24020002 */ addiu $v0, $zero, 2 -/* 7EE574 80243864 03E00008 */ jr $ra -/* 7EE578 80243868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s deleted file mode 100644 index af1729b614..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243D60_8045E0 -/* 8045E0 80243D60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8045E4 80243D64 AFBF0010 */ sw $ra, 0x10($sp) -/* 8045E8 80243D68 8C82000C */ lw $v0, 0xc($a0) -/* 8045EC 80243D6C 0C0B1EAF */ jal evt_get_variable -/* 8045F0 80243D70 8C450000 */ lw $a1, ($v0) -/* 8045F4 80243D74 0040182D */ daddu $v1, $v0, $zero -/* 8045F8 80243D78 10600012 */ beqz $v1, .L80243DC4 -/* 8045FC 80243D7C 0000202D */ daddu $a0, $zero, $zero -/* 804600 80243D80 8C620000 */ lw $v0, ($v1) -/* 804604 80243D84 5040000A */ beql $v0, $zero, .L80243DB0 -/* 804608 80243D88 00041080 */ sll $v0, $a0, 2 -/* 80460C 80243D8C 3C058026 */ lui $a1, %hi(D_80262A70) -/* 804610 80243D90 24A52A70 */ addiu $a1, $a1, %lo(D_80262A70) -.L80243D94: -/* 804614 80243D94 24630004 */ addiu $v1, $v1, 4 -/* 804618 80243D98 24840001 */ addiu $a0, $a0, 1 -/* 80461C 80243D9C ACA20000 */ sw $v0, ($a1) -/* 804620 80243DA0 8C620000 */ lw $v0, ($v1) -/* 804624 80243DA4 1440FFFB */ bnez $v0, .L80243D94 -/* 804628 80243DA8 24A50004 */ addiu $a1, $a1, 4 -/* 80462C 80243DAC 00041080 */ sll $v0, $a0, 2 -.L80243DB0: -/* 804630 80243DB0 3C018026 */ lui $at, %hi(D_80262A70) -/* 804634 80243DB4 00220821 */ addu $at, $at, $v0 -/* 804638 80243DB8 AC202A70 */ sw $zero, %lo(D_80262A70)($at) -/* 80463C 80243DBC 08090F7B */ j .L80243DEC -/* 804640 80243DC0 00000000 */ nop -.L80243DC4: -/* 804644 80243DC4 3C038026 */ lui $v1, %hi(D_80262A70) -/* 804648 80243DC8 24632A70 */ addiu $v1, $v1, %lo(D_80262A70) -/* 80464C 80243DCC 0060282D */ daddu $a1, $v1, $zero -.L80243DD0: -/* 804650 80243DD0 24820010 */ addiu $v0, $a0, 0x10 -/* 804654 80243DD4 AC620000 */ sw $v0, ($v1) -/* 804658 80243DD8 24630004 */ addiu $v1, $v1, 4 -/* 80465C 80243DDC 24840001 */ addiu $a0, $a0, 1 -/* 804660 80243DE0 28820070 */ slti $v0, $a0, 0x70 -/* 804664 80243DE4 1440FFFA */ bnez $v0, .L80243DD0 -/* 804668 80243DE8 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80243DEC: -/* 80466C 80243DEC 8FBF0010 */ lw $ra, 0x10($sp) -/* 804670 80243DF0 24020002 */ addiu $v0, $zero, 2 -/* 804674 80243DF4 03E00008 */ jr $ra -/* 804678 80243DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s deleted file mode 100644 index 8817adbf28..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BA8_825E68 -/* 825E68 80242BA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825E6C 80242BAC AFBF0010 */ sw $ra, 0x10($sp) -/* 825E70 80242BB0 8C82000C */ lw $v0, 0xc($a0) -/* 825E74 80242BB4 0C0B1EAF */ jal evt_get_variable -/* 825E78 80242BB8 8C450000 */ lw $a1, ($v0) -/* 825E7C 80242BBC 0040182D */ daddu $v1, $v0, $zero -/* 825E80 80242BC0 10600012 */ beqz $v1, .L80242C0C -/* 825E84 80242BC4 0000202D */ daddu $a0, $zero, $zero -/* 825E88 80242BC8 8C620000 */ lw $v0, ($v1) -/* 825E8C 80242BCC 5040000A */ beql $v0, $zero, .L80242BF8 -/* 825E90 80242BD0 00041080 */ sll $v0, $a0, 2 -/* 825E94 80242BD4 3C058025 */ lui $a1, %hi(D_8024E738) -/* 825E98 80242BD8 24A5E738 */ addiu $a1, $a1, %lo(D_8024E738) -.L80242BDC: -/* 825E9C 80242BDC 24630004 */ addiu $v1, $v1, 4 -/* 825EA0 80242BE0 24840001 */ addiu $a0, $a0, 1 -/* 825EA4 80242BE4 ACA20000 */ sw $v0, ($a1) -/* 825EA8 80242BE8 8C620000 */ lw $v0, ($v1) -/* 825EAC 80242BEC 1440FFFB */ bnez $v0, .L80242BDC -/* 825EB0 80242BF0 24A50004 */ addiu $a1, $a1, 4 -/* 825EB4 80242BF4 00041080 */ sll $v0, $a0, 2 -.L80242BF8: -/* 825EB8 80242BF8 3C018025 */ lui $at, %hi(D_8024E738) -/* 825EBC 80242BFC 00220821 */ addu $at, $at, $v0 -/* 825EC0 80242C00 AC20E738 */ sw $zero, %lo(D_8024E738)($at) -/* 825EC4 80242C04 08090B0D */ j .L80242C34 -/* 825EC8 80242C08 00000000 */ nop -.L80242C0C: -/* 825ECC 80242C0C 3C038025 */ lui $v1, %hi(D_8024E738) -/* 825ED0 80242C10 2463E738 */ addiu $v1, $v1, %lo(D_8024E738) -/* 825ED4 80242C14 0060282D */ daddu $a1, $v1, $zero -.L80242C18: -/* 825ED8 80242C18 24820080 */ addiu $v0, $a0, 0x80 -/* 825EDC 80242C1C AC620000 */ sw $v0, ($v1) -/* 825EE0 80242C20 24630004 */ addiu $v1, $v1, 4 -/* 825EE4 80242C24 24840001 */ addiu $a0, $a0, 1 -/* 825EE8 80242C28 2882005B */ slti $v0, $a0, 0x5b -/* 825EEC 80242C2C 1440FFFA */ bnez $v0, .L80242C18 -/* 825EF0 80242C30 ACA0016C */ sw $zero, 0x16c($a1) -.L80242C34: -/* 825EF4 80242C34 8FBF0010 */ lw $ra, 0x10($sp) -/* 825EF8 80242C38 24020002 */ addiu $v0, $zero, 2 -/* 825EFC 80242C3C 03E00008 */ jr $ra -/* 825F00 80242C40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s deleted file mode 100644 index d454361253..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417FC_832FFC -/* 832FFC 802417FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833000 80241800 AFBF0010 */ sw $ra, 0x10($sp) -/* 833004 80241804 8C82000C */ lw $v0, 0xc($a0) -/* 833008 80241808 0C0B1EAF */ jal evt_get_variable -/* 83300C 8024180C 8C450000 */ lw $a1, ($v0) -/* 833010 80241810 0040182D */ daddu $v1, $v0, $zero -/* 833014 80241814 10600012 */ beqz $v1, .L80241860 -/* 833018 80241818 0000202D */ daddu $a0, $zero, $zero -/* 83301C 8024181C 8C620000 */ lw $v0, ($v1) -/* 833020 80241820 5040000A */ beql $v0, $zero, .L8024184C -/* 833024 80241824 00041080 */ sll $v0, $a0, 2 -/* 833028 80241828 3C058025 */ lui $a1, %hi(D_80251400) -/* 83302C 8024182C 24A51400 */ addiu $a1, $a1, %lo(D_80251400) -.L80241830: -/* 833030 80241830 24630004 */ addiu $v1, $v1, 4 -/* 833034 80241834 24840001 */ addiu $a0, $a0, 1 -/* 833038 80241838 ACA20000 */ sw $v0, ($a1) -/* 83303C 8024183C 8C620000 */ lw $v0, ($v1) -/* 833040 80241840 1440FFFB */ bnez $v0, .L80241830 -/* 833044 80241844 24A50004 */ addiu $a1, $a1, 4 -/* 833048 80241848 00041080 */ sll $v0, $a0, 2 -.L8024184C: -/* 83304C 8024184C 3C018025 */ lui $at, %hi(D_80251400) -/* 833050 80241850 00220821 */ addu $at, $at, $v0 -/* 833054 80241854 AC201400 */ sw $zero, %lo(D_80251400)($at) -/* 833058 80241858 08090622 */ j .L80241888 -/* 83305C 8024185C 00000000 */ nop -.L80241860: -/* 833060 80241860 3C038025 */ lui $v1, %hi(D_80251400) -/* 833064 80241864 24631400 */ addiu $v1, $v1, %lo(D_80251400) -/* 833068 80241868 0060282D */ daddu $a1, $v1, $zero -.L8024186C: -/* 83306C 8024186C 24820010 */ addiu $v0, $a0, 0x10 -/* 833070 80241870 AC620000 */ sw $v0, ($v1) -/* 833074 80241874 24630004 */ addiu $v1, $v1, 4 -/* 833078 80241878 24840001 */ addiu $a0, $a0, 1 -/* 83307C 8024187C 28820070 */ slti $v0, $a0, 0x70 -/* 833080 80241880 1440FFFA */ bnez $v0, .L8024186C -/* 833084 80241884 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241888: -/* 833088 80241888 8FBF0010 */ lw $ra, 0x10($sp) -/* 83308C 8024188C 24020002 */ addiu $v0, $zero, 2 -/* 833090 80241890 03E00008 */ jr $ra -/* 833094 80241894 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s deleted file mode 100644 index 7530c0bbc7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC_84437C -/* 84437C 802417AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844380 802417B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 844384 802417B4 8C82000C */ lw $v0, 0xc($a0) -/* 844388 802417B8 0C0B1EAF */ jal evt_get_variable -/* 84438C 802417BC 8C450000 */ lw $a1, ($v0) -/* 844390 802417C0 0040182D */ daddu $v1, $v0, $zero -/* 844394 802417C4 10600012 */ beqz $v1, .L80241810 -/* 844398 802417C8 0000202D */ daddu $a0, $zero, $zero -/* 84439C 802417CC 8C620000 */ lw $v0, ($v1) -/* 8443A0 802417D0 5040000A */ beql $v0, $zero, .L802417FC -/* 8443A4 802417D4 00041080 */ sll $v0, $a0, 2 -/* 8443A8 802417D8 3C058025 */ lui $a1, %hi(D_8024F5D0) -/* 8443AC 802417DC 24A5F5D0 */ addiu $a1, $a1, %lo(D_8024F5D0) -.L802417E0: -/* 8443B0 802417E0 24630004 */ addiu $v1, $v1, 4 -/* 8443B4 802417E4 24840001 */ addiu $a0, $a0, 1 -/* 8443B8 802417E8 ACA20000 */ sw $v0, ($a1) -/* 8443BC 802417EC 8C620000 */ lw $v0, ($v1) -/* 8443C0 802417F0 1440FFFB */ bnez $v0, .L802417E0 -/* 8443C4 802417F4 24A50004 */ addiu $a1, $a1, 4 -/* 8443C8 802417F8 00041080 */ sll $v0, $a0, 2 -.L802417FC: -/* 8443CC 802417FC 3C018025 */ lui $at, %hi(D_8024F5D0) -/* 8443D0 80241800 00220821 */ addu $at, $at, $v0 -/* 8443D4 80241804 AC20F5D0 */ sw $zero, %lo(D_8024F5D0)($at) -/* 8443D8 80241808 0809060E */ j .L80241838 -/* 8443DC 8024180C 00000000 */ nop -.L80241810: -/* 8443E0 80241810 3C038025 */ lui $v1, %hi(D_8024F5D0) -/* 8443E4 80241814 2463F5D0 */ addiu $v1, $v1, %lo(D_8024F5D0) -/* 8443E8 80241818 0060282D */ daddu $a1, $v1, $zero -.L8024181C: -/* 8443EC 8024181C 24820010 */ addiu $v0, $a0, 0x10 -/* 8443F0 80241820 AC620000 */ sw $v0, ($v1) -/* 8443F4 80241824 24630004 */ addiu $v1, $v1, 4 -/* 8443F8 80241828 24840001 */ addiu $a0, $a0, 1 -/* 8443FC 8024182C 28820070 */ slti $v0, $a0, 0x70 -/* 844400 80241830 1440FFFA */ bnez $v0, .L8024181C -/* 844404 80241834 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241838: -/* 844408 80241838 8FBF0010 */ lw $ra, 0x10($sp) -/* 84440C 8024183C 24020002 */ addiu $v0, $zero, 2 -/* 844410 80241840 03E00008 */ jr $ra -/* 844414 80241844 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s deleted file mode 100644 index 0b2c1959ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024266C_8547DC -/* 8547DC 8024266C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8547E0 80242670 AFBF0010 */ sw $ra, 0x10($sp) -/* 8547E4 80242674 8C82000C */ lw $v0, 0xc($a0) -/* 8547E8 80242678 0C0B1EAF */ jal evt_get_variable -/* 8547EC 8024267C 8C450000 */ lw $a1, ($v0) -/* 8547F0 80242680 0040182D */ daddu $v1, $v0, $zero -/* 8547F4 80242684 10600012 */ beqz $v1, .L802426D0 -/* 8547F8 80242688 0000202D */ daddu $a0, $zero, $zero -/* 8547FC 8024268C 8C620000 */ lw $v0, ($v1) -/* 854800 80242690 5040000A */ beql $v0, $zero, .L802426BC -/* 854804 80242694 00041080 */ sll $v0, $a0, 2 -/* 854808 80242698 3C058025 */ lui $a1, %hi(D_80252A00) -/* 85480C 8024269C 24A52A00 */ addiu $a1, $a1, %lo(D_80252A00) -.L802426A0: -/* 854810 802426A0 24630004 */ addiu $v1, $v1, 4 -/* 854814 802426A4 24840001 */ addiu $a0, $a0, 1 -/* 854818 802426A8 ACA20000 */ sw $v0, ($a1) -/* 85481C 802426AC 8C620000 */ lw $v0, ($v1) -/* 854820 802426B0 1440FFFB */ bnez $v0, .L802426A0 -/* 854824 802426B4 24A50004 */ addiu $a1, $a1, 4 -/* 854828 802426B8 00041080 */ sll $v0, $a0, 2 -.L802426BC: -/* 85482C 802426BC 3C018025 */ lui $at, %hi(D_80252A00) -/* 854830 802426C0 00220821 */ addu $at, $at, $v0 -/* 854834 802426C4 AC202A00 */ sw $zero, %lo(D_80252A00)($at) -/* 854838 802426C8 080909BE */ j .L802426F8 -/* 85483C 802426CC 00000000 */ nop -.L802426D0: -/* 854840 802426D0 3C038025 */ lui $v1, %hi(D_80252A00) -/* 854844 802426D4 24632A00 */ addiu $v1, $v1, %lo(D_80252A00) -/* 854848 802426D8 0060282D */ daddu $a1, $v1, $zero -.L802426DC: -/* 85484C 802426DC 24820010 */ addiu $v0, $a0, 0x10 -/* 854850 802426E0 AC620000 */ sw $v0, ($v1) -/* 854854 802426E4 24630004 */ addiu $v1, $v1, 4 -/* 854858 802426E8 24840001 */ addiu $a0, $a0, 1 -/* 85485C 802426EC 28820070 */ slti $v0, $a0, 0x70 -/* 854860 802426F0 1440FFFA */ bnez $v0, .L802426DC -/* 854864 802426F4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802426F8: -/* 854868 802426F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 85486C 802426FC 24020002 */ addiu $v0, $zero, 2 -/* 854870 80242700 03E00008 */ jr $ra -/* 854874 80242704 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s deleted file mode 100644 index 1d4d905269..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242708_854878 -/* 854878 80242708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 85487C 8024270C AFBF0010 */ sw $ra, 0x10($sp) -/* 854880 80242710 8C82000C */ lw $v0, 0xc($a0) -/* 854884 80242714 0C0B1EAF */ jal evt_get_variable -/* 854888 80242718 8C450000 */ lw $a1, ($v0) -/* 85488C 8024271C 0040182D */ daddu $v1, $v0, $zero -/* 854890 80242720 10600012 */ beqz $v1, .L8024276C -/* 854894 80242724 0000202D */ daddu $a0, $zero, $zero -/* 854898 80242728 8C620000 */ lw $v0, ($v1) -/* 85489C 8024272C 5040000A */ beql $v0, $zero, .L80242758 -/* 8548A0 80242730 00041080 */ sll $v0, $a0, 2 -/* 8548A4 80242734 3C058025 */ lui $a1, %hi(D_80252BC8) -/* 8548A8 80242738 24A52BC8 */ addiu $a1, $a1, %lo(D_80252BC8) -.L8024273C: -/* 8548AC 8024273C 24630004 */ addiu $v1, $v1, 4 -/* 8548B0 80242740 24840001 */ addiu $a0, $a0, 1 -/* 8548B4 80242744 ACA20000 */ sw $v0, ($a1) -/* 8548B8 80242748 8C620000 */ lw $v0, ($v1) -/* 8548BC 8024274C 1440FFFB */ bnez $v0, .L8024273C -/* 8548C0 80242750 24A50004 */ addiu $a1, $a1, 4 -/* 8548C4 80242754 00041080 */ sll $v0, $a0, 2 -.L80242758: -/* 8548C8 80242758 3C018025 */ lui $at, %hi(D_80252BC8) -/* 8548CC 8024275C 00220821 */ addu $at, $at, $v0 -/* 8548D0 80242760 AC202BC8 */ sw $zero, %lo(D_80252BC8)($at) -/* 8548D4 80242764 080909E5 */ j .L80242794 -/* 8548D8 80242768 00000000 */ nop -.L8024276C: -/* 8548DC 8024276C 3C038025 */ lui $v1, %hi(D_80252BC8) -/* 8548E0 80242770 24632BC8 */ addiu $v1, $v1, %lo(D_80252BC8) -/* 8548E4 80242774 0060282D */ daddu $a1, $v1, $zero -.L80242778: -/* 8548E8 80242778 24820080 */ addiu $v0, $a0, 0x80 -/* 8548EC 8024277C AC620000 */ sw $v0, ($v1) -/* 8548F0 80242780 24630004 */ addiu $v1, $v1, 4 -/* 8548F4 80242784 24840001 */ addiu $a0, $a0, 1 -/* 8548F8 80242788 2882005B */ slti $v0, $a0, 0x5b -/* 8548FC 8024278C 1440FFFA */ bnez $v0, .L80242778 -/* 854900 80242790 ACA0016C */ sw $zero, 0x16c($a1) -.L80242794: -/* 854904 80242794 8FBF0010 */ lw $ra, 0x10($sp) -/* 854908 80242798 24020002 */ addiu $v0, $zero, 2 -/* 85490C 8024279C 03E00008 */ jr $ra -/* 854910 802427A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s deleted file mode 100644 index 95d1f71fd8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420B4_9C7494 -/* 9C7494 802420B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7498 802420B8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C749C 802420BC 8C82000C */ lw $v0, 0xc($a0) -/* 9C74A0 802420C0 0C0B1EAF */ jal evt_get_variable -/* 9C74A4 802420C4 8C450000 */ lw $a1, ($v0) -/* 9C74A8 802420C8 0040182D */ daddu $v1, $v0, $zero -/* 9C74AC 802420CC 10600012 */ beqz $v1, .L80242118 -/* 9C74B0 802420D0 0000202D */ daddu $a0, $zero, $zero -/* 9C74B4 802420D4 8C620000 */ lw $v0, ($v1) -/* 9C74B8 802420D8 5040000A */ beql $v0, $zero, .L80242104 -/* 9C74BC 802420DC 00041080 */ sll $v0, $a0, 2 -/* 9C74C0 802420E0 3C058025 */ lui $a1, %hi(D_80251C70) -/* 9C74C4 802420E4 24A51C70 */ addiu $a1, $a1, %lo(D_80251C70) -.L802420E8: -/* 9C74C8 802420E8 24630004 */ addiu $v1, $v1, 4 -/* 9C74CC 802420EC 24840001 */ addiu $a0, $a0, 1 -/* 9C74D0 802420F0 ACA20000 */ sw $v0, ($a1) -/* 9C74D4 802420F4 8C620000 */ lw $v0, ($v1) -/* 9C74D8 802420F8 1440FFFB */ bnez $v0, .L802420E8 -/* 9C74DC 802420FC 24A50004 */ addiu $a1, $a1, 4 -/* 9C74E0 80242100 00041080 */ sll $v0, $a0, 2 -.L80242104: -/* 9C74E4 80242104 3C018025 */ lui $at, %hi(D_80251C70) -/* 9C74E8 80242108 00220821 */ addu $at, $at, $v0 -/* 9C74EC 8024210C AC201C70 */ sw $zero, %lo(D_80251C70)($at) -/* 9C74F0 80242110 08090850 */ j .L80242140 -/* 9C74F4 80242114 00000000 */ nop -.L80242118: -/* 9C74F8 80242118 3C038025 */ lui $v1, %hi(D_80251C70) -/* 9C74FC 8024211C 24631C70 */ addiu $v1, $v1, %lo(D_80251C70) -/* 9C7500 80242120 0060282D */ daddu $a1, $v1, $zero -.L80242124: -/* 9C7504 80242124 24820010 */ addiu $v0, $a0, 0x10 -/* 9C7508 80242128 AC620000 */ sw $v0, ($v1) -/* 9C750C 8024212C 24630004 */ addiu $v1, $v1, 4 -/* 9C7510 80242130 24840001 */ addiu $a0, $a0, 1 -/* 9C7514 80242134 28820070 */ slti $v0, $a0, 0x70 -/* 9C7518 80242138 1440FFFA */ bnez $v0, .L80242124 -/* 9C751C 8024213C ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242140: -/* 9C7520 80242140 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7524 80242144 24020002 */ addiu $v0, $zero, 2 -/* 9C7528 80242148 03E00008 */ jr $ra -/* 9C752C 8024214C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s deleted file mode 100644 index a1ae9543e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406B0_9D76D0 -/* 9D76D0 802406B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D76D4 802406B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D76D8 802406B8 8C82000C */ lw $v0, 0xc($a0) -/* 9D76DC 802406BC 0C0B1EAF */ jal evt_get_variable -/* 9D76E0 802406C0 8C450000 */ lw $a1, ($v0) -/* 9D76E4 802406C4 0040182D */ daddu $v1, $v0, $zero -/* 9D76E8 802406C8 10600012 */ beqz $v1, .L80240714 -/* 9D76EC 802406CC 0000202D */ daddu $a0, $zero, $zero -/* 9D76F0 802406D0 8C620000 */ lw $v0, ($v1) -/* 9D76F4 802406D4 5040000A */ beql $v0, $zero, .L80240700 -/* 9D76F8 802406D8 00041080 */ sll $v0, $a0, 2 -/* 9D76FC 802406DC 3C058025 */ lui $a1, %hi(D_802547D0) -/* 9D7700 802406E0 24A547D0 */ addiu $a1, $a1, %lo(D_802547D0) -.L802406E4: -/* 9D7704 802406E4 24630004 */ addiu $v1, $v1, 4 -/* 9D7708 802406E8 24840001 */ addiu $a0, $a0, 1 -/* 9D770C 802406EC ACA20000 */ sw $v0, ($a1) -/* 9D7710 802406F0 8C620000 */ lw $v0, ($v1) -/* 9D7714 802406F4 1440FFFB */ bnez $v0, .L802406E4 -/* 9D7718 802406F8 24A50004 */ addiu $a1, $a1, 4 -/* 9D771C 802406FC 00041080 */ sll $v0, $a0, 2 -.L80240700: -/* 9D7720 80240700 3C018025 */ lui $at, %hi(D_802547D0) -/* 9D7724 80240704 00220821 */ addu $at, $at, $v0 -/* 9D7728 80240708 AC2047D0 */ sw $zero, %lo(D_802547D0)($at) -/* 9D772C 8024070C 080901CF */ j .L8024073C -/* 9D7730 80240710 00000000 */ nop -.L80240714: -/* 9D7734 80240714 3C038025 */ lui $v1, %hi(D_802547D0) -/* 9D7738 80240718 246347D0 */ addiu $v1, $v1, %lo(D_802547D0) -/* 9D773C 8024071C 0060282D */ daddu $a1, $v1, $zero -.L80240720: -/* 9D7740 80240720 24820010 */ addiu $v0, $a0, 0x10 -/* 9D7744 80240724 AC620000 */ sw $v0, ($v1) -/* 9D7748 80240728 24630004 */ addiu $v1, $v1, 4 -/* 9D774C 8024072C 24840001 */ addiu $a0, $a0, 1 -/* 9D7750 80240730 28820070 */ slti $v0, $a0, 0x70 -/* 9D7754 80240734 1440FFFA */ bnez $v0, .L80240720 -/* 9D7758 80240738 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024073C: -/* 9D775C 8024073C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D7760 80240740 24020002 */ addiu $v0, $zero, 2 -/* 9D7764 80240744 03E00008 */ jr $ra -/* 9D7768 80240748 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9D776C 8024074C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s deleted file mode 100644 index dc04363764..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C5C_9D9C7C -/* 9D9C7C 80242C5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9C80 80242C60 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9C84 80242C64 8C82000C */ lw $v0, 0xc($a0) -/* 9D9C88 80242C68 0C0B1EAF */ jal evt_get_variable -/* 9D9C8C 80242C6C 8C450000 */ lw $a1, ($v0) -/* 9D9C90 80242C70 0040182D */ daddu $v1, $v0, $zero -/* 9D9C94 80242C74 10600012 */ beqz $v1, .L80242CC0 -/* 9D9C98 80242C78 0000202D */ daddu $a0, $zero, $zero -/* 9D9C9C 80242C7C 8C620000 */ lw $v0, ($v1) -/* 9D9CA0 80242C80 5040000A */ beql $v0, $zero, .L80242CAC -/* 9D9CA4 80242C84 00041080 */ sll $v0, $a0, 2 -/* 9D9CA8 80242C88 3C058025 */ lui $a1, %hi(D_802549D0) -/* 9D9CAC 80242C8C 24A549D0 */ addiu $a1, $a1, %lo(D_802549D0) -.L80242C90: -/* 9D9CB0 80242C90 24630004 */ addiu $v1, $v1, 4 -/* 9D9CB4 80242C94 24840001 */ addiu $a0, $a0, 1 -/* 9D9CB8 80242C98 ACA20000 */ sw $v0, ($a1) -/* 9D9CBC 80242C9C 8C620000 */ lw $v0, ($v1) -/* 9D9CC0 80242CA0 1440FFFB */ bnez $v0, .L80242C90 -/* 9D9CC4 80242CA4 24A50004 */ addiu $a1, $a1, 4 -/* 9D9CC8 80242CA8 00041080 */ sll $v0, $a0, 2 -.L80242CAC: -/* 9D9CCC 80242CAC 3C018025 */ lui $at, %hi(D_802549D0) -/* 9D9CD0 80242CB0 00220821 */ addu $at, $at, $v0 -/* 9D9CD4 80242CB4 AC2049D0 */ sw $zero, %lo(D_802549D0)($at) -/* 9D9CD8 80242CB8 08090B3A */ j .L80242CE8 -/* 9D9CDC 80242CBC 00000000 */ nop -.L80242CC0: -/* 9D9CE0 80242CC0 3C038025 */ lui $v1, %hi(D_802549D0) -/* 9D9CE4 80242CC4 246349D0 */ addiu $v1, $v1, %lo(D_802549D0) -/* 9D9CE8 80242CC8 0060282D */ daddu $a1, $v1, $zero -.L80242CCC: -/* 9D9CEC 80242CCC 24820010 */ addiu $v0, $a0, 0x10 -/* 9D9CF0 80242CD0 AC620000 */ sw $v0, ($v1) -/* 9D9CF4 80242CD4 24630004 */ addiu $v1, $v1, 4 -/* 9D9CF8 80242CD8 24840001 */ addiu $a0, $a0, 1 -/* 9D9CFC 80242CDC 28820070 */ slti $v0, $a0, 0x70 -/* 9D9D00 80242CE0 1440FFFA */ bnez $v0, .L80242CCC -/* 9D9D04 80242CE4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242CE8: -/* 9D9D08 80242CE8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9D0C 80242CEC 24020002 */ addiu $v0, $zero, 2 -/* 9D9D10 80242CF0 03E00008 */ jr $ra -/* 9D9D14 80242CF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s deleted file mode 100644 index 7fc9144222..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C78_9DAC98 -/* 9DAC98 80243C78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAC9C 80243C7C AFBF0010 */ sw $ra, 0x10($sp) -/* 9DACA0 80243C80 8C82000C */ lw $v0, 0xc($a0) -/* 9DACA4 80243C84 0C0B1EAF */ jal evt_get_variable -/* 9DACA8 80243C88 8C450000 */ lw $a1, ($v0) -/* 9DACAC 80243C8C 0040182D */ daddu $v1, $v0, $zero -/* 9DACB0 80243C90 10600012 */ beqz $v1, .L80243CDC -/* 9DACB4 80243C94 0000202D */ daddu $a0, $zero, $zero -/* 9DACB8 80243C98 8C620000 */ lw $v0, ($v1) -/* 9DACBC 80243C9C 5040000A */ beql $v0, $zero, .L80243CC8 -/* 9DACC0 80243CA0 00041080 */ sll $v0, $a0, 2 -/* 9DACC4 80243CA4 3C058025 */ lui $a1, %hi(D_80254BA0) -/* 9DACC8 80243CA8 24A54BA0 */ addiu $a1, $a1, %lo(D_80254BA0) -.L80243CAC: -/* 9DACCC 80243CAC 24630004 */ addiu $v1, $v1, 4 -/* 9DACD0 80243CB0 24840001 */ addiu $a0, $a0, 1 -/* 9DACD4 80243CB4 ACA20000 */ sw $v0, ($a1) -/* 9DACD8 80243CB8 8C620000 */ lw $v0, ($v1) -/* 9DACDC 80243CBC 1440FFFB */ bnez $v0, .L80243CAC -/* 9DACE0 80243CC0 24A50004 */ addiu $a1, $a1, 4 -/* 9DACE4 80243CC4 00041080 */ sll $v0, $a0, 2 -.L80243CC8: -/* 9DACE8 80243CC8 3C018025 */ lui $at, %hi(D_80254BA0) -/* 9DACEC 80243CCC 00220821 */ addu $at, $at, $v0 -/* 9DACF0 80243CD0 AC204BA0 */ sw $zero, %lo(D_80254BA0)($at) -/* 9DACF4 80243CD4 08090F41 */ j .L80243D04 -/* 9DACF8 80243CD8 00000000 */ nop -.L80243CDC: -/* 9DACFC 80243CDC 3C038025 */ lui $v1, %hi(D_80254BA0) -/* 9DAD00 80243CE0 24634BA0 */ addiu $v1, $v1, %lo(D_80254BA0) -/* 9DAD04 80243CE4 0060282D */ daddu $a1, $v1, $zero -.L80243CE8: -/* 9DAD08 80243CE8 24820010 */ addiu $v0, $a0, 0x10 -/* 9DAD0C 80243CEC AC620000 */ sw $v0, ($v1) -/* 9DAD10 80243CF0 24630004 */ addiu $v1, $v1, 4 -/* 9DAD14 80243CF4 24840001 */ addiu $a0, $a0, 1 -/* 9DAD18 80243CF8 28820070 */ slti $v0, $a0, 0x70 -/* 9DAD1C 80243CFC 1440FFFA */ bnez $v0, .L80243CE8 -/* 9DAD20 80243D00 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80243D04: -/* 9DAD24 80243D04 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DAD28 80243D08 24020002 */ addiu $v0, $zero, 2 -/* 9DAD2C 80243D0C 03E00008 */ jr $ra -/* 9DAD30 80243D10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s deleted file mode 100644 index 7b1597172a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243D14_9DAD34 -/* 9DAD34 80243D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAD38 80243D18 AFBF0010 */ sw $ra, 0x10($sp) -/* 9DAD3C 80243D1C 8C82000C */ lw $v0, 0xc($a0) -/* 9DAD40 80243D20 0C0B1EAF */ jal evt_get_variable -/* 9DAD44 80243D24 8C450000 */ lw $a1, ($v0) -/* 9DAD48 80243D28 0040182D */ daddu $v1, $v0, $zero -/* 9DAD4C 80243D2C 10600012 */ beqz $v1, .L80243D78 -/* 9DAD50 80243D30 0000202D */ daddu $a0, $zero, $zero -/* 9DAD54 80243D34 8C620000 */ lw $v0, ($v1) -/* 9DAD58 80243D38 5040000A */ beql $v0, $zero, .L80243D64 -/* 9DAD5C 80243D3C 00041080 */ sll $v0, $a0, 2 -/* 9DAD60 80243D40 3C058025 */ lui $a1, %hi(D_80254D68) -/* 9DAD64 80243D44 24A54D68 */ addiu $a1, $a1, %lo(D_80254D68) -.L80243D48: -/* 9DAD68 80243D48 24630004 */ addiu $v1, $v1, 4 -/* 9DAD6C 80243D4C 24840001 */ addiu $a0, $a0, 1 -/* 9DAD70 80243D50 ACA20000 */ sw $v0, ($a1) -/* 9DAD74 80243D54 8C620000 */ lw $v0, ($v1) -/* 9DAD78 80243D58 1440FFFB */ bnez $v0, .L80243D48 -/* 9DAD7C 80243D5C 24A50004 */ addiu $a1, $a1, 4 -/* 9DAD80 80243D60 00041080 */ sll $v0, $a0, 2 -.L80243D64: -/* 9DAD84 80243D64 3C018025 */ lui $at, %hi(D_80254D68) -/* 9DAD88 80243D68 00220821 */ addu $at, $at, $v0 -/* 9DAD8C 80243D6C AC204D68 */ sw $zero, %lo(D_80254D68)($at) -/* 9DAD90 80243D70 08090F68 */ j .L80243DA0 -/* 9DAD94 80243D74 00000000 */ nop -.L80243D78: -/* 9DAD98 80243D78 3C038025 */ lui $v1, %hi(D_80254D68) -/* 9DAD9C 80243D7C 24634D68 */ addiu $v1, $v1, %lo(D_80254D68) -/* 9DADA0 80243D80 0060282D */ daddu $a1, $v1, $zero -.L80243D84: -/* 9DADA4 80243D84 24820080 */ addiu $v0, $a0, 0x80 -/* 9DADA8 80243D88 AC620000 */ sw $v0, ($v1) -/* 9DADAC 80243D8C 24630004 */ addiu $v1, $v1, 4 -/* 9DADB0 80243D90 24840001 */ addiu $a0, $a0, 1 -/* 9DADB4 80243D94 2882005B */ slti $v0, $a0, 0x5b -/* 9DADB8 80243D98 1440FFFA */ bnez $v0, .L80243D84 -/* 9DADBC 80243D9C ACA0016C */ sw $zero, 0x16c($a1) -.L80243DA0: -/* 9DADC0 80243DA0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DADC4 80243DA4 24020002 */ addiu $v0, $zero, 2 -/* 9DADC8 80243DA8 03E00008 */ jr $ra -/* 9DADCC 80243DAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s deleted file mode 100644 index 0510fea227..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_BC47C0 -/* BC47C0 80240540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC47C4 80240544 AFBF0010 */ sw $ra, 0x10($sp) -/* BC47C8 80240548 8C82000C */ lw $v0, 0xc($a0) -/* BC47CC 8024054C 0C0B1EAF */ jal evt_get_variable -/* BC47D0 80240550 8C450000 */ lw $a1, ($v0) -/* BC47D4 80240554 0040182D */ daddu $v1, $v0, $zero -/* BC47D8 80240558 10600012 */ beqz $v1, .L802405A4 -/* BC47DC 8024055C 0000202D */ daddu $a0, $zero, $zero -/* BC47E0 80240560 8C620000 */ lw $v0, ($v1) -/* BC47E4 80240564 5040000A */ beql $v0, $zero, .L80240590 -/* BC47E8 80240568 00041080 */ sll $v0, $a0, 2 -/* BC47EC 8024056C 3C058024 */ lui $a1, %hi(D_80243BE0) -/* BC47F0 80240570 24A53BE0 */ addiu $a1, $a1, %lo(D_80243BE0) -.L80240574: -/* BC47F4 80240574 24630004 */ addiu $v1, $v1, 4 -/* BC47F8 80240578 24840001 */ addiu $a0, $a0, 1 -/* BC47FC 8024057C ACA20000 */ sw $v0, ($a1) -/* BC4800 80240580 8C620000 */ lw $v0, ($v1) -/* BC4804 80240584 1440FFFB */ bnez $v0, .L80240574 -/* BC4808 80240588 24A50004 */ addiu $a1, $a1, 4 -/* BC480C 8024058C 00041080 */ sll $v0, $a0, 2 -.L80240590: -/* BC4810 80240590 3C018024 */ lui $at, %hi(D_80243BE0) -/* BC4814 80240594 00220821 */ addu $at, $at, $v0 -/* BC4818 80240598 AC203BE0 */ sw $zero, %lo(D_80243BE0)($at) -/* BC481C 8024059C 08090173 */ j .L802405CC -/* BC4820 802405A0 00000000 */ nop -.L802405A4: -/* BC4824 802405A4 3C038024 */ lui $v1, %hi(D_80243BE0) -/* BC4828 802405A8 24633BE0 */ addiu $v1, $v1, %lo(D_80243BE0) -/* BC482C 802405AC 0060282D */ daddu $a1, $v1, $zero -.L802405B0: -/* BC4830 802405B0 24820010 */ addiu $v0, $a0, 0x10 -/* BC4834 802405B4 AC620000 */ sw $v0, ($v1) -/* BC4838 802405B8 24630004 */ addiu $v1, $v1, 4 -/* BC483C 802405BC 24840001 */ addiu $a0, $a0, 1 -/* BC4840 802405C0 28820070 */ slti $v0, $a0, 0x70 -/* BC4844 802405C4 1440FFFA */ bnez $v0, .L802405B0 -/* BC4848 802405C8 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802405CC: -/* BC484C 802405CC 8FBF0010 */ lw $ra, 0x10($sp) -/* BC4850 802405D0 24020002 */ addiu $v0, $zero, 2 -/* BC4854 802405D4 03E00008 */ jr $ra -/* BC4858 802405D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s deleted file mode 100644 index 0acd519b02..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242204_DB44C4 -/* DB44C4 80242204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB44C8 80242208 AFBF0010 */ sw $ra, 0x10($sp) -/* DB44CC 8024220C 8C82000C */ lw $v0, 0xc($a0) -/* DB44D0 80242210 0C0B1EAF */ jal evt_get_variable -/* DB44D4 80242214 8C450000 */ lw $a1, ($v0) -/* DB44D8 80242218 0040182D */ daddu $v1, $v0, $zero -/* DB44DC 8024221C 10600012 */ beqz $v1, .L80242268 -/* DB44E0 80242220 0000202D */ daddu $a0, $zero, $zero -/* DB44E4 80242224 8C620000 */ lw $v0, ($v1) -/* DB44E8 80242228 5040000A */ beql $v0, $zero, .L80242254 -/* DB44EC 8024222C 00041080 */ sll $v0, $a0, 2 -/* DB44F0 80242230 3C058024 */ lui $a1, %hi(D_80245650) -/* DB44F4 80242234 24A55650 */ addiu $a1, $a1, %lo(D_80245650) -.L80242238: -/* DB44F8 80242238 24630004 */ addiu $v1, $v1, 4 -/* DB44FC 8024223C 24840001 */ addiu $a0, $a0, 1 -/* DB4500 80242240 ACA20000 */ sw $v0, ($a1) -/* DB4504 80242244 8C620000 */ lw $v0, ($v1) -/* DB4508 80242248 1440FFFB */ bnez $v0, .L80242238 -/* DB450C 8024224C 24A50004 */ addiu $a1, $a1, 4 -/* DB4510 80242250 00041080 */ sll $v0, $a0, 2 -.L80242254: -/* DB4514 80242254 3C018024 */ lui $at, %hi(D_80245650) -/* DB4518 80242258 00220821 */ addu $at, $at, $v0 -/* DB451C 8024225C AC205650 */ sw $zero, %lo(D_80245650)($at) -/* DB4520 80242260 080908A4 */ j .L80242290 -/* DB4524 80242264 00000000 */ nop -.L80242268: -/* DB4528 80242268 3C038024 */ lui $v1, %hi(D_80245650) -/* DB452C 8024226C 24635650 */ addiu $v1, $v1, %lo(D_80245650) -/* DB4530 80242270 0060282D */ daddu $a1, $v1, $zero -.L80242274: -/* DB4534 80242274 24820080 */ addiu $v0, $a0, 0x80 -/* DB4538 80242278 AC620000 */ sw $v0, ($v1) -/* DB453C 8024227C 24630004 */ addiu $v1, $v1, 4 -/* DB4540 80242280 24840001 */ addiu $a0, $a0, 1 -/* DB4544 80242284 2882005B */ slti $v0, $a0, 0x5b -/* DB4548 80242288 1440FFFA */ bnez $v0, .L80242274 -/* DB454C 8024228C ACA0016C */ sw $zero, 0x16c($a1) -.L80242290: -/* DB4550 80242290 8FBF0010 */ lw $ra, 0x10($sp) -/* DB4554 80242294 24020002 */ addiu $v0, $zero, 2 -/* DB4558 80242298 03E00008 */ jr $ra -/* DB455C 8024229C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s deleted file mode 100644 index b6581eae3b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C_DE341C -/* DE341C 80240F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DE3420 80240F90 AFBF0010 */ sw $ra, 0x10($sp) -/* DE3424 80240F94 8C82000C */ lw $v0, 0xc($a0) -/* DE3428 80240F98 0C0B1EAF */ jal evt_get_variable -/* DE342C 80240F9C 8C450000 */ lw $a1, ($v0) -/* DE3430 80240FA0 0040182D */ daddu $v1, $v0, $zero -/* DE3434 80240FA4 10600012 */ beqz $v1, .L80240FF0 -/* DE3438 80240FA8 0000202D */ daddu $a0, $zero, $zero -/* DE343C 80240FAC 8C620000 */ lw $v0, ($v1) -/* DE3440 80240FB0 5040000A */ beql $v0, $zero, .L80240FDC -/* DE3444 80240FB4 00041080 */ sll $v0, $a0, 2 -/* DE3448 80240FB8 3C058024 */ lui $a1, %hi(flo_10_npcSettings_80243220) -/* DE344C 80240FBC 24A53220 */ addiu $a1, $a1, %lo(flo_10_npcSettings_80243220) -.L80240FC0: -/* DE3450 80240FC0 24630004 */ addiu $v1, $v1, 4 -/* DE3454 80240FC4 24840001 */ addiu $a0, $a0, 1 -/* DE3458 80240FC8 ACA20000 */ sw $v0, ($a1) -/* DE345C 80240FCC 8C620000 */ lw $v0, ($v1) -/* DE3460 80240FD0 1440FFFB */ bnez $v0, .L80240FC0 -/* DE3464 80240FD4 24A50004 */ addiu $a1, $a1, 4 -/* DE3468 80240FD8 00041080 */ sll $v0, $a0, 2 -.L80240FDC: -/* DE346C 80240FDC 3C018024 */ lui $at, %hi(flo_10_npcSettings_80243220) -/* DE3470 80240FE0 00220821 */ addu $at, $at, $v0 -/* DE3474 80240FE4 AC203220 */ sw $zero, %lo(flo_10_npcSettings_80243220)($at) -/* DE3478 80240FE8 08090406 */ j .L80241018 -/* DE347C 80240FEC 00000000 */ nop -.L80240FF0: -/* DE3480 80240FF0 3C038024 */ lui $v1, %hi(flo_10_npcSettings_80243220) -/* DE3484 80240FF4 24633220 */ addiu $v1, $v1, %lo(flo_10_npcSettings_80243220) -/* DE3488 80240FF8 0060282D */ daddu $a1, $v1, $zero -.L80240FFC: -/* DE348C 80240FFC 24820080 */ addiu $v0, $a0, 0x80 -/* DE3490 80241000 AC620000 */ sw $v0, ($v1) -/* DE3494 80241004 24630004 */ addiu $v1, $v1, 4 -/* DE3498 80241008 24840001 */ addiu $a0, $a0, 1 -/* DE349C 8024100C 2882005B */ slti $v0, $a0, 0x5b -/* DE34A0 80241010 1440FFFA */ bnez $v0, .L80240FFC -/* DE34A4 80241014 ACA0016C */ sw $zero, 0x16c($a1) -.L80241018: -/* DE34A8 80241018 8FBF0010 */ lw $ra, 0x10($sp) -/* DE34AC 8024101C 24020002 */ addiu $v0, $zero, 2 -/* DE34B0 80241020 03E00008 */ jr $ra -/* DE34B4 80241024 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s deleted file mode 100644 index ee07bd8e36..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241238_D4E278 -/* D4E278 80241238 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E27C 8024123C AFBF0010 */ sw $ra, 0x10($sp) -/* D4E280 80241240 8C82000C */ lw $v0, 0xc($a0) -/* D4E284 80241244 0C0B1EAF */ jal evt_get_variable -/* D4E288 80241248 8C450000 */ lw $a1, ($v0) -/* D4E28C 8024124C 0040182D */ daddu $v1, $v0, $zero -/* D4E290 80241250 10600012 */ beqz $v1, .L8024129C -/* D4E294 80241254 0000202D */ daddu $a0, $zero, $zero -/* D4E298 80241258 8C620000 */ lw $v0, ($v1) -/* D4E29C 8024125C 5040000A */ beql $v0, $zero, .L80241288 -/* D4E2A0 80241260 00041080 */ sll $v0, $a0, 2 -/* D4E2A4 80241264 3C058024 */ lui $a1, %hi(D_80242FB0) -/* D4E2A8 80241268 24A52FB0 */ addiu $a1, $a1, %lo(D_80242FB0) -.L8024126C: -/* D4E2AC 8024126C 24630004 */ addiu $v1, $v1, 4 -/* D4E2B0 80241270 24840001 */ addiu $a0, $a0, 1 -/* D4E2B4 80241274 ACA20000 */ sw $v0, ($a1) -/* D4E2B8 80241278 8C620000 */ lw $v0, ($v1) -/* D4E2BC 8024127C 1440FFFB */ bnez $v0, .L8024126C -/* D4E2C0 80241280 24A50004 */ addiu $a1, $a1, 4 -/* D4E2C4 80241284 00041080 */ sll $v0, $a0, 2 -.L80241288: -/* D4E2C8 80241288 3C018024 */ lui $at, %hi(D_80242FB0) -/* D4E2CC 8024128C 00220821 */ addu $at, $at, $v0 -/* D4E2D0 80241290 AC202FB0 */ sw $zero, %lo(D_80242FB0)($at) -/* D4E2D4 80241294 080904B1 */ j .L802412C4 -/* D4E2D8 80241298 00000000 */ nop -.L8024129C: -/* D4E2DC 8024129C 3C038024 */ lui $v1, %hi(D_80242FB0) -/* D4E2E0 802412A0 24632FB0 */ addiu $v1, $v1, %lo(D_80242FB0) -/* D4E2E4 802412A4 0060282D */ daddu $a1, $v1, $zero -.L802412A8: -/* D4E2E8 802412A8 24820010 */ addiu $v0, $a0, 0x10 -/* D4E2EC 802412AC AC620000 */ sw $v0, ($v1) -/* D4E2F0 802412B0 24630004 */ addiu $v1, $v1, 4 -/* D4E2F4 802412B4 24840001 */ addiu $a0, $a0, 1 -/* D4E2F8 802412B8 28820070 */ slti $v0, $a0, 0x70 -/* D4E2FC 802412BC 1440FFFA */ bnez $v0, .L802412A8 -/* D4E300 802412C0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802412C4: -/* D4E304 802412C4 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E308 802412C8 24020002 */ addiu $v0, $zero, 2 -/* D4E30C 802412CC 03E00008 */ jr $ra -/* D4E310 802412D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s deleted file mode 100644 index ab98139229..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D4_D4E314 -/* D4E314 802412D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E318 802412D8 AFBF0010 */ sw $ra, 0x10($sp) -/* D4E31C 802412DC 8C82000C */ lw $v0, 0xc($a0) -/* D4E320 802412E0 0C0B1EAF */ jal evt_get_variable -/* D4E324 802412E4 8C450000 */ lw $a1, ($v0) -/* D4E328 802412E8 0040182D */ daddu $v1, $v0, $zero -/* D4E32C 802412EC 10600012 */ beqz $v1, .L80241338 -/* D4E330 802412F0 0000202D */ daddu $a0, $zero, $zero -/* D4E334 802412F4 8C620000 */ lw $v0, ($v1) -/* D4E338 802412F8 5040000A */ beql $v0, $zero, .L80241324 -/* D4E33C 802412FC 00041080 */ sll $v0, $a0, 2 -/* D4E340 80241300 3C058024 */ lui $a1, %hi(pra_01_80243178) -/* D4E344 80241304 24A53178 */ addiu $a1, $a1, %lo(pra_01_80243178) -.L80241308: -/* D4E348 80241308 24630004 */ addiu $v1, $v1, 4 -/* D4E34C 8024130C 24840001 */ addiu $a0, $a0, 1 -/* D4E350 80241310 ACA20000 */ sw $v0, ($a1) -/* D4E354 80241314 8C620000 */ lw $v0, ($v1) -/* D4E358 80241318 1440FFFB */ bnez $v0, .L80241308 -/* D4E35C 8024131C 24A50004 */ addiu $a1, $a1, 4 -/* D4E360 80241320 00041080 */ sll $v0, $a0, 2 -.L80241324: -/* D4E364 80241324 3C018024 */ lui $at, %hi(pra_01_80243178) -/* D4E368 80241328 00220821 */ addu $at, $at, $v0 -/* D4E36C 8024132C AC203178 */ sw $zero, %lo(pra_01_80243178)($at) -/* D4E370 80241330 080904D8 */ j .L80241360 -/* D4E374 80241334 00000000 */ nop -.L80241338: -/* D4E378 80241338 3C038024 */ lui $v1, %hi(pra_01_80243178) -/* D4E37C 8024133C 24633178 */ addiu $v1, $v1, %lo(pra_01_80243178) -/* D4E380 80241340 0060282D */ daddu $a1, $v1, $zero -.L80241344: -/* D4E384 80241344 24820080 */ addiu $v0, $a0, 0x80 -/* D4E388 80241348 AC620000 */ sw $v0, ($v1) -/* D4E38C 8024134C 24630004 */ addiu $v1, $v1, 4 -/* D4E390 80241350 24840001 */ addiu $a0, $a0, 1 -/* D4E394 80241354 2882005B */ slti $v0, $a0, 0x5b -/* D4E398 80241358 1440FFFA */ bnez $v0, .L80241344 -/* D4E39C 8024135C ACA0016C */ sw $zero, 0x16c($a1) -.L80241360: -/* D4E3A0 80241360 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E3A4 80241364 24020002 */ addiu $v0, $zero, 2 -/* D4E3A8 80241368 03E00008 */ jr $ra -/* D4E3AC 8024136C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s deleted file mode 100644 index 59e78a8b42..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D51264 -/* D51264 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D51268 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D5126C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D51270 80241280 0C0B1EAF */ jal evt_get_variable -/* D51274 80241284 8C450000 */ lw $a1, ($v0) -/* D51278 80241288 0040182D */ daddu $v1, $v0, $zero -/* D5127C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D51280 80241290 0000202D */ daddu $a0, $zero, $zero -/* D51284 80241294 8C620000 */ lw $v0, ($v1) -/* D51288 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D5128C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D51290 802412A0 3C058024 */ lui $a1, %hi(D_80243E88_846A58) -/* D51294 802412A4 24A53E88 */ addiu $a1, $a1, %lo(D_80243E88_846A58) -.L802412A8: -/* D51298 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D5129C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D512A0 802412B0 ACA20000 */ sw $v0, ($a1) -/* D512A4 802412B4 8C620000 */ lw $v0, ($v1) -/* D512A8 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D512AC 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D512B0 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D512B4 802412C4 3C018024 */ lui $at, %hi(D_80243E88_846A58) -/* D512B8 802412C8 00220821 */ addu $at, $at, $v0 -/* D512BC 802412CC AC203E88 */ sw $zero, %lo(D_80243E88_846A58)($at) -/* D512C0 802412D0 080904C0 */ j .L80241300 -/* D512C4 802412D4 00000000 */ nop -.L802412D8: -/* D512C8 802412D8 3C038024 */ lui $v1, %hi(D_80243E88_846A58) -/* D512CC 802412DC 24633E88 */ addiu $v1, $v1, %lo(D_80243E88_846A58) -/* D512D0 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D512D4 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D512D8 802412E8 AC620000 */ sw $v0, ($v1) -/* D512DC 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D512E0 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D512E4 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D512E8 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D512EC 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D512F0 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D512F4 80241304 24020002 */ addiu $v0, $zero, 2 -/* D512F8 80241308 03E00008 */ jr $ra -/* D512FC 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s deleted file mode 100644 index 35e2e2e444..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D59A68 -/* D59A68 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59A6C 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D59A70 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D59A74 802411E4 0C0B1EAF */ jal evt_get_variable -/* D59A78 802411E8 8C450000 */ lw $a1, ($v0) -/* D59A7C 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D59A80 802411F0 10600012 */ beqz $v1, .L8024123C -/* D59A84 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D59A88 802411F8 8C620000 */ lw $v0, ($v1) -/* D59A8C 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D59A90 80241200 00041080 */ sll $v0, $a0, 2 -/* D59A94 80241204 3C058024 */ lui $a1, %hi(flo_18_shakeTree) -/* D59A98 80241208 24A56A20 */ addiu $a1, $a1, %lo(flo_18_shakeTree) -.L8024120C: -/* D59A9C 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D59AA0 80241210 24840001 */ addiu $a0, $a0, 1 -/* D59AA4 80241214 ACA20000 */ sw $v0, ($a1) -/* D59AA8 80241218 8C620000 */ lw $v0, ($v1) -/* D59AAC 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D59AB0 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D59AB4 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D59AB8 80241228 3C018024 */ lui $at, %hi(flo_18_shakeTree) -/* D59ABC 8024122C 00220821 */ addu $at, $at, $v0 -/* D59AC0 80241230 AC206A20 */ sw $zero, %lo(flo_18_shakeTree)($at) -/* D59AC4 80241234 08090499 */ j .L80241264 -/* D59AC8 80241238 00000000 */ nop -.L8024123C: -/* D59ACC 8024123C 3C038024 */ lui $v1, %hi(flo_18_shakeTree) -/* D59AD0 80241240 24636A20 */ addiu $v1, $v1, %lo(flo_18_shakeTree) -/* D59AD4 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D59AD8 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D59ADC 8024124C AC620000 */ sw $v0, ($v1) -/* D59AE0 80241250 24630004 */ addiu $v1, $v1, 4 -/* D59AE4 80241254 24840001 */ addiu $a0, $a0, 1 -/* D59AE8 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D59AEC 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D59AF0 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D59AF4 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D59AF8 80241268 24020002 */ addiu $v0, $zero, 2 -/* D59AFC 8024126C 03E00008 */ jr $ra -/* D59B00 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s deleted file mode 100644 index cb816b2c32..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D59B04 -/* D59B04 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D59B08 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D59B0C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D59B10 80241280 0C0B1EAF */ jal evt_get_variable -/* D59B14 80241284 8C450000 */ lw $a1, ($v0) -/* D59B18 80241288 0040182D */ daddu $v1, $v0, $zero -/* D59B1C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D59B20 80241290 0000202D */ daddu $a0, $zero, $zero -/* D59B24 80241294 8C620000 */ lw $v0, ($v1) -/* D59B28 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D59B2C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D59B30 802412A0 3C058024 */ lui $a1, %hi(D_80246BE8) -/* D59B34 802412A4 24A56BE8 */ addiu $a1, $a1, %lo(D_80246BE8) -.L802412A8: -/* D59B38 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D59B3C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D59B40 802412B0 ACA20000 */ sw $v0, ($a1) -/* D59B44 802412B4 8C620000 */ lw $v0, ($v1) -/* D59B48 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D59B4C 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D59B50 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D59B54 802412C4 3C018024 */ lui $at, %hi(D_80246BE8) -/* D59B58 802412C8 00220821 */ addu $at, $at, $v0 -/* D59B5C 802412CC AC206BE8 */ sw $zero, %lo(D_80246BE8)($at) -/* D59B60 802412D0 080904C0 */ j .L80241300 -/* D59B64 802412D4 00000000 */ nop -.L802412D8: -/* D59B68 802412D8 3C038024 */ lui $v1, %hi(D_80246BE8) -/* D59B6C 802412DC 24636BE8 */ addiu $v1, $v1, %lo(D_80246BE8) -/* D59B70 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D59B74 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D59B78 802412E8 AC620000 */ sw $v0, ($v1) -/* D59B7C 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D59B80 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D59B84 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D59B88 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D59B8C 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D59B90 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D59B94 80241304 24020002 */ addiu $v0, $zero, 2 -/* D59B98 80241308 03E00008 */ jr $ra -/* D59B9C 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s deleted file mode 100644 index 102a3bf418..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D657B8 -/* D657B8 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D657BC 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D657C0 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D657C4 802411E4 0C0B1EAF */ jal evt_get_variable -/* D657C8 802411E8 8C450000 */ lw $a1, ($v0) -/* D657CC 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D657D0 802411F0 10600012 */ beqz $v1, .L8024123C -/* D657D4 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D657D8 802411F8 8C620000 */ lw $v0, ($v1) -/* D657DC 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D657E0 80241200 00041080 */ sll $v0, $a0, 2 -/* D657E4 80241204 3C058024 */ lui $a1, %hi(D_80243720) -/* D657E8 80241208 24A53720 */ addiu $a1, $a1, %lo(D_80243720) -.L8024120C: -/* D657EC 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D657F0 80241210 24840001 */ addiu $a0, $a0, 1 -/* D657F4 80241214 ACA20000 */ sw $v0, ($a1) -/* D657F8 80241218 8C620000 */ lw $v0, ($v1) -/* D657FC 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D65800 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D65804 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D65808 80241228 3C018024 */ lui $at, %hi(D_80243720) -/* D6580C 8024122C 00220821 */ addu $at, $at, $v0 -/* D65810 80241230 AC203720 */ sw $zero, %lo(D_80243720)($at) -/* D65814 80241234 08090499 */ j .L80241264 -/* D65818 80241238 00000000 */ nop -.L8024123C: -/* D6581C 8024123C 3C038024 */ lui $v1, %hi(D_80243720) -/* D65820 80241240 24633720 */ addiu $v1, $v1, %lo(D_80243720) -/* D65824 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D65828 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D6582C 8024124C AC620000 */ sw $v0, ($v1) -/* D65830 80241250 24630004 */ addiu $v1, $v1, 4 -/* D65834 80241254 24840001 */ addiu $a0, $a0, 1 -/* D65838 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D6583C 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D65840 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D65844 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D65848 80241268 24020002 */ addiu $v0, $zero, 2 -/* D6584C 8024126C 03E00008 */ jr $ra -/* D65850 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s deleted file mode 100644 index 6467a06008..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D65854 -/* D65854 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D65858 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D6585C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D65860 80241280 0C0B1EAF */ jal evt_get_variable -/* D65864 80241284 8C450000 */ lw $a1, ($v0) -/* D65868 80241288 0040182D */ daddu $v1, $v0, $zero -/* D6586C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D65870 80241290 0000202D */ daddu $a0, $zero, $zero -/* D65874 80241294 8C620000 */ lw $v0, ($v1) -/* D65878 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D6587C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D65880 802412A0 3C058024 */ lui $a1, %hi(pra_13_802438E8) -/* D65884 802412A4 24A538E8 */ addiu $a1, $a1, %lo(pra_13_802438E8) -.L802412A8: -/* D65888 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D6588C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D65890 802412B0 ACA20000 */ sw $v0, ($a1) -/* D65894 802412B4 8C620000 */ lw $v0, ($v1) -/* D65898 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D6589C 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D658A0 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D658A4 802412C4 3C018024 */ lui $at, %hi(pra_13_802438E8) -/* D658A8 802412C8 00220821 */ addu $at, $at, $v0 -/* D658AC 802412CC AC2038E8 */ sw $zero, %lo(pra_13_802438E8)($at) -/* D658B0 802412D0 080904C0 */ j .L80241300 -/* D658B4 802412D4 00000000 */ nop -.L802412D8: -/* D658B8 802412D8 3C038024 */ lui $v1, %hi(pra_13_802438E8) -/* D658BC 802412DC 246338E8 */ addiu $v1, $v1, %lo(pra_13_802438E8) -/* D658C0 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D658C4 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D658C8 802412E8 AC620000 */ sw $v0, ($v1) -/* D658CC 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D658D0 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D658D4 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D658D8 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D658DC 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D658E0 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D658E4 80241304 24020002 */ addiu $v0, $zero, 2 -/* D658E8 80241308 03E00008 */ jr $ra -/* D658EC 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s deleted file mode 100644 index 8c2d3baf09..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_D6FB88 -/* D6FB88 802411D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FB8C 802411DC AFBF0010 */ sw $ra, 0x10($sp) -/* D6FB90 802411E0 8C82000C */ lw $v0, 0xc($a0) -/* D6FB94 802411E4 0C0B1EAF */ jal evt_get_variable -/* D6FB98 802411E8 8C450000 */ lw $a1, ($v0) -/* D6FB9C 802411EC 0040182D */ daddu $v1, $v0, $zero -/* D6FBA0 802411F0 10600012 */ beqz $v1, .L8024123C -/* D6FBA4 802411F4 0000202D */ daddu $a0, $zero, $zero -/* D6FBA8 802411F8 8C620000 */ lw $v0, ($v1) -/* D6FBAC 802411FC 5040000A */ beql $v0, $zero, .L80241228 -/* D6FBB0 80241200 00041080 */ sll $v0, $a0, 2 -/* D6FBB4 80241204 3C058024 */ lui $a1, %hi(D_802479F0) -/* D6FBB8 80241208 24A579F0 */ addiu $a1, $a1, %lo(D_802479F0) -.L8024120C: -/* D6FBBC 8024120C 24630004 */ addiu $v1, $v1, 4 -/* D6FBC0 80241210 24840001 */ addiu $a0, $a0, 1 -/* D6FBC4 80241214 ACA20000 */ sw $v0, ($a1) -/* D6FBC8 80241218 8C620000 */ lw $v0, ($v1) -/* D6FBCC 8024121C 1440FFFB */ bnez $v0, .L8024120C -/* D6FBD0 80241220 24A50004 */ addiu $a1, $a1, 4 -/* D6FBD4 80241224 00041080 */ sll $v0, $a0, 2 -.L80241228: -/* D6FBD8 80241228 3C018024 */ lui $at, %hi(D_802479F0) -/* D6FBDC 8024122C 00220821 */ addu $at, $at, $v0 -/* D6FBE0 80241230 AC2079F0 */ sw $zero, %lo(D_802479F0)($at) -/* D6FBE4 80241234 08090499 */ j .L80241264 -/* D6FBE8 80241238 00000000 */ nop -.L8024123C: -/* D6FBEC 8024123C 3C038024 */ lui $v1, %hi(D_802479F0) -/* D6FBF0 80241240 246379F0 */ addiu $v1, $v1, %lo(D_802479F0) -/* D6FBF4 80241244 0060282D */ daddu $a1, $v1, $zero -.L80241248: -/* D6FBF8 80241248 24820010 */ addiu $v0, $a0, 0x10 -/* D6FBFC 8024124C AC620000 */ sw $v0, ($v1) -/* D6FC00 80241250 24630004 */ addiu $v1, $v1, 4 -/* D6FC04 80241254 24840001 */ addiu $a0, $a0, 1 -/* D6FC08 80241258 28820070 */ slti $v0, $a0, 0x70 -/* D6FC0C 8024125C 1440FFFA */ bnez $v0, .L80241248 -/* D6FC10 80241260 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241264: -/* D6FC14 80241264 8FBF0010 */ lw $ra, 0x10($sp) -/* D6FC18 80241268 24020002 */ addiu $v0, $zero, 2 -/* D6FC1C 8024126C 03E00008 */ jr $ra -/* D6FC20 80241270 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s deleted file mode 100644 index f6fbd370a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274_D6FC24 -/* D6FC24 80241274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D6FC28 80241278 AFBF0010 */ sw $ra, 0x10($sp) -/* D6FC2C 8024127C 8C82000C */ lw $v0, 0xc($a0) -/* D6FC30 80241280 0C0B1EAF */ jal evt_get_variable -/* D6FC34 80241284 8C450000 */ lw $a1, ($v0) -/* D6FC38 80241288 0040182D */ daddu $v1, $v0, $zero -/* D6FC3C 8024128C 10600012 */ beqz $v1, .L802412D8 -/* D6FC40 80241290 0000202D */ daddu $a0, $zero, $zero -/* D6FC44 80241294 8C620000 */ lw $v0, ($v1) -/* D6FC48 80241298 5040000A */ beql $v0, $zero, .L802412C4 -/* D6FC4C 8024129C 00041080 */ sll $v0, $a0, 2 -/* D6FC50 802412A0 3C058024 */ lui $a1, %hi(D_80247BB8_pra_19) -/* D6FC54 802412A4 24A57BB8 */ addiu $a1, $a1, %lo(D_80247BB8_pra_19) -.L802412A8: -/* D6FC58 802412A8 24630004 */ addiu $v1, $v1, 4 -/* D6FC5C 802412AC 24840001 */ addiu $a0, $a0, 1 -/* D6FC60 802412B0 ACA20000 */ sw $v0, ($a1) -/* D6FC64 802412B4 8C620000 */ lw $v0, ($v1) -/* D6FC68 802412B8 1440FFFB */ bnez $v0, .L802412A8 -/* D6FC6C 802412BC 24A50004 */ addiu $a1, $a1, 4 -/* D6FC70 802412C0 00041080 */ sll $v0, $a0, 2 -.L802412C4: -/* D6FC74 802412C4 3C018024 */ lui $at, %hi(D_80247BB8_pra_19) -/* D6FC78 802412C8 00220821 */ addu $at, $at, $v0 -/* D6FC7C 802412CC AC207BB8 */ sw $zero, %lo(D_80247BB8_pra_19)($at) -/* D6FC80 802412D0 080904C0 */ j .L80241300 -/* D6FC84 802412D4 00000000 */ nop -.L802412D8: -/* D6FC88 802412D8 3C038024 */ lui $v1, %hi(D_80247BB8_pra_19) -/* D6FC8C 802412DC 24637BB8 */ addiu $v1, $v1, %lo(D_80247BB8_pra_19) -/* D6FC90 802412E0 0060282D */ daddu $a1, $v1, $zero -.L802412E4: -/* D6FC94 802412E4 24820080 */ addiu $v0, $a0, 0x80 -/* D6FC98 802412E8 AC620000 */ sw $v0, ($v1) -/* D6FC9C 802412EC 24630004 */ addiu $v1, $v1, 4 -/* D6FCA0 802412F0 24840001 */ addiu $a0, $a0, 1 -/* D6FCA4 802412F4 2882005B */ slti $v0, $a0, 0x5b -/* D6FCA8 802412F8 1440FFFA */ bnez $v0, .L802412E4 -/* D6FCAC 802412FC ACA0016C */ sw $zero, 0x16c($a1) -.L80241300: -/* D6FCB0 80241300 8FBF0010 */ lw $ra, 0x10($sp) -/* D6FCB4 80241304 24020002 */ addiu $v0, $zero, 2 -/* D6FCB8 80241308 03E00008 */ jr $ra -/* D6FCBC 8024130C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s deleted file mode 100644 index 142a5947db..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D8_D7F038 -/* D7F038 802402D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F03C 802402DC AFBF0010 */ sw $ra, 0x10($sp) -/* D7F040 802402E0 8C82000C */ lw $v0, 0xc($a0) -/* D7F044 802402E4 0C0B1EAF */ jal evt_get_variable -/* D7F048 802402E8 8C450000 */ lw $a1, ($v0) -/* D7F04C 802402EC 0040182D */ daddu $v1, $v0, $zero -/* D7F050 802402F0 10600012 */ beqz $v1, .L8024033C -/* D7F054 802402F4 0000202D */ daddu $a0, $zero, $zero -/* D7F058 802402F8 8C620000 */ lw $v0, ($v1) -/* D7F05C 802402FC 5040000A */ beql $v0, $zero, .L80240328 -/* D7F060 80240300 00041080 */ sll $v0, $a0, 2 -/* D7F064 80240304 3C058024 */ lui $a1, %hi(D_80247CA0) -/* D7F068 80240308 24A57CA0 */ addiu $a1, $a1, %lo(D_80247CA0) -.L8024030C: -/* D7F06C 8024030C 24630004 */ addiu $v1, $v1, 4 -/* D7F070 80240310 24840001 */ addiu $a0, $a0, 1 -/* D7F074 80240314 ACA20000 */ sw $v0, ($a1) -/* D7F078 80240318 8C620000 */ lw $v0, ($v1) -/* D7F07C 8024031C 1440FFFB */ bnez $v0, .L8024030C -/* D7F080 80240320 24A50004 */ addiu $a1, $a1, 4 -/* D7F084 80240324 00041080 */ sll $v0, $a0, 2 -.L80240328: -/* D7F088 80240328 3C018024 */ lui $at, %hi(D_80247CA0) -/* D7F08C 8024032C 00220821 */ addu $at, $at, $v0 -/* D7F090 80240330 AC207CA0 */ sw $zero, %lo(D_80247CA0)($at) -/* D7F094 80240334 080900D9 */ j .L80240364 -/* D7F098 80240338 00000000 */ nop -.L8024033C: -/* D7F09C 8024033C 3C038024 */ lui $v1, %hi(D_80247CA0) -/* D7F0A0 80240340 24637CA0 */ addiu $v1, $v1, %lo(D_80247CA0) -/* D7F0A4 80240344 0060282D */ daddu $a1, $v1, $zero -.L80240348: -/* D7F0A8 80240348 24820010 */ addiu $v0, $a0, 0x10 -/* D7F0AC 8024034C AC620000 */ sw $v0, ($v1) -/* D7F0B0 80240350 24630004 */ addiu $v1, $v1, 4 -/* D7F0B4 80240354 24840001 */ addiu $a0, $a0, 1 -/* D7F0B8 80240358 28820070 */ slti $v0, $a0, 0x70 -/* D7F0BC 8024035C 1440FFFA */ bnez $v0, .L80240348 -/* D7F0C0 80240360 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240364: -/* D7F0C4 80240364 8FBF0010 */ lw $ra, 0x10($sp) -/* D7F0C8 80240368 24020002 */ addiu $v0, $zero, 2 -/* D7F0CC 8024036C 03E00008 */ jr $ra -/* D7F0D0 80240370 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s deleted file mode 100644 index ca7851013b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240374_D7F0D4 -/* D7F0D4 80240374 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F0D8 80240378 AFBF0010 */ sw $ra, 0x10($sp) -/* D7F0DC 8024037C 8C82000C */ lw $v0, 0xc($a0) -/* D7F0E0 80240380 0C0B1EAF */ jal evt_get_variable -/* D7F0E4 80240384 8C450000 */ lw $a1, ($v0) -/* D7F0E8 80240388 0040182D */ daddu $v1, $v0, $zero -/* D7F0EC 8024038C 10600012 */ beqz $v1, .L802403D8 -/* D7F0F0 80240390 0000202D */ daddu $a0, $zero, $zero -/* D7F0F4 80240394 8C620000 */ lw $v0, ($v1) -/* D7F0F8 80240398 5040000A */ beql $v0, $zero, .L802403C4 -/* D7F0FC 8024039C 00041080 */ sll $v0, $a0, 2 -/* D7F100 802403A0 3C058024 */ lui $a1, %hi(D_80247E68) -/* D7F104 802403A4 24A57E68 */ addiu $a1, $a1, %lo(D_80247E68) -.L802403A8: -/* D7F108 802403A8 24630004 */ addiu $v1, $v1, 4 -/* D7F10C 802403AC 24840001 */ addiu $a0, $a0, 1 -/* D7F110 802403B0 ACA20000 */ sw $v0, ($a1) -/* D7F114 802403B4 8C620000 */ lw $v0, ($v1) -/* D7F118 802403B8 1440FFFB */ bnez $v0, .L802403A8 -/* D7F11C 802403BC 24A50004 */ addiu $a1, $a1, 4 -/* D7F120 802403C0 00041080 */ sll $v0, $a0, 2 -.L802403C4: -/* D7F124 802403C4 3C018024 */ lui $at, %hi(D_80247E68) -/* D7F128 802403C8 00220821 */ addu $at, $at, $v0 -/* D7F12C 802403CC AC207E68 */ sw $zero, %lo(D_80247E68)($at) -/* D7F130 802403D0 08090100 */ j .L80240400 -/* D7F134 802403D4 00000000 */ nop -.L802403D8: -/* D7F138 802403D8 3C038024 */ lui $v1, %hi(D_80247E68) -/* D7F13C 802403DC 24637E68 */ addiu $v1, $v1, %lo(D_80247E68) -/* D7F140 802403E0 0060282D */ daddu $a1, $v1, $zero -.L802403E4: -/* D7F144 802403E4 24820080 */ addiu $v0, $a0, 0x80 -/* D7F148 802403E8 AC620000 */ sw $v0, ($v1) -/* D7F14C 802403EC 24630004 */ addiu $v1, $v1, 4 -/* D7F150 802403F0 24840001 */ addiu $a0, $a0, 1 -/* D7F154 802403F4 2882005B */ slti $v0, $a0, 0x5b -/* D7F158 802403F8 1440FFFA */ bnez $v0, .L802403E4 -/* D7F15C 802403FC ACA0016C */ sw $zero, 0x16c($a1) -.L80240400: -/* D7F160 80240400 8FBF0010 */ lw $ra, 0x10($sp) -/* D7F164 80240404 24020002 */ addiu $v0, $zero, 2 -/* D7F168 80240408 03E00008 */ jr $ra -/* D7F16C 8024040C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s deleted file mode 100644 index 9415df7a6b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C8_CF8138 -/* CF8138 802405C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF813C 802405CC AFBF0010 */ sw $ra, 0x10($sp) -/* CF8140 802405D0 8C82000C */ lw $v0, 0xc($a0) -/* CF8144 802405D4 0C0B1EAF */ jal evt_get_variable -/* CF8148 802405D8 8C450000 */ lw $a1, ($v0) -/* CF814C 802405DC 0040182D */ daddu $v1, $v0, $zero -/* CF8150 802405E0 10600012 */ beqz $v1, .L8024062C -/* CF8154 802405E4 0000202D */ daddu $a0, $zero, $zero -/* CF8158 802405E8 8C620000 */ lw $v0, ($v1) -/* CF815C 802405EC 5040000A */ beql $v0, $zero, .L80240618 -/* CF8160 802405F0 00041080 */ sll $v0, $a0, 2 -/* CF8164 802405F4 3C058025 */ lui $a1, %hi(D_8024DBC0) -/* CF8168 802405F8 24A5DBC0 */ addiu $a1, $a1, %lo(D_8024DBC0) -.L802405FC: -/* CF816C 802405FC 24630004 */ addiu $v1, $v1, 4 -/* CF8170 80240600 24840001 */ addiu $a0, $a0, 1 -/* CF8174 80240604 ACA20000 */ sw $v0, ($a1) -/* CF8178 80240608 8C620000 */ lw $v0, ($v1) -/* CF817C 8024060C 1440FFFB */ bnez $v0, .L802405FC -/* CF8180 80240610 24A50004 */ addiu $a1, $a1, 4 -/* CF8184 80240614 00041080 */ sll $v0, $a0, 2 -.L80240618: -/* CF8188 80240618 3C018025 */ lui $at, %hi(D_8024DBC0) -/* CF818C 8024061C 00220821 */ addu $at, $at, $v0 -/* CF8190 80240620 AC20DBC0 */ sw $zero, %lo(D_8024DBC0)($at) -/* CF8194 80240624 08090195 */ j .L80240654 -/* CF8198 80240628 00000000 */ nop -.L8024062C: -/* CF819C 8024062C 3C038025 */ lui $v1, %hi(D_8024DBC0) -/* CF81A0 80240630 2463DBC0 */ addiu $v1, $v1, %lo(D_8024DBC0) -/* CF81A4 80240634 0060282D */ daddu $a1, $v1, $zero -.L80240638: -/* CF81A8 80240638 24820010 */ addiu $v0, $a0, 0x10 -/* CF81AC 8024063C AC620000 */ sw $v0, ($v1) -/* CF81B0 80240640 24630004 */ addiu $v1, $v1, 4 -/* CF81B4 80240644 24840001 */ addiu $a0, $a0, 1 -/* CF81B8 80240648 28820070 */ slti $v0, $a0, 0x70 -/* CF81BC 8024064C 1440FFFA */ bnez $v0, .L80240638 -/* CF81C0 80240650 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240654: -/* CF81C4 80240654 8FBF0010 */ lw $ra, 0x10($sp) -/* CF81C8 80240658 24020002 */ addiu $v0, $zero, 2 -/* CF81CC 8024065C 03E00008 */ jr $ra -/* CF81D0 80240660 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s deleted file mode 100644 index 6721b2949b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240664_CF81D4 -/* CF81D4 80240664 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF81D8 80240668 AFBF0010 */ sw $ra, 0x10($sp) -/* CF81DC 8024066C 8C82000C */ lw $v0, 0xc($a0) -/* CF81E0 80240670 0C0B1EAF */ jal evt_get_variable -/* CF81E4 80240674 8C450000 */ lw $a1, ($v0) -/* CF81E8 80240678 0040182D */ daddu $v1, $v0, $zero -/* CF81EC 8024067C 10600012 */ beqz $v1, .L802406C8 -/* CF81F0 80240680 0000202D */ daddu $a0, $zero, $zero -/* CF81F4 80240684 8C620000 */ lw $v0, ($v1) -/* CF81F8 80240688 5040000A */ beql $v0, $zero, .L802406B4 -/* CF81FC 8024068C 00041080 */ sll $v0, $a0, 2 -/* CF8200 80240690 3C058025 */ lui $a1, %hi(D_8024DD88) -/* CF8204 80240694 24A5DD88 */ addiu $a1, $a1, %lo(D_8024DD88) -.L80240698: -/* CF8208 80240698 24630004 */ addiu $v1, $v1, 4 -/* CF820C 8024069C 24840001 */ addiu $a0, $a0, 1 -/* CF8210 802406A0 ACA20000 */ sw $v0, ($a1) -/* CF8214 802406A4 8C620000 */ lw $v0, ($v1) -/* CF8218 802406A8 1440FFFB */ bnez $v0, .L80240698 -/* CF821C 802406AC 24A50004 */ addiu $a1, $a1, 4 -/* CF8220 802406B0 00041080 */ sll $v0, $a0, 2 -.L802406B4: -/* CF8224 802406B4 3C018025 */ lui $at, %hi(D_8024DD88) -/* CF8228 802406B8 00220821 */ addu $at, $at, $v0 -/* CF822C 802406BC AC20DD88 */ sw $zero, %lo(D_8024DD88)($at) -/* CF8230 802406C0 080901BC */ j .L802406F0 -/* CF8234 802406C4 00000000 */ nop -.L802406C8: -/* CF8238 802406C8 3C038025 */ lui $v1, %hi(D_8024DD88) -/* CF823C 802406CC 2463DD88 */ addiu $v1, $v1, %lo(D_8024DD88) -/* CF8240 802406D0 0060282D */ daddu $a1, $v1, $zero -.L802406D4: -/* CF8244 802406D4 24820080 */ addiu $v0, $a0, 0x80 -/* CF8248 802406D8 AC620000 */ sw $v0, ($v1) -/* CF824C 802406DC 24630004 */ addiu $v1, $v1, 4 -/* CF8250 802406E0 24840001 */ addiu $a0, $a0, 1 -/* CF8254 802406E4 2882005B */ slti $v0, $a0, 0x5b -/* CF8258 802406E8 1440FFFA */ bnez $v0, .L802406D4 -/* CF825C 802406EC ACA0016C */ sw $zero, 0x16c($a1) -.L802406F0: -/* CF8260 802406F0 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8264 802406F4 24020002 */ addiu $v0, $zero, 2 -/* CF8268 802406F8 03E00008 */ jr $ra -/* CF826C 802406FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s deleted file mode 100644 index b34864b868..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C8_D13B98 -/* D13B98 802405C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D13B9C 802405CC AFBF0010 */ sw $ra, 0x10($sp) -/* D13BA0 802405D0 8C82000C */ lw $v0, 0xc($a0) -/* D13BA4 802405D4 0C0B1EAF */ jal evt_get_variable -/* D13BA8 802405D8 8C450000 */ lw $a1, ($v0) -/* D13BAC 802405DC 0040182D */ daddu $v1, $v0, $zero -/* D13BB0 802405E0 10600012 */ beqz $v1, .L8024062C -/* D13BB4 802405E4 0000202D */ daddu $a0, $zero, $zero -/* D13BB8 802405E8 8C620000 */ lw $v0, ($v1) -/* D13BBC 802405EC 5040000A */ beql $v0, $zero, .L80240618 -/* D13BC0 802405F0 00041080 */ sll $v0, $a0, 2 -/* D13BC4 802405F4 3C058024 */ lui $a1, %hi(sam_04_80245210) -/* D13BC8 802405F8 24A55210 */ addiu $a1, $a1, %lo(sam_04_80245210) -.L802405FC: -/* D13BCC 802405FC 24630004 */ addiu $v1, $v1, 4 -/* D13BD0 80240600 24840001 */ addiu $a0, $a0, 1 -/* D13BD4 80240604 ACA20000 */ sw $v0, ($a1) -/* D13BD8 80240608 8C620000 */ lw $v0, ($v1) -/* D13BDC 8024060C 1440FFFB */ bnez $v0, .L802405FC -/* D13BE0 80240610 24A50004 */ addiu $a1, $a1, 4 -/* D13BE4 80240614 00041080 */ sll $v0, $a0, 2 -.L80240618: -/* D13BE8 80240618 3C018024 */ lui $at, %hi(sam_04_80245210) -/* D13BEC 8024061C 00220821 */ addu $at, $at, $v0 -/* D13BF0 80240620 AC205210 */ sw $zero, %lo(sam_04_80245210)($at) -/* D13BF4 80240624 08090195 */ j .L80240654 -/* D13BF8 80240628 00000000 */ nop -.L8024062C: -/* D13BFC 8024062C 3C038024 */ lui $v1, %hi(sam_04_80245210) -/* D13C00 80240630 24635210 */ addiu $v1, $v1, %lo(sam_04_80245210) -/* D13C04 80240634 0060282D */ daddu $a1, $v1, $zero -.L80240638: -/* D13C08 80240638 24820010 */ addiu $v0, $a0, 0x10 -/* D13C0C 8024063C AC620000 */ sw $v0, ($v1) -/* D13C10 80240640 24630004 */ addiu $v1, $v1, 4 -/* D13C14 80240644 24840001 */ addiu $a0, $a0, 1 -/* D13C18 80240648 28820070 */ slti $v0, $a0, 0x70 -/* D13C1C 8024064C 1440FFFA */ bnez $v0, .L80240638 -/* D13C20 80240650 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240654: -/* D13C24 80240654 8FBF0010 */ lw $ra, 0x10($sp) -/* D13C28 80240658 24020002 */ addiu $v0, $zero, 2 -/* D13C2C 8024065C 03E00008 */ jr $ra -/* D13C30 80240660 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s deleted file mode 100644 index 8f646f8322..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240664_D13C34 -/* D13C34 80240664 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D13C38 80240668 AFBF0010 */ sw $ra, 0x10($sp) -/* D13C3C 8024066C 8C82000C */ lw $v0, 0xc($a0) -/* D13C40 80240670 0C0B1EAF */ jal evt_get_variable -/* D13C44 80240674 8C450000 */ lw $a1, ($v0) -/* D13C48 80240678 0040182D */ daddu $v1, $v0, $zero -/* D13C4C 8024067C 10600012 */ beqz $v1, .L802406C8 -/* D13C50 80240680 0000202D */ daddu $a0, $zero, $zero -/* D13C54 80240684 8C620000 */ lw $v0, ($v1) -/* D13C58 80240688 5040000A */ beql $v0, $zero, .L802406B4 -/* D13C5C 8024068C 00041080 */ sll $v0, $a0, 2 -/* D13C60 80240690 3C058024 */ lui $a1, %hi(D_802453D8) -/* D13C64 80240694 24A553D8 */ addiu $a1, $a1, %lo(D_802453D8) -.L80240698: -/* D13C68 80240698 24630004 */ addiu $v1, $v1, 4 -/* D13C6C 8024069C 24840001 */ addiu $a0, $a0, 1 -/* D13C70 802406A0 ACA20000 */ sw $v0, ($a1) -/* D13C74 802406A4 8C620000 */ lw $v0, ($v1) -/* D13C78 802406A8 1440FFFB */ bnez $v0, .L80240698 -/* D13C7C 802406AC 24A50004 */ addiu $a1, $a1, 4 -/* D13C80 802406B0 00041080 */ sll $v0, $a0, 2 -.L802406B4: -/* D13C84 802406B4 3C018024 */ lui $at, %hi(D_802453D8) -/* D13C88 802406B8 00220821 */ addu $at, $at, $v0 -/* D13C8C 802406BC AC2053D8 */ sw $zero, %lo(D_802453D8)($at) -/* D13C90 802406C0 080901BC */ j .L802406F0 -/* D13C94 802406C4 00000000 */ nop -.L802406C8: -/* D13C98 802406C8 3C038024 */ lui $v1, %hi(D_802453D8) -/* D13C9C 802406CC 246353D8 */ addiu $v1, $v1, %lo(D_802453D8) -/* D13CA0 802406D0 0060282D */ daddu $a1, $v1, $zero -.L802406D4: -/* D13CA4 802406D4 24820080 */ addiu $v0, $a0, 0x80 -/* D13CA8 802406D8 AC620000 */ sw $v0, ($v1) -/* D13CAC 802406DC 24630004 */ addiu $v1, $v1, 4 -/* D13CB0 802406E0 24840001 */ addiu $a0, $a0, 1 -/* D13CB4 802406E4 2882005B */ slti $v0, $a0, 0x5b -/* D13CB8 802406E8 1440FFFA */ bnez $v0, .L802406D4 -/* D13CBC 802406EC ACA0016C */ sw $zero, 0x16c($a1) -.L802406F0: -/* D13CC0 802406F0 8FBF0010 */ lw $ra, 0x10($sp) -/* D13CC4 802406F4 24020002 */ addiu $v0, $zero, 2 -/* D13CC8 802406F8 03E00008 */ jr $ra -/* D13CCC 802406FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s deleted file mode 100644 index 659e019374..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E18_D21CA8 -/* D21CA8 80241E18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21CAC 80241E1C AFBF0010 */ sw $ra, 0x10($sp) -/* D21CB0 80241E20 8C82000C */ lw $v0, 0xc($a0) -/* D21CB4 80241E24 0C0B1EAF */ jal evt_get_variable -/* D21CB8 80241E28 8C450000 */ lw $a1, ($v0) -/* D21CBC 80241E2C 0040182D */ daddu $v1, $v0, $zero -/* D21CC0 80241E30 10600012 */ beqz $v1, .L80241E7C -/* D21CC4 80241E34 0000202D */ daddu $a0, $zero, $zero -/* D21CC8 80241E38 8C620000 */ lw $v0, ($v1) -/* D21CCC 80241E3C 5040000A */ beql $v0, $zero, .L80241E68 -/* D21CD0 80241E40 00041080 */ sll $v0, $a0, 2 -/* D21CD4 80241E44 3C058025 */ lui $a1, %hi(D_8024BEA0) -/* D21CD8 80241E48 24A5BEA0 */ addiu $a1, $a1, %lo(D_8024BEA0) -.L80241E4C: -/* D21CDC 80241E4C 24630004 */ addiu $v1, $v1, 4 -/* D21CE0 80241E50 24840001 */ addiu $a0, $a0, 1 -/* D21CE4 80241E54 ACA20000 */ sw $v0, ($a1) -/* D21CE8 80241E58 8C620000 */ lw $v0, ($v1) -/* D21CEC 80241E5C 1440FFFB */ bnez $v0, .L80241E4C -/* D21CF0 80241E60 24A50004 */ addiu $a1, $a1, 4 -/* D21CF4 80241E64 00041080 */ sll $v0, $a0, 2 -.L80241E68: -/* D21CF8 80241E68 3C018025 */ lui $at, %hi(D_8024BEA0) -/* D21CFC 80241E6C 00220821 */ addu $at, $at, $v0 -/* D21D00 80241E70 AC20BEA0 */ sw $zero, %lo(D_8024BEA0)($at) -/* D21D04 80241E74 080907A9 */ j .L80241EA4 -/* D21D08 80241E78 00000000 */ nop -.L80241E7C: -/* D21D0C 80241E7C 3C038025 */ lui $v1, %hi(D_8024BEA0) -/* D21D10 80241E80 2463BEA0 */ addiu $v1, $v1, %lo(D_8024BEA0) -/* D21D14 80241E84 0060282D */ daddu $a1, $v1, $zero -.L80241E88: -/* D21D18 80241E88 24820010 */ addiu $v0, $a0, 0x10 -/* D21D1C 80241E8C AC620000 */ sw $v0, ($v1) -/* D21D20 80241E90 24630004 */ addiu $v1, $v1, 4 -/* D21D24 80241E94 24840001 */ addiu $a0, $a0, 1 -/* D21D28 80241E98 28820070 */ slti $v0, $a0, 0x70 -/* D21D2C 80241E9C 1440FFFA */ bnez $v0, .L80241E88 -/* D21D30 80241EA0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241EA4: -/* D21D34 80241EA4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21D38 80241EA8 24020002 */ addiu $v0, $zero, 2 -/* D21D3C 80241EAC 03E00008 */ jr $ra -/* D21D40 80241EB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s deleted file mode 100644 index 8f9ae1f19d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EB4_D21D44 -/* D21D44 80241EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21D48 80241EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D21D4C 80241EBC 8C82000C */ lw $v0, 0xc($a0) -/* D21D50 80241EC0 0C0B1EAF */ jal evt_get_variable -/* D21D54 80241EC4 8C450000 */ lw $a1, ($v0) -/* D21D58 80241EC8 0040182D */ daddu $v1, $v0, $zero -/* D21D5C 80241ECC 10600012 */ beqz $v1, .L80241F18 -/* D21D60 80241ED0 0000202D */ daddu $a0, $zero, $zero -/* D21D64 80241ED4 8C620000 */ lw $v0, ($v1) -/* D21D68 80241ED8 5040000A */ beql $v0, $zero, .L80241F04 -/* D21D6C 80241EDC 00041080 */ sll $v0, $a0, 2 -/* D21D70 80241EE0 3C058025 */ lui $a1, %hi(D_8024C068) -/* D21D74 80241EE4 24A5C068 */ addiu $a1, $a1, %lo(D_8024C068) -.L80241EE8: -/* D21D78 80241EE8 24630004 */ addiu $v1, $v1, 4 -/* D21D7C 80241EEC 24840001 */ addiu $a0, $a0, 1 -/* D21D80 80241EF0 ACA20000 */ sw $v0, ($a1) -/* D21D84 80241EF4 8C620000 */ lw $v0, ($v1) -/* D21D88 80241EF8 1440FFFB */ bnez $v0, .L80241EE8 -/* D21D8C 80241EFC 24A50004 */ addiu $a1, $a1, 4 -/* D21D90 80241F00 00041080 */ sll $v0, $a0, 2 -.L80241F04: -/* D21D94 80241F04 3C018025 */ lui $at, %hi(D_8024C068) -/* D21D98 80241F08 00220821 */ addu $at, $at, $v0 -/* D21D9C 80241F0C AC20C068 */ sw $zero, %lo(D_8024C068)($at) -/* D21DA0 80241F10 080907D0 */ j .L80241F40 -/* D21DA4 80241F14 00000000 */ nop -.L80241F18: -/* D21DA8 80241F18 3C038025 */ lui $v1, %hi(D_8024C068) -/* D21DAC 80241F1C 2463C068 */ addiu $v1, $v1, %lo(D_8024C068) -/* D21DB0 80241F20 0060282D */ daddu $a1, $v1, $zero -.L80241F24: -/* D21DB4 80241F24 24820080 */ addiu $v0, $a0, 0x80 -/* D21DB8 80241F28 AC620000 */ sw $v0, ($v1) -/* D21DBC 80241F2C 24630004 */ addiu $v1, $v1, 4 -/* D21DC0 80241F30 24840001 */ addiu $a0, $a0, 1 -/* D21DC4 80241F34 2882005B */ slti $v0, $a0, 0x5b -/* D21DC8 80241F38 1440FFFA */ bnez $v0, .L80241F24 -/* D21DCC 80241F3C ACA0016C */ sw $zero, 0x16c($a1) -.L80241F40: -/* D21DD0 80241F40 8FBF0010 */ lw $ra, 0x10($sp) -/* D21DD4 80241F44 24020002 */ addiu $v0, $zero, 2 -/* D21DD8 80241F48 03E00008 */ jr $ra -/* D21DDC 80241F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s deleted file mode 100644 index 3211a4d942..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802411AC_94075C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411AC_94075C -/* 94075C 802411AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940760 802411B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 940764 802411B4 8C82000C */ lw $v0, 0xc($a0) -/* 940768 802411B8 0C0B1EAF */ jal evt_get_variable -/* 94076C 802411BC 8C450000 */ lw $a1, ($v0) -/* 940770 802411C0 0040182D */ daddu $v1, $v0, $zero -/* 940774 802411C4 10600012 */ beqz $v1, .L80241210 -/* 940778 802411C8 0000202D */ daddu $a0, $zero, $zero -/* 94077C 802411CC 8C620000 */ lw $v0, ($v1) -/* 940780 802411D0 5040000A */ beql $v0, $zero, .L802411FC -/* 940784 802411D4 00041080 */ sll $v0, $a0, 2 -/* 940788 802411D8 3C058024 */ lui $a1, %hi(btl_state_update_end_battle) -/* 94078C 802411DC 24A54A50 */ addiu $a1, $a1, %lo(btl_state_update_end_battle) -.L802411E0: -/* 940790 802411E0 24630004 */ addiu $v1, $v1, 4 -/* 940794 802411E4 24840001 */ addiu $a0, $a0, 1 -/* 940798 802411E8 ACA20000 */ sw $v0, ($a1) -/* 94079C 802411EC 8C620000 */ lw $v0, ($v1) -/* 9407A0 802411F0 1440FFFB */ bnez $v0, .L802411E0 -/* 9407A4 802411F4 24A50004 */ addiu $a1, $a1, 4 -/* 9407A8 802411F8 00041080 */ sll $v0, $a0, 2 -.L802411FC: -/* 9407AC 802411FC 3C018024 */ lui $at, %hi(btl_state_update_end_battle) -/* 9407B0 80241200 00220821 */ addu $at, $at, $v0 -/* 9407B4 80241204 AC204A50 */ sw $zero, %lo(btl_state_update_end_battle)($at) -/* 9407B8 80241208 0809048E */ j .L80241238 -/* 9407BC 8024120C 00000000 */ nop -.L80241210: -/* 9407C0 80241210 3C038024 */ lui $v1, %hi(btl_state_update_end_battle) -/* 9407C4 80241214 24634A50 */ addiu $v1, $v1, %lo(btl_state_update_end_battle) -/* 9407C8 80241218 0060282D */ daddu $a1, $v1, $zero -.L8024121C: -/* 9407CC 8024121C 24820010 */ addiu $v0, $a0, 0x10 -/* 9407D0 80241220 AC620000 */ sw $v0, ($v1) -/* 9407D4 80241224 24630004 */ addiu $v1, $v1, 4 -/* 9407D8 80241228 24840001 */ addiu $a0, $a0, 1 -/* 9407DC 8024122C 28820070 */ slti $v0, $a0, 0x70 -/* 9407E0 80241230 1440FFFA */ bnez $v0, .L8024121C -/* 9407E4 80241234 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241238: -/* 9407E8 80241238 8FBF0010 */ lw $ra, 0x10($sp) -/* 9407EC 8024123C 24020002 */ addiu $v0, $zero, 2 -/* 9407F0 80241240 03E00008 */ jr $ra -/* 9407F4 80241244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s deleted file mode 100644 index 203af377fe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241248_9407F8 -/* 9407F8 80241248 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9407FC 8024124C AFBF0010 */ sw $ra, 0x10($sp) -/* 940800 80241250 8C82000C */ lw $v0, 0xc($a0) -/* 940804 80241254 0C0B1EAF */ jal evt_get_variable -/* 940808 80241258 8C450000 */ lw $a1, ($v0) -/* 94080C 8024125C 0040182D */ daddu $v1, $v0, $zero -/* 940810 80241260 10600012 */ beqz $v1, .L802412AC -/* 940814 80241264 0000202D */ daddu $a0, $zero, $zero -/* 940818 80241268 8C620000 */ lw $v0, ($v1) -/* 94081C 8024126C 5040000A */ beql $v0, $zero, .L80241298 -/* 940820 80241270 00041080 */ sll $v0, $a0, 2 -/* 940824 80241274 3C058024 */ lui $a1, %hi(D_80244C18) -/* 940828 80241278 24A54C18 */ addiu $a1, $a1, %lo(D_80244C18) -.L8024127C: -/* 94082C 8024127C 24630004 */ addiu $v1, $v1, 4 -/* 940830 80241280 24840001 */ addiu $a0, $a0, 1 -/* 940834 80241284 ACA20000 */ sw $v0, ($a1) -/* 940838 80241288 8C620000 */ lw $v0, ($v1) -/* 94083C 8024128C 1440FFFB */ bnez $v0, .L8024127C -/* 940840 80241290 24A50004 */ addiu $a1, $a1, 4 -/* 940844 80241294 00041080 */ sll $v0, $a0, 2 -.L80241298: -/* 940848 80241298 3C018024 */ lui $at, %hi(D_80244C18) -/* 94084C 8024129C 00220821 */ addu $at, $at, $v0 -/* 940850 802412A0 AC204C18 */ sw $zero, %lo(D_80244C18)($at) -/* 940854 802412A4 080904B5 */ j .L802412D4 -/* 940858 802412A8 00000000 */ nop -.L802412AC: -/* 94085C 802412AC 3C038024 */ lui $v1, %hi(D_80244C18) -/* 940860 802412B0 24634C18 */ addiu $v1, $v1, %lo(D_80244C18) -/* 940864 802412B4 0060282D */ daddu $a1, $v1, $zero -.L802412B8: -/* 940868 802412B8 24820080 */ addiu $v0, $a0, 0x80 -/* 94086C 802412BC AC620000 */ sw $v0, ($v1) -/* 940870 802412C0 24630004 */ addiu $v1, $v1, 4 -/* 940874 802412C4 24840001 */ addiu $a0, $a0, 1 -/* 940878 802412C8 2882005B */ slti $v0, $a0, 0x5b -/* 94087C 802412CC 1440FFFA */ bnez $v0, .L802412B8 -/* 940880 802412D0 ACA0016C */ sw $zero, 0x16c($a1) -.L802412D4: -/* 940884 802412D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 940888 802412D8 24020002 */ addiu $v0, $zero, 2 -/* 94088C 802412DC 03E00008 */ jr $ra -/* 940890 802412E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240680_8A8600.s b/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240680_8A8600.s deleted file mode 100644 index 5cf84e206a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240680_8A8600.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680_8A8600 -/* 8A8600 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A8604 80240684 AFBF0010 */ sw $ra, 0x10($sp) -/* 8A8608 80240688 0C04417A */ jal get_entity_by_index -/* 8A860C 8024068C 8C840084 */ lw $a0, 0x84($a0) -/* 8A8610 80240690 8C440040 */ lw $a0, 0x40($v0) -/* 8A8614 80240694 24030001 */ addiu $v1, $zero, 1 -/* 8A8618 80240698 A0830030 */ sb $v1, 0x30($a0) -/* 8A861C 8024069C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8A8620 802406A0 24020002 */ addiu $v0, $zero, 2 -/* 8A8624 802406A4 03E00008 */ jr $ra -/* 8A8628 802406A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 6a77fca428..cef6024397 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -26063,7 +26063,7 @@ D_802429A4 = 0x802429A4; // type:data sbk_34_LetterDelivery_SavedNpcAnim = 0x802429A4; // type:data D_802429BC = 0x802429BC; // type:data flo_23_D_802429BC = 0x802429BC; // type:data -D_802429E0 = 0x802429E0; // type:data +EDC020_D_802429E0 = 0x802429E0; // type:data flo_12_D_802429E0 = 0x802429E0; // type:data D_80242A00 = 0x80242A00; // type:data D_80242AC4 = 0x80242AC4; // type:data @@ -26131,7 +26131,7 @@ D_802440FF = 0x802440FF; // type:data D_80244100 = 0x80244100; // type:data D_80244104 = 0x80244104; // type:data dro_02_pad_41B4 = 0x802441B4; // type:data -D_802442D0 = 0x802442D0; // type:data +EB1170_D_802442D0 = 0x802442D0; // type:data code_eb1170_bss = 0x802442D0; // type:data kzn_20_bss = 0x802442D0; // type:data flo_17_pad_XXX = 0x802443D8; // type:data @@ -26144,11 +26144,11 @@ arn_03_pad_47DC = 0x802447DC; // type:data D_80244A20 = 0x80244A20; // type:data arn_03_ConsumableChoiceList = 0x80244A20; // type:data arn_03_KeyItemChoiceList = 0x80244A20; // type:data -D_80244C18 = 0x80244C18; // type:data +sbk_30_D_80244C18 = 0x80244C18; // type:data D_80244D88 = 0x80244D88; // type:data sbk_30_LetterDelivery_SavedNpcAnim = 0x80244D88; // type:data dro_02_pad_4DD4 = 0x80244DD4; // type:data -D_80244E78 = 0x80244E78; // type:data +kkj_18_D_80244E78 = 0x80244E78; // type:data flo_03_pad_4ECC = 0x80244ECC; // type:data flo_14_pad_4F24 = 0x80244F24; // type:data flo_08_pad_4F3C = 0x80244F3C; // type:data @@ -26187,7 +26187,7 @@ D_8024561C = 0x8024561C; // type:data D_8024561F = 0x8024561F; // type:data D_80245620 = 0x80245620; // type:data D_80245624 = 0x80245624; // type:data -D_80245630 = 0x80245630; // type:data +sbk_02_D_80245630 = 0x80245630; // type:data D_80245650 = 0x80245650; // type:data D_802458F0 = 0x802458F0; // type:data D_80245928 = 0x80245928; // type:data @@ -26197,8 +26197,8 @@ D_802459C0 = 0x802459C0; // type:data D_80245AB4 = 0x80245AB4; // type:data obk_01_LetterDelivery_SavedNpcAnim = 0x80245AB4; // type:data flo_00_pad_5E2C = 0x80245E2C; // type:data -D_802461F0 = 0x802461F0; // type:data -D_80246260 = 0x80246260; // type:data +kkj_19_D_802461F0 = 0x802461F0; // type:data +hos_06_D_80246260 = 0x80246260; // type:data flo_08_ItemChoiceList = 0x802462C0; // type:data ECAA80_ItemChoiceList = 0x802462F0; // type:data D_80246300 = 0x80246300; // type:data @@ -26228,7 +26228,7 @@ D_802465A0 = 0x802465A0; // type:data D_802465CC = 0x802465CC; // type:data D_802465F0 = 0x802465F0; // type:data flo_18_pad_66B4 = 0x802466B4; // type:data -D_802466D0 = 0x802466D0; // type:data +EA0C10_D_802466D0 = 0x802466D0; // type:data D_80246794 = 0x80246794; // type:data kzn_02_LetterDelivery_SavedNpcAnim = 0x80246794; // type:data kzn_17_LetterDelivery_SavedNpcAnim = 0x802467B4; // type:data @@ -26267,11 +26267,11 @@ D_80247DF0 = 0x80247DF0; // type:data D_80247E68 = 0x80247E68; // type:data D_80248380 = 0x80248380; // type:data kzn_19_VineRenderState = 0x80248380; // type:data -D_80248388 = 0x80248388; // type:data +EA8AE0_D_80248388 = 0x80248388; // type:data D_802483C0 = 0x802483C0; // type:data D_802483C4 = 0x802483C4; // type:data D_802483D0 = 0x802483D0; // type:data -D_80248480 = 0x80248480; // type:data +iwa_10_D_80248480 = 0x80248480; // type:data D_8024854C = 0x8024854C; // type:data EA8AE0_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C; // type:data @@ -26348,13 +26348,13 @@ mac_02_Quizmo_AnswerResult = 0x8024E558; // type:data mac_02_Quizmo_StageEffect = 0x8024E560; // type:data mac_02_Quizmo_AudienceEffect = 0x8024E564; // type:data mac_02_Quizmo_VannaTEffect = 0x8024E568; // type:data -D_8024E570 = 0x8024E570; // type:data -D_8024E738 = 0x8024E738; // type:data +mac_02_D_8024E570 = 0x8024E570; // type:data +mac_02_D_8024E738 = 0x8024E738; // type:data end_00_CreditsData = 0x8024E960; // type:data D_8024EA10 = 0x8024EA10; // type:data D_8024EA14 = 0x8024EA14; // type:data mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18; // type:data -dro_02_pad_D_8024EF80 = 0x8024EF80; // type:data +dro_02_D_8024EF80 = 0x8024EF80; // type:data gPausePanels = 0x8024EF80; // D_8024EF84 = 0x8024EF84; // type:data dro_02_D_8024EF84 = 0x8024EF84; // type:data @@ -26465,7 +26465,7 @@ mac_04_Quizmo_AnswerResult = 0x8024F5B8; // type:data mac_04_Quizmo_StageEffect = 0x8024F5C0; // type:data mac_04_Quizmo_AudienceEffect = 0x8024F5C4; // type:data mac_04_Quizmo_VannaTEffect = 0x8024F5C8; // type:data -D_8024F5D0 = 0x8024F5D0; // type:data +mac_04_D_8024F5D0 = 0x8024F5D0; // type:data end_00_CreditsDataPtr = 0x8024F7E4; // type:data end_00_CreditsMessageBuffers = 0x8024F7F0; // type:data D_8024FBA0 = 0x8024FBA0; // type:data @@ -26484,7 +26484,7 @@ mac_03_Quizmo_AnswerResult = 0x802513E8; // type:data mac_03_Quizmo_StageEffect = 0x802513F0; // type:data mac_03_Quizmo_AudienceEffect = 0x802513F4; // type:data mac_03_Quizmo_VannaTEffect = 0x802513F8; // type:data -D_80251400 = 0x80251400; // type:data +mac_03_D_80251400 = 0x80251400; // type:data sam_11_Quizmo_Worker = 0x80251450; // type:data sam_11_Quizmo_AnswerResult = 0x80251468; // type:data sam_11_Quizmo_StageEffect = 0x80251470; // type:data @@ -26498,7 +26498,7 @@ nok_01_Quizmo_AnswerResult = 0x80251C58; // type:data nok_01_Quizmo_StageEffect = 0x80251C60; // type:data nok_01_Quizmo_AudienceEffect = 0x80251C64; // type:data nok_01_Quizmo_VannaTEffect = 0x80251C68; // type:data -D_80251C70 = 0x80251C70; // type:data +nok_01_D_80251C70 = 0x80251C70; // type:data D_80251E34 = 0x80251E34; // type:data nok_01_LetterDelivery_SavedNpcAnim = 0x80251E34; // type:data mac_05_Quizmo_Worker = 0x802529D0; // type:data @@ -26507,8 +26507,8 @@ mac_05_Quizmo_StageEffect = 0x802529F0; // type:data mac_05_Quizmo_AudienceEffect = 0x802529F4; // type:data D_802529F8 = 0x802529F8; // type:data mac_05_Quizmo_VannaTEffect = 0x802529F8; // type:data -D_80252A00 = 0x80252A00; // type:data -D_80252BC8 = 0x80252BC8; // type:data +mac_05_D_80252A00 = 0x80252A00; // type:data +mac_05_D_80252BC8 = 0x80252BC8; // type:data mac_05_LetterDelivery_SavedNpcAnim = 0x80252D38; // type:data D_80253060 = 0x80253060; // type:data dgb_01_pad_2 = 0x80253158; // type:data @@ -26516,18 +26516,18 @@ D_80253378 = 0x80253378; // type:data D_80253384 = 0x80253384; // type:data D_8025338C = 0x8025338C; // type:data D_80253390 = 0x80253390; // type:data -D_802547D0 = 0x802547D0; // type:data +nok_02_D_802547D0 = 0x802547D0; // type:data nok_02_Quizmo_Worker = 0x802549A0; // type:data nok_02_Quizmo_AnswerResult = 0x802549B8; // type:data nok_02_Quizmo_StageEffect = 0x802549C0; // type:data nok_02_Quizmo_AudienceEffect = 0x802549C4; // type:data nok_02_Quizmo_VannaTEffect = 0x802549C8; // type:data -D_802549D0 = 0x802549D0; // type:data +nok_02_D_802549D0 = 0x802549D0; // type:data D_80254B94 = 0x80254B94; // type:data nok_02_LetterDelivery_SavedNpcAnim = 0x80254B94; // type:data -D_80254BA0 = 0x80254BA0; // type:data +nok_02_D_80254BA0 = 0x80254BA0; // type:data D_80254C50 = 0x80254C50; // type:data -D_80254D68 = 0x80254D68; // type:data +nok_02_D_80254D68 = 0x80254D68; // type:data D_8025595C = 0x8025595C; // type:data D_8025599C = 0x8025599C; // type:data mac_00_Quizmo_Worker = 0x80255B70; // type:data @@ -26535,8 +26535,8 @@ mac_00_Quizmo_AnswerResult = 0x80255B88; // type:data mac_00_Quizmo_StageEffect = 0x80255B90; // type:data mac_00_Quizmo_AudienceEffect = 0x80255B94; // type:data mac_00_Quizmo_VannaTEffect = 0x80255B98; // type:data -D_80255BA0 = 0x80255BA0; // type:data -D_80255D68 = 0x80255D68; // type:data +mac_00_D_80255BA0 = 0x80255BA0; // type:data +mac_00_D_80255D68 = 0x80255D68; // type:data mac_00_LetterDelivery_SavedNpcAnim = 0x80255ED8; // type:data D_80255EE0 = 0x80255EE0; // type:data dup_mac_00_LetterDelivery_SavedNpcAnim = 0x802560A4; // type:data @@ -26562,7 +26562,7 @@ kmr_02_Quizmo_AnswerResult = 0x80257F40; // type:data kmr_02_Quizmo_StageEffect = 0x80257F48; // type:data kmr_02_Quizmo_AudienceEffect = 0x80257F4C; // type:data kmr_02_Quizmo_VannaTEffect = 0x80257F50; // type:data -D_80257F58 = 0x80257F58; // type:data +kmr_02_D_80257F58 = 0x80257F58; // type:data D_8025811C = 0x8025811C; // type:data kmr_02_LetterDelivery_SavedNpcAnim = 0x8025811C; // type:data D_80258120 = 0x80258120; // type:data @@ -26579,7 +26579,7 @@ mac_01_Quizmo_AnswerResult = 0x80262A58; // type:data mac_01_Quizmo_StageEffect = 0x80262A60; // type:data mac_01_Quizmo_AudienceEffect = 0x80262A64; // type:data mac_01_Quizmo_VannaTEffect = 0x80262A68; // type:data -D_80262A70 = 0x80262A70; // type:data +mac_01_D_80262A70 = 0x80262A70; // type:data mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34; // type:data D_80262C38 = 0x80262C38; // type:data D_80262F68 = 0x80262F68; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 987f4ea4ca..34ea5e1363 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -91,6 +91,7 @@ dead_wDisabledPartnerHudScripts = 0x801000A0; dead_evt_get_variable = 0x802D4E8C; dead_evt_set_variable = 0x802D5468; dead_evt_get_float_variable = 0x802D57FC; +dead_sin_rad = 0x8002B45C; dead_cos_rad = 0x8002B4C0; dead_evt_set_float_variable = 0x802D5A10; dead_fx_sparkles = 0x80075170; @@ -148,7 +149,7 @@ func_8002AA2C = 0x8002AA2C; func_80059AC8 = 0x80059AC8; dead_get_entity_by_index = 0x80118BB0; dead_fx_sun = 0x80077BD0; -func_80041080 = 0x80041080; +dead_func_8003D660 = 0x80041080; dead_set_max_SP = 0x800F1D9C; dead_sync_status_menu = 0x800F1730; dead_get_npc_by_index = 0x8003C43C; @@ -215,6 +216,11 @@ dead_osVirtualToPhysical = 0x80066FE0; dead_transform_point = 0x8002A910; dead_gMasterGfxPos = 0x800A15C4; dead_nuGfxCfb_ptr = 0x800A15A4; +dead_guMtxF2L = 0x8006C6C0; +dead_mdl_get_copied_vertices = 0x801266F8; +dead_mdl_get_copied_gfx = 0x80126734; +dead_gMatrixListPos = 0x80079540; +dead_gDisplayContext = 0x800A15CC; // TODO below @@ -247,7 +253,7 @@ D_80210000 = 0x80210000; func_80242040_8B20B0 = 0x80242040; spiked_goomba = 0x8021B0AC; paragoomba = 0x8021CD00; -D_802442D0 = 0x802442D0; +EB1170_D_802442D0 = 0x802442D0; D_802AB513 = 0x802AB513; D_80247AF0_CCB300 = 0x80247AF0; @@ -265,7 +271,6 @@ D_800FBBE0 = 0x800FBBE0; D_80164000 = 0x80164000; // display contexts, part of bss3 -D_8022AD80_4C3F70 = 0x8022AD80; b_area_kzn2_VineData = 0x8022ADD0; b_area_kzn2_VineRenderState = 0x8022B550; D_80232C4C = 0x80232C4C; @@ -330,7 +335,7 @@ D_80242344 = 0x80242344; D_802423B0 = 0x802423B0; D_802429BC = 0x802429BC; D_80242A00 = 0x80242A00; -D_802429E0 = 0x802429E0; +flo_12_D_802429E0 = 0x802429E0; D_80242C00 = 0x80242C00; D_80242FB0 = 0x80242FB0; D_80243190 = 0x80243190; @@ -357,13 +362,13 @@ D_802440FC = 0x802440FC; D_802440FF = 0x802440FF; D_80244100 = 0x80244100; D_80244104 = 0x80244104; -D_802442D0 = 0x802442D0; +EB1170_D_802442D0 = 0x802442D0; kzn_20_LetterDelivery_SavedNpcAnim = 0x80244494; D_802447C0 = 0x802447C0; D_80244A20 = 0x80244A20; -D_80244C18 = 0x80244C18; +sbk_30_D_80244C18 = 0x80244C18; D_80244D88 = 0x80244D88; -D_80244E78 = 0x80244E78; +kkj_18_D_80244E78 = 0x80244E78; D_802451F0 = 0x802451F0; D_80245230 = 0x80245230; D_802453D8 = 0x802453D8; @@ -381,14 +386,14 @@ D_80245614 = 0x80245614; D_80245618 = 0x80245618; D_8024561C = 0x8024561C; D_80245620 = 0x80245620; -D_80245630 = 0x80245630; +sbk_02_D_80245630 = 0x80245630; D_80245650 = 0x80245650; D_80245928 = 0x80245928; D_8024592C = 0x8024592C; D_802459C0 = 0x802459C0; D_80245AB4 = 0x80245AB4; -D_802461F0 = 0x802461F0; -D_80246260 = 0x80246260; +kkj_19_D_802461F0 = 0x802461F0; +hos_06_D_80246260 = 0x80246260; ECAA80_ItemChoiceList = 0x802462F0; D_80246300 = 0x80246300; D_80246424 = 0x80246424; @@ -404,7 +409,7 @@ D_8024659C = 0x8024659C; D_802465A0 = 0x802465A0; D_802465CC = 0x802465CC; D_802465F0 = 0x802465F0; -D_802466D0 = 0x802466D0; +EA0C10_D_802466D0 = 0x802466D0; D_80246794 = 0x80246794; EB1170_LetterDelivery_SavedNpcAnim = 0x80244494; EA8AE0_LetterDelivery_SavedNpcAnim = 0x8024854C; @@ -426,6 +431,7 @@ sbk_30_LetterDelivery_SavedNpcAnim = 0x80244D88; sbk_34_LetterDelivery_SavedNpcAnim = 0x802429A4; obk_01_LetterDelivery_SavedNpcAnim = 0x80245AB4; obk_03_LetterDelivery_SavedNpcAnim = 0x80243DA4; +D_80243370 = 0x80243370; D_80246990 = 0x80246990; D_80246BE8 = 0x80246BE8; D_80247050 = 0x80247050; @@ -440,11 +446,11 @@ D_80247CA0 = 0x80247CA0; D_80247CB4 = 0x80247CB4; D_80247D00 = 0x80247D00; D_80247E68 = 0x80247E68; -D_80248388 = 0x80248388; +EA8AE0_D_80248388 = 0x80248388; D_802483C0 = 0x802483C0; D_802483C4 = 0x802483C4; D_802483D0 = 0x802483D0; -D_80248480 = 0x80248480; +iwa_10_D_80248480 = 0x80248480; D_80248600 = 0x80248600; D_80248624 = 0x80248624; D_80248650 = 0x80248650; @@ -496,9 +502,12 @@ mac_02_Quizmo_AnswerResult = 0x8024E558; mac_02_Quizmo_StageEffect = 0x8024E560; mac_02_Quizmo_AudienceEffect = 0x8024E564; mac_02_Quizmo_VannaTEffect = 0x8024E568; -D_8024E570 = 0x8024E570; -D_8024E738 = 0x8024E738; +mac_02_D_8024E570 = 0x8024E570; +mac_02_D_8024E738 = 0x8024E738; end_00_CreditsData = 0x8024E960; +sbk_30_D_80244A50 = 0x80244A50; +kkj_18_D_80244CB0 = 0x80244CB0; +EDC020_D_802429E0 = 0x802429E0; D_8024EA10 = 0x8024EA10; D_8024EA14 = 0x8024EA14; mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18; @@ -582,7 +591,7 @@ D_8024F5A4 = 0x8024F5A4; mac_04_Quizmo_AnswerResult = 0x8024F5B8; // type:data mac_04_Quizmo_AudienceEffect = 0x8024F5C4; mac_04_Quizmo_VannaTEffect = 0x8024F5C8; -D_8024F5D0 = 0x8024F5D0; +mac_04_D_8024F5D0 = 0x8024F5D0; end_00_CreditsDataPtr = 0x8024F7E4; end_00_CreditsMessageBuffers = 0x8024F7F0; D_8024FBA0 = 0x8024FBA0; @@ -599,7 +608,7 @@ mac_03_Quizmo_AnswerResult = 0x802513E8; mac_03_Quizmo_StageEffect = 0x802513F0; mac_03_Quizmo_AudienceEffect = 0x802513F4; mac_03_Quizmo_VannaTEffect = 0x802513F8; -D_80251400 = 0x80251400; +mac_03_D_80251400 = 0x80251400; sam_11_Quizmo_Worker = 0x80251450; sam_11_Quizmo_AnswerResult = 0x80251468; sam_11_Quizmo_StageEffect = 0x80251470; @@ -611,38 +620,38 @@ nok_01_Quizmo_AnswerResult = 0x80251C58; nok_01_Quizmo_StageEffect = 0x80251C60; nok_01_Quizmo_AudienceEffect = 0x80251C64; nok_01_Quizmo_VannaTEffect = 0x80251C68; -D_80251C70 = 0x80251C70; +nok_01_D_80251C70 = 0x80251C70; D_80251E34 = 0x80251E34; mac_05_Quizmo_Worker = 0x802529D0; mac_05_Quizmo_AnswerResult = 0x802529E8; mac_05_Quizmo_StageEffect = 0x802529F0; mac_05_Quizmo_AudienceEffect = 0x802529F4; mac_05_Quizmo_VannaTEffect = 0x802529F8; -D_80252A00 = 0x80252A00; -D_80252BC8 = 0x80252BC8; +mac_05_D_80252A00 = 0x80252A00; +mac_05_D_80252BC8 = 0x80252BC8; mac_05_LetterDelivery_SavedNpcAnim = 0x80252D38; D_80253060 = 0x80253060; D_80253378 = 0x80253378; D_80253384 = 0x80253384; D_8025338C = 0x8025338C; D_80253390 = 0x80253390; -D_802547D0 = 0x802547D0; +nok_02_D_802547D0 = 0x802547D0; nok_02_Quizmo_AnswerResult = 0x802549B8; nok_02_Quizmo_Worker = 0x802549A0; nok_02_Quizmo_StageEffect = 0x802549C0; nok_02_Quizmo_AudienceEffect = 0x802549C4; nok_02_Quizmo_VannaTEffect = 0x802549C8; -D_802549D0 = 0x802549D0; +nok_02_D_802549D0 = 0x802549D0; D_80254B94 = 0x80254B94; -D_80254BA0 = 0x80254BA0; -D_80254D68 = 0x80254D68; +nok_02_D_80254BA0 = 0x80254BA0; +nok_02_D_80254D68 = 0x80254D68; mac_00_Quizmo_Worker = 0x80255B70; mac_00_Quizmo_AnswerResult = 0x80255B88; mac_00_Quizmo_StageEffect = 0x80255B90; mac_00_Quizmo_AudienceEffect = 0x80255B94; mac_00_Quizmo_VannaTEffect = 0x80255B98; -D_80255BA0 = 0x80255BA0; -D_80255D68 = 0x80255D68; +mac_00_D_80255BA0 = 0x80255BA0; +mac_00_D_80255D68 = 0x80255D68; mac_00_LetterDelivery_SavedNpcAnim = 0x80255ED8; D_80255EE0 = 0x80255EE0; dup_mac_00_LetterDelivery_SavedNpcAnim = 0x802560A4; @@ -664,7 +673,7 @@ kmr_02_Quizmo_StageEffect = 0x80257F48; kmr_02_Quizmo_AudienceEffect = 0x80257F4C; kmr_02_Quizmo_VannaTEffect = 0x80257F50; kmr_21_802407F4 = 0x802407F4; -D_80257F58 = 0x80257F58; +kmr_02_D_80257F58 = 0x80257F58; D_8025811C = 0x8025811C; D_80258120 = 0x80258120; D_80258140 = 0x80258140; @@ -679,7 +688,7 @@ mac_01_Quizmo_AnswerResult = 0x80262A58; mac_01_Quizmo_StageEffect = 0x80262A60; mac_01_Quizmo_AudienceEffect = 0x80262A64; mac_01_Quizmo_VannaTEffect = 0x80262A68; -D_80262A70 = 0x80262A70; +mac_01_D_80262A70 = 0x80262A70; mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34; D_80262C38 = 0x80262C38; D_80262F68 = 0x80262F68;