From 8fbdc830555bc7a25d6297adc6c1d2fa04eacbdc Mon Sep 17 00:00:00 2001 From: Maide <34639600+Kelebek1@users.noreply.github.com> Date: Thu, 8 Apr 2021 18:42:36 +0100 Subject: [PATCH] area_dgb (#254) * area_arn/arn_02 * Signed StoryProgress enum * arn_03 * Update scripts * arn_04 * fix kmr * Broken for Ethan * Commiting before maybe breaking everything * Fix star rod * Add funcs * arn_05 * arn_07 * arn_08/arn_09 * Cleanup prototypes * arn_11/12/13 * Cleanup * Cleanup * Review * Add npc flag * Comments * dgb_01 * dgb_02 * dgb_03 * dgb_04 * Fixup commented functions * dgb_05 * dgb_06 * dgb_07 * dgb_08 * dgb_09 * dgb_10 * dgb_11 * dgb_12 * dgb_15 * dgb_13 * dgb_14 * dgb_16 * dgb_17 * dgb_18 * Dumb newlines * Replacing some funcs, scared I'll break everything to commit NOW! * More * More * More * a * b * c * d * e * f * remove asm * Move newlines --- include/common_structs.h | 2 +- include/enums.h | 19 +- include/functions.h | 21 +- include/macros.h | 1 + include/map.h | 6 +- include/messages.h | 2 - include/script_api/common.h | 1 + src/code_23680.c | 2 +- src/code_25AF0.c | 2 +- src/code_4ac90_len_3910.c | 2 +- src/code_B9D60.c | 2 +- src/code_EA0C10.c | 12 +- src/code_EA8AE0.c | 12 +- src/code_EB1170.c | 12 +- src/code_EB8E90.c | 16 +- src/code_EB9D90.c | 2 +- src/code_EC2240.c | 6 +- src/code_EC7590.c | 6 +- src/code_ECAA80.c | 6 +- src/code_ED0310.c | 8 +- src/code_ED42A0.c | 6 +- src/code_ED510.c | 4 +- src/code_EDC020.c | 12 +- src/code_EDEA00.c | 8 +- src/code_EE70C0.c | 14 +- src/code_EEDF50.c | 8 +- src/code_EF2680.c | 8 +- src/code_EFEB00.c | 4 +- src/code_F5750.c | 28 +- src/code_FBE10.c | 6 +- src/code_f4c60_len_4300.c | 4 +- src/code_f8f60_len_1560.c | 18 +- src/code_fa4c0_len_3bf0.c | 10 +- src/code_fe0b0_len_5a0.c | 4 +- src/world/area_arn/arn_02/events.c | 32 +- src/world/area_arn/arn_03/arn_03.h | 4 - src/world/area_arn/arn_03/events.c | 14 +- src/world/area_arn/arn_04/events.c | 51 +- src/world/area_arn/arn_05/arn_05.h | 11 +- src/world/area_arn/arn_05/events.c | 223 +- src/world/area_arn/arn_07/BECDF0.c | 46 +- src/world/area_arn/arn_07/arn_07.h | 41 +- src/world/area_arn/arn_07/events.c | 100 +- src/world/area_arn/arn_08/arn_08.h | 20 +- src/world/area_arn/arn_08/events.c | 41 +- src/world/area_arn/arn_10/events.c | 2 +- src/world/area_arn/arn_11/events.c | 28 +- src/world/area_arn/arn_12/events.c | 2 +- src/world/area_arn/arn_13/events.c | 2 +- src/world/area_dgb/dgb_00/BFA0A0.c | 130 +- src/world/area_dgb/dgb_00/BFA100.c | 799 ++- src/world/area_dgb/dgb_00/dgb_00.h | 11 + src/world/area_dgb/dgb_01/BFD880.c | 2 +- src/world/area_dgb/dgb_01/BFD8C0.c | 2 + src/world/area_dgb/dgb_01/BFD9A0.c | 1781 ++++- src/world/area_dgb/dgb_01/data.c | 6143 +++++++++++++++++ src/world/area_dgb/dgb_01/data0.c | 13 + src/world/area_dgb/dgb_01/data1.c | 13 + src/world/area_dgb/dgb_01/data2.c | 13 + src/world/area_dgb/dgb_01/data3.c | 13 + src/world/area_dgb/dgb_01/data4.c | 13 + src/world/area_dgb/dgb_01/data5.c | 13 + src/world/area_dgb/dgb_01/data6.c | 13 + src/world/area_dgb/dgb_01/data7.c | 13 + src/world/area_dgb/dgb_01/dgb_01.h | 32 + src/world/area_dgb/dgb_02/C2EBA0.c | 875 ++- src/world/area_dgb/dgb_02/dgb_02.h | 7 + src/world/area_dgb/dgb_03/C314E0.c | 48 +- src/world/area_dgb/dgb_03/C31730.c | 1404 +++- src/world/area_dgb/dgb_03/dgb_03.h | 15 + src/world/area_dgb/dgb_04/C36530.c | 1353 +++- src/world/area_dgb/dgb_04/dgb_04.h | 23 + src/world/area_dgb/dgb_05/C3AA10.c | 811 ++- src/world/area_dgb/dgb_05/dgb_05.h | 10 + src/world/area_dgb/dgb_06/C3D080.c | 201 +- src/world/area_dgb/dgb_06/dgb_06.h | 4 + src/world/area_dgb/dgb_07/C3DBF0.c | 720 +- src/world/area_dgb/dgb_07/dgb_07.h | 7 + src/world/area_dgb/dgb_08/C3FDB0.c | 1849 ++++- src/world/area_dgb/dgb_08/dgb_08.h | 17 + src/world/area_dgb/dgb_09/C46BE0.c | 1598 ++++- src/world/area_dgb/dgb_09/dgb_09.h | 9 + src/world/area_dgb/dgb_10/C4C390.c | 353 +- src/world/area_dgb/dgb_10/dgb_10.h | 12 + src/world/area_dgb/dgb_11/C4D3E0.c | 217 +- src/world/area_dgb/dgb_11/dgb_11.h | 5 + src/world/area_dgb/dgb_12/C4DEF0.c | 179 +- src/world/area_dgb/dgb_12/dgb_12.h | 4 + src/world/area_dgb/dgb_13/C4E960.c | 135 + src/world/area_dgb/dgb_13/dgb_13.h | 8 + src/world/area_dgb/dgb_14/C4F030.c | 108 + src/world/area_dgb/dgb_14/dgb_14.h | 7 + src/world/area_dgb/dgb_15/C4F510.c | 759 +- src/world/area_dgb/dgb_15/dgb_15.h | 14 + src/world/area_dgb/dgb_16/C52540.c | 1077 ++- src/world/area_dgb/dgb_16/dgb_16.h | 7 + src/world/area_dgb/dgb_17/C55A60.c | 106 + src/world/area_dgb/dgb_17/dgb_17.h | 7 + src/world/area_dgb/dgb_18/C55F40.c | 832 ++- src/world/area_dgb/dgb_18/C56EF0.c | 9 +- src/world/area_dgb/dgb_18/dgb_18.h | 10 + src/world/area_dro/dro_01/95B7E0.c | 220 +- src/world/area_dro/dro_01/95E660.c | 6 +- src/world/area_dro/dro_02/9694C0.c | 12 +- src/world/area_flo/flo_00/C9DF60.c | 208 +- src/world/area_flo/flo_03/CA72E0.c | 6 +- src/world/area_flo/flo_07/CAC5D0.c | 6 +- src/world/area_flo/flo_08/CAED40.c | 179 +- src/world/area_flo/flo_08/CAFAC0.c | 6 +- src/world/area_flo/flo_09/CB5320.c | 190 +- src/world/area_flo/flo_10/CB9280.c | 6 +- src/world/area_flo/flo_12/CC0E70.c | 12 +- src/world/area_flo/flo_13/CC3850.c | 251 +- src/world/area_flo/flo_14/CCBE20.c | 257 +- src/world/area_flo/flo_16/CD1F10.c | 181 +- src/world/area_flo/flo_16/CD2C80.c | 251 +- src/world/area_flo/flo_17/CD7350.c | 251 +- src/world/area_flo/flo_21/CE6700.c | 2 +- src/world/area_flo/flo_23/CEE2A0.c | 6 +- src/world/area_flo/flo_25/CF2C10.c | 318 +- src/world/area_hos/hos_00/A0C4E0.c | 6 +- src/world/area_hos/hos_01/A11020.c | 6 +- src/world/area_hos/hos_02/A17210.c | 251 +- src/world/area_hos/hos_03/A1BDB0.c | 257 +- src/world/area_hos/hos_04/A27AA0.c | 6 +- src/world/area_hos/hos_05/A2EC30.c | 6 +- src/world/area_hos/hos_06/A397F0.c | 12 +- src/world/area_hos/hos_06/A3A230.c | 12 +- src/world/area_hos/hos_06/A3B4B0.c | 6 +- src/world/area_isk/isk_04/97BF60.c | 6 +- src/world/area_isk/isk_09/9864E0.c | 6 +- src/world/area_isk/isk_10/988B60.c | 181 +- src/world/area_iwa/iwa_00/90CC40.c | 6 +- src/world/area_iwa/iwa_01/90FBD0.c | 90 +- src/world/area_iwa/iwa_02/915D70.c | 96 +- src/world/area_iwa/iwa_03/918BB0.c | 6 +- src/world/area_iwa/iwa_03/918EF0.c | 90 +- src/world/area_iwa/iwa_04/91B8E0.c | 90 +- src/world/area_iwa/iwa_10/91E5B0.c | 6 +- src/world/area_iwa/iwa_10/91E6D0.c | 179 +- src/world/area_iwa/iwa_10/91F5A0.c | 6 +- src/world/area_jan/jan_00/B20540.c | 12 +- src/world/area_jan/jan_02/B2C8A0.c | 220 +- src/world/area_jan/jan_03/B34BD0.c | 220 +- src/world/area_jan/jan_04/B44AC0.c | 6 +- src/world/area_jan/jan_05/B4B260.c | 213 +- src/world/area_jan/jan_06/B52F70.c | 215 +- src/world/area_jan/jan_07/B59870.c | 213 +- src/world/area_jan/jan_08/B5E910.c | 179 +- src/world/area_jan/jan_08/B5F650.c | 213 +- src/world/area_jan/jan_09/B663F0.c | 213 +- src/world/area_jan/jan_12/B73570.c | 213 +- src/world/area_jan/jan_22/B84180.c | 214 +- src/world/area_kkj/kkj_00/ABB340.c | 208 +- src/world/area_kkj/kkj_01/AC5170.c | 208 +- src/world/area_kkj/kkj_17/AF1C60.c | 6 +- src/world/area_kkj/kkj_18/AF2FE0.c | 6 +- src/world/area_kkj/kkj_19/AF7C00.c | 6 +- src/world/area_kkj/kkj_20/AFDB40.c | 6 +- src/world/area_kmr/kmr_02/8B0070.c | 12 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 - src/world/area_kmr/kmr_03/8C8140.c | 54 +- src/world/area_kmr/kmr_03/kmr_03.h | 12 +- src/world/area_kmr/kmr_04/8CA960.c | 6 +- src/world/area_kmr/kmr_05/8CE070.c | 190 +- src/world/area_kmr/kmr_06/8D1510.c | 190 +- src/world/area_kmr/kmr_07/8D3DC0.c | 13 + src/world/area_kmr/kmr_09/8D5E00.c | 251 +- src/world/area_kmr/kmr_10/8D84D0.c | 6 +- src/world/area_kmr/kmr_12/events.c | 12 +- src/world/area_kmr/kmr_20/8ED440.c | 6 +- src/world/area_kpa/kpa_04/A4BF60.c | 2 +- src/world/area_kpa/kpa_111/A99590.c | 4 +- src/world/area_kpa/kpa_113/A9CC70.c | 4 +- src/world/area_kpa/kpa_115/A9ED40.c | 4 +- src/world/area_kpa/kpa_14/A57830.c | 6 +- src/world/area_kpa/kpa_15/A596A0.c | 6 +- src/world/area_kpa/kpa_81/A78510.c | 6 +- src/world/area_kpa/kpa_82/A7A550.c | 6 +- src/world/area_kpa/kpa_91/A86A50.c | 208 +- src/world/area_kpa/kpa_95/A8CB60.c | 208 +- src/world/area_kzn/kzn_02/C5AC20.c | 324 +- src/world/area_kzn/kzn_03/C61020.c | 139 +- src/world/area_kzn/kzn_04/C68440.c | 179 +- src/world/area_kzn/kzn_07/C6EA50.c | 251 +- src/world/area_kzn/kzn_08/C71C10.c | 6 +- src/world/area_kzn/kzn_08/C71ED0.c | 439 +- src/world/area_kzn/kzn_09/C76CE0.c | 179 +- src/world/area_kzn/kzn_09/C77D00.c | 139 +- src/world/area_kzn/kzn_11/C80600.c | 312 +- src/world/area_kzn/kzn_17/C85DC0.c | 139 +- src/world/area_kzn/kzn_19/C8DBB0.c | 14 +- src/world/area_kzn/kzn_20/C96240.c | 12 +- src/world/area_mac/mac_00/7EB340.c | 12 +- src/world/area_mac/mac_00/7ED280.c | 220 +- src/world/area_mac/mac_01/8017D0.c | 220 +- src/world/area_mac/mac_01/805DD0.c | 208 +- src/world/area_mac/mac_02/823BF0.c | 220 +- src/world/area_mac/mac_03/831B20.c | 12 +- src/world/area_mac/mac_04/843030.c | 12 +- src/world/area_mac/mac_05/852170.c | 220 +- src/world/area_mgm/mgm_00/E0E7A0.c | 208 +- src/world/area_mim/mim_01/B93940.c | 127 +- src/world/area_mim/mim_02/B97C70.c | 6 +- src/world/area_mim/mim_04/B9DB60.c | 6 +- src/world/area_mim/mim_05/BA07A0.c | 127 +- src/world/area_mim/mim_06/BA4CF0.c | 127 +- src/world/area_mim/mim_08/BAD940.c | 378 +- src/world/area_mim/mim_10/BB59E0.c | 8 + src/world/area_nok/nok_01/9C53E0.c | 12 +- src/world/area_nok/nok_02/9D7020.c | 12 +- src/world/area_nok/nok_02/9D7AA0.c | 224 +- src/world/area_nok/nok_02/9DA8F0.c | 12 +- src/world/area_nok/nok_11/9F4A40.c | 251 +- src/world/area_nok/nok_12/9FAD60.c | 208 +- src/world/area_nok/nok_14/A02A00.c | 251 +- src/world/area_nok/nok_15/A06F00.c | 251 +- src/world/area_obk/obk_01/BBD980.c | 12 +- src/world/area_obk/obk_03/BC43F0.c | 12 +- src/world/area_obk/obk_04/BC7EB0.c | 6 +- src/world/area_obk/obk_07/BCEBF0.c | 6 +- src/world/area_omo/omo_04/DAD400.c | 257 +- src/world/area_omo/omo_05/DB22C0.c | 257 +- src/world/area_omo/omo_06/DB8180.c | 6 +- src/world/area_omo/omo_07/DBD2B0.c | 459 +- src/world/area_omo/omo_07/DC01D0.c | 6 +- src/world/area_omo/omo_09/DCD3F0.c | 6 +- src/world/area_omo/omo_09/DCD6B0.c | 208 +- src/world/area_omo/omo_11/DDCFC0.c | 179 +- src/world/area_omo/omo_13/DE2710.c | 6 +- src/world/area_omo/omo_13/DE36C0.c | 6 +- src/world/area_omo/omo_17/DEF400.c | 251 +- src/world/area_osr/osr_01/AB0350.c | 12 +- src/world/area_pra/pra_01/D4D060.c | 6 +- src/world/area_pra/pra_02/D50010.c | 6 +- src/world/area_pra/pra_05/D55BD0.c | 6 +- src/world/area_pra/pra_09/D588B0.c | 6 +- src/world/area_pra/pra_11/D61520.c | 6 +- src/world/area_pra/pra_12/D62D10.c | 6 +- src/world/area_pra/pra_13/D64600.c | 10 +- src/world/area_pra/pra_14/D67D20.c | 6 +- src/world/area_pra/pra_19/D6E9D0.c | 6 +- src/world/area_pra/pra_22/D788A0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 6 +- src/world/area_pra/pra_28/D7B2A0.c | 6 +- src/world/area_pra/pra_31/D7ED80.c | 6 +- src/world/area_pra/pra_31/D7F270.c | 2 +- src/world/area_pra/pra_32/D86A20.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 335 +- src/world/area_pra/pra_35/D8FBA0.c | 6 +- src/world/area_pra/pra_37/D92F40.c | 127 +- src/world/area_sam/sam_01/CF7E80.c | 18 +- src/world/area_sam/sam_02/D05F60.c | 6 +- src/world/area_sam/sam_03/D110C0.c | 127 +- src/world/area_sam/sam_04/D138E0.c | 6 +- src/world/area_sam/sam_05/D187E0.c | 127 +- src/world/area_sam/sam_06/D203E0.c | 263 +- src/world/area_sam/sam_07/D2BD30.c | 127 +- src/world/area_sam/sam_08/D2FC80.c | 179 +- src/world/area_sam/sam_08/D309C0.c | 127 +- src/world/area_sam/sam_09/D362F0.c | 6 +- src/world/area_sam/sam_10/D37800.c | 6 +- src/world/area_sam/sam_10/D37BD0.c | 127 +- src/world/area_sam/sam_11/D3ADA0.c | 6 +- src/world/area_sbk/sbk_00/9292B0.c | 2 +- src/world/area_sbk/sbk_01/929AD0.c | 2 +- src/world/area_sbk/sbk_02/92A9A0.c | 12 +- src/world/area_sbk/sbk_30/93F5B0.c | 12 +- src/world/area_sbk/sbk_34/945F10.c | 12 +- src/world/area_sbk/sbk_56/953FC0.c | 179 +- src/world/area_tik/tik_02/86CA50.c | 6 +- src/world/area_tik/tik_05/8750D0.c | 6 +- src/world/area_tik/tik_07/879BE0.c | 179 +- src/world/area_tik/tik_07/87AC00.c | 190 +- src/world/area_tik/tik_10/8866D0.c | 179 +- src/world/area_tik/tik_12/8891C0.c | 183 +- src/world/area_tik/tik_15/890190.c | 6 +- src/world/area_tik/tik_17/892A50.c | 179 +- src/world/area_tik/tik_19/897BD0.c | 179 +- src/world/area_trd/trd_00/999F80.c | 6 +- src/world/area_trd/trd_02/9A10C0.c | 208 +- src/world/area_trd/trd_04/9A88A0.c | 459 +- src/world/area_trd/trd_07/9B6C90.c | 251 +- src/world/area_trd/trd_10/9C2910.c | 2 +- src/world/area_tst/tst_13/B1D760.c | 35 + src/world/common/UnkFunc10.inc.c | 38 + src/world/common/UnkFunc11.inc.c | 28 + src/world/common/UnkFunc12.inc.c | 24 + src/world/common/UnkFunc13.inc.c | 50 + src/world/common/UnkFunc13_copy.inc.c | 50 + src/world/common/UnkFunc14.inc.c | 32 + src/world/common/UnkFunc14_copy.inc.c | 32 + src/world/common/UnkFunc15.inc.c | 23 + src/world/common/UnkFunc15_copy.inc.c | 23 + src/world/common/UnkFunc16.inc.c | 20 + src/world/common/UnkFunc16_copy.inc.c | 20 + src/world/common/UnkFunc17.inc.c | 7 + src/world/common/UnkFunc18.inc.c | 14 + src/world/common/UnkFunc19.inc.c | 10 + src/world/common/UnkFunc20.inc.c | 14 + src/world/common/UnkFunc21.inc.c | 10 + src/world/common/UnkFunc22.inc.c | 10 + src/world/common/UnkFunc23.inc.c | 49 + src/world/common/UnkFunc24.inc.c | 11 + src/world/common/UnkFunc4.inc.c | 67 + src/world/common/UnkFunc5.inc.c | 31 + src/world/common/UnkFunc6.inc.c | 89 + src/world/common/UnkFunc7.inc.c | 74 + src/world/common/UnkFunc8.inc.c | 28 + src/world/common/UnkFunc9.inc.c | 19 + src/world/common/UnkNpcAIFunc11.inc.c | 2 +- src/world/common/UnkNpcAIFunc13.inc.c | 6 +- src/world/script_api/7E0E80.c | 2 +- src/world/script_api/7E2AA0.c | 2 +- src/world/script_api/7E3700.c | 10 +- tools/compile_dsl_macros.py | 1 + tools/disasm_script.py | 126 +- tools/gfxdis_loop.py | 52 + tools/new_lines.py | 13 + tools/star_rod_idx_to_c.py | 145 +- tools/substitute2.py | 81 + ver/us/asm/data/code_1422A0.data.s | 4 +- .../world/area_dgb/dgb_01/C20C70.rodata.s | 6 +- .../data/world/area_dgb/dgb_04/C39A90.data.s | 5 +- .../world/area_dgb/dgb_04/C3A910.rodata.s | 4 - .../world/area_dgb/dgb_08/C467B0.rodata.s | 6 - .../world/area_dgb/dgb_09/C4BF50.rodata.s | 6 - .../data/world/area_flo/flo_08/CB0C20.data.s | 2 +- .../data/world/area_flo/flo_16/CD5530.data.s | 2 +- .../data/world/area_isk/isk_10/989910.data.s | 2 +- .../data/world/area_iwa/iwa_10/923FD0.data.s | 2 +- .../data/world/area_jan/jan_05/B4F170.data.s | 2 +- .../data/world/area_jan/jan_06/B57320.data.s | 2 +- .../data/world/area_jan/jan_07/B5ACA0.data.s | 2 +- .../data/world/area_jan/jan_08/B620B0.data.s | 2 +- .../data/world/area_jan/jan_08/B62850.data.s | 2 +- .../data/world/area_jan/jan_09/B687D0.data.s | 2 +- .../data/world/area_jan/jan_12/B75D30.data.s | 2 +- .../data/world/area_kpa/kpa_04/A4C1A0.data.s | 2 +- .../data/world/area_kpa/kpa_111/A9ACF0.data.s | 2 +- .../data/world/area_kpa/kpa_113/A9DD00.data.s | 2 +- .../data/world/area_kpa/kpa_115/AA0430.data.s | 2 +- .../data/world/area_kzn/kzn_03/C647B0.data.s | 2 +- .../data/world/area_kzn/kzn_04/C69D70.data.s | 2 +- .../data/world/area_kzn/kzn_08/C76030.data.s | 2 +- .../data/world/area_kzn/kzn_09/C7A9E0.data.s | 2 +- .../data/world/area_kzn/kzn_09/C7B0D0.data.s | 2 +- .../data/world/area_kzn/kzn_17/C89450.data.s | 2 +- .../data/world/area_mim/mim_01/B960E0.data.s | 2 +- .../data/world/area_mim/mim_05/BA3A80.data.s | 2 +- .../data/world/area_mim/mim_06/BA9170.data.s | 2 +- .../data/world/area_mim/mim_08/BB1D00.data.s | 2 +- .../data/world/area_omo/omo_11/DDDD90.data.s | 2 +- .../data/world/area_pra/pra_22/D78BF0.data.s | 2 +- .../data/world/area_pra/pra_31/D81250.data.s | 2 +- .../data/world/area_pra/pra_35/D90700.data.s | 2 +- .../data/world/area_pra/pra_37/D94800.data.s | 2 +- .../data/world/area_sam/sam_03/D11D40.data.s | 2 +- .../data/world/area_sam/sam_05/D1A900.data.s | 2 +- .../data/world/area_sam/sam_07/D2E9C0.data.s | 2 +- .../data/world/area_sam/sam_08/D314C0.data.s | 2 +- .../data/world/area_sam/sam_08/D31E80.data.s | 2 +- .../data/world/area_sam/sam_10/D38840.data.s | 2 +- .../data/world/area_sbk/sbk_56/9553F0.data.s | 2 +- .../data/world/area_tik/tik_07/87D5D0.data.s | 2 +- .../data/world/area_tik/tik_10/8883F0.data.s | 2 +- .../data/world/area_tik/tik_12/88C810.data.s | 2 +- .../data/world/area_tik/tik_17/893E40.data.s | 2 +- .../data/world/area_tik/tik_19/899C90.data.s | 2 +- .../BDD1B0/arn_02_func_80240000_BDD1B0.s | 104 - .../BE37B0/arn_04_func_80242388_BE5B38.s | 103 - .../dgb_00/BFA0A0/func_80240000_BFA0A0.s | 28 - ...BFDB50.s => dgb_01_func_802402D0_BFDB50.s} | 8 + .../dgb_01/BFD9A0/func_80240120_BFD9A0.s | 116 - .../dgb_01/BFD9A0/func_802409B8_BFE238.s | 225 - .../dgb_01/BFD9A0/func_80240D74_BFE5F4.s | 32 - .../dgb_01/BFD9A0/func_80240F78_BFE7F8.s | 243 - .../dgb_01/BFD9A0/func_80241308_BFEB88.s | 79 - .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 140 - .../dgb_01/BFD9A0/func_80241618_BFEE98.s | 93 - .../dgb_01/BFD9A0/func_80241770_BFEFF0.s | 72 - .../dgb_01/BFD9A0/func_80241874_BFF0F4.s | 64 - .../dgb_01/BFD9A0/func_80241954_BFF1D4.s | 177 - .../dgb_01/BFD9A0/func_80241BF0_BFF470.s | 51 - .../dgb_01/BFD9A0/func_80241CA8_BFF528.s | 101 - .../dgb_01/BFD9A0/func_80241E28_BFF6A8.s | 23 - .../dgb_01/BFD9A0/func_80241E70_BFF6F0.s | 39 - .../dgb_01/BFD9A0/func_80241EF0_BFF770.s | 46 - .../dgb_01/BFD9A0/func_80241F98_BFF818.s | 207 - .../dgb_01/BFD9A0/func_802422B0_BFFB30.s | 180 - .../dgb_01/BFD9A0/func_8024252C_BFFDAC.s | 95 - .../dgb_01/BFD9A0/func_80242684_BFFF04.s | 183 - .../dgb_01/BFD9A0/func_802429EC_C0026C.s | 120 - .../dgb_01/BFD9A0/func_80242BA8_C00428.s | 52 - .../dgb_01/BFD9A0/func_80242E78_C006F8.s | 80 - .../dgb_01/BFD9A0/func_80243000_C00880.s | 55 - .../dgb_01/BFD9A0/func_802430C0_C00940.s | 214 - .../dgb_02/C2EBA0/func_80240208_C2EDA8.s | 119 - .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 198 - .../dgb_02/C2EBA0/func_802408D0_C2F470.s | 41 - .../dgb_02/C2EBA0/func_80240958_C2F4F8.s | 192 - .../dgb_02/C2EBA0/func_80240C10_C2F7B0.s | 30 - .../dgb_02/C2EBA0/func_80240C74_C2F814.s | 46 - .../dgb_02/C2EBA0/func_80240D1C_C2F8BC.s | 87 - .../dgb_02/C2EBA0/func_80240E54_C2F9F4.s | 50 - .../dgb_02/C2EBA0/func_80240F00_C2FAA0.s | 101 - .../dgb_02/C2EBA0/func_80241078_C2FC18.s | 28 - .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 242 - .../C2EBA0/update_starpoints_display_C2EF5C.s | 163 - .../dgb_03/C314E0/func_80240000_C314E0.s | 57 - .../dgb_03/C314E0/func_802400BC_C3159C.s | 51 - .../dgb_03/C31730/func_80240458_C31938.s | 119 - .../dgb_03/C31730/func_8024060C_C31AEC.s | 163 - .../dgb_03/C31730/func_8024086C_C31D4C.s | 198 - .../dgb_03/C31730/func_80240B20_C32000.s | 95 - .../dgb_03/C31730/func_80240C78_C32158.s | 183 - .../dgb_03/C31730/func_80240FE0_C324C0.s | 120 - .../dgb_03/C31730/func_8024119C_C3267C.s | 52 - .../dgb_03/C31730/func_8024146C_C3294C.s | 80 - .../dgb_03/C31730/func_802415F4_C32AD4.s | 55 - .../dgb_03/C31730/func_802416B4_C32B94.s | 214 - .../dgb_03/C31730/func_802419B0_C32E90.s | 205 - .../dgb_03/C31730/func_80241C7C_C3315C.s | 41 - .../dgb_03/C31730/func_80241D04_C331E4.s | 192 - .../dgb_03/C31730/func_80241FBC_C3349C.s | 30 - .../dgb_03/C31730/func_80242020_C33500.s | 46 - .../dgb_03/C31730/func_802420C8_C335A8.s | 87 - .../dgb_03/C31730/func_80242200_C336E0.s | 50 - .../dgb_03/C31730/func_802422AC_C3378C.s | 101 - .../dgb_03/C31730/func_80242424_C33904.s | 28 - .../dgb_03/C31730/func_80242480_C33960.s | 239 - ...C366E0.s => dgb_04_func_802401B0_C366E0.s} | 8 + ...C389D4.s => dgb_04_func_802424A4_C389D4.s} | 2 +- ...C38ACC.s => dgb_04_func_8024259C_C38ACC.s} | 14 +- .../dgb_04/C36530/func_80240000_C36530.s | 116 - .../dgb_04/C36530/func_80240898_C36DC8.s | 225 - .../dgb_04/C36530/func_80240C54_C37184.s | 32 - .../dgb_04/C36530/func_80240E58_C37388.s | 243 - .../dgb_04/C36530/func_802411E8_C37718.s | 79 - .../dgb_04/C36530/func_8024130C_C3783C.s | 140 - .../dgb_04/C36530/func_802414F8_C37A28.s | 93 - .../dgb_04/C36530/func_80241650_C37B80.s | 72 - .../dgb_04/C36530/func_80241754_C37C84.s | 46 - .../dgb_04/C36530/func_802417F8_C37D28.s | 177 - .../dgb_04/C36530/func_80241A94_C37FC4.s | 51 - .../dgb_04/C36530/func_80241B4C_C3807C.s | 101 - .../dgb_04/C36530/func_80241CCC_C381FC.s | 23 - .../dgb_04/C36530/func_80241D14_C38244.s | 39 - .../dgb_04/C36530/func_80241D94_C382C4.s | 46 - .../dgb_04/C36530/func_80241E3C_C3836C.s | 207 - .../dgb_04/C36530/func_80242154_C38684.s | 180 - .../dgb_04/C36530/func_802423EC_C3891C.s | 12 - .../dgb_04/C36530/func_8024240C_C3893C.s | 15 - .../dgb_04/C36530/func_80242438_C38968.s | 31 - .../dgb_04/C36530/func_802424F0_C38A20.s | 50 - .../dgb_04/C36530/func_802427EC_C38D1C.s | 15 - .../dgb_04/C36530/func_80242818_C38D48.s | 18 - .../dgb_04/C36530/func_80242850_C38D80.s | 40 - .../dgb_04/C36530/func_802428E0_C38E10.s | 17 - .../dgb_04/C36530/func_80242914_C38E44.s | 29 - .../dgb_04/C36530/func_80242978_C38EA8.s | 26 - .../dgb_04/C36530/func_802429D0_C38F00.s | 356 - .../dgb_04/C36530/func_80242F08_C39438.s | 92 - .../dgb_04/C36530/func_802430D8_C39608.s | 19 - .../dgb_05/C3AA10/func_80240000_C3AA10.s | 17 - .../dgb_05/C3AA10/func_80240030_C3AA40.s | 17 - .../dgb_05/C3AA10/func_80240268_C3AC78.s | 119 - .../dgb_05/C3AA10/func_8024041C_C3AE2C.s | 163 - .../dgb_05/C3AA10/func_8024067C_C3B08C.s | 41 - .../dgb_05/C3AA10/func_80240704_C3B114.s | 192 - .../dgb_05/C3AA10/func_802409BC_C3B3CC.s | 30 - .../dgb_05/C3AA10/func_80240A20_C3B430.s | 46 - .../dgb_05/C3AA10/func_80240AC8_C3B4D8.s | 87 - .../dgb_05/C3AA10/func_80240C00_C3B610.s | 50 - .../dgb_05/C3AA10/func_80240CAC_C3B6BC.s | 101 - .../dgb_05/C3AA10/func_80240E24_C3B834.s | 28 - .../dgb_05/C3AA10/func_80240E80_C3B890.s | 239 - .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 201 - .../dgb_06/C3D080/func_80240000_C3D080.s | 53 - .../dgb_07/C3DBF0/func_80240208_C3DDF8.s | 119 - .../dgb_07/C3DBF0/func_8024061C_C3E20C.s | 41 - .../dgb_07/C3DBF0/func_802406A4_C3E294.s | 192 - .../dgb_07/C3DBF0/func_8024095C_C3E54C.s | 30 - .../dgb_07/C3DBF0/func_802409C0_C3E5B0.s | 46 - .../dgb_07/C3DBF0/func_80240A68_C3E658.s | 87 - .../dgb_07/C3DBF0/func_80240BA0_C3E790.s | 50 - .../dgb_07/C3DBF0/func_80240C4C_C3E83C.s | 101 - .../dgb_07/C3DBF0/func_80240DC4_C3E9B4.s | 28 - .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 239 - .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 201 - .../C3DBF0/update_starpoints_display_C3DFAC.s | 163 - ...C416C0.s => dgb_08_func_80241910_C416C0.s} | 8 + .../dgb_08/C3FDB0/func_80240000_C3FDB0.s | 95 - .../dgb_08/C3FDB0/func_80240158_C3FF08.s | 183 - .../dgb_08/C3FDB0/func_802404C0_C40270.s | 120 - .../dgb_08/C3FDB0/func_8024067C_C4042C.s | 52 - .../dgb_08/C3FDB0/func_8024094C_C406FC.s | 80 - .../dgb_08/C3FDB0/func_80240AD4_C40884.s | 55 - .../dgb_08/C3FDB0/func_80240B94_C40944.s | 214 - .../dgb_08/C3FDB0/func_80241098_C40E48.s | 119 - .../dgb_08/C3FDB0/func_8024124C_C40FFC.s | 163 - .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 198 - .../dgb_08/C3FDB0/func_80241760_C41510.s | 116 - .../dgb_08/C3FDB0/func_80241FF8_C41DA8.s | 225 - .../dgb_08/C3FDB0/func_802423B4_C42164.s | 32 - .../dgb_08/C3FDB0/func_802425B8_C42368.s | 243 - .../dgb_08/C3FDB0/func_80242948_C426F8.s | 79 - .../dgb_08/C3FDB0/func_80242A6C_C4281C.s | 140 - .../dgb_08/C3FDB0/func_80242C58_C42A08.s | 93 - .../dgb_08/C3FDB0/func_80242DB0_C42B60.s | 72 - .../dgb_08/C3FDB0/func_80242EB4_C42C64.s | 64 - .../dgb_08/C3FDB0/func_80242F94_C42D44.s | 177 - .../dgb_08/C3FDB0/func_80243230_C42FE0.s | 51 - .../dgb_08/C3FDB0/func_802432E8_C43098.s | 101 - .../dgb_08/C3FDB0/func_80243468_C43218.s | 23 - .../dgb_08/C3FDB0/func_802434B0_C43260.s | 39 - .../dgb_08/C3FDB0/func_80243530_C432E0.s | 46 - .../dgb_08/C3FDB0/func_802435D8_C43388.s | 207 - .../dgb_08/C3FDB0/func_802438F0_C436A0.s | 180 - .../dgb_08/C3FDB0/func_80243B98_C43948.s | 35 - .../dgb_08/C3FDB0/func_80243C10_C439C0.s | 21 - .../dgb_08/C3FDB0/func_80243C50_C43A00.s | 20 - ...C481B4.s => dgb_09_func_802415D4_C481B4.s} | 9 + .../dgb_09/C46BE0/func_80240208_C46DE8.s | 119 - .../dgb_09/C46BE0/func_8024061C_C471FC.s | 198 - .../dgb_09/C46BE0/func_802408D0_C474B0.s | 41 - .../dgb_09/C46BE0/func_80240958_C47538.s | 192 - .../dgb_09/C46BE0/func_80240C10_C477F0.s | 30 - .../dgb_09/C46BE0/func_80240C74_C47854.s | 46 - .../dgb_09/C46BE0/func_80240D1C_C478FC.s | 87 - .../dgb_09/C46BE0/func_80240E54_C47A34.s | 50 - .../dgb_09/C46BE0/func_80240F00_C47AE0.s | 101 - .../dgb_09/C46BE0/func_80241078_C47C58.s | 28 - .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 239 - .../dgb_09/C46BE0/func_80241424_C48004.s | 116 - .../dgb_09/C46BE0/func_80241CBC_C4889C.s | 225 - .../dgb_09/C46BE0/func_80242078_C48C58.s | 32 - .../dgb_09/C46BE0/func_8024227C_C48E5C.s | 243 - .../dgb_09/C46BE0/func_8024260C_C491EC.s | 79 - .../dgb_09/C46BE0/func_80242730_C49310.s | 140 - .../dgb_09/C46BE0/func_8024291C_C494FC.s | 93 - .../dgb_09/C46BE0/func_80242A74_C49654.s | 72 - .../dgb_09/C46BE0/func_80242B78_C49758.s | 46 - .../dgb_09/C46BE0/func_80242C1C_C497FC.s | 177 - .../dgb_09/C46BE0/func_80242EB8_C49A98.s | 51 - .../dgb_09/C46BE0/func_80242F70_C49B50.s | 101 - .../dgb_09/C46BE0/func_802430F0_C49CD0.s | 23 - .../dgb_09/C46BE0/func_80243138_C49D18.s | 39 - .../dgb_09/C46BE0/func_802431B8_C49D98.s | 46 - .../dgb_09/C46BE0/func_80243260_C49E40.s | 207 - .../dgb_09/C46BE0/func_80243578_C4A158.s | 183 - .../C46BE0/update_starpoints_display_C46F9C.s | 163 - .../dgb_10/C4C390/func_80240000_C4C390.s | 46 - .../dgb_10/C4C390/func_802400A0_C4C430.s | 45 - .../dgb_10/C4C390/func_8024013C_C4C4CC.s | 40 - .../dgb_10/C4C390/func_802401C0_C4C550.s | 17 - .../dgb_11/C4D3E0/func_80240000_C4D3E0.s | 25 - .../dgb_12/C4DEF0/func_80240000_C4DEF0.s | 53 - .../dgb_15/C4F510/func_80240208_C4F718.s | 119 - .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 198 - .../dgb_15/C4F510/func_802408D0_C4FDE0.s | 95 - .../dgb_15/C4F510/func_80240A28_C4FF38.s | 183 - .../dgb_15/C4F510/func_80240D90_C502A0.s | 120 - .../dgb_15/C4F510/func_80240F4C_C5045C.s | 52 - .../dgb_15/C4F510/func_8024121C_C5072C.s | 80 - .../dgb_15/C4F510/func_802413A4_C508B4.s | 55 - .../dgb_15/C4F510/func_80241464_C50974.s | 214 - .../C4F510/update_starpoints_display_C4F8CC.s | 163 - .../dgb_16/C52540/func_80240208_C52748.s | 119 - .../dgb_16/C52540/func_8024061C_C52B5C.s | 41 - .../dgb_16/C52540/func_802406A4_C52BE4.s | 192 - .../dgb_16/C52540/func_8024095C_C52E9C.s | 30 - .../dgb_16/C52540/func_802409C0_C52F00.s | 46 - .../dgb_16/C52540/func_80240A68_C52FA8.s | 87 - .../dgb_16/C52540/func_80240BA0_C530E0.s | 50 - .../dgb_16/C52540/func_80240C4C_C5318C.s | 101 - .../dgb_16/C52540/func_80240DC4_C53304.s | 28 - .../dgb_16/C52540/func_80240E20_C53360.s | 239 - .../dgb_16/C52540/func_80241170_C536B0.s | 201 - .../C52540/update_starpoints_display_C528FC.s | 163 - .../dgb_18/C55F40/func_80240000_C55F40.s | 95 - .../dgb_18/C55F40/func_80240158_C56098.s | 183 - .../dgb_18/C55F40/func_802404C0_C56400.s | 120 - .../dgb_18/C55F40/func_8024067C_C565BC.s | 52 - .../dgb_18/C55F40/func_8024094C_C5688C.s | 80 - .../dgb_18/C55F40/func_80240AD4_C56A14.s | 55 - .../dgb_18/C55F40/func_80240B94_C56AD4.s | 214 - .../dgb_18/C55F40/func_80240EBC_C56DFC.s | 68 - .../dgb_18/C56EF0/func_80240FB0_C56EF0.s | 53 - .../dro_01/95B7E0/func_80240738_95B938.s | 183 - .../dro_01/95B7E0/func_80240AA0_95BCA0.s | 120 - .../dro_01/95B7E0/func_80240F2C_95C12C.s | 80 - .../dro_01/95B7E0/func_802410B4_95C2B4.s | 55 - .../dro_01/95B7E0/func_80241174_95C374.s | 8 +- .../flo_00/C9DF60/func_80240198_C9E0B8.s | 183 - .../flo_00/C9DF60/func_80240500_C9E420.s | 120 - .../flo_00/C9DF60/func_8024098C_C9E8AC.s | 80 - .../flo_00/C9DF60/func_80240B14_C9EA34.s | 55 - .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 8 +- .../flo_08/CAED40/func_8024001C_CAED5C.s | 12 - .../flo_08/CAED40/func_80240068_CAEDA8.s | 31 - .../flo_08/CAED40/func_80240448_CAF188.s | 18 - .../flo_08/CAED40/func_80240480_CAF1C0.s | 40 - .../flo_08/CAED40/func_80240544_CAF284.s | 29 - .../flo_08/CAED40/func_802405A8_CAF2E8.s | 26 - .../flo_08/CAED40/func_80240B38_CAF878.s | 92 - .../flo_09/CB5320/func_80240BB8_CB5BB8.s | 225 - .../flo_09/CB5320/func_80241178_CB6178.s | 243 - .../flo_09/CB5320/func_80241508_CB6508.s | 79 - .../flo_09/CB5320/func_8024162C_CB662C.s | 6 +- .../flo_13/CC3850/func_80240A5C_CC426C.s | 225 - .../flo_13/CC3850/func_8024101C_CC482C.s | 243 - .../flo_13/CC3850/func_802413AC_CC4BBC.s | 79 - .../flo_13/CC3850/func_802414D0_CC4CE0.s | 6 +- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 4 +- .../flo_14/CCBE20/func_802413A8_CCC6B8.s | 225 - .../flo_14/CCBE20/func_80241968_CCCC78.s | 243 - .../flo_14/CCBE20/func_80241CF8_CCD008.s | 79 - .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 6 +- .../flo_16/CD1F10/func_802400FC_CD1F2C.s | 12 - .../flo_16/CD1F10/func_80240148_CD1F78.s | 31 - .../flo_16/CD1F10/func_80240528_CD2358.s | 18 - .../flo_16/CD1F10/func_80240560_CD2390.s | 40 - .../flo_16/CD1F10/func_80240624_CD2454.s | 29 - .../flo_16/CD1F10/func_80240688_CD24B8.s | 26 - .../flo_16/CD1F10/func_80240C18_CD2A48.s | 92 - .../flo_16/CD1F10/func_80240DE8_CD2C18.s | 17 - .../flo_16/CD2C80/func_802416E8_CD3518.s | 225 - .../flo_16/CD2C80/func_80241CA8_CD3AD8.s | 243 - .../flo_16/CD2C80/func_80242038_CD3E68.s | 79 - .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 6 +- .../flo_16/CD2C80/func_80242754_CD4584.s | 4 +- .../flo_17/CD7350/func_80240908_CD7BE8.s | 225 - .../flo_17/CD7350/func_80240EC8_CD81A8.s | 243 - .../flo_17/CD7350/func_80241258_CD8538.s | 79 - .../flo_17/CD7350/func_8024137C_CD865C.s | 6 +- .../flo_17/CD7350/func_80241C64_CD8F44.s | 4 +- .../flo_25/CF2C10/func_802408D8_CF34A8.s | 225 - .../flo_25/CF2C10/func_80240E98_CF3A68.s | 243 - .../flo_25/CF2C10/func_80241228_CF3DF8.s | 79 - .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 6 +- .../flo_25/CF2C10/func_80241944_CF4514.s | 4 +- .../hos_02/A17210/func_80241888_A17AA8.s | 225 - .../hos_02/A17210/func_80241E48_A18068.s | 243 - .../hos_02/A17210/func_802421D8_A183F8.s | 79 - .../hos_02/A17210/func_802422FC_A1851C.s | 6 +- .../hos_02/A17210/func_802428F4_A18B14.s | 4 +- .../hos_03/A1BDB0/func_80241548_A1C648.s | 225 - .../hos_03/A1BDB0/func_80241B08_A1CC08.s | 243 - .../hos_03/A1BDB0/func_80241E98_A1CF98.s | 79 - .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 6 +- .../isk_10/988B60/func_8024001C_988B7C.s | 12 - .../isk_10/988B60/func_80240068_988BC8.s | 31 - .../isk_10/988B60/func_80240448_988FA8.s | 18 - .../isk_10/988B60/func_80240480_988FE0.s | 40 - .../isk_10/988B60/func_80240544_9890A4.s | 29 - .../isk_10/988B60/func_802405A8_989108.s | 26 - .../isk_10/988B60/func_80240B38_989698.s | 92 - .../isk_10/988B60/func_80240D08_989868.s | 17 - .../iwa_01/90FBD0/func_80242794_911E44.s | 101 - .../iwa_01/90FBD0/func_80242AF8_9121A8.s | 91 - .../iwa_01/90FBD0/func_80242CF4_9123A4.s | 85 - .../iwa_01/90FBD0/func_80242F54_912604.s | 6 +- .../iwa_02/915D70/func_802404D0_916240.s | 101 - .../iwa_02/915D70/func_80240834_9165A4.s | 91 - .../iwa_02/915D70/func_80240A30_9167A0.s | 85 - .../iwa_02/915D70/func_80240C90_916A00.s | 6 +- .../iwa_03/918EF0/func_80240810_9193C0.s | 101 - .../iwa_03/918EF0/func_80240B74_919724.s | 91 - .../iwa_03/918EF0/func_80240D70_919920.s | 85 - .../iwa_03/918EF0/func_80240FD0_919B80.s | 6 +- .../iwa_04/91B8E0/func_80240550_91BE30.s | 101 - .../iwa_04/91B8E0/func_802408B4_91C194.s | 91 - .../iwa_04/91B8E0/func_80240AB0_91C390.s | 85 - .../iwa_04/91B8E0/func_80240D10_91C5F0.s | 6 +- .../iwa_10/91E6D0/func_8024030C_91E87C.s | 12 - .../iwa_10/91E6D0/func_80240358_91E8C8.s | 31 - .../iwa_10/91E6D0/func_80240738_91ECA8.s | 18 - .../iwa_10/91E6D0/func_80240770_91ECE0.s | 40 - .../iwa_10/91E6D0/func_80240834_91EDA4.s | 29 - .../iwa_10/91E6D0/func_80240898_91EE08.s | 26 - .../iwa_10/91E6D0/func_80240E28_91F398.s | 92 - .../jan_02/B2C8A0/func_80240588_B2C9F8.s | 183 - .../jan_02/B2C8A0/func_802408F0_B2CD60.s | 120 - .../jan_02/B2C8A0/func_80240D7C_B2D1EC.s | 80 - .../jan_02/B2C8A0/func_80240F04_B2D374.s | 55 - .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 8 +- .../jan_03/B34BD0/func_80240778_B35348.s | 183 - .../jan_03/B34BD0/func_80240AE0_B356B0.s | 120 - .../jan_03/B34BD0/func_80240F6C_B35B3C.s | 80 - .../jan_03/B34BD0/func_802410F4_B35CC4.s | 55 - .../jan_03/B34BD0/func_802411B4_B35D84.s | 8 +- .../jan_05/B4B260/func_80241C88_B4C6F8.s | 163 - .../jan_06/B52F70/func_80241BD8_B54408.s | 163 - .../jan_07/B59870/func_802405D0_B59E40.s | 163 - .../jan_08/B5E910/func_8024067C_B5E92C.s | 12 - .../jan_08/B5E910/func_802406C8_B5E978.s | 31 - .../jan_08/B5E910/func_80240AA8_B5ED58.s | 18 - .../jan_08/B5E910/func_80240AE0_B5ED90.s | 40 - .../jan_08/B5E910/func_80240BA4_B5EE54.s | 29 - .../jan_08/B5E910/func_80240C08_B5EEB8.s | 26 - .../jan_08/B5E910/func_80241198_B5F448.s | 92 - .../jan_08/B5F650/func_80241A24_B5FCD4.s | 163 - .../jan_09/B663F0/func_80240F10_B669C0.s | 163 - .../jan_12/B73570/func_80240A90_B73B40.s | 163 - .../jan_22/B84180/func_80240158_B842D8.s | 183 - .../jan_22/B84180/func_802404C0_B84640.s | 120 - .../jan_22/B84180/func_8024094C_B84ACC.s | 80 - .../jan_22/B84180/func_80240AD4_B84C54.s | 55 - .../jan_22/B84180/func_80240B94_B84D14.s | 8 +- .../kkj_00/ABB340/func_80240208_ABB498.s | 183 - .../kkj_00/ABB340/func_80240570_ABB800.s | 120 - .../kkj_00/ABB340/func_802409FC_ABBC8C.s | 80 - .../kkj_00/ABB340/func_80240B84_ABBE14.s | 55 - .../kkj_00/ABB340/func_80240C44_ABBED4.s | 8 +- .../kkj_01/AC5170/func_80240158_AC52C8.s | 183 - .../kkj_01/AC5170/func_802404C0_AC5630.s | 120 - .../kkj_01/AC5170/func_8024094C_AC5ABC.s | 80 - .../kkj_01/AC5170/func_80240AD4_AC5C44.s | 55 - .../kkj_01/AC5170/func_80240B94_AC5D04.s | 8 +- .../kmr_05/8CE070/func_80240898_8CE908.s | 225 - .../kmr_05/8CE070/func_80240E58_8CEEC8.s | 243 - .../kmr_05/8CE070/func_802411E8_8CF258.s | 79 - .../kmr_05/8CE070/func_8024130C_8CF37C.s | 6 +- .../kmr_06/8D1510/func_80240898_8D1DA8.s | 225 - .../kmr_06/8D1510/func_80240E58_8D2368.s | 243 - .../kmr_06/8D1510/func_802411E8_8D26F8.s | 79 - .../kmr_06/8D1510/func_8024130C_8D281C.s | 6 +- .../kmr_09/8D5E00/func_80240898_8D6698.s | 225 - .../kmr_09/8D5E00/func_80240E58_8D6C58.s | 243 - .../kmr_09/8D5E00/func_802411E8_8D6FE8.s | 79 - .../kmr_09/8D5E00/func_8024130C_8D710C.s | 6 +- .../kpa_04/A4BF60/func_80240000_A4BF60.s | 57 - .../kpa_111/A99590/func_80240000_A99590.s | 57 - .../kpa_111/A99590/func_802400BC_A9964C.s | 51 - .../kpa_113/A9CC70/func_80240040_A9CC70.s | 57 - .../kpa_113/A9CC70/func_802400FC_A9CD2C.s | 51 - .../kpa_115/A9ED40/func_80240000_A9ED40.s | 57 - .../kpa_115/A9ED40/func_802400BC_A9EDFC.s | 51 - .../kpa_91/A86A50/func_80240158_A86BA8.s | 183 - .../kpa_91/A86A50/func_802404C0_A86F10.s | 120 - .../kpa_91/A86A50/func_8024094C_A8739C.s | 80 - .../kpa_91/A86A50/func_80240AD4_A87524.s | 55 - .../kpa_91/A86A50/func_80240B94_A875E4.s | 8 +- .../kpa_91/A86A50/func_80241224_A87C74.s | 4 +- .../kpa_95/A8CB60/func_80240238_A8CCB8.s | 183 - .../kpa_95/A8CB60/func_802405A0_A8D020.s | 120 - .../kpa_95/A8CB60/func_80240A2C_A8D4AC.s | 80 - .../kpa_95/A8CB60/func_80240BB4_A8D634.s | 55 - .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 8 +- .../kpa_95/A8CB60/func_80241304_A8DD84.s | 4 +- .../kzn_02/C5AC20/func_80240D78_C5B4B8.s | 225 - .../kzn_02/C5AC20/func_80241338_C5BA78.s | 243 - .../kzn_02/C5AC20/func_802416C8_C5BE08.s | 79 - .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 6 +- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 4 +- .../kzn_03/C61020/func_80240FB4_C61CC4.s | 163 - .../kzn_04/C68440/func_8024032C_C6845C.s | 12 - .../kzn_04/C68440/func_80240378_C684A8.s | 31 - .../kzn_04/C68440/func_80240758_C68888.s | 18 - .../kzn_04/C68440/func_80240790_C688C0.s | 40 - .../kzn_04/C68440/func_80240854_C68984.s | 29 - .../kzn_04/C68440/func_802408B8_C689E8.s | 26 - .../kzn_04/C68440/func_80240E48_C68F78.s | 92 - .../kzn_07/C6EA50/func_802410B8_C6F3E8.s | 225 - .../kzn_07/C6EA50/func_80241678_C6F9A8.s | 243 - .../kzn_07/C6EA50/func_80241A08_C6FD38.s | 79 - .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 6 +- .../kzn_07/C6EA50/func_80242124_C70454.s | 4 +- .../kzn_08/C71ED0/func_802412E8_C72768.s | 225 - .../kzn_08/C71ED0/func_802418A8_C72D28.s | 243 - .../kzn_08/C71ED0/func_80241C38_C730B8.s | 79 - .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 6 +- .../kzn_08/C71ED0/func_80242354_C737D4.s | 4 +- .../kzn_08/C71ED0/func_802428F8_C73D78.s | 163 - .../kzn_09/C76CE0/func_8024001C_C76CFC.s | 12 - .../kzn_09/C76CE0/func_80240068_C76D48.s | 31 - .../kzn_09/C76CE0/func_80240448_C77128.s | 18 - .../kzn_09/C76CE0/func_80240480_C77160.s | 40 - .../kzn_09/C76CE0/func_80240544_C77224.s | 29 - .../kzn_09/C76CE0/func_802405A8_C77288.s | 26 - .../kzn_09/C76CE0/func_80240B38_C77818.s | 92 - .../kzn_09/C77D00/func_802413DC_C780BC.s | 163 - .../kzn_11/C80600/func_80240CF8_C80E98.s | 225 - .../kzn_11/C80600/func_802412B8_C81458.s | 243 - .../kzn_11/C80600/func_80241648_C817E8.s | 79 - .../kzn_11/C80600/func_8024176C_C8190C.s | 6 +- .../kzn_11/C80600/func_80241D64_C81F04.s | 4 +- .../kzn_17/C85DC0/func_802406CC_C8617C.s | 163 - .../mac_00/7ED280/func_802426C8_7ED3D8.s | 183 - .../mac_00/7ED280/func_80242A30_7ED740.s | 120 - .../mac_00/7ED280/func_80242EBC_7EDBCC.s | 80 - .../mac_00/7ED280/func_80243044_7EDD54.s | 55 - .../mac_00/7ED280/func_80243104_7EDE14.s | 8 +- .../mac_01/8017D0/func_802411D8_801A58.s | 183 - .../mac_01/8017D0/func_80241540_801DC0.s | 120 - .../mac_01/8017D0/func_802419CC_80224C.s | 80 - .../mac_01/8017D0/func_80241B54_8023D4.s | 55 - .../mac_01/8017D0/func_80241C14_802494.s | 8 +- .../mac_01/805DD0/func_802456A8_805F28.s | 183 - .../mac_01/805DD0/func_80245A10_806290.s | 120 - .../mac_01/805DD0/func_80245E9C_80671C.s | 80 - .../mac_01/805DD0/func_80246024_8068A4.s | 55 - .../mac_01/805DD0/func_802460E4_806964.s | 8 +- .../mac_02/823BF0/func_80240A88_823D48.s | 183 - .../mac_02/823BF0/func_80240DF0_8240B0.s | 120 - .../mac_02/823BF0/func_8024127C_82453C.s | 80 - .../mac_02/823BF0/func_80241404_8246C4.s | 55 - .../mac_02/823BF0/func_802414C4_824784.s | 8 +- .../mac_05/852170/func_802405E8_852758.s | 183 - .../mac_05/852170/func_80240950_852AC0.s | 120 - .../mac_05/852170/func_80240DDC_852F4C.s | 80 - .../mac_05/852170/func_80240F64_8530D4.s | 55 - .../mac_05/852170/func_80241024_853194.s | 8 +- .../mgm_00/E0E7A0/func_80240438_E0EBD8.s | 183 - .../mgm_00/E0E7A0/func_802407A0_E0EF40.s | 120 - .../mgm_00/E0E7A0/func_80240C2C_E0F3CC.s | 80 - .../mgm_00/E0E7A0/func_80240DB4_E0F554.s | 55 - .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 8 +- .../mim_01/B93940/func_802408BC_B93CFC.s | 163 - .../mim_05/BA07A0/func_8024042C_BA0B5C.s | 163 - .../mim_06/BA4CF0/func_8024092C_BA50AC.s | 163 - .../mim_08/BAD940/func_80240938_BAE278.s | 225 - .../mim_08/BAD940/func_80240EF8_BAE838.s | 243 - .../mim_08/BAD940/func_80241288_BAEBC8.s | 79 - .../mim_08/BAD940/func_802413AC_BAECEC.s | 6 +- .../mim_08/BAD940/func_80241954_BAF294.s | 163 - .../nok_02/9D7AA0/func_80240BD8_9D7BF8.s | 183 - .../nok_02/9D7AA0/func_80240F40_9D7F60.s | 120 - .../nok_02/9D7AA0/func_802413CC_9D83EC.s | 80 - .../nok_02/9D7AA0/func_80241554_9D8574.s | 55 - .../nok_02/9D7AA0/func_80241614_9D8634.s | 8 +- .../nok_11/9F4A40/func_8024106C_9F5AAC.s | 225 - .../nok_11/9F4A40/func_8024162C_9F606C.s | 243 - .../nok_11/9F4A40/func_802419BC_9F63FC.s | 79 - .../nok_11/9F4A40/func_80241AE0_9F6520.s | 6 +- .../nok_12/9FAD60/func_80240E9C_9FB68C.s | 183 - .../nok_12/9FAD60/func_80241204_9FB9F4.s | 120 - .../nok_12/9FAD60/func_80241690_9FBE80.s | 80 - .../nok_12/9FAD60/func_80241818_9FC008.s | 55 - .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 8 +- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 4 +- .../nok_14/A02A00/func_8024122C_A03A6C.s | 225 - .../nok_14/A02A00/func_802417EC_A0402C.s | 243 - .../nok_14/A02A00/func_80241B7C_A043BC.s | 79 - .../nok_14/A02A00/func_80241CA0_A044E0.s | 6 +- .../nok_14/A02A00/func_802421CC_A04A0C.s | 4 +- .../nok_15/A06F00/func_8024134C_A0824C.s | 225 - .../nok_15/A06F00/func_8024190C_A0880C.s | 243 - .../nok_15/A06F00/func_80241C9C_A08B9C.s | 79 - .../nok_15/A06F00/func_80241DC0_A08CC0.s | 6 +- .../nok_15/A06F00/func_802422EC_A091EC.s | 4 +- .../omo_04/DAD400/func_80240C38_DAE038.s | 225 - .../omo_04/DAD400/func_802411F8_DAE5F8.s | 243 - .../omo_04/DAD400/func_80241588_DAE988.s | 79 - .../omo_04/DAD400/func_802416AC_DAEAAC.s | 6 +- .../omo_05/DB22C0/func_802412EC_DB35AC.s | 225 - .../omo_05/DB22C0/func_802418AC_DB3B6C.s | 243 - .../omo_05/DB22C0/func_80241C3C_DB3EFC.s | 79 - .../omo_05/DB22C0/func_80241D60_DB4020.s | 6 +- .../omo_07/DBD2B0/func_802406C4_DBD974.s | 183 - .../omo_07/DBD2B0/func_80240A2C_DBDCDC.s | 120 - .../omo_07/DBD2B0/func_80240EB8_DBE168.s | 80 - .../omo_07/DBD2B0/func_80241040_DBE2F0.s | 55 - .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 8 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 6 +- .../omo_07/DBD2B0/func_80242210_DBF4C0.s | 225 - .../omo_07/DBD2B0/func_802427D0_DBFA80.s | 243 - .../omo_07/DBD2B0/func_80242B60_DBFE10.s | 79 - .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 6 +- .../omo_09/DCD6B0/func_802410A4_DCDD74.s | 183 - .../omo_09/DCD6B0/func_8024140C_DCE0DC.s | 120 - .../omo_09/DCD6B0/func_80241898_DCE568.s | 80 - .../omo_09/DCD6B0/func_80241A20_DCE6F0.s | 55 - .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 8 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 6 +- .../omo_11/DDCFC0/func_802407AC_DDCFDC.s | 12 - .../omo_11/DDCFC0/func_802407F8_DDD028.s | 31 - .../omo_11/DDCFC0/func_80240BD8_DDD408.s | 18 - .../omo_11/DDCFC0/func_80240C10_DDD440.s | 40 - .../omo_11/DDCFC0/func_80240CD4_DDD504.s | 29 - .../omo_11/DDCFC0/func_80240D38_DDD568.s | 26 - .../omo_11/DDCFC0/func_802412C8_DDDAF8.s | 92 - .../omo_17/DEF400/func_8024184C_DF06EC.s | 225 - .../omo_17/DEF400/func_80241E0C_DF0CAC.s | 243 - .../omo_17/DEF400/func_8024219C_DF103C.s | 79 - .../omo_17/DEF400/func_802422C0_DF1160.s | 6 +- .../pra_22/D788A0/func_80240020_D788A0.s | 57 - .../pra_31/D7F270/func_80240DBC_D7FB1C.s | 51 - .../pra_35/D8D270/func_80241078_D8E2C8.s | 183 - .../pra_35/D8D270/func_802413E0_D8E630.s | 120 - .../pra_35/D8D270/func_8024186C_D8EABC.s | 80 - .../pra_35/D8D270/func_802419F4_D8EC44.s | 55 - .../pra_35/D8D270/func_80241AB4_D8ED04.s | 8 +- .../pra_35/D8D270/func_8024216C_D8F3BC.s | 163 - .../pra_35/D8D270/func_802423CC_D8F61C.s | 6 +- .../pra_37/D92F40/func_8024130C_D9424C.s | 163 - .../sam_03/D110C0/func_8024040C_D114CC.s | 163 - .../D187E0/update_starpoints_display_D18B9C.s | 163 - .../sam_06/D203E0/func_80240DE8_D20C78.s | 225 - .../sam_06/D203E0/func_802413A8_D21238.s | 243 - .../sam_06/D203E0/func_80241738_D215C8.s | 79 - .../sam_06/D203E0/func_8024185C_D216EC.s | 6 +- .../sam_07/D2BD30/func_80240A0C_D2C73C.s | 163 - .../sam_08/D2FC80/func_8024001C_D2FC9C.s | 12 - .../sam_08/D2FC80/func_80240068_D2FCE8.s | 31 - .../sam_08/D2FC80/func_80240448_D300C8.s | 18 - .../sam_08/D2FC80/func_80240480_D30100.s | 40 - .../sam_08/D2FC80/func_80240544_D301C4.s | 29 - .../sam_08/D2FC80/func_802405A8_D30228.s | 26 - .../sam_08/D2FC80/func_80240B38_D307B8.s | 92 - .../sam_08/D309C0/func_802410FC_D30D7C.s | 163 - .../sam_10/D37BD0/func_8024078C_D37F8C.s | 163 - .../sbk_56/953FC0/func_8024009C_95405C.s | 12 - .../sbk_56/953FC0/func_802400E8_9540A8.s | 31 - .../sbk_56/953FC0/func_802404C8_954488.s | 18 - .../sbk_56/953FC0/func_80240500_9544C0.s | 40 - .../sbk_56/953FC0/func_802405C4_954584.s | 29 - .../sbk_56/953FC0/func_80240628_9545E8.s | 26 - .../sbk_56/953FC0/func_80240BB8_954B78.s | 92 - .../tik_07/879BE0/func_802402FC_879EDC.s | 12 - .../tik_07/879BE0/func_80240348_879F28.s | 31 - .../tik_07/879BE0/func_80240728_87A308.s | 18 - .../tik_07/879BE0/func_80240760_87A340.s | 40 - .../tik_07/879BE0/func_80240824_87A404.s | 29 - .../tik_07/879BE0/func_80240888_87A468.s | 26 - .../tik_07/879BE0/func_80240E18_87A9F8.s | 92 - .../tik_07/87AC00/func_80241C88_87B868.s | 225 - .../tik_07/87AC00/func_80242248_87BE28.s | 243 - .../tik_07/87AC00/func_802425D8_87C1B8.s | 79 - .../tik_07/87AC00/func_802426FC_87C2DC.s | 6 +- .../tik_10/8866D0/func_8024069C_886A5C.s | 12 - .../tik_10/8866D0/func_802406E8_886AA8.s | 31 - .../tik_10/8866D0/func_80240AC8_886E88.s | 18 - .../tik_10/8866D0/func_80240B00_886EC0.s | 40 - .../tik_10/8866D0/func_80240BC4_886F84.s | 29 - .../tik_10/8866D0/func_80240C28_886FE8.s | 26 - .../tik_10/8866D0/func_802411B8_887578.s | 92 - .../tik_12/8891C0/func_80240C38_889808.s | 12 - .../tik_12/8891C0/func_80240C84_889854.s | 31 - .../tik_12/8891C0/func_80241064_889C34.s | 18 - .../tik_12/8891C0/func_8024109C_889C6C.s | 40 - .../tik_12/8891C0/func_80241160_889D30.s | 29 - .../tik_12/8891C0/func_802411C4_889D94.s | 26 - .../tik_12/8891C0/func_80241754_88A324.s | 92 - .../tik_17/892A50/func_8024004C_892A6C.s | 12 - .../tik_17/892A50/func_80240098_892AB8.s | 31 - .../tik_17/892A50/func_80240478_892E98.s | 18 - .../tik_17/892A50/func_802404B0_892ED0.s | 40 - .../tik_17/892A50/func_80240574_892F94.s | 29 - .../tik_17/892A50/func_802405D8_892FF8.s | 26 - .../tik_17/892A50/func_80240B68_893588.s | 92 - .../tik_19/897BD0/func_8024060C_897BEC.s | 12 - .../tik_19/897BD0/func_80240658_897C38.s | 31 - .../tik_19/897BD0/func_80240A38_898018.s | 18 - .../tik_19/897BD0/func_80240A70_898050.s | 40 - .../tik_19/897BD0/func_80240B34_898114.s | 29 - .../tik_19/897BD0/func_80240B98_898178.s | 26 - .../tik_19/897BD0/func_80241128_898708.s | 92 - .../trd_02/9A10C0/func_80240A0C_9A19EC.s | 183 - .../trd_02/9A10C0/func_80240D74_9A1D54.s | 120 - .../trd_02/9A10C0/func_80241200_9A21E0.s | 80 - .../trd_02/9A10C0/func_80241388_9A2368.s | 55 - .../trd_02/9A10C0/func_80241448_9A2428.s | 8 +- .../trd_02/9A10C0/func_80241744_9A2724.s | 4 +- .../trd_04/9A88A0/func_80240DDC_9A91CC.s | 183 - .../trd_04/9A88A0/func_80241144_9A9534.s | 120 - .../trd_04/9A88A0/func_802415D0_9A99C0.s | 80 - .../trd_04/9A88A0/func_80241758_9A9B48.s | 55 - .../trd_04/9A88A0/func_80241818_9A9C08.s | 8 +- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 4 +- .../trd_04/9A88A0/func_802426B0_9AAAA0.s | 225 - .../trd_04/9A88A0/func_80242C70_9AB060.s | 243 - .../trd_04/9A88A0/func_80243000_9AB3F0.s | 79 - .../trd_04/9A88A0/func_80243124_9AB514.s | 6 +- .../trd_04/9A88A0/func_80243650_9ABA40.s | 4 +- .../trd_07/9B6C90/func_8024137C_9B7CFC.s | 225 - .../trd_07/9B6C90/func_8024193C_9B82BC.s | 243 - .../trd_07/9B6C90/func_80241CCC_9B864C.s | 79 - .../trd_07/9B6C90/func_80241DF0_9B8770.s | 6 +- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 4 +- ver/us/splat.yaml | 271 +- 982 files changed, 33302 insertions(+), 65287 deletions(-) create mode 100644 src/world/area_dgb/dgb_01/data.c create mode 100644 src/world/area_dgb/dgb_01/data0.c create mode 100644 src/world/area_dgb/dgb_01/data1.c create mode 100644 src/world/area_dgb/dgb_01/data2.c create mode 100644 src/world/area_dgb/dgb_01/data3.c create mode 100644 src/world/area_dgb/dgb_01/data4.c create mode 100644 src/world/area_dgb/dgb_01/data5.c create mode 100644 src/world/area_dgb/dgb_01/data6.c create mode 100644 src/world/area_dgb/dgb_01/data7.c create mode 100644 src/world/area_dgb/dgb_13/C4E960.c create mode 100644 src/world/area_dgb/dgb_13/dgb_13.h create mode 100644 src/world/area_dgb/dgb_14/C4F030.c create mode 100644 src/world/area_dgb/dgb_14/dgb_14.h create mode 100644 src/world/area_dgb/dgb_17/C55A60.c create mode 100644 src/world/area_dgb/dgb_17/dgb_17.h create mode 100644 src/world/common/UnkFunc10.inc.c create mode 100644 src/world/common/UnkFunc11.inc.c create mode 100644 src/world/common/UnkFunc12.inc.c create mode 100644 src/world/common/UnkFunc13.inc.c create mode 100644 src/world/common/UnkFunc13_copy.inc.c create mode 100644 src/world/common/UnkFunc14.inc.c create mode 100644 src/world/common/UnkFunc14_copy.inc.c create mode 100644 src/world/common/UnkFunc15.inc.c create mode 100644 src/world/common/UnkFunc15_copy.inc.c create mode 100644 src/world/common/UnkFunc16.inc.c create mode 100644 src/world/common/UnkFunc16_copy.inc.c create mode 100644 src/world/common/UnkFunc17.inc.c create mode 100644 src/world/common/UnkFunc18.inc.c create mode 100644 src/world/common/UnkFunc19.inc.c create mode 100644 src/world/common/UnkFunc20.inc.c create mode 100644 src/world/common/UnkFunc21.inc.c create mode 100644 src/world/common/UnkFunc22.inc.c create mode 100644 src/world/common/UnkFunc23.inc.c create mode 100644 src/world/common/UnkFunc24.inc.c create mode 100644 src/world/common/UnkFunc4.inc.c create mode 100644 src/world/common/UnkFunc5.inc.c create mode 100644 src/world/common/UnkFunc6.inc.c create mode 100644 src/world/common/UnkFunc7.inc.c create mode 100644 src/world/common/UnkFunc8.inc.c create mode 100644 src/world/common/UnkFunc9.inc.c create mode 100644 tools/gfxdis_loop.py create mode 100644 tools/new_lines.py create mode 100644 tools/substitute2.py delete mode 100644 ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/arn_02_func_80240000_BDD1B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/arn_04_func_80242388_BE5B38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s rename ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/{func_802402D0_BFDB50.s => dgb_01_func_802402D0_BFDB50.s} (99%) delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E28_BFF6A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C10_C2F7B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241FBC_C3349C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s rename ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/{func_802401B0_C366E0.s => dgb_04_func_802401B0_C366E0.s} (99%) rename ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/{func_802424A4_C389D4.s => dgb_04_func_802424A4_C389D4.s} (97%) rename ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/{func_8024259C_C38ACC.s => dgb_04_func_8024259C_C38ACC.s} (93%) delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241CCC_C381FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024240C_C3893C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242438_C38968.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802427EC_C38D1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242850_C38D80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024095C_C3E54C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s rename ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/{func_80241910_C416C0.s => dgb_08_func_80241910_C416C0.s} (99%) delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243468_C43218.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s rename ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/{func_802415D4_C481B4.s => dgb_09_func_802415D4_C481B4.s} (99%) delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C10_C477F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802430F0_C49CD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024095C_C52E9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024001C_CAED5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240068_CAEDA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240480_CAF1C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240544_CAF284.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802405A8_CAF2E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400FC_CD1F2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240148_CD1F78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240624_CD2454.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240688_CD24B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DE8_CD2C18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s delete mode 100644 ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240480_988FE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240544_9890A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802405A8_989108.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024030C_91E87C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240358_91E8C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240770_91ECE0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240834_91EDA4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240898_91EE08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024067C_B5E92C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802406C8_B5E978.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AE0_B5ED90.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C08_B5EEB8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024032C_C6845C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240790_C688C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240854_C68984.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024001C_C76CFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240068_C76D48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240480_C77160.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240544_C77224.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802405A8_C77288.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407AC_DDCFDC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240C10_DDD440.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CD4_DDD504.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D38_DDD568.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024001C_D2FC9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240068_D2FCE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240480_D30100.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240544_D301C4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802405A8_D30228.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240500_9544C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240628_9545E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802404B0_892ED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240658_897C38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s diff --git a/include/common_structs.h b/include/common_structs.h index fd41e679f6..0cf711819f 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -78,7 +78,7 @@ typedef struct CamPosSettings { typedef struct PartnerData { /* 0x00 */ u8 enabled; - /* 0x01 */ u8 level; + /* 0x01 */ s8 level; /* 0x02 */ s16 unk_02[3]; } PartnerData; // size = 0x08 diff --git a/include/enums.h b/include/enums.h index 6ce35183fd..428aa03041 100644 --- a/include/enums.h +++ b/include/enums.h @@ -502,6 +502,7 @@ enum SoundIDs { SOUND_JR_TROOPA_SPLASH = 69, SOUND_JR_TROOPA_SWIM, SOUND_BOO_SPOOK, + SOUND_UNKNOWN_B4 = 180, SOUND_BOO_VANISH = 193, SOUND_BOO_APPEAR = 195, SOUND_MENU_OPEN = 197, @@ -517,6 +518,7 @@ enum SoundIDs { SOUND_LAND = 331, SOUND_HIT_BLOCK = 334, SOUND_SEARCH_BUSH = 339, + SOUND_UNKNOWN_162 = 354, SOUND_BASIC_DOOR_OPEN = 449, SOUND_BASIC_DOOR_CLOSE, SOUND_METAL_DOOR_OPEN, @@ -532,20 +534,25 @@ enum SoundIDs { SOUND_UNKNOWN_25A, SOUND_UNKNOWN_25C = 604, SOUND_UNKNOWN_25D, + SOUND_UNKNOWN_262 = 610, SOUND_BOW_SPOOK = 657, SOUND_UNUSED_2C1 = 705, SOUND_SMOKE_BURST = 717, SOUND_DAYZEE_SONG = 727, SOUND_POWER_UP, + SOUND_UNKNOWN_2F1 = 753, + SOUND_UNKNOWN_2F7 = 759, SOUND_CLOSE_SHELL = 767, SOUND_SHY_GUY_SCREAMS1 = 780, SOUND_SHY_GUY_SCREAMS2, SOUND_SHY_GUY_SCREAMS3, SOUND_TOY_TANK_MOVE1, SOUND_TOY_TANK_MOVE2, + SOUND_UNKNOWN_315 = 789, SOUND_MOLE_SURFACE = 801, SOUND_MOLE_DIG, SOUND_MOLE_POP, + SOUND_UNKNOWN_32E = 814, SOUND_UNKNOWN_361 = 865, SOUND_UNKNOWN_362, SOUND_UNKNOWN_363, @@ -579,6 +586,8 @@ enum SoundIDs { SOUND_UNKNOWN_202E, SOUND_UNKNOWN_202F, SOUND_UNKNOWN_2030, + SOUND_UNKNOWN_2038 = 8248, + SOUND_UNKNOWN_2039, SOUND_BOMB_BLAST = 8310, SOUND_JUMP_2081 = 8321, SOUND_UNKNOWN_208D = 8333, @@ -589,6 +598,7 @@ enum SoundIDs { SOUND_SPELL_CAST3, SOUND_SPELL_CAST4, SOUND_SPELL_CAST5, + SOUND_UNKNOWN_20F6 = 8438, }; typedef UNK_TYPE Cam; @@ -1010,7 +1020,14 @@ enum PlayerAnims { ANIM_30004 = 0x30004, ANIM_30008 = 0x30008, ANIM_30009, + ANIM_80003 = 0x80003, + ANIM_80007 = 0x80007, ANIM_8000B = 0x8000B, + ANIM_8000C, + ANIM_80017 = 0x80017, + ANIM_8001B = 0x8001B, + ANIM_8001D = 0x8001D, + ANIM_8001E, }; typedef UNK_TYPE AmbientSound; @@ -1362,7 +1379,7 @@ enum ActionStates { typedef s32 NpcID; enum NpcIDs { NPC_SELF = -1, - NPC_PLAYER, + NPC_PLAYER = -2, NPC_PARTNER = -4, }; diff --git a/include/functions.h b/include/functions.h index cd6c48aabc..fe7c8b093b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2,12 +2,14 @@ #define _FUNCTIONS_H_ #include "ultra64.h" -#include "common_structs.h" +#include "common.h" +#include "map.h" #include "enums.h" f32 fabsf(f32 f); f32 sqrtf(f32 f); f64 sqrt(f64 d); +f32 cosine(s16 arg0); void nuBoot(void); void boot_idle(void); @@ -103,7 +105,7 @@ void func_8006FEF0(s32, f32, f32, f32, f32); void func_80070190(s32, f32, f32, f32, s32, f32, s32, s32); void func_80071090(s32, f32, f32, f32, s32); -void func_80071750(s32, f32, f32, f32, f32, s32); +Effect* func_80071750(s32, f32, f32, f32, f32, s32); void func_800720B0(s32, f32, f32, f32, f32, s32); void func_80072950(s32, f32, f32, f32, f32, s32 time); @@ -203,6 +205,7 @@ s32 rand_int(s32); void sort_items(void); s32 is_ability_active(s32 arg0); f32 update_lerp(Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); +void sin_cos_deg(f32 rad, f32* outSinTheta, f32* outCosTheta); s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 facingAngleSign, s32 pickupVar); @@ -318,4 +321,18 @@ f32 dead_set_float_variable(ScriptInstance* script, Bytecode var, f32 value); f32 dead_cos_rad(f32 x); f32 dead_atan2(f32 startX, f32 startZ, f32 endX, f32 endZ); +void func_8004A784(Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5); +void base_UnkNpcAIFunc1(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory); +ApiStatus func_80045900(ScriptInstance* script); +ApiStatus func_802D6420(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D6954(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D2B6C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_80045838(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D585C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802CA988(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802CDE68(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D8248(ScriptInstance* script, s32 isInitialCall); + + #endif diff --git a/include/macros.h b/include/macros.h index e475d8953d..ac32e98988 100644 --- a/include/macros.h +++ b/include/macros.h @@ -19,6 +19,7 @@ #define STATIC_ASSERT(condition) enum { static_assert_fail = 1/(!!(condition)) } // Causes division by zero ("not integer constant") if false #define CAM(id) (&gCameras[id]) +#define CAM2(id) ({ Camera* c = gCameras; &c[id]; }) #define CURRENT_CAM (&gCameras[gCurrentCameraID]) #define GET_MAP_ENTRY(cfg, idx) (&(*cfg->entryList)[idx]) diff --git a/include/map.h b/include/map.h index baf263fcfd..d3878fb748 100644 --- a/include/map.h +++ b/include/map.h @@ -8,7 +8,7 @@ // TODO: consider moving Npc here #define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f)) - +typedef s32 MessageID; typedef Vec4f EntryList[]; /// Fields other than main, entryList, entryCount, background, and tattle are initialised when the map loads. @@ -74,7 +74,7 @@ typedef struct NpcAISettings { /* 0x10 */ X32 unk_10; /* 0x14 */ s32 unk_14; /* 0x18 */ f32 chaseSpeed; - /* 0x1C */ s32 unk_1C; // chase turn step? + /* 0x1C */ X32 unk_1C; // chase turn step? /* 0x20 */ s32 unk_20; /* 0x24 */ f32 chaseRadius; /* 0x28 */ X32 unk_28; @@ -301,7 +301,7 @@ typedef struct { Enemy* get_enemy(NpcID npcId); MapConfig* get_current_map_header(void); -s32 func_800490B4(EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4); +s32 func_800490B4(EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s32 arg4); /// Zero-terminated. Area gAreas[29]; diff --git a/include/messages.h b/include/messages.h index 96abcb73b6..946784769f 100644 --- a/include/messages.h +++ b/include/messages.h @@ -3,8 +3,6 @@ #include "types.h" -typedef s32 MessageID; - // Prefer editing splat.yaml's msg ids section than using this directly! #define MESSAGE_ID(section, index) (((section << 16) + index)) diff --git a/include/script_api/common.h b/include/script_api/common.h index 7c6ed11cf1..5effa42008 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -117,6 +117,7 @@ ApiStatus AdjustCam(ScriptInstance* script, s32 isInitialCall); ApiStatus ResetCam(ScriptInstance* script, s32 isInitialCall); ApiStatus LoadModelAnimation(ScriptInstance* script, s32 isInitialCall); ApiStatus PlayModelAnimation(ScriptInstance* script, s32 isInitialCall); +ApiStatus SetAnimModelPosition(ScriptInstance* script, s32 isInitialCall); ApiStatus ChangeModelAnimation(ScriptInstance* script, s32 isInitialCall); ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall); ApiStatus GetNpcPointer(ScriptInstance* script, s32 isInitialCall); diff --git a/src/code_23680.c b/src/code_23680.c index effb2c7641..5de0f5d748 100644 --- a/src/code_23680.c +++ b/src/code_23680.c @@ -106,7 +106,7 @@ s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 c } } -INCLUDE_ASM(s32, "code_23680", func_800490B4, EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, s32 arg3, s32 arg4); +INCLUDE_ASM(s32, "code_23680", func_800490B4, EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s32 arg4); s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/code_25AF0.c b/src/code_25AF0.c index 0acd362493..f1e8ea14ef 100644 --- a/src/code_25AF0.c +++ b/src/code_25AF0.c @@ -19,4 +19,4 @@ void func_8004A73C(ScriptInstance* script) { } } -INCLUDE_ASM(s32, "code_25AF0", func_8004A784); +INCLUDE_ASM(void, "code_25AF0", func_8004A784, Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5); diff --git a/src/code_4ac90_len_3910.c b/src/code_4ac90_len_3910.c index eb8cade318..602586ec4f 100644 --- a/src/code_4ac90_len_3910.c +++ b/src/code_4ac90_len_3910.c @@ -170,7 +170,7 @@ INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071690); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800716F0); -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); +INCLUDE_ASM(Effect*, "code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800717B0); diff --git a/src/code_B9D60.c b/src/code_B9D60.c index 71b121a7b0..665317a798 100644 --- a/src/code_B9D60.c +++ b/src/code_B9D60.c @@ -89,7 +89,7 @@ void func_80127B70(s32 arg0) { INCLUDE_ASM(s32, "code_B9D60", func_80127BA4); -INCLUDE_ASM(s32, "code_B9D60", func_80127D90); +INCLUDE_ASM(s32, "code_B9D60", func_80127D90, s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); void func_8012C2E0(void) { diff --git a/src/code_EA0C10.c b/src/code_EA0C10.c index 7cbc2918c8..af724a2622 100644 --- a/src/code_EA0C10.c +++ b/src/code_EA0C10.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "code_EA0C10", func_80242608_EA2F08); INCLUDE_ASM(s32, "code_EA0C10", func_8024267C_EA2F7C); /* ApiStatus N(func_8024267C_EA2F7C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -66,11 +66,11 @@ ApiStatus N(func_8024267C_EA2F7C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -96,10 +96,10 @@ ApiStatus N(func_802429C0_EA32C0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -110,7 +110,7 @@ ApiStatus N(func_80242A14_EA3314)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_EA8AE0.c b/src/code_EA8AE0.c index fffd6bae01..4b322cd5fe 100644 --- a/src/code_EA8AE0.c +++ b/src/code_EA8AE0.c @@ -37,7 +37,7 @@ INCLUDE_ASM(s32, "code_EA8AE0", func_8024140C_EA9EEC); INCLUDE_ASM(s32, "code_EA8AE0", func_80241468_EA9F48); /* ApiStatus N(func_80241468_EA9F48)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -51,11 +51,11 @@ ApiStatus N(func_80241468_EA9F48)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -81,10 +81,10 @@ ApiStatus N(func_802417AC_EAA28C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -95,7 +95,7 @@ ApiStatus N(func_80241800_EAA2E0)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_EB1170.c b/src/code_EB1170.c index 3f3321bfb3..b4a4077872 100644 --- a/src/code_EB1170.c +++ b/src/code_EB1170.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "code_EB1170", func_80240310_EB1170); /* ApiStatus N(func_80240310_EB1170)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240310_EB1170)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -47,10 +47,10 @@ ApiStatus N(func_80240654_EB14B4)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_802406A8_EB1508)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_EB8E90.c b/src/code_EB8E90.c index 9dc6ac54fb..75aea2471e 100644 --- a/src/code_EB8E90.c +++ b/src/code_EB8E90.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_EB8E90", func_80240040_EB8E90); /* -ApiStatus N(func_80240040_EB8E90)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240040_EB8E90)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,7 +34,7 @@ ApiStatus N(func_80240040_EB8E90)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -49,7 +49,7 @@ void N(func_80240198_EB8FE8)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -98,7 +98,7 @@ void N(func_80240500_EB9350)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -126,7 +126,7 @@ void N(func_80240500_EB9350)(ScriptInstance* script, NpcAISettings* aiSettings, INCLUDE_ASM(s32, "code_EB8E90", func_802406BC_EB950C); /* -ApiStatus N(func_802406BC_EB950C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802406BC_EB950C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +141,7 @@ ApiStatus N(func_802406BC_EB950C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -153,12 +153,12 @@ INCLUDE_ASM(s32, "code_EB8E90", func_8024085C_EB96AC); INCLUDE_ASM(s32, "code_EB8E90", func_8024098C_EB97DC); /* -ApiStatus N(func_8024098C_EB97DC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024098C_EB97DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; diff --git a/src/code_EB9D90.c b/src/code_EB9D90.c index 14fa6d0bfa..cfb4ea3b45 100644 --- a/src/code_EB9D90.c +++ b/src/code_EB9D90.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "code_EB9D90", func_802410E4_EB9F34); INCLUDE_ASM(s32, "code_EB9D90", func_8024121C_EBA06C); /* -A) { +ApiStatus N(func_8024121C_EBA06C)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; s32 var0 = get_variable(script, a1); diff --git a/src/code_EC2240.c b/src/code_EC2240.c index bdbfe0567c..443cdea38e 100644 --- a/src/code_EC2240.c +++ b/src/code_EC2240.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "code_EC2240", func_80240040_EC2240); /* ApiStatus N(func_80240040_EC2240)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240040_EC2240)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_EC7590.c b/src/code_EC7590.c index 26c5f6784b..543ea1e577 100644 --- a/src/code_EC7590.c +++ b/src/code_EC7590.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "code_EC7590", func_80240450_EC7600); INCLUDE_ASM(s32, "code_EC7590", func_8024061C_EC77CC); /* ApiStatus N(func_8024061C_EC77CC)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -21,11 +21,11 @@ ApiStatus N(func_8024061C_EC77CC)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_ECAA80.c b/src/code_ECAA80.c index b80863ff0c..bad1b49307 100644 --- a/src/code_ECAA80.c +++ b/src/code_ECAA80.c @@ -28,10 +28,10 @@ ApiStatus N(func_8024199C_ECB69C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -42,7 +42,7 @@ ApiStatus N(func_802419F0_ECB6F0)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_ED0310.c b/src/code_ED0310.c index a6e470504e..d07f3f4c02 100644 --- a/src/code_ED0310.c +++ b/src/code_ED0310.c @@ -72,7 +72,7 @@ void N(func_80240BB8_ED0BA8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -168,12 +168,12 @@ void N(func_80241178_ED1168)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); diff --git a/src/code_ED42A0.c b/src/code_ED42A0.c index 4551780805..317537bcb1 100644 --- a/src/code_ED42A0.c +++ b/src/code_ED42A0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "code_ED42A0", func_80240080_ED42A0); /* ApiStatus N(func_80240080_ED42A0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240080_ED42A0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_ED510.c b/src/code_ED510.c index dd84b313d3..d45aab59ff 100644 --- a/src/code_ED510.c +++ b/src/code_ED510.c @@ -324,7 +324,7 @@ INCLUDE_ASM(s32, "code_ED510", ResetFromLava, ScriptInstance* script, s32 isInit INCLUDE_ASM(s32, "code_ED510", func_802C9FD4); -ApiStatus GetColliderCenter(ScriptInstance* script, s32 initialCall) { +ApiStatus GetColliderCenter(ScriptInstance* script, s32 isInitialCall) { f32 x, y, z; get_collider_center(get_variable(script, *script->ptrReadPos), &x, &y, &z); @@ -353,7 +353,7 @@ ApiStatus UpdateColliderTransform(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "code_ED510", set_zone_enabled); -INCLUDE_ASM(s32, "code_ED510", SetZoneEnabled); +INCLUDE_ASM(ApiStatus, "code_ED510", SetZoneEnabled, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_ED510", goto_map); diff --git a/src/code_EDC020.c b/src/code_EDC020.c index 9d363fdda6..be8494d995 100644 --- a/src/code_EDC020.c +++ b/src/code_EDC020.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "code_EDC020", func_802400B0_EDC090); INCLUDE_ASM(s32, "code_EDC020", func_8024027C_EDC25C); /* ApiStatus N(func_8024027C_EDC25C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -21,11 +21,11 @@ ApiStatus N(func_8024027C_EDC25C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -51,10 +51,10 @@ ApiStatus N(func_802405C0_EDC5A0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -65,7 +65,7 @@ ApiStatus N(func_80240614_EDC5F4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_EDEA00.c b/src/code_EDEA00.c index 9de7d403ad..a6e85304a6 100644 --- a/src/code_EDEA00.c +++ b/src/code_EDEA00.c @@ -74,7 +74,7 @@ void N(func_80240A5C_EDF41C)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -170,12 +170,12 @@ void N(func_8024101C_EDF9DC)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); diff --git a/src/code_EE70C0.c b/src/code_EE70C0.c index 229336bfc5..66f11200d8 100644 --- a/src/code_EE70C0.c +++ b/src/code_EE70C0.c @@ -72,7 +72,7 @@ void N(func_802413A8_EE7958)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -168,12 +168,12 @@ void N(func_80241968_EE7F18)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); @@ -264,10 +264,10 @@ ApiStatus N(func_80242260_EE8810)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -278,7 +278,7 @@ ApiStatus N(func_802422B4_EE8864)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/code_EEDF50.c b/src/code_EEDF50.c index f86bad2c4a..a8720d87be 100644 --- a/src/code_EEDF50.c +++ b/src/code_EEDF50.c @@ -72,7 +72,7 @@ void N(func_802416E8_EEE7E8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -168,12 +168,12 @@ void N(func_80241CA8_EEEDA8)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); diff --git a/src/code_EF2680.c b/src/code_EF2680.c index 9a05c9a346..af46267819 100644 --- a/src/code_EF2680.c +++ b/src/code_EF2680.c @@ -72,7 +72,7 @@ void N(func_80240908_EF2F18)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -168,12 +168,12 @@ void N(func_80240EC8_EF34D8)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); diff --git a/src/code_EFEB00.c b/src/code_EFEB00.c index 27365d7346..64119fe7d5 100644 --- a/src/code_EFEB00.c +++ b/src/code_EFEB00.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "code_EFEB00", func_80240340_EFEE40); /* -A) { +ApiStatus N(func_80240340_EFEE40)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 a1 = *args++; s32 var0 = get_variable(script, a1); @@ -41,4 +41,4 @@ INCLUDE_ASM(s32, "code_EFEB00", func_80240660_EFF160); INCLUDE_ASM(s32, "code_EFEB00", func_80240784_EFF284); -INCLUDE_ASM(s32, "code_EFEB00", func_802407B0_EFF2B0); \ No newline at end of file +INCLUDE_ASM(s32, "code_EFEB00", func_802407B0_EFF2B0); diff --git a/src/code_F5750.c b/src/code_F5750.c index 6f547abf2f..4f09487a35 100644 --- a/src/code_F5750.c +++ b/src/code_F5750.c @@ -173,16 +173,16 @@ INCLUDE_ASM(s32, "code_F5750", func_802D1380); INCLUDE_ASM(s32, "code_F5750", player_jump); -void PlayerJump(ScriptInstance* script, s32 isInitialCall) { - player_jump(script, isInitialCall, 0); +ApiStatus PlayerJump(ScriptInstance* script, s32 isInitialCall) { + return player_jump(script, isInitialCall, 0); } -void PlayerJump1(ScriptInstance* script, s32 isInitialCall) { - player_jump(script, isInitialCall, 1); +ApiStatus PlayerJump1(ScriptInstance* script, s32 isInitialCall) { + return player_jump(script, isInitialCall, 1); } -void PlayerJump2(ScriptInstance* script, s32 isInitialCall) { - player_jump(script, isInitialCall, 2); +ApiStatus PlayerJump2(ScriptInstance* script, s32 isInitialCall) { + return player_jump(script, isInitialCall, 2); } ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) { @@ -309,14 +309,14 @@ ApiStatus DisablePartner(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_F5750", UseEntryHeading); +INCLUDE_ASM(ApiStatus, "code_F5750", UseEntryHeading, ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D2148(ScriptInstance* script, s32 isInitialCall) { gPlayerStatus.flags &= ~0x4000000; return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_F5750", UseExitHeading); +INCLUDE_ASM(ApiStatus, "code_F5750", UseExitHeading, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_F5750", func_802D23F8); @@ -536,25 +536,25 @@ ApiStatus func_802D354C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_F5750", func_802D3624); +INCLUDE_ASM(ApiStatus, "code_F5750", func_802D3624, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_F5750", func_802D3674); -INCLUDE_ASM(s32, "code_F5750", func_802D36E0); +INCLUDE_ASM(ApiStatus, "code_F5750", func_802D36E0, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_F5750", func_802D378C); -INCLUDE_ASM(s32, "code_F5750", func_802D3840); +INCLUDE_ASM(ApiStatus, "code_F5750", func_802D3840, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D38EC); +INCLUDE_ASM(ApiStatus, "code_F5750", func_802D38EC, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_F5750", func_802D3998); -INCLUDE_ASM(s32, "code_F5750", func_802D39FC); +INCLUDE_ASM(ApiStatus, "code_F5750", func_802D39FC, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_F5750", func_802D3A60); -INCLUDE_ASM(s32, "code_F5750", func_802D3C58); +INCLUDE_ASM(ApiStatus, "code_F5750", func_802D3C58, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_F5750", func_802D3EB8); diff --git a/src/code_FBE10.c b/src/code_FBE10.c index 46695cc154..531817746b 100644 --- a/src/code_FBE10.c +++ b/src/code_FBE10.c @@ -118,8 +118,8 @@ ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "code_FBE10", func_802D7E08); -INCLUDE_ASM(s32, "code_FBE10", ShowSleepBubble); +INCLUDE_ASM(ApiStatus, "code_FBE10", ShowSleepBubble, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_FBE10", func_802D8248); +INCLUDE_ASM(ApiStatus, "code_FBE10", func_802D8248, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_FBE10", PlayEffect); +INCLUDE_ASM(ApiStatus, "code_FBE10", PlayEffect, ScriptInstance* script, s32 isInitialCall); diff --git a/src/code_f4c60_len_4300.c b/src/code_f4c60_len_4300.c index fd45617bfe..e81710e900 100644 --- a/src/code_f4c60_len_4300.c +++ b/src/code_f4c60_len_4300.c @@ -78,7 +78,7 @@ ApiStatus SetMessageImages(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D0C94(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D0C94(ScriptInstance* script, s32 isInitialCall) { if (get_variable(script, *script->ptrReadPos) == 0) { OVERRIDE_FLAG_SET(0x10); } else { @@ -96,7 +96,7 @@ ApiStatus SetMessageString(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetMessageValue(ScriptInstance* script, s32 initialCall) { +ApiStatus SetMessageValue(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 value = get_variable(script, *ptrReadPos++); s32 index = get_variable(script, *ptrReadPos); diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 9943e69fa8..28f7c990b0 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -188,12 +188,12 @@ ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D4BDC(ScriptInstance* script, s32 isInitialCall) { s32* t0 = &script->functionTemp[0].s; s32* t1 = &script->functionTemp[1].s; s32 t1v; - if (initialCall) { + if (isInitialCall) { *t0 = 0; *t1 = 0; } @@ -216,12 +216,12 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D4C4C(ScriptInstance* script, s32 isInitialCall) { s32* t0 = &script->functionTemp[0].s; s32* t1 = &script->functionTemp[1].s; s32 t1v; - if (initialCall) { + if (isInitialCall) { *t0 = 0; *t1 = 255; } @@ -243,7 +243,7 @@ ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D4CC4(ScriptInstance* script, s32 isInitialCall) { s32 value = get_variable(script, *script->ptrReadPos); if (value < 0) { set_transition_stencil_zoom_1(255, -1.0f); @@ -254,7 +254,7 @@ ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4D14(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D4D14(ScriptInstance* script, s32 isInitialCall) { s32 value = get_float_variable(script, *script->ptrReadPos); set_transition_stencil_center(0, 0, 0xC, 0x14); @@ -264,7 +264,7 @@ ApiStatus func_802D4D14(ScriptInstance* script, s32 initialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4D88(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D4D88(ScriptInstance* script, s32 isInitialCall) { set_transition_stencil_zoom_0(0xC, 0); return ApiStatus_DONE2; } @@ -389,12 +389,12 @@ ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D5830(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D5830(ScriptInstance* script, s32 isInitialCall) { func_80027088(get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } -ApiStatus func_802D585C(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D585C(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 setMode = get_variable(script, *ptrReadPos++); s32 flags = get_variable(script, *ptrReadPos++); diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index 1ce16b2934..dba36194a0 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -105,7 +105,7 @@ ApiStatus PlaySound(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D617C(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D617C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 soundID = get_variable(script, *args++); s32 value2 = get_variable(script, *args++); @@ -133,7 +133,7 @@ ApiStatus StopSound(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D62E4(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D62E4(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; func_80149A6C(get_variable(script, *args++), 1); @@ -147,7 +147,7 @@ ApiStatus UseDoorSounds(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D6340(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D6340(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; D_80151308 = get_variable(script, *args++); @@ -166,7 +166,7 @@ ApiStatus PlaySoundAtF(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D6420); +INCLUDE_ASM(ApiStatus, "code_fa4c0_len_3bf0", func_802D6420, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D663C); @@ -269,7 +269,7 @@ ApiStatus AddItem(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D6AF0(ScriptInstance* script, s32 initialCall) { +ApiStatus func_802D6AF0(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, 0); return ApiStatus_DONE2; } diff --git a/src/code_fe0b0_len_5a0.c b/src/code_fe0b0_len_5a0.c index 6004a3058f..2f8268e35d 100644 --- a/src/code_fe0b0_len_5a0.c +++ b/src/code_fe0b0_len_5a0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "code_fe0b0_len_5a0", SetSpriteShading); +INCLUDE_ASM(ApiStatus, "code_fe0b0_len_5a0", SetSpriteShading, ScriptInstance* script, s32 isInitialCall); ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) { if (get_variable(script, *script->ptrReadPos) != 0) { @@ -11,7 +11,7 @@ ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -s32 GetDemoState(ScriptInstance* script) { +ApiStatus GetDemoState(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gGameStatusPtr->demoState); return ApiStatus_DONE2; } diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index a9f16348eb..307762c4d7 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -47,7 +47,7 @@ NpcAISettings N(npcAISettings_802413D0) = { .alertRadius = 150.0f, .unk_14 = 2, .chaseSpeed = 3.3f, - .unk_1C = 70, + .unk_1C = { .s = 70 }, .unk_20 = 1, .chaseRadius = 180.0f, .unk_2C = 1, @@ -73,7 +73,7 @@ NpcAISettings N(npcAISettings_8024144C) = { .alertRadius = 120.0f, .unk_14 = 3, .chaseSpeed = 8.5f, - .unk_1C = 60, + .unk_1C = { .s = 60 }, .unk_20 = 3, .chaseRadius = 100.0f, .unk_28 = { .f = 60.0f }, @@ -200,41 +200,37 @@ NpcGroupList N(npcGroupList_80241A9C) = { {}, }; -// gCameras loading after the offset calculation instead of before -#ifdef NON_MATCHING s32 N(func_80240000_BDD1B0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { PlayerStatus** playerStatus; Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); - Camera* camera = CAM(D_8009A634); + Camera* camera = CAM2(D_8009A634); f32 phi_f20; - s32 phi_s0 = 0; + s32 ret = FALSE; if (func_800493EC(enemy, 0, aiSettings->alertRadius, aiSettings->unk_10.f)) { - phi_s0 = 1; + ret = TRUE; } - phi_f20 = 270.0f; if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; } playerStatus = &gPlayerStatusPtr; if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > 75.0) { - phi_s0 = 0; + ret = FALSE; } if (fabsf(npc->pos.y - (*playerStatus)->position.y) >= 40.0f) { - phi_s0 = 0; + ret = FALSE; } if (D_8010EBB0.unk_03 == 9) { - phi_s0 = 0; + ret = FALSE; } - return phi_s0; + return ret; } -#else -INCLUDE_ASM(s32, "world/area_arn/arn_02/BDD1B0", arn_02_func_80240000_BDD1B0, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif #include "world/common/UnkNpcAIFunc18.inc.c" @@ -245,7 +241,7 @@ void N(func_802401D4_BDD384)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim = enemy->animList[9]; fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); @@ -269,7 +265,7 @@ void N(func_802404D0_BDD680)(ScriptInstance* script, NpcAISettings* aiSettings, Npc *npc = get_npc_unsafe(enemy->npcID); s32 var; - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { playerStatus = &gPlayerStatusPtr; npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); script->functionTemp[0].s = 12; @@ -375,7 +371,7 @@ void N(func_80240A30_BDDBE0)(ScriptInstance* script, NpcAISettings* aiSettings, Npc *npc = get_npc_unsafe(enemy->npcID); PlayerStatus** playerStatus = &gPlayerStatusPtr; - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); script->functionTemp[0].s = 12; } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { diff --git a/src/world/area_arn/arn_03/arn_03.h b/src/world/area_arn/arn_03/arn_03.h index dfaaa4ec27..3b6c53703e 100644 --- a/src/world/area_arn/arn_03/arn_03.h +++ b/src/world/area_arn/arn_03/arn_03.h @@ -5,10 +5,6 @@ #define NAMESPACE arn_03 -void func_802D6420(void); -void func_802D6954(void); -void func_802CF56C(void); - ApiStatus N(SomeXYZFuncTodoRename)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80241648_BE03D8)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80241680_BE0410)(ScriptInstance* script, s32 isInitialCall); diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index f7d0825ae8..bfbd9df1b9 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -684,22 +684,22 @@ Script N(idle_80243D28) = SCRIPT({ Script N(init_80243E90) = SCRIPT({ BindNpcIdle(NPC_SELF, N(idle_80243D28)); - SetNpcFlagBits(NPC_SELF, 0x00000010, FALSE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_10, FALSE); }); Script N(init_80243ECC) = SCRIPT({ BindNpcIdle(NPC_SELF, N(idle_80243D28)); - SetNpcFlagBits(NPC_SELF, 0x00000010, FALSE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_10, FALSE); }); Script N(init_80243F08) = SCRIPT({ BindNpcIdle(NPC_SELF, N(idle_80243D28)); - SetNpcFlagBits(NPC_SELF, 0x00000010, FALSE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_10, FALSE); }); Script N(init_80243F44) = SCRIPT({ BindNpcIdle(NPC_SELF, N(idle_80243D28)); - SetNpcFlagBits(NPC_SELF, 0x00000010, FALSE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_10, FALSE); }); StaticNpc N(npcGroup_80243F80)[] = { @@ -893,7 +893,7 @@ void N(func_80240158_BDEEE8)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -939,7 +939,7 @@ void N(func_802404C0_BDF250)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -992,7 +992,7 @@ void N(func_8024094C_BDF6DC)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 2cf30a626c..da9c1d93eb 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -37,7 +37,7 @@ NpcAISettings N(npcAISettings_80243660) = { .alertRadius = 130.0f, .unk_14 = 1, .chaseSpeed = 2.5f, - .unk_1C = 180, + .unk_1C = { .s = 180 }, .unk_20 = 3, .chaseRadius = 150.0f, .unk_2C = 1, @@ -68,7 +68,7 @@ NpcAISettings N(npcAISettings_802436F4) = { .alertRadius = 120.0f, .unk_14 = 3, .chaseSpeed = 4.0f, - .unk_1C = 5, + .unk_1C = { .s = 5 }, .unk_20 = 1, .chaseRadius = 150.0f, .unk_2C = 1, @@ -99,7 +99,7 @@ NpcAISettings N(npcAISettings_802437C0) = { .alertRadius = 120.0f, .unk_14 = 3, .chaseSpeed = 8.5f, - .unk_1C = 60, + .unk_1C = { .s = 60 }, .unk_20 = 3, .chaseRadius = 100.0f, .unk_28 = { .f = 60.0f }, @@ -318,7 +318,7 @@ void N(func_80240158_BE3908)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -364,7 +364,7 @@ void N(func_802404C0_BE3C70)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -417,7 +417,7 @@ void N(func_8024094C_BE40FC)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; @@ -653,7 +653,7 @@ void N(func_80241040_BE47F0)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -744,7 +744,7 @@ void N(func_80241728_BE4ED8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -834,12 +834,12 @@ void N(func_80241CE8_BE5498)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); @@ -964,40 +964,37 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -#ifdef NON_MATCHING -s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +s32 N(func_80242388_BE5B38)(ScriptInstance* script, NpcAISettings *aiSettings, EnemyTerritoryThing* territory) { PlayerStatus** playerStatus; Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); - Camera* camera = CAM(D_8009A634); + Camera* camera = CAM2(D_8009A634); f32 phi_f20; - s32 phi_s0 = 0; + s32 ret = FALSE; if (func_800493EC(enemy, 0, aiSettings->alertRadius, aiSettings->unk_10.f)) { - phi_s0 = 1; + ret = TRUE; } - phi_f20 = 270.0f; if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; } playerStatus = &gPlayerStatusPtr; if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > 75.0) { - phi_s0 = 0; + ret = FALSE; } if (fabsf(npc->pos.y - (*playerStatus)->position.y) >= 40.0f) { - phi_s0 = 0; + ret = FALSE; } if (D_8010EBB0.unk_03 == 9) { - phi_s0 = 0; + ret = FALSE; } - return phi_s0; + return ret; } -#else -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", arn_04_func_80242388_BE5B38, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); -#endif #include "world/common/UnkNpcAIFunc18.inc.c" @@ -1008,7 +1005,7 @@ void N(func_8024255C_BE5D0C)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim = enemy->animList[9]; fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); @@ -1032,7 +1029,7 @@ void N(func_80242858_BE6008)(ScriptInstance* script, NpcAISettings* aiSettings, Npc *npc = get_npc_unsafe(enemy->npcID); s32 var; - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { playerStatus = &gPlayerStatusPtr; npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); script->functionTemp[0].s = 12; @@ -1138,7 +1135,7 @@ void N(func_80242DB8_BE6568)(ScriptInstance* script, NpcAISettings* aiSettings, Npc *npc = get_npc_unsafe(enemy->npcID); PlayerStatus** playerStatus = &gPlayerStatusPtr; - if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); script->functionTemp[0].s = 12; } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { diff --git a/src/world/area_arn/arn_05/arn_05.h b/src/world/area_arn/arn_05/arn_05.h index 6b4716b35a..862986d4a5 100644 --- a/src/world/area_arn/arn_05/arn_05.h +++ b/src/world/area_arn/arn_05/arn_05.h @@ -5,15 +5,14 @@ #define NAMESPACE arn_05 ApiStatus func_802D2B50(void); -ApiStatus func_802D2B6C(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802412C8_BE8EA8)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802412B0_BE8E90)(ScriptInstance* script, s32 isInitialCall); - +ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall); + +Script N(makeEntities); Script N(main); Script N(80241360); -NpcGroupList N(npcGroupList_80244FA4); -NpcGroupList N(npcGroupList_80244FC8); -Script N(makeEntities); Script N(802441FC); +NpcGroupList N(npcGroupList_80244FC8); +NpcGroupList N(npcGroupList_80244FA4); diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 7f427b700c..cdccd37cbe 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -3,6 +3,19 @@ #include "sprite/npc/world_bow.h" #include "sprite/npc/world_tubba.h" +enum { + NPC_BOO0, + NPC_BOO1, + NPC_BOO2, + NPC_BOO3, + NPC_BOO4, + NPC_WORLD_TUBBA, + NPC_BOO5, + NPC_BOO6, + NPC_BOO7, + NPC_BOO8, +}; + Script N(exitWalk_80241430) = EXIT_WALK_SCRIPT(60, 0, "arn_03", 1); Script N(exitWalk_8024148C) = EXIT_WALK_SCRIPT(60, 1, "arn_02", 0); @@ -252,7 +265,7 @@ Script N(init_8024202C) = SCRIPT({ BindNpcInteract(NPC_SELF, N(interact_80241AB4)); match STORY_PROGRESS { < STORY_CH3_SAW_TUBBA_EAT_BOO { - SetNpcFlagBits(NPC_SELF, 0x00000100, TRUE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_100, TRUE); } < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { RemoveNpc(NPC_SELF); @@ -301,7 +314,7 @@ Script N(init_802421EC) = SCRIPT({ StaticNpc N(npcGroup_8024223C)[] = { { - .id = 0, + .id = NPC_BOO0, .settings = &N(npcSettings_8024172C), .pos = { 55.0f, 195.0f, 160.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -332,7 +345,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .tattle = MESSAGE_ID(0x1A, 0x00AE), }, { - .id = 1, + .id = NPC_BOO1, .settings = &N(npcSettings_80241758), .pos = { 160.0f, 191.0f, 250.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -362,7 +375,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .tattle = MESSAGE_ID(0x1A, 0x00AF), }, { - .id = 2, + .id = NPC_BOO2, .settings = &N(npcSettings_80241758), .pos = { 390.0f, 190.0f, 255.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -392,7 +405,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .tattle = MESSAGE_ID(0x1A, 0x00B0), }, { - .id = 3, + .id = NPC_BOO3, .settings = &N(npcSettings_80241758), .pos = { 503.0f, 206.0f, 210.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -422,7 +435,7 @@ StaticNpc N(npcGroup_8024223C)[] = { .tattle = MESSAGE_ID(0x1A, 0x00B1), }, { - .id = 4, + .id = NPC_BOO4, .settings = &N(npcSettings_8024172C), .pos = { 350.0f, 185.0f, 197.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -456,7 +469,7 @@ StaticNpc N(npcGroup_8024223C)[] = { Script N(80242BEC) = SCRIPT({ loop SI_VAR(0) { - PlaySoundAtNpc(0x5, 0x20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); ShakeCam(0, 0, 10, 0.5); sleep 5; } @@ -464,21 +477,21 @@ Script N(80242BEC) = SCRIPT({ Script N(80242C50) = SCRIPT({ DisablePlayerInput(TRUE); - NpcFacePlayer(0x2, 1); - PlaySoundAtNpc(0x2, 0x262, 0); + NpcFacePlayer(NPC_BOO2, 1); + PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0); ShowEmote(2, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); sleep 20; - GetNpcPos(0x2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); GetPlayerPos(SI_VAR(3), SI_VAR(4), SI_VAR(5)); SI_VAR(0) -= SI_VAR(3); SI_VAR(0) -= 50; SI_VAR(1) -= SI_VAR(4); SI_VAR(2) -= SI_VAR(5); - GetNpcPos(0x2, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + GetNpcPos(NPC_BOO2, SI_VAR(3), SI_VAR(4), SI_VAR(5)); SI_VAR(3) -= SI_VAR(0); SI_VAR(4) -= SI_VAR(1); SI_VAR(5) -= SI_VAR(2); - NpcMoveTo(0x2, SI_VAR(3), SI_VAR(5), 30); + NpcMoveTo(NPC_BOO2, SI_VAR(3), SI_VAR(5), 30); SetCamType(0, 6, 1); SetCamSpeed(0, 5.0); GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -487,13 +500,13 @@ Script N(80242C50) = SCRIPT({ SetCamDistance(0, 350); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(0x2, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00A0)); - PlaySoundAt(0x20F6, 0, 450, 200, 160); + SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00A0)); + PlaySoundAt(SOUND_UNKNOWN_20F6, 0, 450, 200, 160); ShakeCam(0, 0, 20, 0.80078125); - PlaySoundAtNpc(NPC_PLAYER, 0x262, 0); - PlaySoundAtNpc(0x1, 0x262, 0); - PlaySoundAtNpc(0x2, 0x262, 0); - PlaySoundAtNpc(0x4, 0x262, 0); + PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO1, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO4, SOUND_UNKNOWN_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); ShowEmote(1, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); ShowEmote(2, EMOTE_EXCLAMATION, -45, 20, 1, 0, 0, 0, 0); @@ -501,33 +514,33 @@ Script N(80242C50) = SCRIPT({ FadeOutMusic(0, 500); ClearAmbientSounds(250); sleep 20; - InterpNpcYaw(0x2, 90, 1); - InterpNpcYaw(0x4, 90, 1); + InterpNpcYaw(NPC_BOO2, 90, 1); + InterpNpcYaw(NPC_BOO4, 90, 1); sleep 20; PlaySound(SOUND_BOO_APPEAR); SI_VAR(0) = 240.0; loop 20 { SI_VAR(0) -= 12.0; - func_802CFD30(NPC_PLAYER, 7, SI_VAR(0), 0, 0, 0); - func_802CFD30(0x1, 7, SI_VAR(0), 0, 0, 0); - func_802CFD30(0x4, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO4, 7, SI_VAR(0), 0, 0, 0); sleep 1; } - SetNpcPos(NPC_PLAYER, 420, 300, 220); - SetNpcPos(0x1, 460, 250, 210); - SetNpcPos(0x4, 0, -1000, 0); - EnableNpcShadow(NPC_PLAYER, FALSE); - EnableNpcShadow(0x1, FALSE); - EnableNpcShadow(0x4, FALSE); + SetNpcPos(NPC_BOO0, 420, 300, 220); + SetNpcPos(NPC_BOO1, 460, 250, 210); + SetNpcPos(NPC_BOO4, 0, -1000, 0); + EnableNpcShadow(NPC_BOO0, FALSE); + EnableNpcShadow(NPC_BOO1, FALSE); + EnableNpcShadow(NPC_BOO4, FALSE); PlaySound(SOUND_BOO_VANISH); SI_VAR(0) = 0.0; loop 20 { SI_VAR(0) += 12.0; - func_802CFD30(NPC_PLAYER, 7, SI_VAR(0), 0, 0, 0); - func_802CFD30(0x1, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0); sleep 1; } - SpeakToPlayer(0x2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A1)); + SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A1)); GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != 9) { N(func_802412C8_BE8EA8)(9); @@ -567,14 +580,14 @@ Script N(80242C50) = SCRIPT({ SetPanTarget(0, 426, 190, 194); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SetNpcFlagBits(0x5, 0x00000200, TRUE); - SetNpcSpeed(0x5, 2.5); - SetNpcPos(0x5, 675, 200, 180); - NpcFaceNpc(NPC_PLAYER, 0x5, 1); - NpcFaceNpc(0x1, 0x5, 1); - SetNpcPos(0x2, 272, 190, 214); - PlaySoundAtNpc(NPC_PLAYER, 0x262, 0); - PlaySoundAtNpc(0x1, 0x262, 0); + SetNpcFlagBits(NPC_WORLD_TUBBA, NPC_FLAG_200, TRUE); + SetNpcSpeed(NPC_WORLD_TUBBA, 2.5); + SetNpcPos(NPC_WORLD_TUBBA, 675, 200, 180); + NpcFaceNpc(NPC_BOO0, NPC_WORLD_TUBBA, 1); + NpcFaceNpc(NPC_BOO1, NPC_WORLD_TUBBA, 1); + SetNpcPos(NPC_BOO2, 272, 190, 214); + PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO1, SOUND_UNKNOWN_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); ShowEmote(1, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); spawn { @@ -583,19 +596,19 @@ Script N(80242C50) = SCRIPT({ SI_VAR(0) = 240.0; loop 20 { SI_VAR(0) -= 12.0; - func_802CFD30(NPC_PLAYER, 7, SI_VAR(0), 0, 0, 0); - func_802CFD30(0x1, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0); sleep 1; } - SetNpcPos(NPC_PLAYER, 0, -1000, 0); - SetNpcPos(0x1, 0, -1000, 0); + SetNpcPos(NPC_BOO0, 0, -1000, 0); + SetNpcPos(NPC_BOO1, 0, -1000, 0); sleep 10; } SI_VAR(0) = 4; spawn N(80242BEC); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_9)); - NpcMoveTo(0x5, 550, 196, 0); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + NpcMoveTo(NPC_WORLD_TUBBA, 550, 196, 0); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); SetCamSpeed(0, 4.0); SetCamPitch(0, 17.0, -11.5); SetCamDistance(0, 375); @@ -609,11 +622,11 @@ Script N(80242C50) = SCRIPT({ spawn { SI_VAR(0) = 7; spawn N(80242BEC); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_9)); - NpcMoveTo(0x5, 370, 220, 0); - GetNpcPos(0x2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); - NpcMoveTo(0x5, 330, SI_VAR(2), 0); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + NpcMoveTo(NPC_WORLD_TUBBA, 370, 220, 0); + GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcMoveTo(NPC_WORLD_TUBBA, 330, SI_VAR(2), 0); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); SI_MAP_VAR(1) = 1; } SetCamSpeed(0, 90.0); @@ -625,7 +638,7 @@ Script N(80242C50) = SCRIPT({ SetPanTarget(0, 240, 169, 206); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SpeakToPlayer(0x2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A4)); + SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A4)); sleep 15; loop { sleep 1; @@ -633,19 +646,19 @@ Script N(80242C50) = SCRIPT({ break loop; } } - NpcFaceNpc(0x2, 0x5, 1); + NpcFaceNpc(NPC_BOO2, NPC_WORLD_TUBBA, 1); sleep 30; - SpeakToPlayer(0x2, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00A5)); - SetNpcAnimation(0x2, NPC_ANIM(boo, Palette_01, Anim_9)); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_1E)); - SetNpcJumpscale(0x2, 0.0); - NpcJump1(0x2, 265, 206, 212, 3); + SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00A5)); + SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_9)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1E)); + SetNpcJumpscale(NPC_BOO2, 0.0); + NpcJump1(NPC_BOO2, 265, 206, 212, 3); sleep 20; - SpeakToPlayer(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_1E), NPC_ANIM(world_tubba, Palette_00, Anim_1E), 5, MESSAGE_ID(0x0E, 0x00A6)); - SetNpcPos(0x2, 303, 237, 228); - SetNpcAnimation(0x2, NPC_ANIM(boo, Palette_01, Anim_6)); - EnableNpcShadow(0x2, FALSE); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_1F)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1E), NPC_ANIM(world_tubba, Palette_00, Anim_1E), 5, MESSAGE_ID(0x0E, 0x00A6)); + SetNpcPos(NPC_BOO2, 303, 237, 228); + SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6)); + EnableNpcShadow(NPC_BOO2, FALSE); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1F)); SetCamSpeed(0, 5.0); SetCamPitch(0, 17.0, -17.0); SetCamDistance(0, 250); @@ -656,11 +669,11 @@ Script N(80242C50) = SCRIPT({ PanToTarget(0, 0, 1); spawn { sleep 50; - PlaySoundAtNpc(0x5, 0x315, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_315, 0); } sleep 40; - SetNpcPos(0x2, 0, -1000, 0); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_20)); + SetNpcPos(NPC_BOO2, 0, -1000, 0); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_20)); sleep 80; SetCamSpeed(0, 90.0); SetCamPitch(0, 17.0, -11.5); @@ -671,46 +684,46 @@ Script N(80242C50) = SCRIPT({ SetPanTarget(0, 240, 169, 206); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); sleep 15; - SpeakToPlayer(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_21), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00A7)); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_21)); - GetNpcPos(0x5, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_21), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00A7)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_21)); + GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += -50; SI_VAR(1) += 50; SI_VAR(2) += 10; PlayEffect(0x6, 1, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10, 0, 0, 0, 0, 0, 0, 0, 0); sleep 20; - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_6)); - InterpNpcYaw(0x5, 90, 1); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + InterpNpcYaw(NPC_WORLD_TUBBA, 90, 1); sleep 30; SI_VAR(0) = 7; spawn N(80242BEC); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_9)); - NpcMoveTo(0x5, 370, 220, 0); - NpcMoveTo(0x5, 550, 196, 0); - SetNpcAnimation(0x5, NPC_ANIM(world_tubba, Palette_00, Anim_6)); - SetNpcPos(0x5, 0, -1000, 0); - SetNpcFlagBits(0x5, 0x00000200, FALSE); - NpcFacePlayer(NPC_PLAYER, 3); - SetNpcPos(NPC_PLAYER, 55, 195, 160); - SetNpcPos(0x1, 160, 191, 250); - SetNpcPos(0x4, 350, 185, 197); - EnableNpcShadow(NPC_PLAYER, TRUE); - EnableNpcShadow(0x1, TRUE); - EnableNpcShadow(0x4, TRUE); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + NpcMoveTo(NPC_WORLD_TUBBA, 370, 220, 0); + NpcMoveTo(NPC_WORLD_TUBBA, 550, 196, 0); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcPos(NPC_WORLD_TUBBA, 0, -1000, 0); + SetNpcFlagBits(NPC_WORLD_TUBBA, NPC_FLAG_200, FALSE); + NpcFacePlayer(NPC_BOO0, 3); + SetNpcPos(NPC_BOO0, 55, 195, 160); + SetNpcPos(NPC_BOO1, 160, 191, 250); + SetNpcPos(NPC_BOO4, 350, 185, 197); + EnableNpcShadow(NPC_BOO0, TRUE); + EnableNpcShadow(NPC_BOO1, TRUE); + EnableNpcShadow(NPC_BOO4, TRUE); PlaySound(SOUND_BOO_VANISH); SI_VAR(0) = 0.0; loop 20 { SI_VAR(0) += 12.5; - func_802CFD30(NPC_PLAYER, 7, SI_VAR(0), 0, 0, 0); - func_802CFD30(0x1, 7, SI_VAR(0), 0, 0, 0); - func_802CFD30(0x4, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO0, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO1, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_BOO4, 7, SI_VAR(0), 0, 0, 0); sleep 1; } - func_802CFD30(NPC_PLAYER, 0, 0, 0, 0, 0); - func_802CFD30(0x1, 0, 0, 0, 0, 0); - func_802CFD30(0x4, 0, 0, 0, 0, 0); + func_802CFD30(NPC_BOO0, 0, 0, 0, 0, 0); + func_802CFD30(NPC_BOO1, 0, 0, 0, 0, 0); + func_802CFD30(NPC_BOO4, 0, 0, 0, 0, 0); sleep 10; SetCamType(0, 4, 0); SetCamSpeed(0, 3.0); @@ -720,13 +733,13 @@ Script N(80242C50) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); PanToTarget(0, 0, 0); - SpeakToPlayer(0x4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00A8)); + SpeakToPlayer(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00A8)); DisablePlayerInput(FALSE); }); Script N(802441FC) = SCRIPT({ if (STORY_PROGRESS < STORY_CH3_SAW_TUBBA_EAT_BOO) { - SetNpcPos(0x2, 330, 184, 240); + SetNpcPos(NPC_BOO2, 330, 184, 240); loop { SI_VAR(10) = 0; GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -742,9 +755,9 @@ Script N(802441FC) = SCRIPT({ } func_802D2B6C(); await N(80242C50); - BindNpcInteract(NPC_PLAYER, N(interact_802418F4)); - BindNpcInteract(0x1, N(interact_80241A84)); - BindNpcInteract(0x4, N(interact_80241F88)); + BindNpcInteract(NPC_BOO0, N(interact_802418F4)); + BindNpcInteract(NPC_BOO1, N(interact_80241A84)); + BindNpcInteract(NPC_BOO4, N(interact_80241F88)); STORY_PROGRESS = STORY_CH3_SAW_TUBBA_EAT_BOO; spawn N(80241360); } @@ -767,7 +780,7 @@ NpcAnimID N(extraAnimationList_80244390)[] = { }; StaticNpc N(npcGroup_802443AC) = { - .id = 5, + .id = NPC_WORLD_TUBBA, .settings = &N(npcSettings_802416B0), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_IGNORE_HEIGHT, @@ -841,7 +854,7 @@ Script N(init_802447AC) = SCRIPT({ StaticNpc N(npcGroup_802447E4)[] = { { - .id = 6, + .id = NPC_BOO5, .settings = &N(npcSettings_80241758), .pos = { 36.0f, 277.0f, 140.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, @@ -870,7 +883,7 @@ StaticNpc N(npcGroup_802447E4)[] = { }, }, { - .id = 7, + .id = NPC_BOO6, .settings = &N(npcSettings_80241758), .pos = { 200.0f, 275.0f, 182.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, @@ -899,7 +912,7 @@ StaticNpc N(npcGroup_802447E4)[] = { }, }, { - .id = 8, + .id = NPC_BOO7, .settings = &N(npcSettings_80241758), .pos = { 379.0f, 300.0f, 192.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, @@ -928,7 +941,7 @@ StaticNpc N(npcGroup_802447E4)[] = { }, }, { - .id = 9, + .id = NPC_BOO8, .settings = &N(npcSettings_80241758), .pos = { 525.0f, 286.0f, 178.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, @@ -1022,7 +1035,7 @@ void N(func_80240158_BE7D38)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -1068,7 +1081,7 @@ void N(func_802404C0_BE80A0)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -1121,7 +1134,7 @@ void N(func_8024094C_BE852C)(ScriptInstance* script, NpcAISettings* aiSettings, Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index 88ed82c0df..a39d616f8b 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -413,21 +413,21 @@ Script N(80242A30) = SCRIPT({ SetPanTarget(0, 5, 0, -147); PanToTarget(0, 0, 1); RotateModel(29, 80, 0, -1, 0); - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - SetNpcJumpscale(NPC_PLAYER, 2.5); - NpcJump0(NPC_PLAYER, 0, 20, -120, 8); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + SetNpcJumpscale(NPC_TUBBAS_HEART, 2.5); + NpcJump0(NPC_TUBBAS_HEART, 0, 20, -120, 8); sleep 1; - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, 0, 10, -60, 12); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, 0, 10, -60, 12); sleep 1; - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, 0, 0, 0, 12); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, 0, 0, 0, 12); sleep 1; SetNpcVar(0, 0, 0); spawn { loop { - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, 0, 0, 0, 10); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, 0, 0, 0, 10); sleep 1; GetNpcVar(0, 0, SI_VAR(0)); if (SI_VAR(0) == 1) { @@ -448,8 +448,8 @@ Script N(80242A30) = SCRIPT({ } PlaySoundAtCollider(10, 450, 0); } - NpcFaceNpc(NPC_PLAYER, 0x1, 0); - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_A), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00C7)); + NpcFaceNpc(NPC_TUBBAS_HEART, NPC_WORLD_TUBBA, 0); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_A), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00C7)); SetNpcVar(0, 0, 1); loop { GetNpcVar(0, 0, SI_VAR(0)); @@ -458,11 +458,11 @@ Script N(80242A30) = SCRIPT({ } sleep 1; } - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, 75, 0, 10, 12); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, 75, 0, 10, 12); sleep 1; - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, 150, 0, 20, 12); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, 150, 0, 20, 12); sleep 1; spawn { sleep 4; @@ -474,16 +474,16 @@ Script N(80242A30) = SCRIPT({ SetCamPosC(0, 0, 0); SetPanTarget(0, 65, 0, -137); PanToTarget(0, 0, 1); - SetNpcAnimation(0x1, NPC_ANIM(world_tubba, Palette_00, Anim_22)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_22)); } - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, 298, 56, 31, 18); - SetNpcPos(NPC_PLAYER, 0, -1000, 0); - EnableNpcShadow(NPC_PLAYER, FALSE); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, 298, 56, 31, 18); + SetNpcPos(NPC_TUBBAS_HEART, 0, -1000, 0); + EnableNpcShadow(NPC_TUBBAS_HEART, FALSE); spawn { - SetNpcAnimation(0x1, NPC_ANIM(world_tubba, Palette_00, Anim_23)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_23)); sleep 20; - SetNpcAnimation(0x1, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_6)); } sleep 20; spawn { @@ -527,7 +527,7 @@ Script N(80242A30) = SCRIPT({ } PlayerMoveTo(200, 0, 35); sleep 5; - SpeakToPlayer(0x1, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x00C8)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x00C8)); SetNpcVar(1, 0, 1); sleep 30; DisablePlayerInput(FALSE); diff --git a/src/world/area_arn/arn_07/arn_07.h b/src/world/area_arn/arn_07/arn_07.h index b7597910cd..7bf0c5ade7 100644 --- a/src/world/area_arn/arn_07/arn_07.h +++ b/src/world/area_arn/arn_07/arn_07.h @@ -4,32 +4,43 @@ #define NAMESPACE arn_07 -void func_802D6420(void); -void func_802D6954(void); -void func_802CF56C(void); - +ApiStatus N(func_80240000_BECDF0)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_8024004C_BECE3C)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802401AC_BECF9C)(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(func_80240000_BECDF0)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802405BC_BED3AC)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802405FC_BED3EC)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80240708_BED4F8)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80240800_BED5F0)(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(GetEntityPosition)(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(GetEntityPosition)(ScriptInstance* script, s32 isInitialCall); ApiStatus PostChapter3StatUpdate(ScriptInstance* script, s32 isInitialCall); -Script N(main); -Script N(80241F10); -Script N(80243790); -Script N(802439B0); -NpcGroupList N(npcGroupList_802478B8); +Script N(exitSingleDoor_802428D4); NpcGroupList N(npcGroupList_8024787C); -NpcGroupList N(npcGroupList_802478E8); NpcGroupList N(npcGroupList_802478B8); -Script N(makeEntities); +NpcGroupList N(npcGroupList_802478E8); Script N(80243790); Script N(802437AC); -Script N(exitSingleDoor_802428D4); +Script N(802439B0); Script N(80242048); +Script N(80241F10); +Script N(main); +Script N(makeEntities); + +enum { + NPC_TUBBAS_HEART, + NPC_WORLD_TUBBA, + NPC_BOO0, + NPC_BOO1, + NPC_BOO2, + NPC_BOO3, + NPC_BOO4, + NPC_BOO5, + NPC_WORLD_BOW, + NPC_BOOTLER, + NPC_PARAGOOMBA0, + NPC_PARAGOOMBA1, + NPC_PARAGOOMBA2, + NPC_WORLD_SKOLAR, +}; diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index 2ab1f7e447..44211a5c27 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -97,7 +97,7 @@ NpcAISettings N(npcAISettings_80243BD8) = { .alertRadius = 120.0f, .unk_14 = 3, .chaseSpeed = 4.0f, - .unk_1C = 5, + .unk_1C = { .s = 5 }, .unk_20 = 1, .chaseRadius = 150.0f, .unk_2C = 1, @@ -171,7 +171,7 @@ NpcSettings N(npcSettings_80243DA0) = { Script N(80243DCC) = SCRIPT({ loop { - PlaySoundAtNpc(0x1, 0x20F6, 0); + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); ShakeCam(0, 0, 3, 0.80078125); } }); @@ -282,13 +282,13 @@ Script N(80243FE8) = SCRIPT({ sleep 10; if (SI_VAR(6) != 9) { SI_VAR(5) = 8; - SetNpcPos(0x8, 257, 25, 0); - func_802CFD30(0x8, 7, 0, 0, 0, 0); - NpcFacePlayer(0x8, 0); + SetNpcPos(NPC_WORLD_BOW, 257, 25, 0); + func_802CFD30(NPC_WORLD_BOW, 7, 0, 0, 0, 0); + NpcFacePlayer(NPC_WORLD_BOW, 0); MakeLerp(0, 240, 20, 0); loop { UpdateLerp(); - func_802CFD30(0x8, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_WORLD_BOW, 7, SI_VAR(0), 0, 0, 0); sleep 1; if (SI_VAR(1) == 0) { break loop; @@ -301,7 +301,7 @@ Script N(80243FE8) = SCRIPT({ if (SI_VAR(6) != 9) { DisablePartnerAI(0); sleep 1; - NpcFaceNpc(NPC_PARTNER, 0x8, 0); + NpcFaceNpc(NPC_PARTNER, NPC_WORLD_BOW, 0); sleep 5; } } @@ -325,8 +325,8 @@ Script N(80243FE8) = SCRIPT({ SetCamSpeed(0, 4.0); SetPanTarget(0, 175, 0, 0); WaitForCam(0, 1.0); - SetNpcPos(0x9, 93, 160, -6); - InterpNpcYaw(0x9, 90, 0); + SetNpcPos(NPC_BOOTLER, 93, 160, -6); + InterpNpcYaw(NPC_BOOTLER, 90, 0); spawn { sleep 10; InterpPlayerYaw(270, 0); @@ -340,7 +340,7 @@ Script N(80243FE8) = SCRIPT({ MakeLerp(160, 31, 70, 0); loop { UpdateLerp(); - SetNpcPos(0x9, 93, SI_VAR(0), -6); + SetNpcPos(NPC_BOOTLER, 93, SI_VAR(0), -6); sleep 1; if (SI_VAR(1) == 0) { break loop; @@ -367,13 +367,13 @@ Script N(80243FE8) = SCRIPT({ MakeLerp(240, 0, 20, 0); loop { UpdateLerp(); - func_802CFD30(0x8, 7, SI_VAR(0), 0, 0, 0); + func_802CFD30(NPC_WORLD_BOW, 7, SI_VAR(0), 0, 0, 0); sleep 1; if (SI_VAR(1) == 0) { break loop; } } - SetNpcPos(0x8, 0, -1000, 0); + SetNpcPos(NPC_WORLD_BOW, 0, -1000, 0); EnablePartnerAI(); } else { sleep 20; @@ -550,9 +550,9 @@ Script N(80245304) = SCRIPT({ SI_VAR(3) += -50; SI_VAR(4) = SI_VAR(1); SI_VAR(4) += 26; - SetNpcPos(0xD, SI_VAR(3), SI_VAR(4), SI_VAR(2)); + SetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(3), SI_VAR(4), SI_VAR(2)); PlayerFaceNpc(13, 0); - NpcFaceNpc(NPC_PARTNER, 0xD, 0); + NpcFaceNpc(NPC_PARTNER, NPC_WORLD_SKOLAR, 0); SI_VAR(0) += -25; UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); @@ -564,7 +564,7 @@ Script N(80245304) = SCRIPT({ WaitForPlayerInputEnabled(); DisablePlayerInput(TRUE); sleep 40; - SpeakToPlayer(0xD, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D3)); + SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D3)); SetCamDistance(0, 300.0); SetCamPitch(0, 18, -9); SetCamSpeed(0, 4.0); @@ -573,14 +573,14 @@ Script N(80245304) = SCRIPT({ MakeLerp(0, 360, 10, 0); loop { UpdateLerp(); - SetNpcRotation(0xD, 0, SI_VAR(0), 0); + SetNpcRotation(NPC_WORLD_SKOLAR, 0, SI_VAR(0), 0); sleep 1; if (SI_VAR(1) == 0) { break loop; } } EnableNpcAI(13, 0); - SetNpcAnimation(0xD, NPC_ANIM(world_skolar, Palette_00, Anim_3)); + SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_3)); sleep 20; SetPlayerAnimation(ANIM_GOT_ITEM); PlaySoundAtPlayer(313, 0); @@ -602,18 +602,18 @@ Script N(80245304) = SCRIPT({ PlayEffect(0x52, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 30, 0, 0, 0, 0, 0, 0, 0); sleep 30; SetPlayerAnimation(ANIM_10002); - SetNpcAnimation(0xD, NPC_ANIM(world_skolar, Palette_00, Anim_1)); + SetNpcAnimation(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_1)); EnableNpcAI(13, 1); PostChapter3StatUpdate(); ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x0193), 160, 40); sleep 10; - GetNpcPos(0xD, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetCamDistance(0, 250.0); PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(0xD, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D4)); + SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D4)); sleep 10; GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); SI_VAR(0) += -25; @@ -623,11 +623,11 @@ Script N(80245304) = SCRIPT({ PanToTarget(0, 0, 1); WaitForCam(0, 1.0); sleep 10; - SpeakToPlayer(0xD, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D5)); - SetNpcFlagBits(0xD, 0x00040000, TRUE); + SpeakToPlayer(NPC_WORLD_SKOLAR, NPC_ANIM(world_skolar, Palette_00, Anim_2), NPC_ANIM(world_skolar, Palette_00, Anim_1), 512, MESSAGE_ID(0x0E, 0x00D5)); + SetNpcFlagBits(NPC_WORLD_SKOLAR, NPC_FLAG_40000, TRUE); spawn { loop 25 { - GetNpcPos(0xD, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(0), SI_VAR(1), SI_VAR(2)); PlayEffect(0x11, 4, SI_VAR(0), SI_VAR(1), SI_VAR(2), 20, 0, 0, 0, 0, 0, 0, 0, 0); sleep 4; } @@ -638,7 +638,7 @@ Script N(80245304) = SCRIPT({ MakeLerp(SI_VAR(2), SI_VAR(3), 100, 2); loop { UpdateLerp(); - SetNpcRotation(0xD, 0, SI_VAR(0), 0); + SetNpcRotation(NPC_WORLD_SKOLAR, 0, SI_VAR(0), 0); sleep 1; if (SI_VAR(1) == 0) { break loop; @@ -646,23 +646,23 @@ Script N(80245304) = SCRIPT({ } } spawn { - GetNpcPos(0xD, SI_VAR(2), SI_VAR(3), SI_VAR(4)); + GetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(2), SI_VAR(3), SI_VAR(4)); SI_VAR(5) = SI_VAR(3); SI_VAR(5) += 180; MakeLerp(SI_VAR(3), SI_VAR(5), 100, 2); loop { UpdateLerp(); - SetNpcPos(0xD, SI_VAR(2), SI_VAR(0), SI_VAR(4)); + SetNpcPos(NPC_WORLD_SKOLAR, SI_VAR(2), SI_VAR(0), SI_VAR(4)); sleep 1; if (SI_VAR(1) == 0) { break loop; } } - SetNpcPos(0xD, 0, -1000, 0); + SetNpcPos(NPC_WORLD_SKOLAR, 0, -1000, 0); } spawn { sleep 15; - PlaySoundAtNpc(0xD, 0x2045, 0); + PlaySoundAtNpc(NPC_WORLD_SKOLAR, 0x2045, 0); } sleep 10; SetPlayerAnimation(0x1002A); @@ -688,7 +688,7 @@ Script N(init_80245C9C) = SCRIPT({ StaticNpc N(npcGroup_80245D0C)[] = { { - .id = 1, + .id = NPC_WORLD_TUBBA, .settings = &N(npcSettings_80243CF0), .pos = { 309.0f, 0.0f, 11.0f }, .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_40000 | NPC_FLAG_200000, @@ -718,7 +718,7 @@ StaticNpc N(npcGroup_80245D0C)[] = { .extraAnimations = &N(extraAnimationList_802451D4), }, { - .id = 0, + .id = NPC_TUBBAS_HEART, .settings = &N(npcSettings_80243CC4), .pos = { -10.0f, 50.0f, -170.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_40000 | NPC_FLAG_200000, @@ -750,7 +750,7 @@ StaticNpc N(npcGroup_80245D0C)[] = { StaticNpc N(npcGroup_802460EC)[] = { { - .id = 2, + .id = NPC_BOO0, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -780,7 +780,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .extraAnimations = &N(extraAnimationList_80245200), }, { - .id = 3, + .id = NPC_BOO1, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -810,7 +810,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .extraAnimations = &N(extraAnimationList_80245200), }, { - .id = 4, + .id = NPC_BOO2, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -840,7 +840,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .extraAnimations = &N(extraAnimationList_80245200), }, { - .id = 5, + .id = NPC_BOO3, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -870,7 +870,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .extraAnimations = &N(extraAnimationList_80245200), }, { - .id = 6, + .id = NPC_BOO4, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -900,7 +900,7 @@ StaticNpc N(npcGroup_802460EC)[] = { .extraAnimations = &N(extraAnimationList_802451F8), }, { - .id = 7, + .id = NPC_BOO5, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -932,7 +932,7 @@ StaticNpc N(npcGroup_802460EC)[] = { }; StaticNpc N(npcGroup_80246C8C) = { - .id = 8, + .id = NPC_WORLD_BOW, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -962,7 +962,7 @@ StaticNpc N(npcGroup_80246C8C) = { }; StaticNpc N(npcGroup_80246E7C) = { - .id = 9, + .id = NPC_BOOTLER, .settings = &N(npcSettings_80243D1C), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000, @@ -1001,7 +1001,7 @@ Script N(init_8024706C) = SCRIPT({ }); StaticNpc N(npcGroup_802470BC) = { - .id = 10, + .id = NPC_PARAGOOMBA0, .settings = &N(npcSettings_80243C78), .pos = { -216.0f, 60.0f, -10.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -1009,7 +1009,9 @@ StaticNpc N(npcGroup_802470BC) = { .yaw = 90, .dropFlags = 0x80, .itemDropChance = 20, + .itemDrops = { { ITEM_DRIED_SHROOM, 10, 0 }, + }, .heartDrops = STANDARD_HEART_DROPS(2), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 2, @@ -1036,7 +1038,7 @@ StaticNpc N(npcGroup_802470BC) = { }; StaticNpc N(npcGroup_802472AC) = { - .id = 11, + .id = NPC_PARAGOOMBA1, .settings = &N(npcSettings_80243C78), .pos = { 0.0f, 60.0f, 150.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -1044,7 +1046,9 @@ StaticNpc N(npcGroup_802472AC) = { .yaw = 270, .dropFlags = 0x80, .itemDropChance = 20, + .itemDrops = { { ITEM_DRIED_SHROOM, 10, 0 }, + }, .heartDrops = STANDARD_HEART_DROPS(2), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 2, @@ -1071,7 +1075,7 @@ StaticNpc N(npcGroup_802472AC) = { }; StaticNpc N(npcGroup_8024749C) = { - .id = 12, + .id = NPC_PARAGOOMBA2, .settings = &N(npcSettings_80243C78), .pos = { 260.0f, 60.0f, 30.0f }, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -1079,7 +1083,9 @@ StaticNpc N(npcGroup_8024749C) = { .yaw = 90, .dropFlags = 0x80, .itemDropChance = 20, + .itemDrops = { { ITEM_DRIED_SHROOM, 10, 0 }, + }, .heartDrops = STANDARD_HEART_DROPS(2), .flowerDrops = STANDARD_FLOWER_DROPS(2), .maxCoinBonus = 2, @@ -1106,7 +1112,7 @@ StaticNpc N(npcGroup_8024749C) = { }; StaticNpc N(npcGroup_8024768C) = { - .id = 13, + .id = NPC_WORLD_SKOLAR, .settings = &N(npcSettings_80243D48), .pos = { 0.0f, -1000.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -1270,7 +1276,7 @@ void N(func_80240B00_BED8F0)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && - func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -1361,7 +1367,7 @@ void N(func_802411E8_BEDFD8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -1451,12 +1457,12 @@ void N(func_802417A8_BEE598)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); diff --git a/src/world/area_arn/arn_08/arn_08.h b/src/world/area_arn/arn_08/arn_08.h index 86003cafb3..daf10463bf 100644 --- a/src/world/area_arn/arn_08/arn_08.h +++ b/src/world/area_arn/arn_08/arn_08.h @@ -7,17 +7,17 @@ f32 func_800E3514(f32, f32*); f32 func_800E34D8(void); -ApiStatus N(func_8024008C_BF482C)(ScriptInstance *script, s32 isInitialCall); -ApiStatus N(func_80240000_BF47A0)(ScriptInstance *script, s32 isInitialCall); -ApiStatus N(func_802400C0_BF4860)(ScriptInstance *script, s32 isInitialCall); -ApiStatus N(func_802400D4_BF4874)(ScriptInstance *script, s32 isInitialCall); -ApiStatus N(func_802400F4_BF4894)(ScriptInstance *script, s32 isInitialCall); -ApiStatus N(func_8024019C_BF493C)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_80240000_BF47A0)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024008C_BF482C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802400C0_BF4860)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802400D4_BF4874)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802400F4_BF4894)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024019C_BF493C)(ScriptInstance* script, s32 isInitialCall); -Script N(main); -Script N(80240300); NpcGroupList N(npcGroupList_80241828); -Script N(makeEntities); +Script N(80240B50); Script N(80240BA0); Script N(8024118C); -Script N(80240B50); +Script N(80240300); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index 322427ce61..57916440ea 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -6,6 +6,11 @@ extern Npc* wPartnerNpc; void func_800EF3C0(s32, s32); void func_800EF3D4(s16); +enum { + NPC_TUBBAS_HEART, + NPC_YAKKEY, +}; + Script N(802403B0) = SCRIPT({ group 27; DisablePlayerInput(TRUE); @@ -50,21 +55,21 @@ Script N(8024049C) = SCRIPT({ SetNpcPos(NPC_PARTNER, 1000, 1000, 0); RotateModel(0, 80, 0, -1, 0); RotateModel(1, 80, 0, -1, 0); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); - SetNpcJumpscale(NPC_PLAYER, 2.5); - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, -50, 0, 50, 10); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); + SetNpcJumpscale(NPC_TUBBAS_HEART, 2.5); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, -50, 0, 50, 10); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); sleep 1; - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, -110, 0, 110, 10); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, -110, 0, 110, 10); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); sleep 1; - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, -180, 0, 180, 10); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_6)); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, -180, 0, 180, 10); + SetNpcAnimation(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_7)); sleep 1; MakeLerp(80, 0, 10, 0); loop { @@ -117,7 +122,7 @@ Script N(main) = SCRIPT({ spawn N(80240300); }); -static s32 N(pad_A6C)[] = { +static s32 N(pad_A6C) = { 0x00000000, }; @@ -269,7 +274,7 @@ Script N(8024118C) = SCRIPT({ spawn N(80240CC0); }); -static s32 N(pad_11FC)[] = { +static s32 N(pad_11FC) = { 0x00000000, }; @@ -336,7 +341,7 @@ Script N(init_802413E8) = SCRIPT({ }); StaticNpc N(npcGroup_80241448) = { - .id = 0, + .id = NPC_TUBBAS_HEART, .settings = &N(npcSettings_80241220), .pos = { -23.0f, 75.0f, 31.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, @@ -366,7 +371,7 @@ StaticNpc N(npcGroup_80241448) = { }; StaticNpc N(npcGroup_80241638) = { - .id = 1, + .id = NPC_YAKKEY, .settings = &N(npcSettings_8024124C), .pos = { 38.0f, 0.0f, 97.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_IGNORE_HEIGHT, @@ -402,7 +407,7 @@ NpcGroupList N(npcGroupList_80241828) = { {}, }; -static s32 N(pad_184C)[] = { +static s32 N(pad_184C) = { 0x00000000, }; diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index fc721f11c8..64206c2a7d 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -92,7 +92,7 @@ NpcAISettings N(npcAISettings_8024047C) = { .alertRadius = 150.0f, .unk_14 = 2, .chaseSpeed = 3.3f, - .unk_1C = 70, + .unk_1C = { .s = 70 }, .unk_20 = 1, .chaseRadius = 180.0f, .unk_2C = 1, diff --git a/src/world/area_arn/arn_11/events.c b/src/world/area_arn/arn_11/events.c index 95c5d7e95c..c898f0f2d8 100644 --- a/src/world/area_arn/arn_11/events.c +++ b/src/world/area_arn/arn_11/events.c @@ -1,6 +1,10 @@ #include "arn_11.h" #include "sprite/npc/tubbas_heart.h" +enum { + NPC_TUBBAS_HEART, +}; + Script N(802400F0) = SCRIPT({ SetCamType(0, 6, 1); SetCamSpeed(0, 3.0); @@ -17,30 +21,30 @@ Script N(802401BC) = SCRIPT({ sleep 30; SetPlayerSpeed(3.0); PlayerMoveTo(6, 0, 0); - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BF)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00BF)); sleep 10; - SetPlayerAnimation(0x80007); + SetPlayerAnimation(ANIM_80007); sleep 40; - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C0)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C0)); SetPlayerAnimation(ANIM_10002); sleep 10; SetPlayerAnimation(0x90000); sleep 30; - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C1)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C1)); SetPlayerAnimation(ANIM_10002); sleep 20; SetPlayerAnimation(0x90000); spawn { - SetNpcJumpscale(NPC_PLAYER, 2.5); - GetNpcPos(NPC_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + SetNpcJumpscale(NPC_TUBBAS_HEART, 2.5); + GetNpcPos(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); sleep 1; - PlaySoundAtNpc(NPC_PLAYER, 0x20C8, 0); - NpcJump0(NPC_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + PlaySoundAtNpc(NPC_TUBBAS_HEART, 0x20C8, 0); + NpcJump0(NPC_TUBBAS_HEART, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); } sleep 40; - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C2)); + SpeakToPlayer(NPC_TUBBAS_HEART, NPC_ANIM(tubbas_heart, Palette_00, Anim_B), NPC_ANIM(tubbas_heart, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00C2)); SetPlayerAnimation(0x90000); sleep 10; SetNpcVar(0, 0, 1); @@ -248,7 +252,7 @@ Script N(init_80240E70) = SCRIPT({ }); StaticNpc N(npcGroup_80240EEC) = { - .id = 0, + .id = NPC_TUBBAS_HEART, .settings = &N(npcSettings_802406A0), .pos = { 119.0f, 60.0f, 0.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_40000, diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index 1acdf9c2dc..6a5e7f49dd 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -91,7 +91,7 @@ NpcAISettings N(npcAISettings_8024046C) = { .alertRadius = 150.0f, .unk_14 = 2, .chaseSpeed = 3.3f, - .unk_1C = 70, + .unk_1C = { .s = 70 }, .unk_20 = 1, .chaseRadius = 180.0f, .unk_2C = 1, diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index c848a63112..25eec5b9cd 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -92,7 +92,7 @@ NpcAISettings N(npcAISettings_8024047C) = { .alertRadius = 150.0f, .unk_14 = 2, .chaseSpeed = 3.3f, - .unk_1C = 70, + .unk_1C = { .s = 70 }, .unk_20 = 1, .chaseRadius = 180.0f, .unk_2C = 1, diff --git a/src/world/area_dgb/dgb_00/BFA0A0.c b/src/world/area_dgb/dgb_00/BFA0A0.c index e63805e9a9..e6e7ee544d 100644 --- a/src/world/area_dgb/dgb_00/BFA0A0.c +++ b/src/world/area_dgb/dgb_00/BFA0A0.c @@ -1,3 +1,131 @@ #include "dgb_00.h" +#include "message_ids.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_00/BFA0A0", func_80240000_BFA0A0); +ApiStatus N(func_80240000_BFA0A0)(ScriptInstance *script, s32 isInitialCall) { + sprintf(&D_800D9230, "arn_20_shape"); + sprintf(&D_800D91E0, "arn_20_hit"); + sprintf(&D_800B0CF0, "arn_tex"); + return ApiStatus_BLOCK; +} + +EntryList N(entryList) = { + { -733.0f, 0.0f, -8.0f, 90.0f }, + { 250.0f, 10.0f, -100.0f, 225.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .background = &gBackgroundImage, + .tattle = MSG_dgb_00_tattle, +}; + +Script N(80240110) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_GUSTY_GULCH, 0, 8); + } + } + ClearAmbientSounds(250); +}); + +static s32 N(pad_1B8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitWalk_802401C0) = EXIT_WALK_SCRIPT(60, 0, "arn_04", 1); + +Script N(exitDoubleDoor_8024021C) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 18; + SI_VAR(2) = 5; + SI_VAR(3) = 7; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 0); + sleep 100; +}); + +Script N(802402D0) = SCRIPT({ + bind N(exitWalk_802401C0) to TRIGGER_FLOOR_ABOVE 15; + match STORY_PROGRESS { + < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES { + bind N(exitDoubleDoor_8024021C) to TRIGGER_WALL_PRESS_A 18; + } + < STORY_CH3_ESCAPED_TUBBAS_MANOR {} + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + spawn N(80240F50); + await N(80241AA0); + } + else { + bind N(exitDoubleDoor_8024021C) to TRIGGER_WALL_PRESS_A 18; + } + } +}); + +Script N(enterDoubleDoor_8024038C) = SCRIPT({ + GetLoadType(SI_VAR(1)); + if (SI_VAR(1) == 1) { + spawn EnterSavePoint; + spawn N(802402D0); + return; + } + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(0) = N(802402D0); + spawn EnterWalk; + sleep 1; + } + == 1 { + if (STORY_PROGRESS >= STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) { + if (STORY_PROGRESS < STORY_CH3_ESCAPED_TUBBAS_MANOR) { + spawn N(802402D0); + spawn { + await N(8024103C); + await N(802413F4); + } + return; + } + } + UseDoorSounds(3); + SI_VAR(2) = 5; + SI_VAR(3) = 7; + await EnterDoubleDoor; + spawn N(802402D0); + } + == 2 { + spawn N(802402D0); + spawn N(80242B84); + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SI_SAVE_FLAG(1978) = 1; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + GetEntryID(SI_VAR(0)); + if (SI_VAR(0) == 2) { + MakeNpcs(0, N(npcGroupList_80243740)); + } else { + MakeNpcs(0, N(npcGroupList_802436EC)); + } + await N(makeEntities); + spawn N(80240110); + spawn N(enterDoubleDoor_8024038C); +}); diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index 29af92ac0b..d8b86c7f2f 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -1,6 +1,803 @@ #include "dgb_00.h" +#include "sprite/npc/boo.h" +#include "sprite/npc/sentinel.h" +#include "sprite/npc/world_bombette.h" +#include "sprite/npc/world_bow.h" +#include "sprite/npc/world_goombario.h" +#include "sprite/npc/world_kooper.h" +#include "sprite/npc/world_parakarry.h" -ApiStatus func_80240060_BFA100(ScriptInstance* script, s32 isInitialCall) { +enum { + NPC_BOO0, + NPC_BOO1, + NPC_BOO2, + NPC_BOO3, + NPC_BOO4, + NPC_BOO5, + NPC_SENTINEL, +}; + +NpcSettings N(npcSettings_80240640) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +NpcSettings N(npcSettings_8024066C) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +Script N(80240698) = SCRIPT({ + SI_VAR(3) = 0; + SI_VAR(3) -= SI_VAR(2); + ModifyColliderFlags(0, 18, 0x7FFFFE00); + PlaySoundAtCollider(18, 455, 0); + MakeLerp(0, 80, 30, 0); +10: + UpdateLerp(); + RotateModel(7, SI_VAR(0), 0, SI_VAR(2), 0); + RotateModel(5, SI_VAR(0), 0, SI_VAR(3), 0); + sleep 1; + if (SI_VAR(1) != 0) { + goto 10; + } +}); + +Script N(8024079C) = SCRIPT({ + SI_VAR(3) = 0; + SI_VAR(3) -= SI_VAR(2); + MakeLerp(80, 0, 12, 0); +10: + UpdateLerp(); + RotateModel(7, SI_VAR(0), 0, SI_VAR(2), 0); + RotateModel(5, SI_VAR(0), 0, SI_VAR(3), 0); + sleep 1; + if (SI_VAR(1) != 0) { + goto 10; + } + ModifyColliderFlags(1, 18, 0x7FFFFE00); + PlaySoundAtCollider(18, 456, 0); +}); + +Script N(802408A0) = SCRIPT({ + GetNpcPos(NPC_BOO0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 200; + NpcMoveTo(NPC_BOO0, SI_VAR(0), SI_VAR(2), 46); +}); + +Script N(802408F8) = SCRIPT({ + GetNpcPos(NPC_BOO1, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 200; + NpcMoveTo(NPC_BOO1, SI_VAR(0), SI_VAR(2), 50); +}); + +Script N(80240950) = SCRIPT({ + GetNpcPos(NPC_BOO2, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 200; + NpcMoveTo(NPC_BOO2, SI_VAR(0), SI_VAR(2), 53); +}); + +Script N(802409A8) = SCRIPT({ + GetNpcPos(NPC_BOO3, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 200; + NpcMoveTo(NPC_BOO3, SI_VAR(0), SI_VAR(2), 46); +}); + +Script N(80240A00) = SCRIPT({ + GetNpcPos(NPC_BOO4, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 200; + NpcMoveTo(NPC_BOO4, SI_VAR(0), SI_VAR(2), 50); +}); + +Script N(80240A58) = SCRIPT({ + GetNpcPos(NPC_BOO5, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 200; + NpcMoveTo(NPC_BOO5, SI_VAR(0), SI_VAR(2), 53); +}); + +Script N(80240AB0) = SCRIPT({ + spawn N(802408A0); + spawn N(802408F8); + spawn N(80240950); + spawn N(802409A8); + spawn N(80240A00); + spawn N(80240A58); +}); + +Script N(80240B08) = SCRIPT({ + SetNpcJumpscale(NPC_BOO0, -0.19921875); + NpcJump0(NPC_BOO0, 257, 30, -90, 5); + EnableNpcShadow(NPC_BOO0, FALSE); + SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); +}); + +Script N(80240B74) = SCRIPT({ + SetNpcJumpscale(NPC_BOO1, -0.2998046875); + NpcJump0(NPC_BOO1, 272, 112, -81, 12); + EnableNpcShadow(NPC_BOO1, FALSE); + SetNpcAnimation(NPC_BOO1, NPC_ANIM(boo, Palette_01, Anim_6)); +}); + +Script N(80240BE0) = SCRIPT({ + SetNpcJumpscale(NPC_BOO2, -0.3994140625); + NpcJump0(NPC_BOO2, 237, 120, -118, 10); + EnableNpcShadow(NPC_BOO2, FALSE); + SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6)); +}); + +Script N(80240C4C) = SCRIPT({ + SetNpcJumpscale(NPC_BOO3, -0.2998046875); + NpcJump0(NPC_BOO3, 280, 60, -79, 8); + EnableNpcShadow(NPC_BOO3, FALSE); + SetNpcAnimation(NPC_BOO3, NPC_ANIM(boo, Palette_01, Anim_6)); +}); + +Script N(80240CB8) = SCRIPT({ + SetNpcJumpscale(NPC_BOO4, -0.3994140625); + NpcJump0(NPC_BOO4, 250, 81, -97, 9); + EnableNpcShadow(NPC_BOO4, FALSE); + SetNpcAnimation(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_6)); +}); + +Script N(80240D24) = SCRIPT({ + SetNpcJumpscale(NPC_BOO5, -0.5); + NpcJump0(NPC_BOO5, 227, 43, -123, 15); + EnableNpcShadow(NPC_BOO5, FALSE); + SetNpcAnimation(NPC_BOO5, NPC_ANIM(boo, Palette_01, Anim_6)); +}); + +Script N(80240D90) = SCRIPT({ + spawn N(80240B74); + spawn N(80240BE0); + spawn N(80240C4C); + spawn N(80240CB8); + spawn N(80240D24); +}); + +Script N(80240DDC) = SCRIPT({ + GetNpcPos(NPC_BOO0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + loop { + RandInt(5, SI_VAR(10)); + SI_VAR(10) += 2; + SI_VAR(11) = 0; + 10: + SI_VAR(3) = SI_VAR(0); + SI_VAR(3) += 1; + SetNpcPos(NPC_BOO0, SI_VAR(3), SI_VAR(1), SI_VAR(2)); + sleep 1; + SI_VAR(3) = SI_VAR(0); + SI_VAR(3) += -1; + SetNpcPos(NPC_BOO0, SI_VAR(3), SI_VAR(1), SI_VAR(2)); + sleep 1; + SI_VAR(11) += 1; + if (SI_VAR(11) < SI_VAR(10)) { + goto 10; + } + RandInt(10, SI_VAR(10)); + SI_VAR(10) += 10; + sleep SI_VAR(10); + } +}); + +Script N(80240F50) = SCRIPT({ + group 239; + loop { + RandInt(50, SI_VAR(0)); + SI_VAR(0) += 80; + sleep SI_VAR(0); + if (SI_MAP_VAR(0) == 0) { + DisablePlayerInput(TRUE); + PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + ShakeCam(0, 0, 20, 2.0); + ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00EF), 160, 40); + DisablePlayerInput(FALSE); + } + } +}); + +Script N(8024103C) = SCRIPT({ + DisablePlayerInput(TRUE); + DisablePartnerAI(0); + SetPlayerPos(350, 10, -150); + InterpPlayerYaw(270, 1); + SetNpcPos(NPC_PARTNER, 350, 10, -150); + EnablePartnerAI(); + SetCamType(0, 4, 0); + SetCamSpeed(0, 90.0); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) = 175; + SI_VAR(1) = 0; + SI_VAR(2) = -75; + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PanToTarget(0, 0, 1); + WaitForCam(0, 1.0); + sleep 40; + SetNpcPos(NPC_BOO0, -60, 10, -70); + SetNpcPos(NPC_BOO1, -100, 10, -110); + SetNpcPos(NPC_BOO2, -140, 10, -150); + SetNpcPos(NPC_BOO3, -100, 10, -30); + SetNpcPos(NPC_BOO4, -140, 10, -70); + SetNpcPos(NPC_BOO5, -180, 10, -100); + await N(80240AB0); + sleep 60; + InterpNpcYaw(NPC_BOO0, 270, 1); + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00DB)); + SpeakToPlayer(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00DC)); + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 5, MESSAGE_ID(0x0E, 0x00DD)); + PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + ShakeCam(0, 0, 20, 2.0); + sleep 10; + PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + ShakeCam(0, 0, 20, 2.0); + InterpNpcYaw(NPC_BOO0, 90, 1); + ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00DE), 160, 40); + SetPlayerPos(350, 10, -150); + InterpPlayerYaw(270, 1); + SetNpcPos(NPC_PARTNER, 350, 10, -150); + SI_VAR(2) = 1; + await N(80240698); +}); + +Script N(802413F4) = SCRIPT({ + SetPlayerSpeed(8.0); + PlayerMoveTo(184, -44, 0); + PlaySoundAtNpc(NPC_BOO0, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO1, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO2, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO3, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO4, SOUND_UNKNOWN_262, 0); + PlaySoundAtNpc(NPC_BOO5, SOUND_UNKNOWN_262, 0); + ShowEmote(0, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); + ShowEmote(1, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); + ShowEmote(2, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); + ShowEmote(3, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); + ShowEmote(4, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); + ShowEmote(5, EMOTE_EXCLAMATION, 45, 20, 1, 0, 0, 0, 0); + sleep 50; + SI_VAR(2) = 1; + spawn N(8024079C); + spawn N(80240D90); + sleep 20; + SetCamType(0, 6, 1); + SetCamSpeed(0, 6.0); + SetCamPitch(0, 15.0, -15.0); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamDistance(0, 300); + PanToTarget(0, 0, 1); + WaitForCam(0, 1.0); + SI_VAR(10) = spawn N(80240DDC); + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00DF)); + kill SI_VAR(10); + SetPlayerAnimation(ANIM_80007); + sleep 20; + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E0)); + sleep 20; + SetPlayerAnimation(ANIM_NOD_YES); + sleep 20; + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E1)); + DisablePartnerAI(0); + GetCurrentPartnerID(SI_VAR(0)); + match SI_VAR(0) { + == 1 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, MESSAGE_ID(0x0E, 0x00E2)); + } + == 2 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_kooper, normal, talk), NPC_ANIM(world_kooper, normal, idle), 0, MESSAGE_ID(0x0E, 0x00E3)); + } + == 3 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bombette, normal, idle_fast), NPC_ANIM(world_bombette, normal, idle), 0, MESSAGE_ID(0x0E, 0x00E4)); + } + == 4 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E5)); + } + == 9 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00E6)); + } + } + EnablePartnerAI(); + SetCamType(0, 4, 0); + SetCamSpeed(0, 6.0); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PanToTarget(0, 0, 1); + WaitForCam(0, 1.0); + PanToTarget(0, 0, 0); + PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + ShakeCam(0, 0, 20, 2.0); + sleep 5; + PlaySoundAt(SOUND_UNKNOWN_B4, 0, 240, 10, -125); + ShakeCam(0, 0, 20, 2.0); + ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00E7), 160, 40); + await N(80240B08); + sleep 10; + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 5, MESSAGE_ID(0x0E, 0x00E8)); + SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); + spawn N(80240F50); + STORY_PROGRESS = STORY_CH3_ESCAPED_TUBBAS_MANOR; + DisablePlayerInput(FALSE); +}); + +Script N(80241AA0) = SCRIPT({ + SetNpcPos(NPC_BOO0, 246, 30, -110); + SetNpcPos(NPC_BOO1, 276, 120, -80); + SetNpcPos(NPC_BOO2, 216, 120, -140); + SetNpcPos(NPC_BOO3, 276, 60, -80); + SetNpcPos(NPC_BOO4, 246, 90, -110); + SetNpcPos(NPC_BOO5, 216, 60, -130); + InterpNpcYaw(NPC_BOO0, 70, 1); + InterpNpcYaw(NPC_BOO1, 99, 1); + InterpNpcYaw(NPC_BOO2, 93, 1); + InterpNpcYaw(NPC_BOO3, 74, 1); + InterpNpcYaw(NPC_BOO4, 78, 1); + InterpNpcYaw(NPC_BOO5, 81, 1); + SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO1, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO3, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO4, NPC_ANIM(boo, Palette_01, Anim_6)); + SetNpcAnimation(NPC_BOO5, NPC_ANIM(boo, Palette_01, Anim_6)); + EnableNpcShadow(NPC_BOO0, FALSE); + EnableNpcShadow(NPC_BOO1, FALSE); + EnableNpcShadow(NPC_BOO2, FALSE); + EnableNpcShadow(NPC_BOO3, FALSE); + EnableNpcShadow(NPC_BOO4, FALSE); + EnableNpcShadow(NPC_BOO5, FALSE); +}); + +Script N(interact_80241CD8) = SCRIPT({ + SI_MAP_VAR(0) = 1; + SpeakToPlayer(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 5, MESSAGE_ID(0x0E, 0x00E9)); + SetNpcAnimation(NPC_BOO0, NPC_ANIM(boo, Palette_01, Anim_6)); + DisablePartnerAI(0); + GetCurrentPartnerID(SI_VAR(0)); + match SI_VAR(0) { + == 1 { + AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, MESSAGE_ID(0x0E, 0x00EA)); + ResetCam(0, 6.0); + } + == 2 { + AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_kooper, normal, talk), NPC_ANIM(world_kooper, normal, idle), 0, MESSAGE_ID(0x0E, 0x00EB)); + ResetCam(0, 6.0); + } + == 3 { + AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bombette, normal, idle_fast), NPC_ANIM(world_bombette, normal, idle), 0, MESSAGE_ID(0x0E, 0x00EC)); + ResetCam(0, 6.0); + } + == 4 { + AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00ED)); + ResetCam(0, 6.0); + } + == 9 { + AdjustCam(0, 6.0, 0, -275.0, 15.0, -6.0); + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00EE)); + ResetCam(0, 6.0); + } + } + EnablePartnerAI(); + SI_MAP_VAR(0) = 0; +}); + +Script N(init_80241F70) = SCRIPT({ + BindNpcInteract(NPC_SELF, N(interact_80241CD8)); +}); + +Script N(init_80241F94) = SCRIPT({ + +}); + +Script N(init_80241FA4) = SCRIPT({ + +}); + +Script N(init_80241FB4) = SCRIPT({ + +}); + +Script N(init_80241FC4) = SCRIPT({ + +}); + +Script N(init_80241FD4) = SCRIPT({ + +}); + +StaticNpc N(npcGroup_80241FE4) = { + .id = NPC_BOO0, + .settings = &N(npcSettings_80240640), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_400000, + .init = &N(init_80241F70), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, + .tattle = MESSAGE_ID(0x1A, 0x00B5), +}; + +StaticNpc N(npcGroup_802421D4) = { + .id = NPC_BOO1, + .settings = &N(npcSettings_80240640), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_80241F94), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, +}; + +StaticNpc N(npcGroup_802423C4) = { + .id = NPC_BOO2, + .settings = &N(npcSettings_80240640), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_80241FA4), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, +}; + +StaticNpc N(npcGroup_802425B4) = { + .id = NPC_BOO3, + .settings = &N(npcSettings_80240640), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_80241FB4), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, +}; + +StaticNpc N(npcGroup_802427A4) = { + .id = NPC_BOO4, + .settings = &N(npcSettings_80240640), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_80241FC4), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, +}; + +StaticNpc N(npcGroup_80242994) = { + .id = NPC_BOO5, + .settings = &N(npcSettings_80240640), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_80241FD4), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, +}; + +Script N(80242B84) = SCRIPT({ + DisablePlayerInput(TRUE); + DisablePlayerPhysics(TRUE); + DisablePartnerAI(0); + SetNpcPos(NPC_PARTNER, 320, 10, -160); + PlaySound(SOUND_UNKNOWN_32E); + spawn { + loop 180 { + GetNpcPos(NPC_SENTINEL, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_80240060_BFA100)(); + sleep 1; + } + } + SetPlayerPos(320, 50, -160); + InterpPlayerYaw(270, 0); + SetPlayerAnimation(ANIM_80017); + SetNpcPos(NPC_SENTINEL, 320, 70, -158); + InterpNpcYaw(NPC_SENTINEL, 270, 0); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_8)); + UseSettingsFrom(0, 175, 0, -35); + SetPanTarget(0, 175, 0, -35); + SetCamDistance(0, 540.0); + SetCamSpeed(0, 90.0); + PanToTarget(0, 0, 1); + sleep 20; + spawn { + SI_VAR(2) = 1; + spawn N(80240698); + } + sleep 15; + spawn { + SetPlayerJumpscale(0); + PlayerJump1(175, 50, -35, 40); + } + spawn { + DisablePartnerAI(0); + sleep 1; + InterpNpcYaw(NPC_PARTNER, 270, 0); + SetNpcAnimation(NPC_PARTNER, 0x107); + sleep 85; + func_802CF56C(2); + sleep 1; + EnablePartnerAI(); + } + NpcMoveTo(NPC_SENTINEL, 175, -33, 40); + sleep 20; + SetNpcPos(NPC_SENTINEL, 175, 85, -33); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_9)); + sleep 20; + PlaySoundAtNpc(NPC_SENTINEL, SOUND_UNKNOWN_2F7, 0); + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_2)); + SetNpcPos(NPC_SENTINEL, 175, 70, -33); + spawn { + sleep 40; + SetNpcAnimation(NPC_SENTINEL, NPC_ANIM(sentinel, Palette_00, Anim_3)); + NpcMoveTo(NPC_SENTINEL, 270, -120, 30); + StopSound(814); + SetNpcPos(NPC_SENTINEL, 0, -1000, 0); + } + spawn { + sleep 60; + SI_VAR(2) = 1; + spawn N(8024079C); + } + SetPlayerJumpscale(0); + PlayerJump1(175, 0, -35, 10); + PlaySoundAtNpc(NPC_SENTINEL, SOUND_UNKNOWN_162, 0); + SetPlayerAnimation(ANIM_80003); + spawn { + sleep 2; + PlayEffect(0x10, 3, 0, 175, 0, -35, 20, -20, 30, 0, 0, 0, 0, 0); + } + spawn { + SetCamDistance(0, 320.0); + SetCamPitch(0, 15.0, -7.5); + SetCamSpeed(0, 2.0); + PanToTarget(0, 0, 1); + } + sleep 65; + GetCurrentPartnerID(SI_VAR(0)); + match SI_VAR(0) { + == 1 { + SetNpcFlagBits(NPC_PARTNER, NPC_FLAG_200, TRUE); + } + == 2 { + SetNpcFlagBits(NPC_PARTNER, NPC_FLAG_200, TRUE); + } + == 3 { + SetNpcFlagBits(NPC_PARTNER, NPC_FLAG_200, TRUE); + } + } + DisablePartnerAI(0); + GetCurrentPartnerID(SI_VAR(0)); + match SI_VAR(0) { + == 1 { + SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00D6)); + } + == 2 { + SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00D7)); + } + == 3 { + SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00D8)); + } + == 4 { + SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00D9)); + } + == 9 { + SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00DA)); + } + else { + SpeakToPlayer(NPC_PARTNER, 0x108, 0x106, 5, MESSAGE_ID(0x0E, 0x00D6)); + } + } + EnablePartnerAI(); + sleep 5; + SetPlayerAnimation(ANIM_GET_UP); + sleep 20; + SetPlayerAnimation(ANIM_DUST_OFF); + sleep 7; + PlaySoundAtPlayer(370, 0); + sleep 8; + PlaySoundAtPlayer(370, 0); + sleep 15; + SetPlayerAnimation(ANIM_8001B); + sleep 25; + InterpPlayerYaw(90, 0); + sleep 1; + SetPlayerAnimation(ANIM_10002); + InterpPlayerYaw(45, 0); + sleep 10; + SetPlayerAnimation(ANIM_MIDAIR_STILL); + SetPlayerJumpscale(1); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerJump1(SI_VAR(0), 0, SI_VAR(2), 10); + PlayerJump1(SI_VAR(0), 0, SI_VAR(2), 10); + SetPlayerAnimation(ANIM_10002); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 4.0); + PanToTarget(0, 0, 1); + WaitForCam(0, 1.0); + PanToTarget(0, 0, 0); + EnablePartnerAI(); + DisablePlayerPhysics(FALSE); + DisablePlayerInput(FALSE); +}); + +Script N(init_802434EC) = SCRIPT({ + +}); + +StaticNpc N(npcGroup_802434FC) = { + .id = NPC_SENTINEL, + .settings = &N(npcSettings_8024066C), + .pos = { 0.0f, 0.0f, -1000.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_200 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_400000, + .init = &N(init_802434EC), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +NpcGroupList N(npcGroupList_802436EC) = { + NPC_GROUP(N(npcGroup_80241FE4), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_802421D4), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_802423C4), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_802425B4), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_802427A4), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80242994), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +NpcGroupList N(npcGroupList_80243740) = { + NPC_GROUP(N(npcGroup_802434FC), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +static s32 N(pad_3758)[] = { + 0x00000000, 0x00000000, +}; + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802E9A18, -65, 60, -240, 0, MAKE_ENTITY_END); +}); + +ApiStatus N(func_80240060_BFA100)(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(get_enemy(6)->npcID); sfx_adjust_env_sound_pos(0x32E, 0, npc->pos.x, npc->pos.y, npc->pos.z); diff --git a/src/world/area_dgb/dgb_00/dgb_00.h b/src/world/area_dgb/dgb_00/dgb_00.h index 54c911d1f0..c222f3196c 100644 --- a/src/world/area_dgb/dgb_00/dgb_00.h +++ b/src/world/area_dgb/dgb_00/dgb_00.h @@ -2,3 +2,14 @@ #include "map.h" #define NAMESPACE dgb_00 + +ApiStatus N(func_80240060_BFA100)(ScriptInstance* script, s32 isInitialCall); +NpcGroupList N(npcGroupList_802436EC); +NpcGroupList N(npcGroupList_80243740); +Script N(80240F50); +Script N(8024103C); +Script N(802413F4); +Script N(80241AA0); +Script N(80242B84); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_01/BFD880.c b/src/world/area_dgb/dgb_01/BFD880.c index fbc225224b..f22807deca 100644 --- a/src/world/area_dgb/dgb_01/BFD880.c +++ b/src/world/area_dgb/dgb_01/BFD880.c @@ -1,7 +1,7 @@ #include "dgb_01.h" #include "ld_addrs.h" -ApiStatus func_80240000_BFD880(void) { +ApiStatus N(func_80240000_BFD880)(void) { dma_copy(&code_code_C20F40_ROM_START, &code_code_C20F40_ROM_END, &gBackgroundImage); return ApiStatus_DONE2; } diff --git a/src/world/area_dgb/dgb_01/BFD8C0.c b/src/world/area_dgb/dgb_01/BFD8C0.c index fe44aab479..e29b4bd9be 100644 --- a/src/world/area_dgb/dgb_01/BFD8C0.c +++ b/src/world/area_dgb/dgb_01/BFD8C0.c @@ -3,3 +3,5 @@ #include "world/common/SetEntityFlags100000.inc.c" #include "world/common/GetEntityPosition.inc.c" + + diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 9dbfa99a98..5cf507629e 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -1,7 +1,492 @@ #include "dgb_01.h" +#include "sprite/npc/sentinel.h" +#include "sprite/npc/world_tubba.h" +#include "message_ids.h" + +EntryList N(entryList) = { + { 0.0f, 0.0f, 485.0f, 0.0f }, + { -485.0f, 0.0f, 0.0f, 90.0f }, + { 485.0f, 0.0f, 0.0f, 270.0f }, + { -485.0f, 210.0f, 0.0f, 90.0f }, + { 485.0f, 210.0f, 0.0f, 270.0f }, + { -485.0f, 420.0f, 0.0f, 90.0f }, + { 485.0f, 420.0f, 0.0f, 270.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_01_tattle, +}; + +Script N(802434A0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } + ClearAmbientSounds(250); +}); + +static s32 N(pad_3548)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80243550) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 4; + SI_VAR(2) = 54; + SI_VAR(3) = 57; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_00", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_80243604) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 8; + SI_VAR(2) = 34; + SI_VAR(3) = 36; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_02", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_802436B8) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 2; + SI_VAR(1) = 20; + SI_VAR(2) = 41; + SI_VAR(3) = 39; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_08", 0); + sleep 100; +}); + +Script N(exitDoubleDoor_8024376C) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 3; + SI_VAR(1) = 12; + SI_VAR(2) = 29; + SI_VAR(3) = 31; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_09", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_80243820) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 4; + SI_VAR(1) = 24; + SI_VAR(2) = 46; + SI_VAR(3) = 44; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_08", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_802438D4) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 5; + SI_VAR(1) = 16; + SI_VAR(2) = 24; + SI_VAR(3) = 26; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_17", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_80243988) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 6; + SI_VAR(1) = 28; + SI_VAR(2) = 51; + SI_VAR(3) = 49; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_18", 0); + sleep 100; +}); + +Script N(enterDoubleDoor_80243A3C) = SCRIPT({ + UseDoorSounds(3); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + if (SI_SAVE_FLAG(1041) == 0) { + SI_SAVE_FLAG(1041) = 1; + STORY_PROGRESS = STORY_CH3_ARRIVED_AT_TUBBAS_MANOR; + } + SI_VAR(2) = 54; + SI_VAR(3) = 57; + await EnterDoubleDoor; + } + == 1 { + SI_VAR(2) = 34; + SI_VAR(3) = 36; + await EnterDoubleDoor; + } + == 2 { + SI_VAR(2) = 41; + SI_VAR(3) = 39; + await EnterDoubleDoor; + } + == 3 { + SI_VAR(2) = 29; + SI_VAR(3) = 31; + await EnterDoubleDoor; + } + == 4 { + SI_VAR(2) = 46; + SI_VAR(3) = 44; + await EnterDoubleDoor; + } + == 5 { + SI_VAR(2) = 24; + SI_VAR(3) = 26; + await EnterDoubleDoor; + } + == 6 { + SI_VAR(2) = 51; + SI_VAR(3) = 49; + await EnterDoubleDoor; + } + } +}); + +s32 N(itemList_80243C40)[] = { + ITEM_CASTLE_KEY1, + ITEM_NONE, +}; + +// *INDENT-OFF* +Script N(main) = { + SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(425), 15), + SI_CMD(ScriptOpcode_CALL, SetSpriteShading, -1), + SI_CMD(ScriptOpcode_CALL, SetCamPerspective, 0, 3, 25, 16, 4096), + SI_CMD(ScriptOpcode_CALL, SetCamBGColor, 0, 0, 0, 0), + SI_CMD(ScriptOpcode_CALL, SetCamEnabled, 0, 1), + SI_CMD(ScriptOpcode_CALL, SetCamLeadPlayer, 0, 0), + SI_CMD(ScriptOpcode_SET, SI_SAVE_FLAG(1978), 1), + SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(makeEntities)), + SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(802449C4)), + SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(802434A0)), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80243550), TRIGGER_WALL_PRESS_A, 4, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80243604), TRIGGER_WALL_PRESS_A, 8, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_8024376C), TRIGGER_WALL_PRESS_A, 12, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80243820), TRIGGER_WALL_PRESS_A, 24, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_802438D4), TRIGGER_WALL_PRESS_A, 16, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80243988), TRIGGER_WALL_PRESS_A, 28, 1, 0), + SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1040), 0), + SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80244AD0), TRIGGER_WALL_PRESS_A, 16384, N(itemList_80243C40), 0, 1), + SI_CMD(ScriptOpcode_ELSE), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_802436B8), TRIGGER_WALL_PRESS_A, 20, 1, 0), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_MATCH, SI_SAVE_VAR(0)), + SI_CMD(ScriptOpcode_CASE_LT, -29), + SI_CMD(ScriptOpcode_CALL, MakeNpcs, 1, N(npcGroupList_80246E50)), + SI_CMD(ScriptOpcode_CASE_LT, -16), + SI_CMD(ScriptOpcode_CALL, GetEntryID, SI_VAR(0)), + SI_CMD(ScriptOpcode_MATCH, SI_VAR(0)), + SI_CMD(ScriptOpcode_CASE_EQ, 2), + SI_CMD(ScriptOpcode_CALL, MakeNpcs, 1, N(npcGroupList_80246F1C)), + SI_CMD(ScriptOpcode_CASE_EQ, 4), + SI_CMD(ScriptOpcode_CALL, MakeNpcs, 1, N(npcGroupList_80246ED4)), + SI_CMD(ScriptOpcode_CASE_EQ, 6), + SI_CMD(ScriptOpcode_CALL, MakeNpcs, 1, N(npcGroupList_80246E8C)), + SI_CMD(ScriptOpcode_END_MATCH), + SI_CMD(ScriptOpcode_END_MATCH), + SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(enterDoubleDoor_80243A3C)), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +static s32 N(pad_3EE4)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(80243EF0) = SCRIPT({ + loop { + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(0) < 100) { + break loop; + } + sleep 1; + } + DisablePlayerInput(TRUE); + N(func_80240000_BFD880)(); + func_802CCCB0(); + sleep 1; + func_802D2B6C(); + SetPlayerAnimation(0x8000A); + spawn { + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + sleep 5; + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + sleep 5; + } + spawn { + ShakeCam(0, 0, 10, 1.0); + } + sleep 30; + spawn { + loop 12 { + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + sleep 5; + } + } + spawn { + ShakeCam(0, 0, 60, 1.0); + } + UseSettingsFrom(0, 400, 420, 0); + SetPanTarget(0, 400, 420, 0); + SetCamDistance(0, 450.0); + SetCamPitch(0, 20.0, -11.0); + SetCamPosB(0, 500.0, 0.0); + SetCamSpeed(0, 3.0); + PanToTarget(0, 0, 1); + WaitForCam(0, 1.0); + SI_SAVE_VAR(203) = 1; + SetNpcVar(4, 0, 1); + loop { + GetNpcVar(4, 0, SI_VAR(0)); + if (SI_VAR(0) == 3) { + break loop; + } + sleep 1; + } + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += -50; + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 90.0); + SetCamDistance(0, 750.0); + SetCamPitch(0, 0.0, 3.0); + DisablePartnerAI(0); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 30; + SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + EnablePartnerAI(); + ShakeCam(0, 0, 20, 1.0); + LoadModelAnimation(0, N(D_80252F4C_C107CC)); + PlayModelAnimation(0, N(D_802539A0_C11220)); + SetAnimModelPosition(0, 0, 0, 0); + func_802CD348(0, 1); + spawn { + PlaySound(0x95); + sleep 60; + PlaySound(0x96); + sleep 25; + PlaySound(0x98); + sleep 70; + PlaySound(0x97); + } + spawn { + sleep 100; + PlaySound(0xA8); + sleep 50; + PlaySound(0xA8); + sleep 30; + PlaySound(0xA8); + sleep 70; + PlaySound(0xA8); + sleep 30; + PlaySound(0xA8); + } + spawn { + DisablePlayerPhysics(TRUE); + sleep 1; + SetGroupEnabled(100, 0); + SetGroupEnabled(111, 0); + SetPlayerAnimation(0x80013); + SetPlayerJumpscale(0.5); + PlayerJump1(121, 210, 0, 60); + sleep 10; + SetPlayerAnimation(0x8001F); + sleep 20; + SetPlayerAnimation(ANIM_RUN_PANIC); + SetPlayerSpeed(8.0); + PlayerMoveTo(412, -29, 0); + sleep 10; + InterpPlayerYaw(270, 0); + SetPlayerAnimation(ANIM_10002); + ModifyColliderFlags(1, 50, 0x7FFFFE00); + DisablePlayerPhysics(FALSE); + } + spawn { + DisablePartnerAI(0); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) -= 210; + sleep 1; + SetNpcJumpscale(NPC_PARTNER, 0.5); + NpcJump1(NPC_PARTNER, 151, SI_VAR(1), 0, 60); + sleep 30; + EnablePartnerAI(); + } + ShakeCam(0, 0, 300, 1.0); + StopSound(0x8000005D); + spawn { + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_D)); + SetNpcSpeed(NPC_WORLD_TUBBA, 3.0); + NpcMoveTo(NPC_WORLD_TUBBA, 176, 0, 0); + } + spawn { + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 5, 0.30078125); + sleep 5; + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 2, 0.150390625); + sleep 8; + } + sleep 20; + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 2.0); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + WaitForCam(0, 1.0); + PanToTarget(0, 0, 0); + STORY_PROGRESS = STORY_CH3_TUBBA_SMASHED_THE_BRIDGES; + SetGroupEnabled(210, 1); + func_802CD3C0(0); + spawn { + sleep 30; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_D)); + SetNpcPos(NPC_WORLD_TUBBA, 137, 244, 35); + SetNpcSpeed(NPC_WORLD_TUBBA, 3.0); + NpcMoveTo(NPC_WORLD_TUBBA, 470, 0, 0); + ShakeCam(0, 0, 10, 3.0); + } + spawn { + loop { + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 5, 0.30078125); + sleep 5; + PlaySoundAtNpc(NPC_WORLD_TUBBA, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 2, 0.150390625); + sleep 8; + } + } + SetPlayerSpeed(3.0); + PlayerMoveTo(470, 0, 0); + DisablePlayerInput(FALSE); + spawn N(exitDoubleDoor_80243820); +}); + +Script N(802449C4) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetGroupEnabled(210, 0); + ModifyColliderFlags(0, 50, 0x7FFFFE00); + } + == STORY_CH3_TUBBA_WOKE_UP { + SetGroupEnabled(210, 0); + ModifyColliderFlags(0, 50, 0x7FFFFE00); + spawn N(80243EF0); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetGroupEnabled(112, 0); + ModifyColliderFlags(0, 40, 0x7FFFFE00); + } + else { + SetGroupEnabled(210, 0); + ModifyColliderFlags(0, 50, 0x7FFFFE00); + } + } +}); + +Script N(80244AD0) = SCRIPT({ + group 0; + suspend group 1; + func_802D6420(); + if (SI_VAR(0) == 0) { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00D8), 160, 40); + func_802D6954(); + resume group 1; + return; + } + if (SI_VAR(0) == -1) { + func_802D6954(); + resume group 1; + return; + } + FindKeyItem(19, SI_VAR(0)); + RemoveKeyItemAt(SI_VAR(0)); + func_802D6954(); + SI_SAVE_FLAG(1040) = 1; + N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) = SI_MAP_VAR(0); + N(SetEntityFlags100000)(); + resume group 1; + unbind; +}); + +Script N(80244C38) = SCRIPT({ + bind N(exitDoubleDoor_802436B8) to TRIGGER_WALL_PRESS_A 20; +}); + +Script N(makeEntities) = SCRIPT({ + if (SI_SAVE_FLAG(1040) == 0) { + MakeEntity(0x802BCD68, 490, 8, 0, -80, MAKE_ENTITY_END); + AssignScript(N(80244C38)); + SI_MAP_VAR(0) = SI_VAR(0); + } +}); + +f32 N(D_80244CD0_C02550)[] = { + 4.5f, 3.5f, 2.6f, 2.0f, + 1.5f, 20.0f, +}; + +Script N(80244CE8) = SCRIPT({ + SetSelfEnemyFlagBits(((0x00100000 | 0x01000000 | 0x02000000 | 0x04000000 | 0x08000000 | 0x10000000 | 0x20000000)), TRUE); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT)), TRUE); +}); + +NpcAISettings N(npcAISettings_80244D24) = { + .moveSpeed = 1.5f, + .moveTime = 90, + .waitTime = 30, + .alertRadius = 240.0f, + .unk_14 = 1, + .chaseSpeed = 5.3f, + .unk_1C = { .s = 180 }, + .unk_20 = 1, + .chaseRadius = 240.0f, + .unk_2C = 1, +}; -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240120_BFD9A0); -/* void N(func_80240120_BFD9A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -25,14 +510,153 @@ void N(func_80240120_BFD9A0)(ScriptInstance* script, NpcAISettings* aiSettings, enemy->varTable[4] = npc->pos.y * 100.0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802402D0_BFDB50); +#ifdef NON_MATCHING +// second func_800DCB7C call +void N(func_802402D0_BFDB50)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f24; + f32 posX, posY, posZ, posW; + s32 var; + f32 temp_f0; + f32 phi_f4; + s32 phi_v0; + s32 phi_s4 = 0; + + f32 a = enemy->varTable[7]; + f32 temp_f2 = a / 100.0; + f32 b = enemy->varTable[3]; + f32 temp_f26 = b / 100.0; + f32 c = enemy->varTable[4]; + f32 temp_f20 = c / 100.0; + f32 d = enemy->varTable[1]; + f32 temp_f22 = d / 100.0; + + enemy->varTable[4] = npc->pos.y * 100.0; + temp_f24 = temp_f26 + temp_f2; + + if ((enemy->varTable[0] & 0x11) == 1) { + if (npc->flags & 8) { + if (temp_f22 < (temp_f24 - npc->pos.y)) { + enemy->varTable[0] |= 0x10; + } + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (temp_f22 < (temp_f26 - posW)) { + enemy->varTable[0] |= 0x10; + } + } + } + + if ((enemy->varTable[0] & 0x11) == 0x11) { + f64 test; + if (npc->flags & 8) { + phi_f4 = temp_f24; + test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + npc->pos.y = test; + } else { + posX = npc->pos.x; + posY = temp_f20; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + phi_f4 = posY; + phi_f4 += temp_f26; + d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + test = d; + npc->pos.y = test; + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + } + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + + if (fabsf(phi_f4 - npc->pos.y) < 1.0) { + npc->pos.y = phi_f4; + enemy->varTable[0] &= ~0x10; + } + } else if (enemy->varTable[1] > 0) { + temp_f0 = sin_deg(enemy->varTable[2]); + if (npc->flags & 8) { + phi_v0 = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + } + if (phi_v0) { + npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f0 * temp_f22); + } + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + + if (enemy->varTable[9] <= 0) { + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->moveToPos.y = npc->pos.y; + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } + script->functionTemp[1].s--; + } + } else { + enemy->varTable[9]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); + if (npc->moveSpeed < posW) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + phi_s4 = 1; + } + } + + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { + if (npc->unk_8C == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + return; + } + } + + enemy->varTable[4] = npc->pos.y * 100.0; + if (aiSettings->moveTime > 0) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + script->functionTemp[0].s = 2; + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) { + script->functionTemp[0].s = 0; + } + } + } +} +#else +INCLUDE_ASM(void, "world/area_dgb/dgb_01/BFD9A0", dgb_01_func_802402D0_BFDB50, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +#endif #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8_BFE238); -/* void N(func_802409B8_BFE238)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -70,7 +694,7 @@ void N(func_802409B8_BFE238)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -97,29 +721,23 @@ void N(func_802409B8_BFE238)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240D74_BFE5F4); -/* void N(func_80240D74_BFE5F4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; + npc->pos.y += N(D_80244CD0_C02550)[npc->duration++]; if (npc->duration >= 5) { script->functionTemp[0].s = 12; } } -*/ #include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F78_BFE7F8); -/* void N(func_80240F78_BFE7F8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -166,12 +784,12 @@ void N(func_80240F78_BFE7F8)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); @@ -206,10 +824,7 @@ void N(func_80240F78_BFE7F8)(ScriptInstance* script, NpcAISettings* aiSettings, npc->jumpVelocity = 0.0f; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241308_BFEB88); -/* void N(func_80241308_BFEB88)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { f32 posX, posY, posZ, posW; s32 temp_a1; @@ -238,35 +853,584 @@ void N(func_80241308_BFEB88)(Npc *npc, Enemy *enemy, ScriptInstance *script, Npc script->functionTemp[1].s = aiSettings->unk_14; enemy->unk_B0 |= 0x10; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024142C_BFECAC); +ApiStatus N(func_8024142C_BFECAC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241618_BFEE98); + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241770_BFEFF0); + if (isInitialCall) { + N(func_80241308_BFEB88)(npc, enemy, script, aiSettings); + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241874_BFF0F4); + npc->unk_AB = -2; -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241954_BFF1D4); + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241BF0_BFF470); + switch (script->functionTemp[0].s) { + case 0: + N(func_80240120_BFD9A0)(script, aiSettings, territoryPtr); + case 1: + N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802409B8_BFE238)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240D74_BFE5F4)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80240F78_BFE7F8)(script, aiSettings, territoryPtr); + break; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241CA8_BFF528); + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241E28_BFF6A8); +void N(func_80241618_BFEE98)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f0; + f32 phi_f20; -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241E70_BFF6F0); + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= 0xFFDFFFFF; + npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); + npc->currentAnim = enemy->animList[8]; + npc->moveSpeed = aiSettings->chaseSpeed; + phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); + if (aiSettings->unk_1C.s < fabsf(temp_f0)) { + phi_f20 = npc->yaw; + if (temp_f0 < 0.0f) { + phi_f20 += -aiSettings->unk_1C.s; + } else { + phi_f20 += aiSettings->unk_1C.s; + } + } + npc->yaw = clamp_angle(phi_f20); + script->functionTemp[0].s = 13; + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241EF0_BFF770); +void N(func_80241770_BFEFF0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241F98_BFF818); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { + npc->duration = 0; + script->functionTemp[0].s = 14; + } else { + npc->duration--; + if (npc->duration <= 0) { + npc->flags |= 0x200000; + script->functionTemp[0].s = 12; + } + } + } else { + script->functionTemp[0].s = 16; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802422B0_BFFB30); +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024252C_BFFDAC); -/* -ApiStatus N(func_8024252C_BFFDAC)(ScriptInstance* script, s32 isInitialCall) { +void N(func_80241874_BFF0F4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 i; + + for (i = 0; i < 4; i++) { + if (i != npc->npcID && (get_enemy(i)->varTable[0] & 0x100)) { + return; + } + } + + enemy->varTable[0] |= 0x100; + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z; + if (!(enemy->varTable[0] & 0x1000)) { + enemy->varTable[0] |= 0x1000; + } + + sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + npc->duration = 0; + script->functionTemp[0].s = 15; +} + +void N(func_80241954_BFF1D4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + s32 temp_f8_2; + + sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + enemy->varTable[0] &= ~0x100; + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + script->functionTemp[0].s = 16; + } else { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + + npc->pos.x = (*playerStatus)->position.x; + npc->pos.z = (*playerStatus)->position.z + 2.0f; + npc->rotation.y += 25.0f; + if (npc->rotation.y > 360.0) { + npc->rotation.y -= 360.0; + } + temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); + func_802DE894(npc->unk_24, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); + + posX = (*playerStatus)->position.x; + posY = (*playerStatus)->position.y; + posZ = (*playerStatus)->position.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (fabsf(npc->pos.y - posY) > 24.0) { + npc->pos.y -= 1.8; + } else { + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + if (D_8010EBB0.unk_03 != 9) { + disable_player_input(); + func_800EF628(); + npc->duration = 0; + script->functionTemp[0].s = 20; + } else { + script->functionTemp[0].s = 16; + } + } + } +} + +void N(func_80241BF0_BFF470)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + if (enemy->varTable[0] & 0x1000) { + sfx_stop_sound(0x80000011); + enemy->varTable[0] &= ~0x1000; + } + npc->currentAnim = enemy->animList[9]; + npc->duration = 20; + script->functionTemp[0].s = 17; +} + +void N(func_80241CA8_BFF528)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 tmp = enemy->varTable[3]; + f32 temp_f20 = tmp / 100.0; + s32 var; + + npc->pos.y += 2.5; + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (!(npc->pos.y < (posY + temp_f20))) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc->pos.y = posY + temp_f20; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + npc->duration = 10; + script->functionTemp[0].s = 18; + } +} + +void N(func_80241E28_BFF6A8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[0].s = 30; + } +} + +void N(func_80241E70_BFF6F0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration++; + if (npc->duration >= 3) { + if (D_8010EBB0.unk_03 != 9) { + npc->duration = 0; + script->functionTemp[0].s = 100; + } else { + enable_player_input(); + func_800EF600(); + script->functionTemp[0].s = 16; + } + } +} + +void N(func_80241EF0_BFF770)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + npc->flags &= 0xFFDFFFFF; + npc->moveSpeed = 2.0 * aiSettings->moveSpeed; + enemy->varTable[2] = 0; + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[1].s = 0x1E; +} + +void N(func_80241F98_BFF818)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX = npc->pos.x; + f32 posY = npc->pos.y; + f32 posZ = npc->pos.z; + f32 posW = 1000.0f; + f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; + f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); + f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; + f32 temp_f20 = sin_deg(enemy->varTable[2]); + s32 var; + s32 var2; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f20 * temp_f22); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + func_800494C0(npc, 0x2F4, 0x200000); + npc->moveToPos.y = npc->pos.y; + script->functionTemp[0].s = 12; + return; + } + } + + script->functionTemp[1].s--; + if (npc->unk_8C == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + if (posW <= (2.0f * npc->moveSpeed)) { + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + script->functionTemp[0].s = 2; + } + } +} + +ApiStatus N(func_802422B0_BFFB30)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 125.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + N(func_80241308_BFEB88)(npc, enemy, script, aiSettings); + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240120_BFD9A0)(script, aiSettings, territoryPtr); + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + case 1: + N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802409B8_BFE238)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 12: + N(func_80241618_BFEE98)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + N(func_80241770_BFEFF0)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241874_BFF0F4)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s != 15) { + break; + } + case 15: + N(func_80241954_BFF1D4)(script, aiSettings, territoryPtr); + break; + case 16: + N(func_80241BF0_BFF470)(script, aiSettings, territoryPtr); + case 17: + N(func_80241CA8_BFF528)(script, aiSettings, territoryPtr); + break; + case 18: + N(func_80241E28_BFF6A8)(script, aiSettings, territoryPtr); + break; + case 20: + N(func_80241E70_BFF6F0)(script, aiSettings, territoryPtr); + break; + case 30: + N(func_80241EF0_BFF770)(script, aiSettings, territoryPtr); + case 31: + N(func_80241F98_BFF818)(script, aiSettings, territoryPtr); + } + + return (script->functionTemp[0].s == 100) * ApiStatus_DONE2; +} + +const char N(dgb_00_name_hack)[]; + +Script N(npcAI_80244D54) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(5, -650); + SetSelfVar(6, 30); + SetSelfVar(1, 600); + N(func_802422B0_BFFB30)(N(npcAISettings_80244D24)); + DisablePlayerInput(TRUE); + sleep 2; +20: + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(4), SI_VAR(2)); + GetPlayerActionState(SI_VAR(0)); + if (SI_VAR(0) != 0) { + sleep 1; + goto 20; + } + DisablePlayerPhysics(TRUE); + func_802D2B6C(); + DisablePartnerAI(0); + group 0; + func_802D5830(1); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + SI_VAR(2) += 2; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_80045838(-1, 759, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + sleep 10; + SetPlayerAnimation(ANIM_80017); + sleep 10; + func_80045838(-1, 1838, 0); + spawn { + loop 100 { + GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + } + spawn { + SetNpcAnimation(NPC_PARTNER, 0x108); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + } + sleep 30; + GotoMap(N(dgb_00_name_hack), 2); + sleep 100; +}); + +Script N(8024517C) = SCRIPT({ + GetOwnerEncounterTrigger(SI_VAR(0)); + match SI_VAR(0) { + == 1, 2, 4, 6 { + GetSelfAnimationFromTable(7, SI_VAR(0)); + await 0x800936DC; + } + } +}); + +Script N(80245208) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + DoNpcDefeat(); + } + == 1 {} + == 2 { + } + } +}); + +NpcSettings N(npcSettings_8024526C) = { + .height = 38, + .radius = 32, + .otherAI = &N(80244CE8), + .ai = &N(npcAI_80244D54), + .level = 99, +}; + +NpcAISettings N(npcAISettings_80245298) = { + .moveSpeed = 4.5f, + .alertRadius = 170.0f, + .unk_10 = { .f = 90.0f }, + .unk_14 = 1, + .chaseSpeed = 3.9f, + .unk_1C = { .s = 180 }, + .unk_20 = 2, + .chaseRadius = 170.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_802452C8) = SCRIPT({ + N(func_802430C0_C00940)(N(npcAISettings_80245298)); +}); + +NpcSettings N(npcSettings_802452E8) = { + .height = 90, + .radius = 65, + .ai = &N(npcAI_802452C8), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcSettings N(npcSettings_80245314) = { + .height = 90, + .radius = 65, + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcSettings N(npcSettings_80245340) = { + .height = 24, + .radius = 24, + .level = 13, +}; + +Script N(idle_8024536C) = SCRIPT({ + loop { + GetSelfVar(0, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + sleep 1; + } + SI_SAVE_VAR(203) = 1; + PlaySoundAtCollider(28, 455, 0); + MakeLerp(0, 80, 10, 0); + loop { + UpdateLerp(); + RotateModel(49, SI_VAR(0), 0, 1, 0); + RotateModel(51, SI_VAR(0), 0, -1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_A)); + SetNpcPos(NPC_SELF, 520, 420, 0); + SetNpcYaw(NPC_SELF, 270); + NpcMoveTo(NPC_SELF, 390, 0, 30); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_7)); + spawn { + sleep 20; + MakeLerp(80, 0, 10, 0); + loop { + UpdateLerp(); + RotateModel(49, SI_VAR(0), 0, 1, 0); + RotateModel(51, SI_VAR(0), 0, -1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + PlaySoundAtCollider(28, 456, 0); + } + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x0101)); + spawn { + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_19)); + sleep 4; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1A)); + sleep 17; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1B)); + sleep 11; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1C)); + sleep 30; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_1D)); + } + sleep 4; + SetNpcJumpscale(NPC_WORLD_TUBBA, 1.0); + GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2), 30); + PlaySoundAtNpc(NPC_WORLD_TUBBA, 0x20A0, 0); + PlaySound(0x8000005D); + ShakeCam(0, 0, 15, 4.0); + ShakeCam(0, 0, 15, 2.0); + SetSelfVar(0, 3); +}); + +Script N(init_80245784) = SCRIPT({ + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + SetSelfVar(0, 0); + BindNpcIdle(NPC_SELF, N(idle_8024536C)); +}); + +const char N(dgb_00_name_hack)[] = "dgb_00"; + +ApiStatus N(func_8024252C_BFFDAC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -300,10 +1464,7 @@ ApiStatus N(func_8024252C_BFFDAC)(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[0].s = 1; return 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242684_BFFF04); -/* void N(func_80242684_BFFF04)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -313,7 +1474,7 @@ void N(func_80242684_BFFF04)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -351,20 +1512,15 @@ void N(func_80242684_BFFF04)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ -#define NAMESPACE dup_dgb_01 -#include "world/common/UnkNpcAIFunc1.inc.c" -#define NAMESPACE dgb_01 +#include "world/common/UnkNpcAIFunc1_copy.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC_C0026C); -/* void N(func_802429EC_C0026C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -388,11 +1544,8 @@ void N(func_802429EC_C0026C)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242BA8_C00428); -/* -ApiStatus N(func_80242BA8_C00428)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80242BA8_C00428)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -409,7 +1562,6 @@ ApiStatus N(func_80242BA8_C00428)(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[0].s = 1; return 1; } -*/ #include "world/common/NpcJumpFunc2.inc.c" @@ -417,14 +1569,12 @@ ApiStatus N(func_80242BA8_C00428)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242E78_C006F8); -/* -ApiStatus N(func_80242E78_C006F8)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80242E78_C006F8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; @@ -439,12 +1589,9 @@ ApiStatus N(func_80242E78_C006F8)(ScriptInstance* script, s32 isInitialCall) { } } } -*/ #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80243000_C00880); -/* void N(func_80243000_C00880)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -462,8 +1609,520 @@ void N(func_80243000_C00880)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[1].s = 0; script->functionTemp[0].s = 1; } -*/ + +ApiStatus N(func_802430C0_C00940)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802430C0_C00940); + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_8024252C_BFFDAC)(script, aiSettings, territoryPtr); + case 1: + N(func_80242684_BFFF04)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); + case 3: + N(func_802429EC_C0026C)(script, aiSettings, territoryPtr); + break; + case 4: + N(func_80242BA8_C00428)(script, aiSettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, aiSettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); + case 13: + N(func_80242E78_C006F8)(script, aiSettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, aiSettings, territoryPtr); + break; + case 15: + N(func_80243000_C00880)(script, aiSettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + break; + } + + return ApiStatus_BLOCK; +} #include "world/common/UnkFunc1.inc.c" + +const char N(dgb_08_name_hack)[]; + +Script N(defeat_802457D8) = SCRIPT({ + N(UnkFunc1)(); + GotoMap(N(dgb_08_name_hack), 1); + sleep 100; +}); + +Script N(init_80245814) = SCRIPT({ + if (SI_SAVE_VAR(203) != 1) { + SetNpcPos(NPC_SELF, 0, -1000, 0); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE); + return; + } + if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL) { + SetNpcPos(NPC_SELF, 0, -1000, 0); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE); + return; + } + SetNpcPos(NPC_WORLD_TUBBA, 137, 244, 35); + BindNpcDefeat(NPC_SELF, N(defeat_802457D8)); + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + spawn { + loop { + ShakeCam(0, 0, 5, 2.0); + sleep 5; + ShakeCam(0, 0, 2, 1.0); + sleep 8; + } + } +}); + +Script N(idle_8024598C) = SCRIPT({ + AwaitPlayerApproach(0, 420, 400); + SI_SAVE_VAR(203) = 1; + STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER; + PlaySoundAtCollider(20, 455, 0); + MakeLerp(0, 80, 10, 0); + loop { + UpdateLerp(); + RotateModel(39, SI_VAR(0), 0, -1, 0); + RotateModel(41, SI_VAR(0), 0, 1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + SetNpcPos(NPC_SELF, 555, 0, 0); + SetNpcYaw(NPC_SELF, 270); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_A)); + NpcMoveTo(NPC_SELF, 426, 0, 30); + spawn { + sleep 20; + MakeLerp(80, 0, 10, 0); + loop { + UpdateLerp(); + RotateModel(39, SI_VAR(0), 0, -1, 0); + RotateModel(41, SI_VAR(0), 0, 1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + PlaySoundAtCollider(20, 456, 0); + } + spawn { + loop { + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + ShakeCam(0, 0, 5, 2.0); + sleep 5; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + ShakeCam(0, 0, 2, 1.0); + sleep 8; + } + } + SetNpcSpeed(NPC_SELF, 5.0); + NpcMoveTo(NPC_SELF, 259, 167, 0); + N(func_802430C0_C00940)(N(npcAISettings_80245298)); +}); + +Script N(defeat_80245CB4) = SCRIPT({ + N(UnkFunc1)(); + GotoMap(N(dgb_00_name_hack), 1); + sleep 100; +}); + +Script N(init_80245CF0) = SCRIPT({ + if (SI_SAVE_VAR(203) != 1) { + BindNpcIdle(NPC_SELF, N(idle_8024598C)); + } else { + SetNpcPos(NPC_SELF, 136, 0, -330); + } + BindNpcDefeat(NPC_SELF, N(defeat_80245CB4)); + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); +}); + +Script N(init_80245D80) = SCRIPT({ + SI_VAR(0) = STORY_PROGRESS; + if (SI_VAR(0) >= -29) { + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); + EnableNpcShadow(NPC_SELF, FALSE); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcPos(NPC_SELF, -33, -3, 8); + SetNpcRotation(NPC_SELF, -50, 30, 10); + BindNpcIdle(NPC_SELF, 0); + } +}); + +Script N(init_80245E44) = SCRIPT({ + SI_VAR(0) = STORY_PROGRESS; + if (SI_VAR(0) >= -29) { + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); + EnableNpcShadow(NPC_SELF, FALSE); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcPos(NPC_SELF, -486, 182, 28); + SetNpcRotation(NPC_SELF, -10, 50, 0); + BindNpcIdle(NPC_SELF, 0); + } +}); + +Script N(init_80245F08) = SCRIPT({ + SI_VAR(0) = STORY_PROGRESS; + if (SI_VAR(0) >= -29) { + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); + EnableNpcShadow(NPC_SELF, FALSE); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcPos(NPC_SELF, -201, 0, -143); + SetNpcRotation(NPC_SELF, -50, 0, 0); + BindNpcIdle(NPC_SELF, 0); + } +}); + +Script N(init_80245FCC) = SCRIPT({ + SI_VAR(0) = STORY_PROGRESS; + if (SI_VAR(0) >= -29) { + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_ENABLE_HIT_SCRIPT | 0x00000040)), TRUE); + EnableNpcShadow(NPC_SELF, FALSE); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_1)); + SetNpcPos(NPC_SELF, -305, -1, -80); + SetNpcRotation(NPC_SELF, -65, -30, 0); + BindNpcIdle(NPC_SELF, 0); + } +}); + +StaticNpc N(npcGroup_80246090) = { + .id = NPC_SENTINEL0, + .settings = &N(npcSettings_8024526C), + .pos = { -180.0f, 100.0f, 230.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_80245D80), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { -180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +StaticNpc N(npcGroup_80246280) = { + .id = NPC_SENTINEL1, + .settings = &N(npcSettings_8024526C), + .pos = { 180.0f, 100.0f, 230.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_80245E44), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { 180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +StaticNpc N(npcGroup_80246470) = { + .id = NPC_SENTINEL2, + .settings = &N(npcSettings_8024526C), + .pos = { -180.0f, 100.0f, -230.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_80245F08), + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { -180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +StaticNpc N(npcGroup_80246660) = { + .id = NPC_SENTINEL3, + .settings = &N(npcSettings_8024526C), + .pos = { 180.0f, 100.0f, -230.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_80245FCC), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { 180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +NpcAnimID N(extraAnimationList_80246850)[] = { + NPC_ANIM(world_tubba, Palette_00, Anim_6), + NPC_ANIM(world_tubba, Palette_00, Anim_10), + NPC_ANIM(world_tubba, Palette_00, Anim_9), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_A), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_19), + NPC_ANIM(world_tubba, Palette_00, Anim_1A), + NPC_ANIM(world_tubba, Palette_00, Anim_1B), + NPC_ANIM(world_tubba, Palette_00, Anim_1C), + NPC_ANIM(world_tubba, Palette_00, Anim_1D), + ANIM_END, +}; + +StaticNpc N(npcGroup_80246880) = { + .id = NPC_WORLD_TUBBA, + .settings = &N(npcSettings_80245314), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_200000, + .init = &N(init_80245784), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_tubba, Palette_00, Anim_6), + NPC_ANIM(world_tubba, Palette_00, Anim_9), + NPC_ANIM(world_tubba, Palette_00, Anim_C), + NPC_ANIM(world_tubba, Palette_00, Anim_C), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + }, + .extraAnimations = &N(extraAnimationList_80246850), +}; + +StaticNpc N(npcGroup_80246A70) = { + .id = NPC_WORLD_TUBBA, + .settings = &N(npcSettings_802452E8), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_200000, + .init = &N(init_80245814), + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 2, 320, 210, 0, 370, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 210, 0, 1000, 250, 1 }, + .animations = { + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_A), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_19), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80246850), +}; + +StaticNpc N(npcGroup_80246C60) = { + .id = NPC_WORLD_TUBBA, + .settings = &N(npcSettings_802452E8), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_200000, + .init = &N(init_80245CF0), + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 8, 156, 0, 187, -36, 0, 290, -159, 0, 50, -80, 0, -218, 66, 0, -362, 196, 0, -268, 280, 0, -124, 250, 0, 100, 0, 0, 0, 0, 0, 0, -32767, 250, 0, 100, 1000, 250, 1 }, + .animations = { + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_A), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_19), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80246850), +}; + +NpcGroupList N(npcGroupList_80246E50) = { + NPC_GROUP(N(npcGroup_80246090), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246280), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246470), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246660), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +NpcGroupList N(npcGroupList_80246E8C) = { + NPC_GROUP(N(npcGroup_80246090), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246280), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246470), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246660), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246880), BATTLE_ID(15, 4, 0, 0)), + {}, +}; + +NpcGroupList N(npcGroupList_80246ED4) = { + NPC_GROUP(N(npcGroup_80246090), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246280), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246470), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246660), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246A70), BATTLE_ID(15, 4, 0, 1)), + {}, +}; + +NpcGroupList N(npcGroupList_80246F1C) = { + NPC_GROUP(N(npcGroup_80246090), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246280), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246470), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246660), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246C60), BATTLE_ID(15, 4, 0, 1)), + {}, +}; + +const char N(dgb_08_name_hack)[] = "dgb_08"; diff --git a/src/world/area_dgb/dgb_01/data.c b/src/world/area_dgb/dgb_01/data.c new file mode 100644 index 0000000000..4911d3a6d0 --- /dev/null +++ b/src/world/area_dgb/dgb_01/data.c @@ -0,0 +1,6143 @@ +#include "dgb_01.h" + +Gfx D_8024B770_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020D6E0, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(13, 15, 11, 0, 13, 11, 16, 0), + gsSP2Triangles(17, 13, 16, 0, 17, 16, 18, 0), + gsSP2Triangles(19, 17, 18, 0, 19, 18, 20, 0), + gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0), + gsSP2Triangles(23, 22, 25, 0, 23, 25, 26, 0), + gsSP1Triangle(27, 28, 29, 0), + gsSPVertex(0x8020D870, 3, 0), + gsSPVertex(0x8020D8C0, 14, 3), + gsSPVertex(0x8020DA40, 15, 17), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 3, 6, 0), + gsSP2Triangles(7, 6, 17, 0, 8, 7, 17, 0), + gsSP2Triangles(8, 17, 18, 0, 9, 19, 20, 0), + gsSP2Triangles(9, 20, 21, 0, 1, 0, 10, 0), + gsSP2Triangles(1, 10, 22, 0, 11, 23, 24, 0), + gsSP2Triangles(11, 24, 12, 0, 12, 24, 25, 0), + gsSP2Triangles(12, 25, 13, 0, 13, 25, 26, 0), + gsSP2Triangles(13, 26, 14, 0, 14, 26, 27, 0), + gsSP2Triangles(14, 27, 28, 0, 15, 16, 29, 0), + gsSP2Triangles(15, 29, 30, 0, 15, 30, 31, 0), + gsSPVertex(0x8020D980, 12, 0), + gsSPVertex(0x8020DB20, 20, 12), + gsSP2Triangles(1, 13, 14, 0, 2, 0, 12, 0), + gsSP2Triangles(2, 12, 15, 0, 3, 2, 15, 0), + gsSP2Triangles(3, 15, 16, 0, 4, 17, 18, 0), + gsSP2Triangles(5, 19, 20, 0, 5, 20, 17, 0), + gsSP2Triangles(5, 17, 21, 0, 6, 5, 21, 0), + gsSP2Triangles(6, 21, 22, 0, 7, 6, 22, 0), + gsSP2Triangles(7, 22, 23, 0, 8, 24, 25, 0), + gsSP2Triangles(8, 25, 9, 0, 9, 25, 26, 0), + gsSP2Triangles(9, 26, 27, 0, 10, 28, 24, 0), + gsSP2Triangles(10, 24, 8, 0, 11, 29, 30, 0), + gsSP1Triangle(11, 30, 31, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024B8F8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020D0E0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0), + gsSP2Triangles(15, 20, 21, 0, 15, 21, 16, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 25, 0, 28, 25, 24, 0), + gsSPVertex(0x8020D2A0, 13, 0), + gsSPVertex(0x8020D450, 17, 13), + gsSP2Triangles(2, 13, 14, 0, 2, 14, 15, 0), + gsSP2Triangles(3, 2, 15, 0, 3, 15, 16, 0), + gsSP2Triangles(4, 3, 16, 0, 4, 16, 17, 0), + gsSP2Triangles(5, 4, 17, 0, 5, 17, 18, 0), + gsSP2Triangles(6, 19, 1, 0, 6, 1, 0, 0), + gsSP2Triangles(7, 20, 19, 0, 7, 19, 6, 0), + gsSP2Triangles(8, 21, 22, 0, 8, 22, 23, 0), + gsSP2Triangles(9, 24, 25, 0, 9, 25, 10, 0), + gsSP2Triangles(10, 25, 26, 0, 10, 26, 27, 0), + gsSP2Triangles(11, 28, 24, 0, 11, 24, 9, 0), + gsSP2Triangles(12, 29, 28, 0, 12, 28, 11, 0), + gsSPVertex(0x8020D370, 12, 0), + gsSPVertex(0x8020D560, 20, 12), + gsSP2Triangles(0, 1, 12, 0, 0, 12, 13, 0), + gsSP2Triangles(1, 2, 14, 0, 1, 14, 12, 0), + gsSP2Triangles(2, 3, 15, 0, 2, 15, 14, 0), + gsSP2Triangles(3, 16, 17, 0, 3, 17, 15, 0), + gsSP2Triangles(4, 18, 19, 0, 4, 19, 20, 0), + gsSP2Triangles(5, 6, 21, 0, 5, 21, 22, 0), + gsSP2Triangles(6, 7, 23, 0, 6, 23, 21, 0), + gsSP2Triangles(7, 8, 24, 0, 7, 24, 23, 0), + gsSP2Triangles(8, 25, 26, 0, 8, 26, 24, 0), + gsSP2Triangles(9, 27, 28, 0, 9, 28, 29, 0), + gsSP2Triangles(10, 30, 31, 0, 10, 31, 11, 0), + gsSPVertex(0x8020D420, 3, 0), + gsSPVertex(0x8020D690, 5, 3), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 1, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(2, 5, 6, 0, 2, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BAA0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020CAE0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 14, 17, 0, 18, 17, 19, 0), + gsSP2Triangles(15, 20, 21, 0, 15, 21, 16, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0), + gsSPVertex(0x8020CCA0, 13, 0), + gsSPVertex(0x8020CE50, 17, 13), + gsSP2Triangles(2, 13, 14, 0, 2, 14, 15, 0), + gsSP2Triangles(3, 2, 15, 0, 3, 15, 16, 0), + gsSP2Triangles(4, 3, 16, 0, 4, 16, 17, 0), + gsSP2Triangles(5, 4, 17, 0, 5, 17, 18, 0), + gsSP2Triangles(1, 0, 6, 0, 1, 6, 7, 0), + gsSP2Triangles(7, 6, 19, 0, 7, 19, 20, 0), + gsSP2Triangles(8, 21, 22, 0, 8, 22, 23, 0), + gsSP2Triangles(9, 24, 25, 0, 9, 25, 10, 0), + gsSP2Triangles(10, 25, 26, 0, 10, 26, 11, 0), + gsSP2Triangles(11, 26, 27, 0, 11, 27, 12, 0), + gsSP2Triangles(12, 27, 28, 0, 12, 28, 29, 0), + gsSPVertex(0x8020CD70, 12, 0), + gsSPVertex(0x8020CF60, 20, 12), + gsSP2Triangles(0, 1, 12, 0, 0, 12, 13, 0), + gsSP2Triangles(1, 2, 14, 0, 1, 14, 12, 0), + gsSP2Triangles(2, 3, 15, 0, 2, 15, 14, 0), + gsSP2Triangles(3, 16, 17, 0, 3, 17, 15, 0), + gsSP2Triangles(4, 18, 19, 0, 4, 19, 20, 0), + gsSP2Triangles(5, 6, 21, 0, 5, 21, 22, 0), + gsSP2Triangles(6, 7, 23, 0, 6, 23, 21, 0), + gsSP2Triangles(7, 8, 24, 0, 7, 24, 23, 0), + gsSP2Triangles(8, 25, 26, 0, 8, 26, 24, 0), + gsSP2Triangles(9, 27, 28, 0, 9, 28, 29, 0), + gsSP2Triangles(10, 30, 31, 0, 10, 31, 11, 0), + gsSPVertex(0x8020CE10, 4, 0), + gsSPVertex(0x8020D080, 6, 4), + gsSP2Triangles(1, 5, 6, 0, 1, 6, 7, 0), + gsSP2Triangles(2, 8, 4, 0, 2, 4, 0, 0), + gsSP2Triangles(3, 9, 8, 0, 3, 8, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BC48_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020C8F0, 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPVertex(0x8020C9B0, 19, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(4, 0, 2, 0, 5, 6, 7, 0), + gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 13, 11, 0), + gsSP2Triangles(10, 14, 15, 0, 10, 16, 14, 0), + gsSP2Triangles(10, 15, 13, 0, 10, 17, 18, 0), + gsSP1Triangle(10, 12, 17, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BCF8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024AE70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020C7A0, 21, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 17, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BD80_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024BCF8), + gsSPDisplayList(0x8024BC48), + gsSPDisplayList(0x8024BAA0), + gsSPDisplayList(0x8024B8F8), + gsSPDisplayList(0x8024B770), + gsSPEndDisplayList(), +}; + +Gfx D_8024BDC8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x8020C760, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BE28_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253960, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024BDC8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024BE60_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x8020C720, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BEC0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253920, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024BE60), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024BEF8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x8020C6E0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024BF58_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802538E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024BEF8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024BF90_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024BF58), + gsSPDisplayList(0x8024BEC0), + gsSPDisplayList(0x8024BE28), + gsSPEndDisplayList(), +}; + +Gfx D_8024BFC8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020C680, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C030_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020C620, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C098_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020C5C0, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C100_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020C320, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 17, 18, 0), + gsSP2Triangles(14, 18, 15, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 18, 0, 19, 21, 22, 0), + gsSP2Triangles(19, 22, 20, 0, 6, 23, 7, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0), + gsSPVertex(0x8020C4A0, 1, 0), + gsSPVertex(0x8020C4D0, 1, 1), + gsSPVertex(0x8020C500, 12, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 7, 0), + gsSP2Triangles(2, 7, 8, 0, 3, 4, 9, 0), + gsSP2Triangles(3, 9, 10, 0, 4, 5, 11, 0), + gsSP2Triangles(4, 11, 9, 0, 5, 6, 12, 0), + gsSP2Triangles(5, 12, 11, 0, 6, 13, 12, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C1F0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020C080, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 17, 18, 0), + gsSP2Triangles(14, 18, 15, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 18, 0, 19, 21, 22, 0), + gsSP2Triangles(19, 22, 20, 0, 6, 23, 7, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0), + gsSPVertex(0x8020C200, 1, 0), + gsSPVertex(0x8020C230, 1, 1), + gsSPVertex(0x8020C260, 12, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 7, 0), + gsSP2Triangles(2, 7, 8, 0, 3, 4, 9, 0), + gsSP2Triangles(3, 9, 10, 0, 4, 5, 11, 0), + gsSP2Triangles(4, 11, 9, 0, 5, 6, 12, 0), + gsSP2Triangles(5, 12, 11, 0, 6, 13, 12, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C2E0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020BDE0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 15, 17, 18, 0), + gsSP2Triangles(15, 18, 16, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 18, 0, 19, 21, 22, 0), + gsSP2Triangles(19, 22, 20, 0, 6, 23, 7, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(25, 28, 29, 0, 25, 29, 26, 0), + gsSPVertex(0x8020BF60, 1, 0), + gsSPVertex(0x8020BF90, 1, 1), + gsSPVertex(0x8020BFC0, 12, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 8, 0), + gsSP2Triangles(3, 2, 8, 0, 4, 5, 9, 0), + gsSP2Triangles(4, 9, 10, 0, 5, 6, 11, 0), + gsSP2Triangles(5, 11, 9, 0, 6, 7, 12, 0), + gsSP2Triangles(6, 12, 11, 0, 7, 13, 12, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C3D0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024C2E0), + gsSPDisplayList(0x8024C1F0), + gsSPDisplayList(0x8024C100), + gsSPDisplayList(0x8024C098), + gsSPDisplayList(0x8024C030), + gsSPDisplayList(0x8024BFC8), + gsSPEndDisplayList(), +}; + +Gfx D_8024C420_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020BC60, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(6, 4, 5, 0, 6, 5, 7, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(9, 11, 12, 0, 10, 13, 14, 0), + gsSP2Triangles(10, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 16, 19, 17, 0), + gsSP2Triangles(20, 15, 18, 0, 20, 18, 21, 0), + gsSP2Triangles(22, 20, 21, 0, 22, 21, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C4C0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020BAE0, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(6, 4, 5, 0, 6, 5, 7, 0), + gsSP2Triangles(8, 6, 7, 0, 9, 10, 11, 0), + gsSP2Triangles(9, 11, 12, 0, 10, 13, 14, 0), + gsSP2Triangles(10, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 16, 19, 17, 0), + gsSP2Triangles(20, 15, 18, 0, 20, 18, 21, 0), + gsSP2Triangles(22, 20, 21, 0, 22, 21, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C560_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x8020B960, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0), + gsSP2Triangles(9, 11, 12, 0, 10, 13, 14, 0), + gsSP2Triangles(10, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 15, 18, 19, 0), + gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C600_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024C560), + gsSPDisplayList(0x8024C4C0), + gsSPDisplayList(0x8024C420), + gsSPEndDisplayList(), +}; + +Gfx D_8024C638_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024C600), + gsSPDisplayList(0x8024C3D0), + gsSPDisplayList(0x8024BF90), + gsSPEndDisplayList(), +}; + +Gfx D_8024C670_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020B5A0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 3, 2, 0, 2, 5, 4, 0), + gsSP2Triangles(2, 6, 5, 0, 2, 7, 6, 0), + gsSP2Triangles(8, 7, 2, 0, 8, 2, 1, 0), + gsSP2Triangles(9, 8, 1, 0, 8, 9, 10, 0), + gsSP2Triangles(9, 1, 0, 0, 11, 9, 12, 0), + gsSP2Triangles(9, 0, 12, 0, 13, 10, 9, 0), + gsSP2Triangles(13, 9, 14, 0, 9, 11, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 18, 15, 17, 0), + gsSP2Triangles(19, 17, 16, 0, 19, 20, 17, 0), + gsSP2Triangles(21, 17, 20, 0, 17, 21, 22, 0), + gsSP2Triangles(23, 18, 17, 0, 23, 17, 22, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 22, 25, 0), + gsSP2Triangles(21, 20, 25, 0, 20, 27, 25, 0), + gsSP2Triangles(25, 27, 28, 0, 29, 25, 28, 0), + gsSP2Triangles(21, 25, 22, 0, 29, 26, 25, 0), + gsSPVertex(0x8020B780, 30, 0), + gsSP2Triangles(0, 14, 2, 0, 0, 2, 15, 0), + gsSP2Triangles(1, 15, 2, 0, 2, 16, 17, 0), + gsSP2Triangles(3, 16, 2, 0, 3, 2, 14, 0), + gsSP2Triangles(2, 18, 1, 0, 2, 17, 18, 0), + gsSP2Triangles(4, 3, 14, 0, 3, 4, 19, 0), + gsSP2Triangles(4, 14, 0, 0, 5, 4, 20, 0), + gsSP2Triangles(4, 0, 20, 0, 6, 4, 21, 0), + gsSP2Triangles(4, 5, 21, 0, 6, 19, 4, 0), + gsSP2Triangles(7, 22, 8, 0, 8, 23, 7, 0), + gsSP2Triangles(9, 8, 22, 0, 8, 24, 23, 0), + gsSP2Triangles(8, 25, 24, 0, 10, 25, 8, 0), + gsSP2Triangles(10, 8, 26, 0, 9, 26, 8, 0), + gsSP2Triangles(11, 26, 9, 0, 11, 9, 27, 0), + gsSP2Triangles(11, 10, 26, 0, 12, 28, 11, 0), + gsSP2Triangles(10, 11, 28, 0, 12, 11, 29, 0), + gsSP2Triangles(13, 11, 27, 0, 11, 13, 29, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C7D0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024C670), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024C808_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020B3C0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 2, 3, 0, 0), + gsSP2Triangles(3, 4, 0, 0, 0, 5, 6, 0), + gsSP2Triangles(1, 0, 6, 0, 4, 7, 0, 0), + gsSP2Triangles(0, 7, 8, 0, 5, 0, 8, 0), + gsSP2Triangles(9, 6, 10, 0, 6, 5, 10, 0), + gsSP2Triangles(5, 8, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 11, 10, 0, 12, 10, 13, 0), + gsSP2Triangles(10, 14, 13, 0, 14, 10, 8, 0), + gsSP2Triangles(15, 16, 17, 0, 18, 15, 19, 0), + gsSP2Triangles(18, 20, 15, 0, 21, 19, 15, 0), + gsSP2Triangles(21, 15, 22, 0, 23, 22, 15, 0), + gsSP2Triangles(15, 17, 23, 0, 15, 20, 16, 0), + gsSP2Triangles(18, 24, 25, 0, 24, 18, 19, 0), + gsSP2Triangles(24, 19, 21, 0, 26, 24, 27, 0), + gsSP2Triangles(26, 25, 24, 0, 24, 28, 27, 0), + gsSP2Triangles(24, 21, 29, 0, 28, 24, 29, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C8E0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024C808), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024C918_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020B280, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024C998_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020B010, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), + gsSP2Triangles(4, 3, 2, 0, 4, 2, 5, 0), + gsSP2Triangles(5, 2, 6, 0, 2, 7, 6, 0), + gsSP2Triangles(2, 8, 7, 0, 2, 1, 8, 0), + gsSP2Triangles(5, 6, 9, 0, 10, 4, 5, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 13, 0, 13, 17, 14, 0), + gsSP2Triangles(18, 19, 14, 0, 20, 21, 15, 0), + gsSP2Triangles(22, 20, 12, 0, 22, 12, 11, 0), + gsSP2Triangles(23, 24, 25, 0, 26, 27, 24, 0), + gsSP2Triangles(26, 24, 28, 0, 24, 27, 25, 0), + gsSP1Triangle(27, 29, 25, 0), + gsSPVertex(0x8020B020, 1, 1), + gsSPVertex(0x8020B090, 1, 2), + gsSPVertex(0x8020B140, 2, 3), + gsSPVertex(0x8020B170, 1, 5), + gsSPVertex(0x8020B1B0, 2, 6), + gsSPVertex(0x8020B1F0, 9, 8), + gsSP2Triangles(8, 15, 1, 0, 0, 9, 8, 0), + gsSP2Triangles(0, 8, 1, 0, 1, 10, 16, 0), + gsSP2Triangles(1, 16, 2, 0, 1, 11, 10, 0), + gsSP2Triangles(6, 12, 7, 0, 5, 3, 13, 0), + gsSP1Triangle(5, 14, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CAA8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802538A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024C998), + gsSPDisplayList(0x8024C918), + gsSPDisplayList(0x8024C8E0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024CAF0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020AF10, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CB68_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x8020AC10, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(0x8020AE10, 16, 0), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0), + gsSP2Triangles(1, 7, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 12, 0), + gsSP2Triangles(3, 13, 14, 0, 3, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CC28_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x8020AB10, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CCA0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020AA70, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(1, 4, 3, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 7, 8, 0, 5, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CD10_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020A9A0, 13, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(3, 5, 8, 0, 3, 8, 9, 0), + gsSP2Triangles(10, 0, 3, 0, 10, 3, 9, 0), + gsSP2Triangles(1, 11, 12, 0, 1, 12, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CD98_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020A910, 9, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 3, 0, 4, 3, 6, 0), + gsSP2Triangles(4, 7, 8, 0, 4, 8, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CE08_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x8020A110, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), + gsSP2Triangles(0, 4, 3, 0, 5, 6, 7, 0), + gsSP2Triangles(6, 8, 7, 0, 8, 9, 7, 0), + gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), + gsSP2Triangles(5, 7, 12, 0, 11, 13, 9, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 17, 18, 0), + gsSP2Triangles(14, 18, 19, 0, 14, 20, 17, 0), + gsSP2Triangles(17, 21, 22, 0, 23, 5, 12, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(24, 27, 28, 0, 29, 25, 30, 0), + gsSP2Triangles(25, 24, 31, 0, 25, 31, 30, 0), + gsSPVertex(0x8020A2E0, 2, 0), + gsSPVertex(0x8020A310, 8, 2), + gsSPVertex(0x8020A4D0, 21, 10), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 10, 0), + gsSP2Triangles(3, 11, 12, 0, 3, 12, 13, 0), + gsSP2Triangles(4, 14, 15, 0, 4, 15, 16, 0), + gsSP2Triangles(5, 17, 18, 0, 5, 18, 19, 0), + gsSP2Triangles(6, 20, 21, 0, 6, 21, 22, 0), + gsSP2Triangles(7, 23, 24, 0, 7, 24, 25, 0), + gsSP2Triangles(8, 26, 27, 0, 8, 27, 28, 0), + gsSP2Triangles(8, 9, 26, 0, 9, 29, 30, 0), + gsSP1Triangle(9, 30, 26, 0), + gsSPVertex(0x8020A390, 8, 0), + gsSPVertex(0x8020A620, 23, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 10, 0), + gsSP2Triangles(0, 10, 11, 0, 1, 12, 13, 0), + gsSP2Triangles(1, 2, 14, 0, 1, 14, 15, 0), + gsSP2Triangles(1, 16, 2, 0, 2, 17, 18, 0), + gsSP2Triangles(3, 19, 20, 0, 3, 20, 21, 0), + gsSP2Triangles(4, 3, 21, 0, 5, 22, 23, 0), + gsSP2Triangles(5, 24, 22, 0, 5, 25, 24, 0), + gsSP2Triangles(6, 26, 7, 0, 6, 7, 27, 0), + gsSP2Triangles(6, 27, 28, 0, 6, 29, 30, 0), + gsSPVertex(0x8020A400, 11, 0), + gsSPVertex(0x8020A790, 21, 11), + gsSP2Triangles(0, 11, 12, 0, 1, 2, 13, 0), + gsSP2Triangles(1, 13, 14, 0, 2, 15, 16, 0), + gsSP2Triangles(2, 16, 13, 0, 3, 17, 18, 0), + gsSP2Triangles(3, 18, 19, 0, 4, 20, 21, 0), + gsSP2Triangles(4, 21, 22, 0, 5, 23, 24, 0), + gsSP2Triangles(5, 24, 25, 0, 6, 5, 25, 0), + gsSP2Triangles(6, 25, 26, 0, 7, 27, 28, 0), + gsSP2Triangles(8, 29, 7, 0, 8, 7, 28, 0), + gsSP2Triangles(8, 28, 30, 0, 9, 10, 31, 0), + gsSPVertex(0x8020A480, 1, 0), + gsSPVertex(0x8020A4A0, 3, 1), + gsSPVertex(0x8020A8C0, 5, 4), + gsSP2Triangles(1, 6, 5, 0, 1, 7, 2, 0), + gsSP2Triangles(1, 2, 6, 0, 2, 8, 6, 0), + gsSP1Triangle(3, 0, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024CFF8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024CE08), + gsSPDisplayList(0x8024CD98), + gsSPDisplayList(0x8024CD10), + gsSPDisplayList(0x8024CCA0), + gsSPDisplayList(0x8024CC28), + gsSPDisplayList(0x8024CB68), + gsSPDisplayList(0x8024CAF0), + gsSPDisplayList(0x8024CAA8), + gsSPDisplayList(0x8024C7D0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D060_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209B70, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 1, 3, 0), + gsSP2Triangles(5, 6, 1, 0, 7, 1, 6, 0), + gsSP2Triangles(7, 8, 1, 0, 8, 4, 1, 0), + gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0), + gsSP2Triangles(13, 11, 14, 0, 11, 15, 14, 0), + gsSP2Triangles(15, 11, 16, 0, 11, 17, 16, 0), + gsSP2Triangles(11, 10, 17, 0, 11, 13, 12, 0), + gsSP2Triangles(18, 17, 19, 0, 17, 18, 16, 0), + gsSP2Triangles(7, 20, 8, 0, 21, 8, 20, 0), + gsSP2Triangles(20, 7, 6, 0, 22, 20, 6, 0), + gsSP2Triangles(15, 16, 18, 0, 15, 18, 23, 0), + gsSP2Triangles(18, 24, 23, 0, 18, 25, 24, 0), + gsSP2Triangles(18, 26, 25, 0, 26, 18, 19, 0), + gsSP2Triangles(27, 28, 20, 0, 21, 20, 29, 0), + gsSP2Triangles(22, 27, 20, 0, 28, 29, 20, 0), + gsSPVertex(0x80209D50, 17, 0), + gsSPVertex(0x80209F70, 15, 17), + gsSP2Triangles(0, 17, 4, 0, 0, 4, 18, 0), + gsSP2Triangles(1, 0, 18, 0, 0, 1, 19, 0), + gsSP2Triangles(2, 0, 19, 0, 0, 2, 20, 0), + gsSP2Triangles(3, 0, 20, 0, 3, 17, 0, 0), + gsSP2Triangles(4, 5, 18, 0, 5, 4, 21, 0), + gsSP2Triangles(1, 18, 5, 0, 6, 5, 21, 0), + gsSP2Triangles(5, 22, 23, 0, 5, 24, 22, 0), + gsSP2Triangles(5, 6, 24, 0, 1, 5, 23, 0), + gsSP2Triangles(7, 25, 8, 0, 7, 8, 26, 0), + gsSP2Triangles(8, 27, 26, 0, 9, 27, 8, 0), + gsSP2Triangles(10, 9, 8, 0, 11, 28, 8, 0), + gsSP2Triangles(11, 8, 25, 0, 10, 8, 28, 0), + gsSP2Triangles(12, 29, 16, 0, 12, 16, 30, 0), + gsSP2Triangles(13, 16, 29, 0, 13, 31, 16, 0), + gsSP2Triangles(14, 16, 31, 0, 14, 15, 16, 0), + gsSPVertex(0x80209DE0, 2, 0), + gsSPVertex(0x80209E30, 17, 2), + gsSPVertex(0x8020A020, 1, 19), + gsSPVertex(0x8020A040, 10, 20), + gsSP2Triangles(4, 22, 20, 0, 3, 22, 4, 0), + gsSP2Triangles(5, 3, 6, 0, 2, 6, 3, 0), + gsSP2Triangles(6, 2, 21, 0, 7, 11, 23, 0), + gsSP2Triangles(7, 0, 11, 0, 8, 23, 11, 0), + gsSP2Triangles(1, 11, 0, 0, 9, 8, 11, 0), + gsSP2Triangles(10, 9, 11, 0, 10, 11, 19, 0), + gsSP2Triangles(11, 1, 19, 0, 12, 6, 21, 0), + gsSP2Triangles(12, 13, 6, 0, 13, 14, 6, 0), + gsSP2Triangles(14, 24, 6, 0, 5, 6, 24, 0), + gsSP2Triangles(15, 25, 26, 0, 16, 15, 26, 0), + gsSP2Triangles(15, 18, 27, 0, 17, 15, 27, 0), + gsSP2Triangles(15, 17, 28, 0, 15, 28, 25, 0), + gsSP2Triangles(18, 15, 29, 0, 16, 29, 15, 0), + gsSPVertex(0x80209F10, 1, 0), + gsSPVertex(0x80209F30, 4, 1), + gsSPVertex(0x8020A0D0, 4, 5), + gsSP2Triangles(2, 1, 5, 0, 2, 6, 1, 0), + gsSP2Triangles(0, 2, 5, 0, 2, 0, 7, 0), + gsSP2Triangles(3, 2, 8, 0, 3, 6, 2, 0), + gsSP2Triangles(2, 4, 8, 0, 4, 2, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D280_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024D060), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024D2B8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209990, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0), + gsSP2Triangles(1, 3, 4, 0, 1, 4, 2, 0), + gsSP2Triangles(5, 6, 0, 0, 6, 7, 0, 0), + gsSP2Triangles(8, 0, 7, 0, 8, 3, 0, 0), + gsSP2Triangles(9, 0, 2, 0, 9, 5, 0, 0), + gsSP2Triangles(3, 10, 4, 0, 11, 2, 4, 0), + gsSP2Triangles(4, 10, 12, 0, 13, 4, 12, 0), + gsSP2Triangles(13, 14, 4, 0, 11, 4, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 18, 16, 15, 0), + gsSP2Triangles(18, 15, 19, 0, 15, 20, 19, 0), + gsSP2Triangles(20, 15, 21, 0, 15, 22, 21, 0), + gsSP2Triangles(22, 15, 23, 0, 15, 17, 23, 0), + gsSP2Triangles(24, 17, 25, 0, 17, 24, 23, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 26, 0), + gsSP2Triangles(24, 27, 26, 0, 28, 24, 25, 0), + gsSP2Triangles(24, 28, 29, 0, 24, 29, 27, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D390_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024D2B8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024D3C8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209850, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D448_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209600, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), + gsSP2Triangles(3, 2, 4, 0, 0, 5, 6, 0), + gsSP2Triangles(0, 6, 1, 0, 7, 1, 8, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(1, 7, 11, 0, 1, 11, 12, 0), + gsSP2Triangles(2, 1, 12, 0, 13, 14, 8, 0), + gsSP2Triangles(13, 8, 1, 0, 13, 1, 6, 0), + gsSP2Triangles(15, 2, 12, 0, 15, 12, 16, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 21, 0, 21, 20, 22, 0), + gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0), + gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0), + gsSP2Triangles(27, 29, 28, 0, 27, 30, 31, 0), + gsSP1Triangle(27, 31, 29, 0), + gsSPVertex(0x802097C0, 2, 0), + gsSPVertex(0x80209800, 5, 2), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 0, 2, 5, 0), + gsSP1Triangle(0, 5, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D538_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253860, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024D448), + gsSPDisplayList(0x8024D3C8), + gsSPDisplayList(0x8024D390), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024D580_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209480, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D608_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80209380, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D680_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80209240, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D700_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209140, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 5, 6, 2, 0), + gsSP2Triangles(5, 2, 1, 0, 5, 1, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(8, 11, 12, 0, 12, 11, 13, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D788_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80209010, 19, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 4, 0), + gsSP2Triangles(2, 5, 9, 0, 2, 9, 10, 0), + gsSP2Triangles(3, 2, 10, 0, 3, 10, 11, 0), + gsSP2Triangles(12, 13, 3, 0, 12, 3, 11, 0), + gsSP2Triangles(13, 6, 0, 0, 13, 0, 3, 0), + gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0), + gsSP2Triangles(16, 17, 8, 0, 16, 8, 18, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D828_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80208EC0, 21, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(6, 1, 7, 0, 6, 7, 8, 0), + gsSP2Triangles(9, 10, 6, 0, 9, 6, 11, 0), + gsSP2Triangles(4, 5, 12, 0, 4, 12, 7, 0), + gsSP2Triangles(13, 14, 8, 0, 13, 8, 15, 0), + gsSP2Triangles(16, 17, 9, 0, 16, 9, 13, 0), + gsSP2Triangles(16, 13, 15, 0, 16, 15, 18, 0), + gsSP2Triangles(13, 9, 11, 0, 13, 11, 14, 0), + gsSP2Triangles(19, 16, 18, 0, 19, 18, 20, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024D8D0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802083F0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 4, 3, 0, 2, 5, 6, 0), + gsSP2Triangles(2, 6, 4, 0, 3, 7, 8, 0), + gsSP2Triangles(3, 8, 9, 0, 3, 4, 7, 0), + gsSP2Triangles(4, 10, 11, 0, 4, 11, 7, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(12, 15, 16, 0, 17, 15, 14, 0), + gsSP2Triangles(17, 14, 18, 0, 17, 18, 19, 0), + gsSP2Triangles(20, 15, 21, 0, 20, 22, 16, 0), + gsSP2Triangles(20, 16, 15, 0, 21, 15, 23, 0), + gsSP2Triangles(15, 17, 24, 0, 15, 24, 23, 0), + gsSP2Triangles(25, 26, 27, 0, 25, 27, 28, 0), + gsSP1Triangle(25, 28, 29, 0), + gsSPVertex(0x80208530, 2, 0), + gsSPVertex(0x80208560, 1, 2), + gsSPVertex(0x802085B0, 13, 3), + gsSPVertex(0x802088B0, 16, 16), + gsSP2Triangles(4, 3, 5, 0, 4, 5, 16, 0), + gsSP2Triangles(4, 16, 17, 0, 6, 0, 1, 0), + gsSP2Triangles(6, 1, 18, 0, 7, 1, 2, 0), + gsSP2Triangles(7, 2, 19, 0, 8, 11, 10, 0), + gsSP2Triangles(9, 20, 8, 0, 9, 8, 10, 0), + gsSP2Triangles(10, 11, 21, 0, 10, 21, 22, 0), + gsSP2Triangles(10, 22, 23, 0, 11, 24, 25, 0), + gsSP2Triangles(11, 25, 21, 0, 12, 13, 15, 0), + gsSP2Triangles(12, 15, 26, 0, 13, 14, 15, 0), + gsSP2Triangles(13, 27, 28, 0, 13, 28, 14, 0), + gsSP2Triangles(14, 29, 30, 0, 14, 30, 31, 0), + gsSP1Triangle(15, 14, 31, 0), + gsSPVertex(0x80208600, 1, 0), + gsSPVertex(0x80208630, 1, 1), + gsSPVertex(0x80208670, 8, 2), + gsSPVertex(0x802089A0, 22, 10), + gsSP2Triangles(3, 2, 10, 0, 3, 10, 12, 0), + gsSP2Triangles(0, 11, 13, 0, 0, 13, 1, 0), + gsSP2Triangles(4, 14, 15, 0, 4, 15, 16, 0), + gsSP2Triangles(5, 17, 18, 0, 5, 18, 19, 0), + gsSP2Triangles(6, 20, 21, 0, 6, 21, 22, 0), + gsSP2Triangles(7, 23, 24, 0, 7, 24, 25, 0), + gsSP2Triangles(8, 26, 27, 0, 8, 27, 28, 0), + gsSP2Triangles(9, 29, 30, 0, 9, 30, 31, 0), + gsSPVertex(0x802086F0, 9, 0), + gsSPVertex(0x80208B00, 23, 9), + gsSP2Triangles(0, 9, 10, 0, 0, 10, 11, 0), + gsSP2Triangles(1, 12, 13, 0, 1, 13, 14, 0), + gsSP2Triangles(2, 15, 3, 0, 2, 3, 16, 0), + gsSP2Triangles(3, 4, 17, 0, 3, 17, 18, 0), + gsSP2Triangles(4, 19, 20, 0, 4, 20, 17, 0), + gsSP2Triangles(5, 19, 21, 0, 5, 21, 22, 0), + gsSP2Triangles(6, 23, 24, 0, 6, 24, 25, 0), + gsSP2Triangles(7, 26, 27, 0, 7, 27, 28, 0), + gsSP2Triangles(8, 29, 30, 0, 8, 30, 31, 0), + gsSPVertex(0x80208710, 1, 0), + gsSPVertex(0x80208780, 10, 1), + gsSPVertex(0x80208B70, 1, 11), + gsSPVertex(0x80208C70, 19, 12), + gsSP2Triangles(1, 12, 13, 0, 1, 13, 14, 0), + gsSP2Triangles(1, 14, 15, 0, 2, 16, 13, 0), + gsSP2Triangles(2, 13, 12, 0, 2, 12, 17, 0), + gsSP2Triangles(3, 18, 19, 0, 3, 19, 20, 0), + gsSP2Triangles(4, 21, 19, 0, 4, 19, 22, 0), + gsSP2Triangles(5, 4, 22, 0, 5, 22, 23, 0), + gsSP2Triangles(6, 23, 24, 0, 6, 24, 25, 0), + gsSP2Triangles(7, 6, 25, 0, 7, 25, 26, 0), + gsSP2Triangles(8, 0, 11, 0, 8, 11, 27, 0), + gsSP2Triangles(9, 28, 29, 0, 9, 29, 30, 0), + gsSP1Triangle(9, 30, 10, 0), + gsSPVertex(0x80208810, 10, 0), + gsSPVertex(0x80208D90, 19, 10), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 12, 0), + gsSP2Triangles(0, 12, 13, 0, 1, 2, 3, 0), + gsSP2Triangles(1, 3, 14, 0, 2, 15, 16, 0), + gsSP2Triangles(2, 16, 9, 0, 2, 9, 3, 0), + gsSP2Triangles(3, 9, 17, 0, 4, 3, 17, 0), + gsSP2Triangles(4, 17, 18, 0, 5, 19, 20, 0), + gsSP2Triangles(5, 20, 8, 0, 5, 8, 7, 0), + gsSP2Triangles(6, 21, 5, 0, 6, 5, 7, 0), + gsSP2Triangles(7, 8, 22, 0, 8, 23, 24, 0), + gsSP2Triangles(8, 24, 22, 0, 7, 22, 25, 0), + gsSP2Triangles(7, 25, 26, 0, 9, 27, 28, 0), + gsSP1Triangle(9, 28, 17, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024DBB0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024D8D0), + gsSPDisplayList(0x8024D828), + gsSPDisplayList(0x8024D788), + gsSPDisplayList(0x8024D700), + gsSPDisplayList(0x8024D680), + gsSPDisplayList(0x8024D608), + gsSPDisplayList(0x8024D580), + gsSPDisplayList(0x8024D538), + gsSPDisplayList(0x8024D280), + gsSPEndDisplayList(), +}; + +Gfx D_8024DC18_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253820, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024DBB0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024DC50_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80208210, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 2, 6, 0), + gsSP2Triangles(2, 4, 6, 0, 2, 7, 3, 0), + gsSP2Triangles(7, 2, 8, 0, 2, 5, 8, 0), + gsSP2Triangles(9, 10, 6, 0, 5, 6, 10, 0), + gsSP2Triangles(8, 5, 10, 0, 11, 10, 12, 0), + gsSP2Triangles(10, 9, 12, 0, 11, 13, 10, 0), + gsSP2Triangles(14, 10, 13, 0, 14, 8, 10, 0), + gsSP2Triangles(15, 16, 17, 0, 17, 18, 19, 0), + gsSP2Triangles(20, 17, 19, 0, 18, 17, 21, 0), + gsSP2Triangles(17, 22, 21, 0, 23, 22, 17, 0), + gsSP2Triangles(16, 23, 17, 0, 17, 20, 15, 0), + gsSP2Triangles(24, 19, 25, 0, 19, 18, 25, 0), + gsSP2Triangles(18, 21, 25, 0, 26, 27, 25, 0), + gsSP2Triangles(24, 25, 27, 0, 25, 28, 29, 0), + gsSP2Triangles(28, 25, 21, 0, 26, 25, 29, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024DD28_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024DC50), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024DD60_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80207E50, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 4, 3, 0, 2, 5, 6, 0), + gsSP2Triangles(5, 2, 7, 0, 2, 8, 7, 0), + gsSP2Triangles(8, 2, 1, 0, 2, 6, 4, 0), + gsSP2Triangles(9, 8, 1, 0, 9, 10, 8, 0), + gsSP2Triangles(0, 9, 1, 0, 9, 11, 12, 0), + gsSP2Triangles(11, 9, 13, 0, 9, 0, 13, 0), + gsSP2Triangles(14, 10, 9, 0, 14, 9, 12, 0), + gsSP2Triangles(15, 16, 17, 0, 18, 15, 19, 0), + gsSP2Triangles(15, 18, 20, 0, 21, 15, 20, 0), + gsSP2Triangles(15, 17, 22, 0, 23, 15, 22, 0), + gsSP2Triangles(23, 19, 15, 0, 15, 21, 16, 0), + gsSP2Triangles(23, 24, 19, 0, 24, 23, 25, 0), + gsSP2Triangles(24, 18, 19, 0, 26, 27, 24, 0), + gsSP2Triangles(24, 27, 18, 0, 26, 24, 28, 0), + gsSP2Triangles(24, 29, 28, 0, 29, 24, 25, 0), + gsSPVertex(0x80208030, 30, 0), + gsSP2Triangles(0, 6, 1, 0, 0, 1, 20, 0), + gsSP2Triangles(1, 3, 21, 0, 2, 1, 21, 0), + gsSP2Triangles(2, 5, 1, 0, 3, 1, 6, 0), + gsSP2Triangles(4, 20, 1, 0, 5, 4, 1, 0), + gsSP2Triangles(3, 6, 9, 0, 6, 22, 9, 0), + gsSP2Triangles(3, 9, 21, 0, 7, 9, 23, 0), + gsSP2Triangles(7, 21, 9, 0, 8, 23, 9, 0), + gsSP2Triangles(9, 22, 24, 0, 8, 9, 24, 0), + gsSP2Triangles(10, 13, 25, 0, 10, 26, 13, 0), + gsSP2Triangles(11, 27, 13, 0, 12, 11, 13, 0), + gsSP2Triangles(13, 27, 25, 0, 12, 13, 28, 0), + gsSP2Triangles(14, 28, 13, 0, 14, 13, 26, 0), + gsSP2Triangles(15, 12, 28, 0, 12, 15, 11, 0), + gsSP2Triangles(16, 19, 15, 0, 17, 29, 15, 0), + gsSP2Triangles(18, 15, 29, 0, 18, 11, 15, 0), + gsSP2Triangles(19, 17, 15, 0, 16, 15, 28, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024DEC0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024DD60), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024DEF8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A170), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80207C70, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(12, 15, 16, 0, 12, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(18, 21, 22, 0, 18, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024DFA0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80207B30, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E020_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80207A30, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 2, 5, 6, 0), + gsSP2Triangles(2, 1, 5, 0, 1, 7, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 9, 8, 11, 0), + gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0), + gsSP2Triangles(9, 14, 10, 0, 15, 8, 10, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E0A8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80207950, 14, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(5, 8, 9, 0, 5, 9, 10, 0), + gsSP2Triangles(11, 12, 6, 0, 11, 6, 13, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E120_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80207860, 15, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(8, 4, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 14, 0), + gsSP2Triangles(12, 6, 9, 0, 12, 9, 13, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E1A8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80206E20, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 2, 0, 1, 5, 6, 0), + gsSP2Triangles(1, 6, 4, 0, 7, 8, 9, 0), + gsSP2Triangles(8, 10, 9, 0, 10, 11, 9, 0), + gsSP2Triangles(5, 12, 13, 0, 5, 13, 6, 0), + gsSP2Triangles(5, 14, 12, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 17, 0), + gsSP2Triangles(17, 21, 18, 0, 22, 23, 18, 0), + gsSP2Triangles(24, 25, 26, 0, 26, 27, 28, 0), + gsSP2Triangles(29, 30, 26, 0, 29, 26, 28, 0), + gsSPVertex(0x80206FE0, 13, 0), + gsSPVertex(0x802072A0, 19, 13), + gsSP2Triangles(3, 13, 0, 0, 4, 14, 15, 0), + gsSP2Triangles(5, 4, 16, 0, 4, 17, 18, 0), + gsSP2Triangles(4, 18, 16, 0, 4, 5, 14, 0), + gsSP2Triangles(6, 5, 16, 0, 6, 16, 19, 0), + gsSP2Triangles(5, 20, 21, 0, 5, 21, 22, 0), + gsSP2Triangles(5, 22, 14, 0, 1, 7, 23, 0), + gsSP2Triangles(1, 23, 8, 0, 2, 1, 8, 0), + gsSP2Triangles(2, 8, 24, 0, 2, 24, 25, 0), + gsSP2Triangles(9, 26, 27, 0, 9, 10, 26, 0), + gsSP2Triangles(10, 28, 26, 0, 11, 29, 12, 0), + gsSP2Triangles(11, 12, 30, 0, 12, 31, 30, 0), + gsSPVertex(0x80207080, 1, 0), + gsSPVertex(0x802070A0, 10, 1), + gsSPVertex(0x80207390, 1, 11), + gsSPVertex(0x802073B0, 1, 12), + gsSPVertex(0x802073D0, 17, 13), + gsSP2Triangles(3, 15, 12, 0, 2, 13, 1, 0), + gsSP2Triangles(4, 16, 17, 0, 4, 17, 18, 0), + gsSP2Triangles(5, 19, 20, 0, 5, 20, 21, 0), + gsSP2Triangles(6, 22, 23, 0, 6, 23, 24, 0), + gsSP2Triangles(0, 7, 14, 0, 0, 14, 11, 0), + gsSP2Triangles(7, 25, 26, 0, 7, 26, 14, 0), + gsSP2Triangles(7, 27, 25, 0, 8, 9, 28, 0), + gsSP2Triangles(9, 10, 28, 0, 10, 29, 28, 0), + gsSPVertex(0x80207140, 10, 0), + gsSPVertex(0x80207250, 1, 10), + gsSPVertex(0x802074E0, 21, 11), + gsSP2Triangles(0, 2, 1, 0, 0, 1, 11, 0), + gsSP2Triangles(0, 11, 12, 0, 1, 2, 13, 0), + gsSP2Triangles(1, 13, 14, 0, 2, 15, 13, 0), + gsSP2Triangles(3, 16, 17, 0, 3, 4, 18, 0), + gsSP2Triangles(3, 18, 19, 0, 3, 19, 20, 0), + gsSP2Triangles(4, 3, 17, 0, 5, 4, 17, 0), + gsSP2Triangles(6, 21, 22, 0, 6, 22, 23, 0), + gsSP2Triangles(7, 6, 23, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 24, 0, 7, 23, 25, 0), + gsSP2Triangles(7, 25, 26, 0, 8, 27, 28, 0), + gsSP1Triangle(8, 28, 29, 0), + gsSPVertex(0x802071D0, 10, 0), + gsSPVertex(0x802075B0, 1, 10), + gsSPVertex(0x80207610, 20, 11), + gsSP2Triangles(0, 11, 12, 0, 0, 12, 13, 0), + gsSP2Triangles(1, 15, 16, 0, 1, 16, 17, 0), + gsSP2Triangles(2, 1, 17, 0, 2, 17, 18, 0), + gsSP2Triangles(3, 19, 20, 0, 3, 20, 21, 0), + gsSP2Triangles(4, 3, 21, 0, 4, 21, 22, 0), + gsSP2Triangles(5, 23, 24, 0, 5, 24, 25, 0), + gsSP2Triangles(6, 26, 27, 0, 6, 27, 28, 0), + gsSP2Triangles(7, 29, 10, 0, 8, 14, 10, 0), + gsSP1Triangle(9, 30, 8, 0), + gsSPVertex(0x80207270, 3, 0), + gsSPVertex(0x80207750, 9, 3), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(1, 0, 5, 0, 0, 6, 7, 0), + gsSP2Triangles(0, 1, 6, 0, 1, 8, 9, 0), + gsSP2Triangles(1, 9, 6, 0, 2, 1, 5, 0), + gsSP2Triangles(2, 5, 10, 0, 1, 11, 8, 0), + gsSPVertex(0x802077E0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E440_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024E1A8), + gsSPDisplayList(0x8024E120), + gsSPDisplayList(0x8024E0A8), + gsSPDisplayList(0x8024E020), + gsSPDisplayList(0x8024DFA0), + gsSPDisplayList(0x8024DEF8), + gsSPDisplayList(0x8024DEC0), + gsSPDisplayList(0x8024DD28), + gsSPEndDisplayList(), +}; + +Gfx D_8024E4A0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802537E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024E440), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024E4D8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80206C40, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0), + gsSP2Triangles(1, 4, 2, 0, 3, 5, 1, 0), + gsSP2Triangles(5, 6, 1, 0, 6, 7, 1, 0), + gsSP2Triangles(1, 7, 8, 0, 4, 1, 8, 0), + gsSP2Triangles(9, 2, 10, 0, 2, 4, 10, 0), + gsSP2Triangles(4, 8, 10, 0, 11, 10, 12, 0), + gsSP2Triangles(10, 13, 12, 0, 9, 10, 14, 0), + gsSP2Triangles(11, 14, 10, 0, 13, 10, 8, 0), + gsSP2Triangles(15, 16, 17, 0, 17, 18, 15, 0), + gsSP2Triangles(18, 19, 15, 0, 19, 20, 15, 0), + gsSP2Triangles(15, 20, 21, 0, 22, 15, 21, 0), + gsSP2Triangles(15, 22, 23, 0, 16, 15, 23, 0), + gsSP2Triangles(24, 25, 21, 0, 25, 24, 26, 0), + gsSP2Triangles(22, 21, 25, 0, 27, 28, 25, 0), + gsSP2Triangles(29, 23, 25, 0, 23, 22, 25, 0), + gsSP2Triangles(29, 25, 28, 0, 27, 25, 26, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E5B0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80206940, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(16, 22, 23, 0, 16, 23, 24, 0), + gsSP2Triangles(16, 24, 17, 0, 22, 25, 26, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0), + gsSPVertex(0x80206B00, 2, 0), + gsSPVertex(0x80206B30, 17, 2), + gsSP2Triangles(0, 2, 8, 0, 0, 8, 1, 0), + gsSP2Triangles(2, 9, 10, 0, 2, 10, 11, 0), + gsSP2Triangles(2, 11, 8, 0, 3, 11, 12, 0), + gsSP2Triangles(4, 13, 14, 0, 4, 14, 5, 0), + gsSP2Triangles(5, 14, 15, 0, 5, 15, 16, 0), + gsSP2Triangles(6, 17, 13, 0, 6, 13, 4, 0), + gsSP2Triangles(7, 18, 17, 0, 7, 17, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E6A0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802537A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024E5B0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024E6D8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80206640, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 16, 25, 26, 0), + gsSP2Triangles(16, 26, 23, 0, 16, 23, 17, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0), + gsSPVertex(0x80206800, 2, 0), + gsSPVertex(0x80206830, 17, 2), + gsSP2Triangles(0, 2, 8, 0, 0, 8, 1, 0), + gsSP2Triangles(2, 3, 9, 0, 2, 9, 10, 0), + gsSP2Triangles(2, 10, 8, 0, 3, 11, 12, 0), + gsSP2Triangles(4, 13, 14, 0, 4, 14, 5, 0), + gsSP2Triangles(5, 14, 15, 0, 5, 15, 6, 0), + gsSP2Triangles(6, 15, 16, 0, 6, 16, 7, 0), + gsSP2Triangles(7, 16, 17, 0, 7, 17, 18, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E7C8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253760, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024E6D8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024E800_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A170), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80206520, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E888_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024E800), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024E8C0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80206460, 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E930_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253720, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024E8C0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024E968_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802063C0, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0), + gsSP2Triangles(6, 8, 7, 0, 9, 5, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024E9D8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802062E0, 14, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 3, 5, 0, 4, 5, 6, 0), + gsSP2Triangles(3, 2, 7, 0, 3, 7, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 7, 0), + gsSP2Triangles(10, 11, 4, 0, 10, 4, 6, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EA60_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80206240, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 3, 5, 0, 4, 5, 6, 0), + gsSP2Triangles(7, 4, 8, 0, 7, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EAD0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80205D80, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(1, 6, 4, 0, 7, 8, 9, 0), + gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), + gsSP2Triangles(8, 12, 10, 0, 7, 9, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 17, 18, 14, 0), + gsSP2Triangles(19, 20, 14, 0, 19, 14, 16, 0), + gsSP2Triangles(21, 22, 16, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(0x80205F70, 9, 0), + gsSPVertex(0x80206070, 22, 9), + gsSP2Triangles(0, 9, 10, 0, 0, 10, 11, 0), + gsSP2Triangles(1, 12, 13, 0, 1, 13, 14, 0), + gsSP2Triangles(2, 15, 16, 0, 2, 3, 15, 0), + gsSP2Triangles(3, 17, 15, 0, 4, 18, 19, 0), + gsSP2Triangles(4, 19, 20, 0, 5, 6, 21, 0), + gsSP2Triangles(5, 21, 22, 0, 6, 23, 24, 0), + gsSP2Triangles(6, 24, 25, 0, 7, 26, 27, 0), + gsSP2Triangles(7, 27, 28, 0, 8, 29, 30, 0), + gsSP1Triangle(8, 30, 27, 0), + gsSPVertex(0x80206000, 7, 0), + gsSPVertex(0x802061D0, 7, 7), + gsSP2Triangles(0, 7, 2, 0, 0, 2, 8, 0), + gsSP2Triangles(1, 9, 2, 0, 2, 10, 8, 0), + gsSP2Triangles(3, 11, 8, 0, 4, 5, 12, 0), + gsSP2Triangles(5, 6, 12, 0, 6, 13, 12, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EC00_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024EAD0), + gsSPDisplayList(0x8024EA60), + gsSPDisplayList(0x8024E9D8), + gsSPDisplayList(0x8024E968), + gsSPDisplayList(0x8024E930), + gsSPDisplayList(0x8024E888), + gsSPDisplayList(0x8024E7C8), + gsSPDisplayList(0x8024E6A0), + gsSPDisplayList(0x8024E4D8), + gsSPEndDisplayList(), +}; + +Gfx D_8024EC68_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024EC00), + gsSPDisplayList(0x8024E4A0), + gsSPDisplayList(0x8024DC18), + gsSPDisplayList(0x8024CFF8), + gsSPDisplayList(0x8024C638), + gsSPEndDisplayList(), +}; + +Gfx D_8024ECB0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80205950, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 5, 0, 4, 5, 6, 0), + gsSP2Triangles(0, 3, 5, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 3, 0, 7, 3, 2, 0), + gsSP2Triangles(10, 3, 9, 0, 10, 9, 11, 0), + gsSP2Triangles(10, 11, 12, 0, 3, 10, 13, 0), + gsSP2Triangles(3, 13, 14, 0, 5, 3, 14, 0), + gsSP2Triangles(15, 5, 14, 0, 15, 14, 16, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(19, 21, 20, 0, 19, 22, 23, 0), + gsSP2Triangles(19, 23, 21, 0, 20, 21, 24, 0), + gsSP2Triangles(21, 25, 26, 0, 21, 26, 24, 0), + gsSP2Triangles(20, 24, 27, 0, 20, 27, 28, 0), + gsSPVertex(0x80205B20, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 4, 3, 5, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPVertex(0x80205BA0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 3, 0, 6, 4, 3, 0), + gsSP2Triangles(5, 1, 3, 0, 1, 7, 8, 0), + gsSP2Triangles(9, 2, 1, 0, 9, 1, 8, 0), + gsSP2Triangles(5, 10, 1, 0, 10, 7, 1, 0), + gsSP2Triangles(5, 4, 10, 0, 11, 10, 4, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(14, 13, 16, 0, 14, 17, 15, 0), + gsSP2Triangles(14, 18, 19, 0, 17, 14, 19, 0), + gsSP2Triangles(14, 16, 20, 0, 18, 14, 20, 0), + gsSP2Triangles(21, 16, 22, 0, 16, 21, 20, 0), + gsSP2Triangles(18, 20, 21, 0, 21, 23, 24, 0), + gsSP2Triangles(21, 25, 23, 0, 21, 26, 25, 0), + gsSP2Triangles(26, 21, 22, 0, 18, 21, 24, 0), + gsSP2Triangles(11, 4, 27, 0, 28, 29, 4, 0), + gsSP2Triangles(6, 28, 4, 0, 29, 27, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EE18_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80205810, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EE98_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024EE18), + gsSPDisplayList(0x8024ECB0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EEC8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802536E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024EE98), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024EF00_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x802057D0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EF60_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802536A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024EF00), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024EF98_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205790, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024EFF8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253660, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024EF98), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F030_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205750, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F090_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253620, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F030), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F0C8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205710, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F128_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802535E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F0C8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F160_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x802056D0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F1C0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802535A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F160), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F1F8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205690, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F258_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253560, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F1F8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F290_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205650, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F2F0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253520, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F290), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F328_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205610, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F388_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802534E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F328), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F3C0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x802055D0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F420_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802534A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F3C0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F458_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024F420), + gsSPDisplayList(0x8024F388), + gsSPDisplayList(0x8024F2F0), + gsSPDisplayList(0x8024F258), + gsSPDisplayList(0x8024F1C0), + gsSPDisplayList(0x8024F128), + gsSPDisplayList(0x8024F090), + gsSPDisplayList(0x8024EFF8), + gsSPDisplayList(0x8024EF60), + gsSPEndDisplayList(), +}; + +Gfx D_8024F4C0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205590, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F520_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253460, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F4C0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F558_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205550, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F5B8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253420, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F558), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F5F0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205510, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F650_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802533E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F5F0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F688_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x802054D0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F6E8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802533A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F688), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F720_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205490, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F780_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253360, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F720), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F7B8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205450, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F818_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253320, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F7B8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F850_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205410, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F8B0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802532E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F850), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F8E8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x802053D0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F948_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802532A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F8E8), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024F980_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205390, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024F9E0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253260, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024F980), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024FA18_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205350, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024FA78_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253220, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024FA18), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024FAB0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80205310, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024FB10_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802531E0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x8024FAB0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_8024FB48_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024FB10), + gsSPDisplayList(0x8024FA78), + gsSPDisplayList(0x8024F9E0), + gsSPDisplayList(0x8024F948), + gsSPDisplayList(0x8024F8B0), + gsSPDisplayList(0x8024F818), + gsSPDisplayList(0x8024F780), + gsSPDisplayList(0x8024F6E8), + gsSPDisplayList(0x8024F650), + gsSPDisplayList(0x8024F5B8), + gsSPDisplayList(0x8024F520), + gsSPEndDisplayList(), +}; + +Gfx D_8024FBC0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x802051F0, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(13, 16, 17, 0, 13, 17, 14, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024FC48_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x80204A10, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 8, 9, 0, 5, 9, 6, 0), + gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), + gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0), + gsSP2Triangles(3, 14, 15, 0, 3, 15, 4, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(17, 20, 21, 0, 17, 21, 18, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 24, 27, 0, 28, 27, 29, 0), + gsSPVertex(0x80204AF0, 2, 0), + gsSPVertex(0x80204BF0, 11, 2), + gsSPVertex(0x80204CC0, 1, 13), + gsSPVertex(0x80204E60, 17, 14), + gsSP2Triangles(0, 2, 14, 0, 0, 14, 1, 0), + gsSP2Triangles(3, 4, 15, 0, 3, 15, 16, 0), + gsSP2Triangles(4, 12, 17, 0, 4, 17, 15, 0), + gsSP2Triangles(5, 18, 19, 0, 5, 19, 20, 0), + gsSP2Triangles(6, 5, 20, 0, 6, 20, 21, 0), + gsSP2Triangles(7, 22, 23, 0, 7, 23, 24, 0), + gsSP2Triangles(8, 7, 24, 0, 8, 24, 25, 0), + gsSP2Triangles(9, 8, 25, 0, 9, 25, 26, 0), + gsSP2Triangles(9, 26, 27, 0, 10, 11, 28, 0), + gsSP2Triangles(10, 28, 29, 0, 11, 13, 30, 0), + gsSP1Triangle(11, 30, 28, 0), + gsSPVertex(0x80204B70, 2, 0), + gsSPVertex(0x80204C90, 13, 2), + gsSPVertex(0x80204E90, 1, 15), + gsSPVertex(0x80204F60, 16, 16), + gsSP2Triangles(2, 3, 17, 0, 2, 17, 15, 0), + gsSP2Triangles(3, 18, 17, 0, 4, 19, 20, 0), + gsSP2Triangles(5, 4, 20, 0, 5, 20, 16, 0), + gsSP2Triangles(0, 6, 1, 0, 7, 8, 21, 0), + gsSP2Triangles(7, 21, 22, 0, 8, 23, 21, 0), + gsSP2Triangles(9, 24, 25, 0, 10, 9, 25, 0), + gsSP2Triangles(10, 25, 26, 0, 11, 10, 26, 0), + gsSP2Triangles(11, 26, 27, 0, 12, 11, 27, 0), + gsSP2Triangles(12, 27, 28, 0, 13, 29, 30, 0), + gsSP1Triangle(13, 30, 31, 0), + gsSPVertex(0x80204CE0, 1, 0), + gsSPVertex(0x80204D40, 12, 1), + gsSPVertex(0x80204FC0, 1, 13), + gsSPVertex(0x80205050, 17, 14), + gsSP2Triangles(2, 1, 14, 0, 2, 14, 15, 0), + gsSP2Triangles(3, 0, 13, 0, 3, 13, 16, 0), + gsSP2Triangles(4, 5, 17, 0, 4, 17, 18, 0), + gsSP2Triangles(4, 18, 19, 0, 5, 6, 20, 0), + gsSP2Triangles(5, 20, 17, 0, 6, 21, 22, 0), + gsSP2Triangles(6, 22, 20, 0, 7, 3, 16, 0), + gsSP2Triangles(7, 16, 23, 0, 8, 9, 24, 0), + gsSP2Triangles(8, 24, 25, 0, 9, 26, 27, 0), + gsSP2Triangles(9, 27, 24, 0, 10, 11, 28, 0), + gsSP2Triangles(10, 28, 29, 0, 11, 12, 30, 0), + gsSP1Triangle(11, 30, 28, 0), + gsSPVertex(0x80204DB0, 1, 0), + gsSPVertex(0x80204DF0, 7, 1), + gsSPVertex(0x80205100, 1, 8), + gsSPVertex(0x80205150, 10, 9), + gsSP2Triangles(1, 2, 10, 0, 1, 10, 9, 0), + gsSP2Triangles(2, 11, 10, 0, 3, 0, 8, 0), + gsSP2Triangles(3, 8, 12, 0, 4, 13, 14, 0), + gsSP2Triangles(4, 14, 15, 0, 5, 4, 15, 0), + gsSP2Triangles(5, 15, 16, 0, 6, 5, 16, 0), + gsSP2Triangles(6, 16, 17, 0, 6, 17, 18, 0), + gsSP1Triangle(7, 3, 12, 0), + gsSPEndDisplayList(), +}; + +Gfx D_8024FEB0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024FC48), + gsSPDisplayList(0x8024FBC0), + gsSPEndDisplayList(), +}; + +Gfx D_8024FEE0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(0x80204410, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(6, 8, 7, 0, 9, 10, 11, 0), + gsSP2Triangles(9, 11, 12, 0, 10, 13, 14, 0), + gsSP2Triangles(10, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 15, 18, 19, 0), + gsSP2Triangles(16, 20, 21, 0, 16, 21, 17, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSP2Triangles(24, 25, 26, 0, 27, 24, 26, 0), + gsSP1Triangle(27, 26, 28, 0), + gsSPVertex(0x802045C0, 17, 0), + gsSPVertex(0x802047D0, 14, 17), + gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(6, 2, 5, 0, 6, 5, 7, 0), + gsSP2Triangles(8, 6, 7, 0, 8, 7, 17, 0), + gsSP2Triangles(8, 17, 18, 0, 9, 10, 19, 0), + gsSP2Triangles(9, 19, 20, 0, 10, 21, 22, 0), + gsSP2Triangles(10, 22, 19, 0, 11, 0, 1, 0), + gsSP2Triangles(11, 1, 23, 0, 12, 11, 23, 0), + gsSP2Triangles(12, 23, 24, 0, 13, 14, 25, 0), + gsSP2Triangles(13, 25, 26, 0, 14, 27, 28, 0), + gsSP2Triangles(14, 28, 25, 0, 15, 16, 29, 0), + gsSP1Triangle(15, 29, 30, 0), + gsSPVertex(0x802046C0, 13, 0), + gsSPVertex(0x80204890, 1, 13), + gsSPVertex(0x802048B0, 17, 14), + gsSP2Triangles(0, 1, 14, 0, 0, 14, 13, 0), + gsSP2Triangles(1, 2, 15, 0, 1, 15, 14, 0), + gsSP2Triangles(2, 16, 15, 0, 3, 4, 17, 0), + gsSP2Triangles(4, 5, 18, 0, 4, 18, 17, 0), + gsSP2Triangles(5, 6, 19, 0, 5, 19, 18, 0), + gsSP2Triangles(6, 20, 21, 0, 6, 21, 19, 0), + gsSP2Triangles(7, 22, 23, 0, 7, 23, 24, 0), + gsSP2Triangles(8, 7, 24, 0, 8, 24, 25, 0), + gsSP2Triangles(9, 8, 25, 0, 9, 25, 26, 0), + gsSP2Triangles(10, 9, 26, 0, 11, 12, 27, 0), + gsSP2Triangles(11, 27, 28, 0, 12, 29, 30, 0), + gsSP1Triangle(12, 30, 27, 0), + gsSPVertex(0x80204790, 4, 0), + gsSPVertex(0x802049C0, 5, 4), + gsSP2Triangles(0, 1, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(1, 6, 4, 0, 2, 0, 5, 0), + gsSP2Triangles(2, 5, 7, 0, 3, 2, 7, 0), + gsSP1Triangle(3, 7, 8, 0), + gsSPEndDisplayList(), +}; + +Gfx D_802500A0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x8024FEE0), + gsSPEndDisplayList(), +}; + +Gfx D_802500C8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x802500A0), + gsSPDisplayList(0x8024FEB0), + gsSPDisplayList(0x8024FB48), + gsSPDisplayList(0x8024F458), + gsSPEndDisplayList(), +}; + +Gfx D_80250108_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802043D0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250168_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80204110, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(0x80204310, 12, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(1, 6, 7, 0, 1, 7, 8, 0), + gsSP2Triangles(2, 9, 10, 0, 2, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250220_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80204070, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(1, 4, 3, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 7, 8, 0, 5, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250290_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80203FF0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_802502F8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80203F70, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250360_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80203410, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 5, 7, 10, 0), + gsSP2Triangles(5, 10, 11, 0, 5, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 17, 18, 0), + gsSP2Triangles(14, 18, 19, 0, 14, 20, 17, 0), + gsSP2Triangles(17, 21, 22, 0, 3, 23, 4, 0), + gsSP2Triangles(23, 24, 4, 0, 23, 25, 26, 0), + gsSP2Triangles(23, 26, 24, 0, 26, 27, 24, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(0x802035D0, 1, 0), + gsSPVertex(0x80203600, 12, 1), + gsSPVertex(0x802037F0, 17, 13), + gsSP2Triangles(0, 1, 2, 0, 3, 13, 14, 0), + gsSP2Triangles(4, 15, 3, 0, 4, 3, 14, 0), + gsSP2Triangles(4, 14, 16, 0, 5, 17, 18, 0), + gsSP2Triangles(6, 19, 20, 0, 7, 21, 22, 0), + gsSP2Triangles(8, 23, 24, 0, 9, 4, 16, 0), + gsSP2Triangles(10, 11, 25, 0, 11, 9, 16, 0), + gsSP2Triangles(11, 16, 25, 0, 12, 26, 27, 0), + gsSP2Triangles(12, 28, 26, 0, 12, 29, 28, 0), + gsSPVertex(0x802036C0, 10, 0), + gsSPVertex(0x80203900, 20, 10), + gsSP2Triangles(0, 10, 11, 0, 0, 12, 10, 0), + gsSP2Triangles(0, 13, 12, 0, 1, 14, 2, 0), + gsSP2Triangles(1, 2, 15, 0, 1, 15, 16, 0), + gsSP2Triangles(1, 17, 18, 0, 2, 19, 20, 0), + gsSP2Triangles(3, 21, 22, 0, 4, 23, 3, 0), + gsSP2Triangles(4, 3, 22, 0, 4, 22, 24, 0), + gsSP2Triangles(5, 4, 24, 0, 6, 7, 25, 0), + gsSP2Triangles(7, 26, 25, 0, 7, 27, 26, 0), + gsSP2Triangles(8, 9, 28, 0, 8, 28, 29, 0), + gsSPVertex(0x80203750, 10, 0), + gsSPVertex(0x80203A20, 1, 10), + gsSPVertex(0x80203A40, 21, 11), + gsSP2Triangles(0, 11, 12, 0, 0, 12, 10, 0), + gsSP2Triangles(1, 13, 14, 0, 1, 14, 15, 0), + gsSP2Triangles(2, 16, 17, 0, 2, 17, 18, 0), + gsSP2Triangles(3, 19, 20, 0, 3, 20, 21, 0), + gsSP2Triangles(4, 3, 21, 0, 4, 21, 22, 0), + gsSP2Triangles(5, 6, 23, 0, 6, 24, 7, 0), + gsSP2Triangles(6, 7, 25, 0, 6, 25, 23, 0), + gsSP2Triangles(7, 26, 25, 0, 8, 27, 28, 0), + gsSP2Triangles(8, 9, 29, 0, 8, 29, 30, 0), + gsSP1Triangle(8, 31, 9, 0), + gsSPVertex(0x802037E0, 1, 0), + gsSPVertex(0x80203B90, 2, 1), + gsSP1Triangle(0, 1, 2, 0), + gsSPVertex(0x80203BB0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 2, 0), + gsSP2Triangles(5, 6, 2, 0, 2, 7, 0, 0), + gsSP2Triangles(3, 2, 1, 0, 2, 6, 8, 0), + gsSP2Triangles(2, 8, 7, 0, 5, 2, 4, 0), + gsSP2Triangles(9, 3, 10, 0, 9, 4, 3, 0), + gsSP2Triangles(11, 9, 10, 0, 9, 11, 12, 0), + gsSP2Triangles(13, 14, 9, 0, 13, 9, 12, 0), + gsSP2Triangles(9, 5, 4, 0, 5, 9, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(15, 19, 16, 0, 20, 15, 17, 0), + gsSP2Triangles(15, 20, 21, 0, 18, 15, 22, 0), + gsSP2Triangles(23, 22, 15, 0, 23, 15, 21, 0), + gsSP2Triangles(16, 24, 25, 0, 16, 19, 24, 0), + gsSP2Triangles(18, 26, 24, 0, 18, 24, 19, 0), + gsSP2Triangles(24, 26, 27, 0, 24, 27, 28, 0), + gsSP2Triangles(24, 28, 29, 0, 29, 25, 24, 0), + gsSPVertex(0x80203D90, 30, 0), + gsSP2Triangles(0, 2, 14, 0, 1, 14, 2, 0), + gsSP2Triangles(1, 2, 15, 0, 2, 0, 16, 0), + gsSP2Triangles(2, 3, 15, 0, 3, 2, 17, 0), + gsSP2Triangles(2, 4, 17, 0, 2, 16, 4, 0), + gsSP2Triangles(0, 5, 16, 0, 4, 16, 5, 0), + gsSP2Triangles(4, 5, 18, 0, 0, 19, 5, 0), + gsSP2Triangles(5, 19, 20, 0, 6, 18, 5, 0), + gsSP2Triangles(5, 21, 6, 0, 5, 20, 21, 0), + gsSP2Triangles(7, 22, 8, 0, 8, 23, 24, 0), + gsSP2Triangles(8, 24, 9, 0, 9, 25, 8, 0), + gsSP2Triangles(10, 8, 25, 0, 10, 26, 8, 0), + gsSP2Triangles(7, 8, 26, 0, 8, 22, 23, 0), + gsSP2Triangles(11, 7, 26, 0, 12, 11, 27, 0), + gsSP2Triangles(11, 26, 10, 0, 11, 10, 28, 0), + gsSP2Triangles(13, 11, 28, 0, 11, 13, 27, 0), + gsSP2Triangles(7, 11, 29, 0, 12, 29, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250648_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x80250360), + gsSPDisplayList(0x802502F8), + gsSPDisplayList(0x80250290), + gsSPDisplayList(0x80250220), + gsSPDisplayList(0x80250168), + gsSPDisplayList(0x80250108), + gsSPEndDisplayList(), +}; + +Gfx D_80250698_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A5F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80203290, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250720_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80203190, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250798_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80203090, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 5, 6, 2, 0), + gsSP2Triangles(5, 2, 1, 0, 5, 1, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(8, 11, 12, 0, 12, 11, 13, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250820_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80202FD0, 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 4, 0), + gsSP2Triangles(9, 10, 8, 0, 9, 8, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250898_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80202F10, 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 6, 10, 0, 9, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250910_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80202160, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 4, 3, 0, 2, 5, 6, 0), + gsSP2Triangles(2, 6, 4, 0, 4, 7, 8, 0), + gsSP2Triangles(4, 8, 9, 0, 3, 4, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(11, 14, 12, 0, 11, 15, 16, 0), + gsSP2Triangles(11, 16, 14, 0, 12, 14, 17, 0), + gsSP2Triangles(18, 12, 17, 0, 18, 17, 19, 0), + gsSP2Triangles(14, 20, 21, 0, 14, 21, 17, 0), + gsSP2Triangles(3, 9, 22, 0, 3, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(25, 28, 26, 0, 29, 28, 25, 0), + gsSP2Triangles(30, 29, 25, 0, 30, 25, 31, 0), + gsSPVertex(0x80202300, 1, 0), + gsSPVertex(0x80202320, 2, 1), + gsSPVertex(0x80202360, 12, 3), + gsSPVertex(0x80202570, 17, 15), + gsSP2Triangles(1, 3, 15, 0, 1, 15, 0, 0), + gsSP2Triangles(2, 4, 16, 0, 2, 16, 1, 0), + gsSP2Triangles(5, 17, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(6, 18, 19, 0, 6, 19, 8, 0), + gsSP2Triangles(6, 8, 7, 0, 7, 8, 20, 0), + gsSP2Triangles(7, 20, 21, 0, 7, 21, 22, 0), + gsSP2Triangles(8, 23, 24, 0, 8, 24, 20, 0), + gsSP2Triangles(9, 14, 13, 0, 10, 9, 13, 0), + gsSP2Triangles(10, 13, 25, 0, 9, 26, 27, 0), + gsSP2Triangles(9, 27, 14, 0, 11, 28, 29, 0), + gsSP2Triangles(11, 29, 14, 0, 11, 14, 27, 0), + gsSP2Triangles(12, 14, 29, 0, 12, 29, 30, 0), + gsSP1Triangle(12, 30, 31, 0), + gsSPVertex(0x802023F0, 13, 0), + gsSPVertex(0x80202680, 19, 13), + gsSP2Triangles(1, 2, 13, 0, 2, 0, 14, 0), + gsSP2Triangles(2, 14, 13, 0, 3, 1, 13, 0), + gsSP2Triangles(3, 13, 15, 0, 4, 16, 17, 0), + gsSP2Triangles(4, 17, 18, 0, 4, 18, 5, 0), + gsSP2Triangles(5, 18, 19, 0, 5, 19, 20, 0), + gsSP2Triangles(5, 20, 21, 0, 6, 22, 7, 0), + gsSP2Triangles(6, 7, 8, 0, 7, 9, 8, 0), + gsSP2Triangles(7, 23, 24, 0, 7, 24, 9, 0), + gsSP2Triangles(8, 25, 26, 0, 8, 26, 27, 0), + gsSP2Triangles(8, 9, 25, 0, 9, 28, 29, 0), + gsSP2Triangles(9, 29, 25, 0, 10, 30, 12, 0), + gsSP1Triangle(10, 12, 31, 0), + gsSPVertex(0x80202490, 12, 0), + gsSPVertex(0x802027A0, 20, 12), + gsSP2Triangles(2, 3, 14, 0, 2, 14, 15, 0), + gsSP2Triangles(1, 0, 12, 0, 1, 12, 13, 0), + gsSP2Triangles(3, 16, 17, 0, 3, 17, 14, 0), + gsSP2Triangles(4, 16, 18, 0, 4, 18, 19, 0), + gsSP2Triangles(5, 20, 21, 0, 5, 21, 22, 0), + gsSP2Triangles(6, 5, 22, 0, 6, 22, 23, 0), + gsSP2Triangles(7, 9, 24, 0, 7, 24, 20, 0), + gsSP2Triangles(8, 25, 26, 0, 8, 26, 27, 0), + gsSP2Triangles(9, 28, 26, 0, 9, 26, 24, 0), + gsSP2Triangles(10, 29, 30, 0, 10, 30, 31, 0), + gsSP1Triangle(10, 31, 11, 0), + gsSPVertex(0x80202540, 3, 0), + gsSPVertex(0x802028D0, 10, 3), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 1, 7, 8, 0), + gsSP2Triangles(1, 8, 9, 0, 1, 9, 10, 0), + gsSP2Triangles(2, 9, 8, 0, 2, 8, 11, 0), + gsSP1Triangle(2, 11, 12, 0), + gsSPVertex(0x80202970, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(4, 1, 5, 0, 0, 6, 1, 0), + gsSP2Triangles(7, 1, 6, 0, 7, 5, 1, 0), + gsSP2Triangles(4, 8, 1, 0, 8, 3, 1, 0), + gsSP2Triangles(9, 10, 11, 0, 11, 12, 13, 0), + gsSP2Triangles(12, 11, 10, 0, 9, 11, 14, 0), + gsSP2Triangles(11, 15, 14, 0, 11, 16, 15, 0), + gsSP2Triangles(17, 11, 13, 0, 11, 17, 16, 0), + gsSP2Triangles(18, 4, 5, 0, 4, 18, 8, 0), + gsSP2Triangles(19, 18, 5, 0, 20, 8, 18, 0), + gsSP2Triangles(21, 22, 23, 0, 22, 21, 24, 0), + gsSP2Triangles(25, 21, 23, 0, 25, 26, 21, 0), + gsSP2Triangles(21, 9, 24, 0, 9, 21, 10, 0), + gsSP2Triangles(21, 12, 10, 0, 21, 26, 12, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 30, 28, 0), + gsSPVertex(0x80202A90, 3, 0), + gsSPVertex(0x80202B30, 20, 3), + gsSPVertex(0x80202DA0, 8, 23), + gsSP2Triangles(6, 9, 3, 0, 7, 6, 3, 0), + gsSP2Triangles(7, 3, 23, 0, 8, 23, 3, 0), + gsSP2Triangles(8, 3, 5, 0, 3, 9, 4, 0), + gsSP2Triangles(7, 14, 6, 0, 10, 6, 14, 0), + gsSP2Triangles(10, 14, 24, 0, 11, 24, 14, 0), + gsSP2Triangles(12, 11, 14, 0, 13, 12, 14, 0), + gsSP2Triangles(13, 14, 23, 0, 14, 7, 23, 0), + gsSP2Triangles(1, 15, 0, 0, 15, 16, 0, 0), + gsSP2Triangles(16, 17, 0, 0, 2, 0, 17, 0), + gsSP2Triangles(18, 20, 25, 0, 18, 26, 20, 0), + gsSP2Triangles(18, 19, 26, 0, 19, 18, 27, 0), + gsSP2Triangles(20, 28, 25, 0, 20, 29, 28, 0), + gsSP2Triangles(20, 21, 29, 0, 21, 20, 30, 0), + gsSP2Triangles(20, 22, 30, 0, 22, 20, 26, 0), + gsSP1Triangle(19, 22, 26, 0), + gsSPVertex(0x80202C30, 1, 0), + gsSPVertex(0x80202C60, 17, 1), + gsSPVertex(0x80202DE0, 1, 18), + gsSPVertex(0x80202E20, 13, 19), + gsSP2Triangles(2, 5, 20, 0, 2, 3, 5, 0), + gsSP2Triangles(3, 7, 5, 0, 4, 8, 5, 0), + gsSP2Triangles(5, 6, 20, 0, 6, 5, 8, 0), + gsSP2Triangles(4, 5, 21, 0, 7, 21, 5, 0), + gsSP2Triangles(6, 8, 11, 0, 8, 22, 11, 0), + gsSP2Triangles(9, 11, 23, 0, 9, 20, 11, 0), + gsSP2Triangles(6, 11, 20, 0, 10, 23, 11, 0), + gsSP2Triangles(11, 22, 24, 0, 10, 11, 24, 0), + gsSP2Triangles(0, 12, 25, 0, 12, 0, 18, 0), + gsSP2Triangles(13, 0, 25, 0, 13, 19, 0, 0), + gsSP2Triangles(0, 19, 1, 0, 14, 15, 26, 0), + gsSP2Triangles(15, 17, 27, 0, 15, 28, 17, 0), + gsSP2Triangles(15, 14, 28, 0, 14, 16, 28, 0), + gsSP2Triangles(16, 17, 28, 0, 17, 16, 29, 0), + gsSP2Triangles(17, 30, 27, 0, 17, 31, 30, 0), + gsSPVertex(0x80202D30, 1, 0), + gsSPVertex(0x80202D50, 5, 1), + gsSPVertex(0x80202E90, 1, 6), + gsSPVertex(0x80202EC0, 1, 7), + gsSPVertex(0x80202EE0, 3, 8), + gsSP2Triangles(0, 9, 1, 0, 3, 2, 7, 0), + gsSP2Triangles(4, 0, 10, 0, 4, 9, 0, 0), + gsSP2Triangles(0, 5, 10, 0, 5, 0, 6, 0), + gsSP1Triangle(2, 3, 8, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250D58_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x80250910), + gsSPDisplayList(0x80250898), + gsSPDisplayList(0x80250820), + gsSPDisplayList(0x80250798), + gsSPDisplayList(0x80250720), + gsSPDisplayList(0x80250698), + gsSPEndDisplayList(), +}; + +Gfx D_80250DA8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x802531A0, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x80250D58), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_80250DE0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A170), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80201F80, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 6, 0, 10, 6, 9, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(12, 15, 16, 0, 12, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(18, 21, 22, 0, 18, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250E88_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x80249CF0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(0x80201CC0, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(0x80201EC0, 12, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(1, 6, 7, 0, 1, 7, 8, 0), + gsSP2Triangles(2, 9, 10, 0, 2, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250F40_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80201BC0, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 2, 5, 6, 0), + gsSP2Triangles(2, 1, 5, 0, 1, 7, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 9, 8, 11, 0), + gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0), + gsSP2Triangles(9, 14, 10, 0, 15, 8, 10, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80250FC8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80201AB0, 17, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(6, 8, 9, 0, 6, 9, 7, 0), + gsSP2Triangles(8, 10, 11, 0, 8, 11, 9, 0), + gsSP2Triangles(12, 4, 11, 0, 12, 11, 13, 0), + gsSP2Triangles(14, 15, 10, 0, 14, 10, 16, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80251050_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80201A10, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSP2Triangles(8, 6, 3, 0, 8, 3, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_802510C8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802009F0, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), + gsSP2Triangles(3, 2, 4, 0, 0, 5, 6, 0), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 8, 0), + gsSP2Triangles(1, 0, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(11, 14, 12, 0, 11, 15, 16, 0), + gsSP2Triangles(11, 16, 17, 0, 11, 18, 15, 0), + gsSP2Triangles(14, 11, 17, 0, 14, 17, 19, 0), + gsSP2Triangles(14, 20, 21, 0, 14, 21, 12, 0), + gsSP2Triangles(1, 22, 23, 0, 1, 23, 2, 0), + gsSP2Triangles(24, 25, 26, 0, 27, 28, 26, 0), + gsSP2Triangles(29, 30, 27, 0, 29, 27, 26, 0), + gsSPVertex(0x80200BA0, 1, 0), + gsSPVertex(0x80200BE0, 11, 1), + gsSPVertex(0x80200EC0, 19, 12), + gsSP2Triangles(1, 12, 13, 0, 2, 14, 13, 0), + gsSP2Triangles(3, 4, 2, 0, 3, 2, 13, 0), + gsSP2Triangles(4, 3, 15, 0, 3, 16, 17, 0), + gsSP2Triangles(3, 17, 15, 0, 4, 15, 18, 0), + gsSP2Triangles(4, 18, 19, 0, 5, 20, 2, 0), + gsSP2Triangles(6, 7, 21, 0, 7, 22, 23, 0), + gsSP2Triangles(7, 23, 21, 0, 7, 6, 8, 0), + gsSP2Triangles(7, 8, 24, 0, 6, 21, 25, 0), + gsSP2Triangles(6, 25, 26, 0, 8, 27, 24, 0), + gsSP2Triangles(9, 28, 8, 0, 10, 29, 24, 0), + gsSP1Triangle(11, 30, 0, 0), + gsSPVertex(0x80200C90, 12, 0), + gsSPVertex(0x80200FF0, 18, 12), + gsSP2Triangles(0, 12, 13, 0, 0, 1, 12, 0), + gsSP2Triangles(1, 5, 14, 0, 1, 14, 15, 0), + gsSP2Triangles(1, 15, 12, 0, 2, 3, 16, 0), + gsSP2Triangles(3, 4, 16, 0, 4, 17, 16, 0), + gsSP2Triangles(5, 18, 19, 0, 5, 19, 14, 0), + gsSP2Triangles(6, 20, 21, 0, 7, 22, 23, 0), + gsSP2Triangles(8, 24, 25, 0, 9, 26, 25, 0), + gsSP2Triangles(10, 27, 9, 0, 10, 9, 25, 0), + gsSP2Triangles(11, 28, 9, 0, 5, 29, 18, 0), + gsSPVertex(0x80200D50, 10, 0), + gsSPVertex(0x80201110, 20, 10), + gsSP2Triangles(0, 1, 10, 0, 1, 2, 10, 0), + gsSP2Triangles(2, 11, 10, 0, 3, 5, 12, 0), + gsSP2Triangles(3, 12, 13, 0, 3, 13, 14, 0), + gsSP2Triangles(4, 3, 14, 0, 4, 14, 15, 0), + gsSP2Triangles(5, 16, 17, 0, 5, 17, 18, 0), + gsSP2Triangles(5, 18, 12, 0, 6, 19, 20, 0), + gsSP2Triangles(6, 20, 21, 0, 6, 22, 23, 0), + gsSP2Triangles(6, 23, 19, 0, 7, 24, 21, 0), + gsSP2Triangles(7, 21, 25, 0, 8, 7, 25, 0), + gsSP2Triangles(8, 25, 26, 0, 9, 27, 28, 0), + gsSP1Triangle(9, 28, 29, 0), + gsSPVertex(0x80200DF0, 12, 0), + gsSPVertex(0x80201250, 20, 12), + gsSP2Triangles(0, 12, 13, 0, 0, 13, 14, 0), + gsSP2Triangles(1, 2, 15, 0, 1, 15, 16, 0), + gsSP2Triangles(2, 3, 17, 0, 2, 17, 15, 0), + gsSP2Triangles(3, 18, 4, 0, 3, 4, 19, 0), + gsSP2Triangles(4, 20, 21, 0, 4, 21, 19, 0), + gsSP2Triangles(5, 22, 23, 0, 5, 23, 24, 0), + gsSP2Triangles(6, 7, 25, 0, 7, 26, 25, 0), + gsSP2Triangles(7, 6, 27, 0, 7, 27, 28, 0), + gsSP2Triangles(7, 28, 29, 0, 8, 6, 25, 0), + gsSP2Triangles(9, 11, 10, 0, 9, 10, 30, 0), + gsSP1Triangle(9, 30, 31, 0), + gsSPVertex(0x80200E90, 3, 0), + gsSPVertex(0x80201390, 6, 3), + gsSP2Triangles(0, 1, 3, 0, 1, 4, 3, 0), + gsSP2Triangles(0, 3, 5, 0, 2, 6, 7, 0), + gsSP1Triangle(2, 7, 8, 0), + gsSPVertex(0x802013F0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), + gsSP2Triangles(1, 3, 4, 0, 1, 4, 2, 0), + gsSP2Triangles(3, 5, 4, 0, 6, 2, 4, 0), + gsSP2Triangles(7, 8, 2, 0, 9, 2, 8, 0), + gsSP2Triangles(9, 0, 2, 0, 2, 6, 10, 0), + gsSP2Triangles(7, 2, 10, 0, 3, 11, 12, 0), + gsSP2Triangles(13, 5, 3, 0, 14, 13, 3, 0), + gsSP2Triangles(11, 3, 0, 0, 12, 14, 3, 0), + gsSP2Triangles(15, 16, 17, 0, 18, 15, 17, 0), + gsSP2Triangles(19, 17, 16, 0, 20, 17, 21, 0), + gsSP2Triangles(20, 18, 17, 0, 17, 22, 21, 0), + gsSP2Triangles(19, 23, 17, 0, 22, 17, 23, 0), + gsSP2Triangles(24, 21, 25, 0, 22, 25, 21, 0), + gsSP2Triangles(22, 23, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(29, 26, 28, 0), + gsSPVertex(0x80201560, 3, 0), + gsSPVertex(0x802015A0, 20, 3), + gsSPVertex(0x80201840, 1, 23), + gsSPVertex(0x802018D0, 6, 24), + gsSP2Triangles(4, 3, 6, 0, 7, 4, 6, 0), + gsSP2Triangles(8, 5, 4, 0, 4, 9, 8, 0), + gsSP2Triangles(9, 4, 23, 0, 4, 7, 23, 0), + gsSP2Triangles(10, 24, 25, 0, 11, 24, 10, 0), + gsSP2Triangles(12, 26, 10, 0, 12, 10, 25, 0), + gsSP2Triangles(13, 10, 26, 0, 13, 27, 10, 0), + gsSP2Triangles(14, 10, 27, 0, 14, 11, 10, 0), + gsSP2Triangles(14, 16, 11, 0, 15, 11, 16, 0), + gsSP2Triangles(16, 14, 27, 0, 17, 16, 27, 0), + gsSP2Triangles(15, 16, 28, 0, 18, 28, 16, 0), + gsSP2Triangles(17, 19, 16, 0, 19, 18, 16, 0), + gsSP2Triangles(0, 20, 2, 0, 1, 2, 21, 0), + gsSP2Triangles(22, 21, 2, 0, 2, 20, 29, 0), + gsSP1Triangle(22, 2, 29, 0), + gsSPVertex(0x802016E0, 22, 0), + gsSPVertex(0x80201930, 8, 22), + gsSP2Triangles(0, 22, 3, 0, 0, 3, 23, 0), + gsSP2Triangles(1, 3, 24, 0, 2, 5, 3, 0), + gsSP2Triangles(3, 1, 23, 0, 4, 3, 22, 0), + gsSP2Triangles(4, 2, 3, 0, 5, 24, 3, 0), + gsSP2Triangles(6, 11, 25, 0, 7, 6, 25, 0), + gsSP2Triangles(7, 26, 6, 0, 8, 6, 26, 0), + gsSP2Triangles(8, 9, 6, 0, 9, 10, 6, 0), + gsSP2Triangles(10, 27, 6, 0, 11, 6, 27, 0), + gsSP2Triangles(12, 14, 15, 0, 13, 12, 15, 0), + gsSP2Triangles(14, 28, 15, 0, 15, 10, 9, 0), + gsSP2Triangles(15, 16, 13, 0, 15, 28, 27, 0), + gsSP2Triangles(10, 15, 27, 0, 16, 15, 9, 0), + gsSP2Triangles(17, 18, 19, 0, 18, 29, 19, 0), + gsSP2Triangles(19, 29, 24, 0, 5, 19, 24, 0), + gsSP2Triangles(19, 5, 2, 0, 20, 19, 2, 0), + gsSP2Triangles(19, 20, 21, 0, 21, 17, 19, 0), + gsSPVertex(0x802015D0, 2, 0), + gsSPVertex(0x80201840, 9, 2), + gsSPVertex(0x802019B0, 6, 11), + gsSP2Triangles(1, 0, 6, 0, 2, 1, 6, 0), + gsSP2Triangles(3, 2, 6, 0, 4, 6, 0, 0), + gsSP2Triangles(3, 6, 11, 0, 5, 11, 6, 0), + gsSP2Triangles(5, 6, 12, 0, 6, 4, 12, 0), + gsSP2Triangles(7, 8, 13, 0, 8, 14, 13, 0), + gsSP2Triangles(9, 10, 15, 0, 10, 16, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80251528_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x802510C8), + gsSPDisplayList(0x80251050), + gsSPDisplayList(0x80250FC8), + gsSPDisplayList(0x80250F40), + gsSPDisplayList(0x80250E88), + gsSPDisplayList(0x80250DE0), + gsSPEndDisplayList(), +}; + +Gfx D_80251578_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPMatrix(0x80253160, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(0x80251528), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_802515B0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(0x8024A170), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802008D0, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(6, 10, 11, 0, 6, 11, 7, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80251638_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80248FF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80200830, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 6, 7, 0), + gsSP2Triangles(6, 8, 7, 0, 9, 5, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_802516A8_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x8024B6F0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x802007C0, 7, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 3, 0, 4, 3, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80251710_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80249870), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80200660, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(13, 16, 17, 0, 13, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 16, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80251798_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(0x80247F70), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(0x80200000, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(0, 2, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(8, 10, 11, 0, 8, 11, 12, 0), + gsSP2Triangles(8, 12, 9, 0, 7, 9, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 28, 0), + gsSPVertex(0x802001C0, 2, 0), + gsSPVertex(0x802001F0, 11, 2), + gsSPVertex(0x802002B0, 1, 13), + gsSPVertex(0x80200300, 18, 14), + gsSP2Triangles(2, 3, 1, 0, 2, 1, 0, 0), + gsSP2Triangles(4, 14, 1, 0, 5, 6, 15, 0), + gsSP2Triangles(6, 16, 15, 0, 5, 15, 17, 0), + gsSP2Triangles(7, 18, 19, 0, 7, 19, 20, 0), + gsSP2Triangles(8, 9, 21, 0, 8, 21, 22, 0), + gsSP2Triangles(9, 23, 24, 0, 9, 24, 25, 0), + gsSP2Triangles(10, 26, 27, 0, 10, 27, 28, 0), + gsSP2Triangles(11, 29, 30, 0, 11, 30, 27, 0), + gsSP1Triangle(12, 31, 13, 0), + gsSPVertex(0x802002A0, 6, 0), + gsSPVertex(0x80200420, 6, 6), + gsSP2Triangles(0, 6, 1, 0, 0, 1, 7, 0), + gsSP2Triangles(1, 8, 7, 0, 2, 9, 7, 0), + gsSP2Triangles(3, 4, 10, 0, 4, 5, 10, 0), + gsSP1Triangle(5, 11, 10, 0), + gsSPVertex(0x80200480, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0), + gsSP2Triangles(4, 5, 1, 0, 1, 5, 2, 0), + gsSP2Triangles(5, 6, 2, 0, 5, 4, 6, 0), + gsSP2Triangles(0, 2, 7, 0, 8, 7, 2, 0), + gsSP2Triangles(8, 2, 9, 0, 2, 10, 9, 0), + gsSP2Triangles(10, 2, 6, 0, 4, 3, 11, 0), + gsSP2Triangles(11, 12, 4, 0, 12, 13, 4, 0), + gsSP2Triangles(4, 14, 6, 0, 13, 14, 4, 0), + gsSP2Triangles(15, 16, 17, 0, 16, 18, 17, 0), + gsSP2Triangles(17, 18, 19, 0, 20, 17, 19, 0), + gsSP2Triangles(21, 15, 17, 0, 17, 22, 21, 0), + gsSP2Triangles(22, 17, 23, 0, 17, 20, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 27, 25, 0), + gsSP2Triangles(20, 19, 25, 0, 28, 25, 19, 0), + gsSP2Triangles(25, 28, 26, 0, 29, 25, 27, 0), + gsSP2Triangles(29, 23, 25, 0, 23, 20, 25, 0), + gsSPEndDisplayList(), +}; + +Gfx D_80251958_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x80251798), + gsSPDisplayList(0x80251710), + gsSPDisplayList(0x802516A8), + gsSPDisplayList(0x80251638), + gsSPDisplayList(0x802515B0), + gsSPEndDisplayList(), +}; + +Gfx D_802519A0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x80251958), + gsSPDisplayList(0x80251578), + gsSPDisplayList(0x80250DA8), + gsSPDisplayList(0x80250648), + gsSPDisplayList(0x802500C8), + gsSPDisplayList(0x8024EEC8), + gsSPEndDisplayList(), +}; + +Gfx D_802519F0_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x802519A0), + gsSPDisplayList(0x8024EC68), + gsSPDisplayList(0x8024BD80), + gsSPEndDisplayList(), +}; + +Gfx D_80251A28_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x802519F0), + gsSPEndDisplayList(), +}; + +Gfx D_80251A50_1[] = { + gsSPSetLights1((*(Lights1*)0x80253140)), + gsSPDisplayList(0x80251A28), + gsSPEndDisplayList(), +}; + +static N(pad_111111)[] = { 0, 0 }; + +s32 N(D_80251A80_C0F300)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x43610000, 0x437F0000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251AAC_C0F32C)[] = { + 0x8024C098, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251AD8_C0F358)[] = { + 0x8024C030, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251AAC, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251B04_C0F384)[] = { + 0x8024BFC8, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251AD8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251B30_C0F3B0)[] = { + 0x8024C2E0, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251B04, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251B5C_C0F3DC)[] = { + 0x8024C1F0, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251B30, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251B88_C0F408)[] = { + 0x8024C100, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251B5C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251BB4_C0F434)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251B88, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251BE0_C0F460)[] = { + 0x8024C560, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251C0C_C0F48C)[] = { + 0x8024C4C0, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251BE0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251C38_C0F4B8)[] = { + 0x8024C420, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80251C0C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251C64_C0F4E4)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251BB4, 0x80251C38, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251C90_C0F510)[] = { + 0x8024B770, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251CBC_C0F53C)[] = { + 0x8024B8F8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251C90, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251CE8_C0F568)[] = { + 0x8024BAA0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251CBC, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251D14_C0F594)[] = { + 0x802515B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251CE8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251D40_C0F5C0)[] = { + 0x80250168, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251D14, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251D6C_C0F5EC)[] = { + 0x80250108, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251D40, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251D98_C0F618)[] = { + 0x80251798, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251D6C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251DC4_C0F644)[] = { + 0x80250360, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251D98, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251DF0_C0F670)[] = { + 0x80251710, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251DC4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251E1C_C0F69C)[] = { + 0x802502F8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251DF0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251E48_C0F6C8)[] = { + 0x802516A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251E1C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251E74_C0F6F4)[] = { + 0x80250290, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251E48, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251EA0_C0F720)[] = { + 0x80251638, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251E74, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251ECC_C0F74C)[] = { + 0x80250220, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251EA0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251EF8_C0F778)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251C64, 0x80251ECC, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251F24_C0F7A4)[] = { + 0x8024FAB0, 0x00001FFF, 0x80010000, 0xC39D8000, 0x40000000, 0xC30B0000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251F50_C0F7D0)[] = { + 0x8024FA18, 0x80012AAA, 0x80010000, 0xC3E38000, 0x43D28000, 0xC1A00000, 0x80251F24, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251F7C_C0F7FC)[] = { + 0x8024F980, 0x8001E001, 0x00000000, 0xC3C08000, 0x40000000, 0x43290000, 0x80251F50, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251FA8_C0F828)[] = { + 0x8024F8E8, 0x00002AAA, 0x80010000, 0xC2D20000, 0x40000000, 0xC3520000, 0x80251F7C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80251FD4_C0F854)[] = { + 0x8024F850, 0x0000EAAB, 0x80010000, 0xC0A00000, 0x40000000, 0xC3340000, 0x80251FA8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252000_C0F880)[] = { + 0x8024F7B8, 0x80010AAA, 0x00000000, 0xC3430000, 0x40000000, 0x43818000, 0x80251FD4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025202C_C0F8AC)[] = { + 0x8024F720, 0x8001D556, 0x80010000, 0xC2820000, 0x40000000, 0x433D0000, 0x80252000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252058_C0F8D8)[] = { + 0x8024F688, 0x80010000, 0x00000000, 0x43898000, 0x40000000, 0xC3010000, 0x8025202C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252084_C0F904)[] = { + 0x8024F5F0, 0x0000F556, 0x80010000, 0x43430000, 0x43D28000, 0xC2200000, 0x80252058, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802520B0_C0F930)[] = { + 0x8024F558, 0x80011555, 0x80010000, 0x42AA0000, 0x40000000, 0x43A48000, 0x80252084, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802520DC_C0F95C)[] = { + 0x8024F4C0, 0x80011555, 0x00000000, 0x43570000, 0x43D28000, 0x41E80000, 0x802520B0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252108_C0F988)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251EF8, 0x802520DC, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252134_C0F9B4)[] = { + 0x8024F328, 0x80010000, 0x00000000, 0x41000000, 0xC1B80000, 0xC2440000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252160_C0F9E0)[] = { + 0x8024F160, 0x0000F8E4, 0x80010000, 0x42920000, 0xC1B80000, 0x41A00000, 0x80252134, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025218C_C0FA0C)[] = { + 0x8024F1F8, 0x80010000, 0x00000000, 0xBF800000, 0xC1B80000, 0x42440000, 0x80252160, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802521B8_C0FA38)[] = { + 0x8024F290, 0x80010000, 0x80010000, 0x41900000, 0xC1B80000, 0x00000000, 0x8025218C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802521E4_C0FA64)[] = { + 0x00000000, 0x00001FFF, 0x00000000, 0x42740000, 0x423C0000, 0xC1F80000, 0x00000000, 0x802521B8, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252210_C0FA90)[] = { + 0x8024F3C0, 0x80010AAA, 0x00000000, 0xC3CF8000, 0x41A80000, 0x41A00000, 0x802521E4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025223C_C0FABC)[] = { + 0x8024F0C8, 0x8001F8E4, 0x80010000, 0x43430000, 0x43530000, 0xC21C0000, 0x80252210, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252268_C0FAE8)[] = { + 0x8024F030, 0x8001F1C8, 0x80010000, 0x42BE0000, 0x43520000, 0xC1F00000, 0x8025223C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252294_C0FB14)[] = { + 0x8024EF98, 0x80011555, 0x80010000, 0x42E60000, 0x43530000, 0x421C0000, 0x80252268, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802522C0_C0FB40)[] = { + 0x8024EF00, 0x80010AAA, 0x80010000, 0x43570000, 0x43530000, 0x421C0000, 0x80252294, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802522EC_C0FB6C)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252108, 0x802522C0, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252318_C0FB98)[] = { + 0x8024BEF8, 0x00000AAA, 0x00000000, 0xC3BB8000, 0x40000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252344_C0FBC4)[] = { + 0x8024BE60, 0x0000EAAB, 0x80010000, 0xC32F0000, 0x40000000, 0xC2440000, 0x80252318, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252370_C0FBF0)[] = { + 0x8024BDC8, 0x80010000, 0x80010000, 0x42960000, 0x40000000, 0xC2440000, 0x80252344, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025239C_C0FC1C)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802522EC, 0x80252370, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802523C8_C0FC48)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80251A80, 0x8025239C, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802523F4_C0FC74)[] = { + 0x8024DEF8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252420_C0FCA0)[] = { + 0x8024E120, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802523F4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025244C_C0FCCC)[] = { + 0x8024E0A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252420, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252478_C0FCF8)[] = { + 0x8024E020, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8025244C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802524A4_C0FD24)[] = { + 0x8024DFA0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252478, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802524D0_C0FD50)[] = { + 0x8024E1A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802524A4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802524FC_C0FD7C)[] = { + 0x8024DD60, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802524D0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252528_C0FDA8)[] = { + 0x8024DC50, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802524FC, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252554_C0FDD4)[] = { + 0x00000000, 0x00000000, 0xEA9F0000, 0xC3B40000, 0x42AA0000, 0xBF800000, 0x00000000, 0x80252528, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252580_C0FE00)[] = { + 0x8024ECB0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802525AC_C0FE2C)[] = { + 0x8024EE18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252580, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802525D8_C0FE58)[] = { + 0x00000000, 0xEAAB2E87, 0xF02E0000, 0x420C0000, 0x439E0000, 0x42100000, 0x80252554, 0x802525AC, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252604_C0FE84)[] = { + 0x80250720, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252630_C0FEB0)[] = { + 0x80250910, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252604, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025265C_C0FEDC)[] = { + 0x80250698, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252630, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252688_C0FF08)[] = { + 0x80250798, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8025265C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802526B4_C0FF34)[] = { + 0x80250820, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252688, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802526E0_C0FF60)[] = { + 0x80250898, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802526B4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025270C_C0FF8C)[] = { + 0x00000000, 0xFC72FE27, 0x00000000, 0x43050000, 0x43878000, 0x41F00000, 0x802525D8, 0x802526E0, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252738_C0FFB8)[] = { + 0x8024C918, 0x00000000, 0x00000000, 0x437C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252764_C0FFE4)[] = { + 0x8024C998, 0x00000000, 0x00000000, 0x437C0000, 0x00000000, 0x00000000, 0x80252738, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252790_C10010)[] = { + 0x8024C808, 0x00000000, 0x00000000, 0x437C0000, 0x00000000, 0x00000000, 0x80252764, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802527BC_C1003C)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252790, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802527E8_C10068)[] = { + 0x00000000, 0x00000000, 0xF60C0000, 0xC37C0000, 0x00000000, 0x00000000, 0x00000000, 0x802527BC, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252814_C10094)[] = { + 0x00000000, 0x00000000, 0x09F40000, 0x437D0000, 0x438E8000, 0x42AC0000, 0x00000000, 0x802527E8, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252840_C100C0)[] = { + 0x8024CAF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252814, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025286C_C100EC)[] = { + 0x8024CC28, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80252840, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252898_C10118)[] = { + 0x8024CB68, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8025286C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802528C4_C10144)[] = { + 0x8024CD98, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252898, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802528F0_C10170)[] = { + 0x8024CD10, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802528C4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_8025291C_C1019C)[] = { + 0x8024CCA0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802528F0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252948_C101C8)[] = { + 0x8024CE08, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8025291C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252974_C101F4)[] = { + 0x8024C670, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252948, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802529A0_C10220)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8025270C, 0x80252974, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802529CC_C1024C)[] = { + 0x8024D2B8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802529F8_C10278)[] = { + 0x8024D448, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802529CC, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252A24_C102A4)[] = { + 0x8024D3C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802529F8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252A50_C102D0)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x42D20000, 0xC1000000, 0x42AE0000, 0x00000000, 0x80252A24, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252A7C_C102FC)[] = { + 0x8024D580, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252A50, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252AA8_C10328)[] = { + 0x8024D680, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252A7C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252AD4_C10354)[] = { + 0x8024D828, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252AA8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252B00_C10380)[] = { + 0x8024D788, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252AD4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252B2C_C103AC)[] = { + 0x8024D700, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252B00, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252B58_C103D8)[] = { + 0x8024D8D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252B2C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252B84_C10404)[] = { + 0x8024D060, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252B58, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252BB0_C10430)[] = { + 0x00000000, 0x00001FFF, 0x00000000, 0x42740000, 0x423C0000, 0xC1F80000, 0x802529A0, 0x80252B84, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252BDC_C1045C)[] = { + 0x8024E6D8, 0x038E0000, 0x18E30000, 0xC3E88000, 0x43520000, 0xC2B40000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252C08_C10488)[] = { + 0x8024E5B0, 0x000018E3, 0x15550000, 0xC3E88000, 0x43520000, 0x42B40000, 0x80252BDC, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252C34_C104B4)[] = { + 0x8024E800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252C08, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252C60_C104E0)[] = { + 0x8024EA60, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252C34, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252C8C_C1050C)[] = { + 0x8024E9D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252C60, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252CB8_C10538)[] = { + 0x8024E968, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252C8C, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252CE4_C10564)[] = { + 0x8024E8C0, 0x00000000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x80252CB8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252D10_C10590)[] = { + 0x8024EAD0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252CE4, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252D3C_C105BC)[] = { + 0x8024E4D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252D10, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252D68_C105E8)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC33C0000, 0x00000000, 0x80252BB0, 0x80252D3C, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252D94_C10614)[] = { + 0x802510C8, 0x00000000, 0x00000000, 0xC3330000, 0x42080000, 0x42C40000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252DC0_C10640)[] = { + 0x80250E88, 0x00000000, 0x00000000, 0xC3330000, 0x42080000, 0x42C40000, 0x80252D94, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252DEC_C1066C)[] = { + 0x80251050, 0x00000000, 0x00000000, 0xC3330000, 0x42080000, 0x42C40000, 0x80252DC0, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252E18_C10698)[] = { + 0x80250FC8, 0x00000000, 0x00000000, 0xC3330000, 0x42080000, 0x42C40000, 0x80252DEC, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252E44_C106C4)[] = { + 0x80250F40, 0x00000000, 0x00000000, 0xC3330000, 0x42080000, 0x42C40000, 0x80252E18, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252E70_C106F0)[] = { + 0x80250DE0, 0x00000000, 0x00000000, 0xC3330000, 0x42080000, 0x42C40000, 0x80252E44, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252E9C_C1071C)[] = { + 0x00000000, 0xFB06C60C, 0x00000000, 0x43330000, 0xC2080000, 0xC2C40000, 0x00000000, 0x80252E70, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252EC8_C10748)[] = { + 0x00000000, 0x0000FA06, 0xC4640000, 0xC3750000, 0x43440000, 0x41A80000, 0x80252D68, 0x80252E9C, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252EF4_C10774)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802523C8, 0x80252EC8, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252F20_C107A0)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80252EF4, + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80252F4C_C107CC)[] = { + 0x80252F20, 0x80252EF4, 0x80252EC8, 0x80252E9C, 0x80252E70, 0x80252E44, 0x80252E18, 0x80252DEC, + 0x80252DC0, 0x80252D94, 0x80252D68, 0x80252D3C, 0x80252D10, 0x80252CE4, 0x80252CB8, 0x80252C8C, + 0x80252C60, 0x80252C34, 0x80252C08, 0x80252BDC, 0x80252BB0, 0x80252B84, 0x80252B58, 0x80252B2C, + 0x80252B00, 0x80252AD4, 0x80252AA8, 0x80252A7C, 0x80252A50, 0x80252A24, 0x802529F8, 0x802529CC, + 0x802529A0, 0x80252974, 0x80252948, 0x8025291C, 0x802528F0, 0x802528C4, 0x80252898, 0x8025286C, + 0x80252840, 0x80252814, 0x802527E8, 0x802527BC, 0x80252790, 0x80252764, 0x80252738, 0x8025270C, + 0x802526E0, 0x802526B4, 0x80252688, 0x8025265C, 0x80252630, 0x80252604, 0x802525D8, 0x802525AC, + 0x80252580, 0x80252554, 0x80252528, 0x802524FC, 0x802524D0, 0x802524A4, 0x80252478, 0x8025244C, + 0x80252420, 0x802523F4, 0x802523C8, 0x8025239C, 0x80252370, 0x80252344, 0x80252318, 0x802522EC, + 0x802522C0, 0x80252294, 0x80252268, 0x8025223C, 0x80252210, 0x802521E4, 0x802521B8, 0x8025218C, + 0x80252160, 0x80252134, 0x80252108, 0x802520DC, 0x802520B0, 0x80252084, 0x80252058, 0x8025202C, + 0x80252000, 0x80251FD4, 0x80251FA8, 0x80251F7C, 0x80251F50, 0x80251F24, 0x80251EF8, 0x80251ECC, + 0x80251EA0, 0x80251E74, 0x80251E48, 0x80251E1C, 0x80251DF0, 0x80251DC4, 0x80251D98, 0x80251D6C, + 0x80251D40, 0x80251D14, 0x80251CE8, 0x80251CBC, 0x80251C90, 0x80251C64, 0x80251C38, 0x80251C0C, + 0x80251BE0, 0x80251BB4, 0x80251B88, 0x80251B5C, 0x80251B30, 0x80251B04, 0x80251AD8, 0x80251AAC, + 0x80251A80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253140_C109C0)[] = { + 0x00000000, 0x00000000, +}; + +s32 N(D_80253148_C109C8)[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253160_C109E0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFF2501B2, 0xFFFF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0E1B66C8, 0xD7770000, +}; + +s32 N(D_802531A0_C10A20)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x002A01BE, 0xFFFF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xB9507E18, 0xD03D0000, +}; + +s32 N(D_802531E0_C10A60)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE8901A4, 0xFFCF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x459C0000, +}; + +s32 N(D_80253220_C10AA0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE5701A4, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253260_C10AE0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE5701A4, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802532A0_C10B20)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE8901A4, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802532E0_C10B60)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFB501A4, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253320_C10BA0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFB501A4, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_80253360_C10BE0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFE701A4, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802533A0_C10C20)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00AF01A4, 0xFFCF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x459C0000, +}; + +s32 N(D_802533E0_C10C60)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x007D01A4, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253420_C10CA0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x007D01A4, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_80253460_C10CE0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00AF01A4, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802534A0_C10D20)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE890190, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802534E0_C10D60)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFB50190, 0xFFCF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x459C0000, +}; + +s32 N(D_80253520_C10DA0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFB50190, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253560_C10DE0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFB50190, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802535A0_C10E20)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFE70190, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802535E0_C10E60)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00AF0190, 0xFFCF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x459C0000, +}; + +s32 N(D_80253620_C10EA0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x007D0190, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253660_C10EE0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x007D0190, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802536A0_C10F20)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00AF0190, 0x00310001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBA640000, +}; + +s32 N(D_802536E0_C10F60)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x001A01E2, 0xFFAA0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6DB70924, 0x0B370000, +}; + +s32 N(D_80253720_C10FA0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253760_C10FE0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE0C00D2, 0xFFA60001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802537A0_C11020)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE0C00D2, 0x005A0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_802537E0_C11060)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFEDA00E4, 0xFFFF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x5C2E4692, 0x55EA0000, +}; + +s32 N(D_80253820_C110A0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFFA300EB, 0xFFFF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x45BCAE56, 0xEA0F0000, +}; + +s32 N(D_80253860_C110E0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x005F0031, 0x00570001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x210551AA, 0x0ABA0000, +}; + +s32 N(D_802538A0_C11120)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00FD011D, 0x00560001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xA4B00000, 0xF4C90000, +}; + +s32 N(D_802538E0_C11160)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFE5700BE, 0x00000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(D_80253920_C111A0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0xFF5100BE, 0xFFCF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x459C0000, +}; + +s32 N(D_80253960_C111E0)[] = { + 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x004B00BE, 0xFFCF0001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x459C0000, +}; + +s32 N(D_802539A0_C11220)[] = { + 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, + 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, + 0x00030000, 0x00000000, 0x00080003, 0xFF2501B2, 0xFFFF0011, 0x000300B6, 0x00B600B6, 0x00050004, + 0x00000000, 0x00000008, 0x000400B3, 0xFFDEFF9E, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, + 0x00000000, 0x00080005, 0xFF4D0022, 0x00620011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, + 0x00000008, 0x0006FF4D, 0x00220062, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, + 0x00080007, 0xFF4D0022, 0x00620011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, + 0x0008FF4D, 0x00220062, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, + 0xFF4D0022, 0x00620011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000AFF4D, + 0x00220062, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, + 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, + 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, + 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, + 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, + 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, + 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, + 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0xFE0C0000, 0x00110012, 0x00B600B6, 0x00B60005, + 0x00130000, 0x00000000, 0x00080013, 0xFE0C00D2, 0x005A0011, 0x001300B6, 0x00B600B6, 0x00050014, + 0x00000000, 0x00000008, 0x0014FE0C, 0x00D2FFA6, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, + 0x00000000, 0x00080015, 0xFFA300EB, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, + 0x00000008, 0x00160000, 0xFE0C0000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, + 0x00080017, 0x00000000, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, + 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, + 0x00000000, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, + 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x00000000, + 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, + 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x005F0031, 0x00570011, + 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, + 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, + 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, + 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, + 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0xFE0C0000, 0x00110022, 0x00B600B6, 0x00B60005, + 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x00050024, + 0x00000000, 0x00000008, 0x00240000, 0x00000000, 0x00110024, 0x00B600B6, 0x00B60005, 0x00250000, + 0x00000000, 0x00080025, 0x00000000, 0x00000011, 0x002500B6, 0x00B600B6, 0x00050026, 0x00000000, + 0x00000008, 0x00260000, 0x00000000, 0x00110026, 0x00B600B6, 0x00B60005, 0x00270000, 0x00000000, + 0x00080027, 0x00000000, 0x00000011, 0x002700B6, 0x00B600B6, 0x00050028, 0x00000000, 0x00000008, + 0x00280000, 0x00000000, 0x00110028, 0x00B600B6, 0x00B60005, 0x00290000, 0x00000000, 0x00080029, + 0x0000FE0C, 0x00000011, 0x002900B6, 0x00B600B6, 0x0005002A, 0x00000000, 0x00000008, 0x002A00FD, + 0x011D0056, 0x0011002A, 0x00B600B6, 0x00B60005, 0x002B0000, 0x00000000, 0x0008002B, 0xFF040000, + 0x00000011, 0x002B00B6, 0x00B600B6, 0x0005002C, 0x00000000, 0x00000008, 0x002C0000, 0x00000000, + 0x0011002C, 0x00B600B6, 0x00B60005, 0x002D0000, 0x00000000, 0x0008002D, 0x00FC0000, 0x00000011, + 0x002D00B6, 0x00B600B6, 0x0005002E, 0x00000000, 0x00000008, 0x002E00FC, 0x00000000, 0x0011002E, + 0x00B600B6, 0x00B60005, 0x002F0000, 0x00000000, 0x0008002F, 0x00FC0000, 0x00000011, 0x002F00B6, + 0x00B600B6, 0x00050030, 0x00000000, 0x00000008, 0x0030002A, 0x01BE0000, 0x00110030, 0x00B600B6, + 0x00B60005, 0x00310000, 0x00000000, 0x00080031, 0x00000000, 0x00000011, 0x003100B6, 0x00B600B6, + 0x00050032, 0x00000000, 0x00000008, 0x00320000, 0x00000000, 0x00110032, 0x00B600B6, 0x00B60005, + 0x00330000, 0x00000000, 0x00080033, 0x00000000, 0x00000011, 0x003300B6, 0x00B600B6, 0x00050034, + 0x00000000, 0x00000008, 0x00340000, 0x00000000, 0x00110034, 0x00B600B6, 0x00B60005, 0x00350000, + 0x00000000, 0x00080035, 0x00000000, 0x00000011, 0x003500B6, 0x00B600B6, 0x00050036, 0x00000000, + 0x00000008, 0x00360000, 0x00000000, 0x00110036, 0x00B600B6, 0x00B60005, 0x00370000, 0x00000000, + 0x00080037, 0x001A01E2, 0xFFAA0011, 0x003700B6, 0x00B600B6, 0x00050038, 0x00000000, 0x00000008, + 0x00380000, 0x00000000, 0x00110038, 0x00B600B6, 0x00B60005, 0x00390000, 0x00000000, 0x00080039, + 0x00000000, 0x00000011, 0x003900B6, 0x00B600B6, 0x0005003A, 0x00000000, 0x00000008, 0x003AFEDA, + 0x00E4FFFF, 0x0011003A, 0x00B600B6, 0x00B60005, 0x003B0000, 0x00000000, 0x0008003B, 0x00000000, + 0x00000011, 0x003B00B6, 0x00B600B6, 0x0005003C, 0x00000000, 0x00000008, 0x003C0000, 0xFE0C0000, + 0x0011003C, 0x00B600B6, 0x00B60005, 0x003D0000, 0x00000000, 0x0008003D, 0x00000000, 0x00000011, + 0x003D00B6, 0x00B600B6, 0x0005003E, 0x00000000, 0x00000008, 0x003E0000, 0x00000000, 0x0011003E, + 0x00B600B6, 0x00B60005, 0x003F0000, 0x00000000, 0x0008003F, 0x00000000, 0x00000011, 0x003F00B6, + 0x00B600B6, 0x00050040, 0x00000000, 0x00000008, 0x00400000, 0x00000000, 0x00110040, 0x00B600B6, + 0x00B60005, 0x00410000, 0x00000000, 0x00080041, 0x00000000, 0x00000011, 0x004100B6, 0x00B600B6, + 0x00050042, 0x00000000, 0x00000008, 0x00420000, 0xFE0C0000, 0x00110042, 0x00B600B6, 0x00B60005, + 0x00430000, 0x00000000, 0x00080043, 0x00000000, 0x00000011, 0x004300B6, 0x00B600B6, 0x00050044, + 0x00000000, 0x00000008, 0x00440000, 0x00000000, 0x00110044, 0x00B600B6, 0x00B60005, 0x00450000, + 0x00000000, 0x00080045, 0x004B00BE, 0xFFCF0011, 0x004500B6, 0x00B600B6, 0x00050046, 0x00000000, + 0x00000008, 0x0046FF51, 0x00BEFFCF, 0x00110046, 0x00B600B6, 0x00B60005, 0x00470000, 0x00000000, + 0x00080047, 0xFE8900BE, 0x00000011, 0x004700B6, 0x00B600B6, 0x00050048, 0x00000000, 0x00000008, + 0x00480000, 0x00000000, 0x00110048, 0x00B600B6, 0x00B60005, 0x00490000, 0x00000000, 0x00080049, + 0x00AF0190, 0x00310011, 0x004900B6, 0x00B600B6, 0x0005004A, 0x00000000, 0x00000008, 0x004A007D, + 0x01900031, 0x0011004A, 0x00B600B6, 0x00B60005, 0x004B0000, 0x00000000, 0x0008004B, 0x007D0190, + 0x00000011, 0x004B00B6, 0x00B600B6, 0x0005004C, 0x00000000, 0x00000008, 0x004C00AF, 0x0190FFCF, + 0x0011004C, 0x00B600B6, 0x00B60005, 0x004D0000, 0x00000000, 0x0008004D, 0xFE890190, 0x00000011, + 0x004D00B6, 0x00B600B6, 0x0005004E, 0x00000000, 0x00000008, 0x004EFFA3, 0x00EB0000, 0x0011004E, + 0x00B600B6, 0x00B60005, 0x004F0000, 0x00000000, 0x0008004F, 0x001200A4, 0x00000011, 0x004F00B6, + 0x00B600B6, 0x00050050, 0x00000000, 0x00000008, 0x00500012, 0x00A40031, 0x00110050, 0x00B600B6, + 0x00B60005, 0x00510000, 0x00000000, 0x00080051, 0x004400A4, 0x00310011, 0x005100B6, 0x00B600B6, + 0x00050052, 0x00000000, 0x00000008, 0x00520012, 0x00A4FFCF, 0x00110052, 0x00B600B6, 0x00B60005, + 0x00530000, 0x00000000, 0x00080053, 0x00000000, 0x00000011, 0x005300B6, 0x00B600B6, 0x00050054, + 0x00000000, 0x00000008, 0x005400AF, 0x01A40031, 0x00110054, 0x00B600B6, 0x00B60005, 0x00550000, + 0x00000000, 0x00080055, 0x007D01A4, 0x00310011, 0x005500B6, 0x00B600B6, 0x00050056, 0x00000000, + 0x00000008, 0x0056007D, 0x01A40000, 0x00110056, 0x00B600B6, 0x00B60005, 0x00570000, 0x00000000, + 0x00080057, 0x007D01A4, 0xFFCF0011, 0x005700B6, 0x00B600B6, 0x00050058, 0x00000000, 0x00000008, + 0x0058FFE7, 0x01A40031, 0x00110058, 0x00B600B6, 0x00B60005, 0x00590000, 0x00000000, 0x00080059, + 0xFFB501A4, 0x00310011, 0x005900B6, 0x00B600B6, 0x0005005A, 0x00000000, 0x00000008, 0x005AFFB5, + 0x01A40000, 0x0011005A, 0x00B600B6, 0x00B60005, 0x005B0000, 0x00000000, 0x0008005B, 0xFE8901A4, + 0x00310011, 0x005B00B6, 0x00B600B6, 0x0005005C, 0x00000000, 0x00000008, 0x005CFE57, 0x01A40031, + 0x0011005C, 0x00B600B6, 0x00B60005, 0x005D0000, 0x00000000, 0x0008005D, 0xFE5701A4, 0x00000011, + 0x005D00B6, 0x00B600B6, 0x0005005E, 0x00000000, 0x00000008, 0x005EFE89, 0x01A4FFCF, 0x0011005E, + 0x00B600B6, 0x00B60005, 0x005F0000, 0x00000000, 0x0008005F, 0x00000000, 0x00000011, 0x005F00B6, + 0x00B600B6, 0x00050060, 0x00000000, 0x00000008, 0x00600000, 0x00000000, 0x00110060, 0x00B600B6, + 0x00B60005, 0x00610000, 0x00000000, 0x00080061, 0x00000000, 0x00000011, 0x006100B6, 0x00B600B6, + 0x00050062, 0x00000000, 0x00000008, 0x00620000, 0x00000000, 0x00110062, 0x00B600B6, 0x00B60005, + 0x00630000, 0x00000000, 0x00080063, 0x00000000, 0x00000011, 0x006300B6, 0x00B600B6, 0x00050064, + 0x00000000, 0x00000008, 0x00640000, 0x00000000, 0x00110064, 0x00B600B6, 0x00B60005, 0x00650000, + 0x00000000, 0x00080065, 0x00000000, 0x00000011, 0x006500B6, 0x00B600B6, 0x00050066, 0x00000000, + 0x00000008, 0x00660000, 0x00000000, 0x00110066, 0x00B600B6, 0x00B60005, 0x00670000, 0x00000000, + 0x00080067, 0x00000000, 0x00000011, 0x006700B6, 0x00B600B6, 0x00050068, 0x00000000, 0x00000008, + 0x00680000, 0x00000000, 0x00110068, 0x00B600B6, 0x00B60005, 0x00690000, 0x00000000, 0x00080069, + 0x00000000, 0x00000011, 0x006900B6, 0x00B600B6, 0x0005006A, 0x00000000, 0x00000008, 0x006A0000, + 0x00000000, 0x0011006A, 0x00B600B6, 0x00B60005, 0x006B0000, 0x00000000, 0x0008006B, 0x00000000, + 0x00000011, 0x006B00B6, 0x00B600B6, 0x0005006C, 0x00000000, 0x00000008, 0x006C0000, 0x00000000, + 0x0011006C, 0x00B600B6, 0x00B60005, 0x006D0000, 0x00000000, 0x0008006D, 0x00000000, 0x00000011, + 0x006D00B6, 0x00B600B6, 0x0005006E, 0x00000000, 0x00000008, 0x006E0000, 0x00000000, 0x0011006E, + 0x00B600B6, 0x00B60005, 0x006F0000, 0x00000000, 0x0008006F, 0x00000000, 0x00000011, 0x006F00B6, + 0x00B600B6, 0x00050070, 0x00000000, 0x00000008, 0x00700000, 0x00000000, 0x00110070, 0x00B600B6, + 0x00B60005, 0x00710000, 0x00000000, 0x00080071, 0x00000000, 0x00000011, 0x007100B6, 0x00B600B6, + 0x00050072, 0x00000000, 0x00000008, 0x00720000, 0x00000000, 0x00110072, 0x00B600B6, 0x00B60005, + 0x00730000, 0x00000000, 0x00080073, 0x00000000, 0x00000011, 0x007300B6, 0x00B600B6, 0x00050074, + 0x00000000, 0x00000008, 0x00740000, 0x00000000, 0x00110074, 0x00B600B6, 0x00B60005, 0x00750000, + 0x00000000, 0x00080075, 0x00000000, 0x00000011, 0x007500B6, 0x00B600B6, 0x00050076, 0x00000000, + 0x00000008, 0x00760000, 0x00000000, 0x00110076, 0x00B600B6, 0x00B60005, 0x00770000, 0x00000000, + 0x00080077, 0x00000000, 0x00000011, 0x007700B6, 0x00B600B6, 0x00050078, 0x00000000, 0x00000008, + 0x00780000, 0x00000000, 0x00110078, 0x00B600B6, 0x00B60005, 0x00790000, 0x00000000, 0x00080079, + 0x007D01A4, 0x00000011, 0x007900B6, 0x00B600B6, 0x00010001, 0x00050003, 0x0000FFC3, 0xFFC40008, + 0x0003FF26, 0x01B30000, 0x00050030, 0x0000FFDE, 0x00BD0008, 0x00300029, 0x01C00000, 0x00050037, + 0x0000005A, 0x00800008, 0x0037001B, 0x01E7FFAB, 0x0005004C, 0xFCD1FFD3, 0xFCD10008, 0x004C00AF, + 0x018FFFCF, 0x0005004D, 0x028F0036, 0x00000008, 0x004DFE89, 0x018F0000, 0x00050050, 0x029C0000, + 0x00000005, 0x00540009, 0x00360013, 0x00080054, 0x00AF01AB, 0x00310005, 0x00550333, 0x002DFEEF, + 0x00080055, 0x007C01AB, 0x00340005, 0x00560000, 0xFFE503D7, 0x00080056, 0x007D01AB, 0x00000005, + 0x0057FF16, 0x000001D4, 0x00080057, 0x007E01AB, 0xFFCE0005, 0x005800EA, 0xFFB202BE, 0x00080058, + 0xFFE701AB, 0x00320005, 0x00590333, 0x0016FDDE, 0x00080059, 0xFFB501AB, 0x00330005, 0x005AFAE6, + 0xFFCA0146, 0x0008005A, 0xFFB601A8, 0xFFFF0005, 0x005BFAE6, 0x006CFC2C, 0x0008005B, 0xFE8C01A8, + 0x002F0005, 0x005C03D7, 0xFFAFFD71, 0x0008005C, 0xFE5801A9, 0x00320005, 0x005DFEB9, 0x006D0147, + 0x0008005D, 0xFE5701AB, 0x00000005, 0x005EFDDE, 0x0044FEEF, 0x0008005E, 0xFE8A01AB, 0xFFCF0008, + 0x0079007C, 0x01AC0000, 0x00010001, 0x00050003, 0x0000FF85, 0xFF830008, 0x0003FF27, 0x01B40000, + 0x00050030, 0x0000FFBB, 0x01740008, 0x00300028, 0x01C10001, 0x00050037, 0x000000B5, 0x00FF0008, + 0x0037001C, 0x01ECFFAC, 0x0005004C, 0xF9A2FFA6, 0xF9A20005, 0x004D051E, 0x006D0000, 0x0008004D, + 0xFE88018F, 0x00000005, 0x00500539, 0x00000000, 0x00080050, 0x001100A4, 0x00310005, 0x00510000, + 0xFFDCFD71, 0x00050054, 0x0026006D, 0x004D0008, 0x005400AF, 0x01B30031, 0x00050055, 0x0666005A, + 0xFDDE0008, 0x0055007C, 0x01B30036, 0x00050056, 0x0000FFCA, 0x07AE0008, 0x0056007D, 0x01B30000, + 0x00050057, 0xFE2C0000, 0x03A80008, 0x0057007F, 0x01B3FFCE, 0x00050058, 0x01D4FF64, 0x057C0008, + 0x0058FFE7, 0x01B30033, 0x00050059, 0x0666002D, 0xFBBC0008, 0x0059FFB4, 0x01B30035, 0x0005005A, + 0xF5CBFF94, 0x028D0008, 0x005AFFB7, 0x01ADFFFD, 0x0005005B, 0xF5CB00D9, 0xF8580008, 0x005BFE8F, + 0x01AD002C, 0x0005005C, 0x07AEFF5D, 0xFAE20008, 0x005CFE58, 0x01AE0034, 0x0005005D, 0xFD7100DA, + 0x028F0008, 0x005DFE57, 0x01B30000, 0x0005005E, 0xFBBC0088, 0xFDDE0008, 0x005EFE8A, 0x01B3FFCF, + 0x00080079, 0x007C01B4, 0x00000001, 0x00010005, 0x00030000, 0xFF46FF40, 0x00080003, 0xFF2801B5, + 0x00000005, 0x00300000, 0xFF970225, 0x00080030, 0x002701C3, 0x00010005, 0x00370000, 0x0111017E, + 0x00080037, 0x001D01F1, 0xFFAD0005, 0x0049FD28, 0x003C02D8, 0x00080049, 0x00AF018F, 0x00310005, + 0x004CF673, 0xFF79F673, 0x0008004C, 0x00B0018E, 0xFFD00005, 0x004D07AE, 0x00A30000, 0x0008004D, + 0xFE87018F, 0x00010005, 0x004F0333, 0x00000333, 0x00050050, 0x07D60000, 0x00000008, 0x00500011, + 0x00A30031, 0x00050051, 0x0000FFB8, 0xFAE20008, 0x00510044, 0x00A30030, 0x00050054, 0x005600A3, + 0x00AD0008, 0x005400B0, 0x01BB0031, 0x00050055, 0x09990088, 0xFCCD0008, 0x0055007C, 0x01BA0038, + 0x00050056, 0x0000FFAF, 0x0B850008, 0x0056007D, 0x01BB0000, 0x00050057, 0xFD420000, 0x057C0008, + 0x00570080, 0x01BBFFCD, 0x00050058, 0x02BEFF16, 0x083A0008, 0x0058FFE7, 0x01BB0034, 0x00050059, + 0x09990044, 0xF99A0008, 0x0059FFB3, 0x01BA0036, 0x0005005A, 0xF0B0FF5D, 0x03D40008, 0x005AFFB8, + 0x01B1FFFB, 0x0005005B, 0xF0B00146, 0xF4840008, 0x005BFE92, 0x01B10029, 0x0005005C, 0x0B85FF0B, + 0xF8520008, 0x005CFE59, 0x01B20035, 0x0005005D, 0xFC290147, 0x03D70008, 0x005DFE57, 0x01BB0000, + 0x0005005E, 0xF99A00CC, 0xFCCD0008, 0x005EFE8B, 0x01BAFFCF, 0x00080079, 0x007C01BB, 0x00000001, + 0x00010005, 0x00030000, 0xFF06FEF9, 0x00080003, 0xFF2901B5, 0x00010005, 0x00300000, 0xFF7402D0, + 0x00080030, 0x002601C4, 0x00020005, 0x00370000, 0x016E01FC, 0x00080037, 0x001E01F6, 0xFFAE0005, + 0x0049FA50, 0x007905B0, 0x00080049, 0x00B0018F, 0x00310005, 0x004CF344, 0xFF4BF344, 0x0008004C, + 0x00B0018D, 0xFFD00005, 0x004D0A3D, 0x00DA0000, 0x0008004D, 0xFE86018E, 0x00010005, 0x004F0666, + 0x00000666, 0x0008004F, 0x001200A3, 0x00000005, 0x00500A72, 0x00000000, 0x00050051, 0x0000FF93, + 0xF8520008, 0x00510045, 0x00A30030, 0x00050054, 0x009900DA, 0x01320008, 0x005400B0, 0x01C20030, + 0x00050055, 0x0CCC00B5, 0xFBBC0008, 0x0055007B, 0x01C1003B, 0x00050056, 0x0000FF93, 0x0F5C0008, + 0x0056007D, 0x01C20000, 0x00050057, 0xFC580000, 0x07500008, 0x00570081, 0x01C2FFCC, 0x00050058, + 0x03A8FEC8, 0x0AF80008, 0x0058FFE6, 0x01C20035, 0x00050059, 0x0CCC005A, 0xF7780008, 0x0059FFB2, + 0x01C10038, 0x0005005A, 0xEB95FF27, 0x051A0008, 0x005AFFB8, 0x01B6FFF9, 0x0005005B, 0xEB9501B3, + 0xF0B00008, 0x005BFE94, 0x01B60027, 0x0005005C, 0x0F5CFEB9, 0xF5C30008, 0x005CFE59, 0x01B70036, + 0x0005005D, 0xFAE201B4, 0x051E0008, 0x005DFE56, 0x01C20000, 0x0005005E, 0xF7780110, 0xFBBC0008, + 0x005EFE8B, 0x01C1FFCE, 0x00080079, 0x007C01C3, 0x00000001, 0x00010005, 0x00030000, 0xFEC5FEAF, + 0x00080003, 0xFF2A01B6, 0x00020005, 0x00300000, 0xFF500374, 0x00080030, 0x002601C6, 0x00030005, + 0x00370000, 0x01CC0279, 0x00080037, 0x001F01FA, 0xFFAF0005, 0x0049F778, 0x00B60888, 0x00080049, + 0x00B1018F, 0x00310005, 0x004CF015, 0xFF1EF015, 0x0008004C, 0x00B1018C, 0xFFD00005, 0x004D0CCC, + 0x01110000, 0x0008004D, 0xFE85018E, 0x00020005, 0x004F0999, 0x00000999, 0x00050050, 0x0D0F0000, + 0x00000008, 0x00500010, 0x00A20031, 0x00050051, 0x0000FF6F, 0xF5C30008, 0x00510045, 0x00A3002F, + 0x00050052, 0xFCCD0000, 0x00000005, 0x005400ED, 0x011101DB, 0x00080054, 0x00B101C9, 0x00300005, + 0x00550FFF, 0x00E3FAAB, 0x00080055, 0x007B01C8, 0x003D0005, 0x00560000, 0xFF781333, 0x00080056, + 0x007D01C9, 0x00000005, 0x0057FB6E, 0x00000924, 0x00080057, 0x008201C9, 0xFFCC0005, 0x00580492, + 0xFE7A0DB6, 0x00080058, 0xFFE601C9, 0x00360005, 0x00590FFF, 0x0071F556, 0x00080059, 0xFFB101C8, + 0x003A0005, 0x005AE67A, 0xFEF00661, 0x0008005A, 0xFFB901BA, 0xFFF80005, 0x005BE67A, 0x0220ECDB, + 0x0008005B, 0xFE9701BA, 0x00240005, 0x005C1333, 0xFE67F334, 0x0008005C, 0xFE5901BB, 0x00370005, + 0x005DF99A, 0x02220666, 0x0008005D, 0xFE5601C9, 0xFFFF0005, 0x005EF556, 0x0154FAAB, 0x0008005E, + 0xFE8C01C8, 0xFFCE0008, 0x0079007B, 0x01CA0000, 0x00010001, 0x00050003, 0x0000FE83, 0xFE610008, + 0x0003FF2B, 0x01B70002, 0x00050030, 0x0000FF2D, 0x04130008, 0x00300025, 0x01C70003, 0x00050037, + 0x0000022B, 0x02F50008, 0x00370020, 0x01FFFFB0, 0x00050049, 0xF4A000F2, 0x0B600008, 0x004900B2, + 0x018E0030, 0x0005004A, 0x03330088, 0xFCCD0008, 0x004A007C, 0x018F0031, 0x0005004B, 0x02D8FFB0, + 0x02D80008, 0x004B007C, 0x018F0000, 0x0005004C, 0xECE5FEF1, 0xECE50008, 0x004C00B1, 0x018AFFD0, + 0x0005004D, 0x0F5C0147, 0x00000008, 0x004DFE85, 0x018D0002, 0x0005004F, 0x0CCC0000, 0x0CCC0008, + 0x004F0012, 0x00A20000, 0x00050050, 0x0FAC0000, 0x00000005, 0x00510000, 0xFF4AF334, 0x00080051, + 0x004500A2, 0x002E0005, 0x0052F99A, 0x00000000, 0x00080052, 0x001200A3, 0xFFCF0005, 0x00540153, + 0x014702A7, 0x00080054, 0x00B101D0, 0x00300005, 0x00551333, 0x0110F99A, 0x00080055, 0x007B01CE, + 0x003F0005, 0x00560000, 0xFF5D170A, 0x00080056, 0x007D01D0, 0x00000005, 0x0057FA84, 0x00000AF8, + 0x00080057, 0x008301D0, 0xFFCB0005, 0x0058057C, 0xFE2C1074, 0x00080058, 0xFFE601D0, 0x00370005, + 0x00591333, 0x0088F334, 0x00080059, 0xFFB001CE, 0x003C0005, 0x005AE15F, 0xFEBA07A8, 0x0008005A, + 0xFFBA01BE, 0xFFF60005, 0x005BE15F, 0x028DE907, 0x0008005B, 0xFE9A01BE, 0x00220005, 0x005C170A, + 0xFE15F0A4, 0x0008005C, 0xFE5A01C0, 0x00380005, 0x005DF852, 0x028F07AE, 0x0008005D, 0xFE5601D0, + 0xFFFF0005, 0x005EF334, 0x0199F99A, 0x0008005E, 0xFE8C01CE, 0xFFCE0008, 0x0079007B, 0x01D10000, + 0x00010001, 0x00050003, 0x0000FE41, 0xFE100008, 0x0003FF2C, 0x01B70003, 0x00050030, 0x0000FF09, + 0x04AB0008, 0x00300024, 0x01C80004, 0x00050037, 0x0000028B, 0x036F0008, 0x00370021, 0x0203FFB1, + 0x00050049, 0xF1C8012F, 0x0E380008, 0x004900B3, 0x018D0030, 0x0005004A, 0x06660111, 0xF99A0005, + 0x004B05B0, 0xFF5F05B0, 0x0008004B, 0x007B018F, 0xFFFF0005, 0x004CE9B6, 0xFEC3E9B6, 0x0008004C, + 0x00B20189, 0xFFD10005, 0x004D11EB, 0x017E0000, 0x0008004D, 0xFE84018C, 0x00020005, 0x004F0FFF, + 0x00000FFF, 0x0008004F, 0x001200A1, 0x00000005, 0x00501249, 0x00000000, 0x00080050, 0x000F00A1, + 0x00310005, 0x00510000, 0xFF26F0A4, 0x00080051, 0x004500A1, 0x002E0005, 0x0052F667, 0x00000000, + 0x00080052, 0x001100A3, 0xFFCF0005, 0x005401CB, 0x017E0396, 0x00080054, 0x00B101D7, 0x00300005, + 0x00551666, 0x013EF889, 0x00080055, 0x007A01D4, 0x00420005, 0x00560000, 0xFF411AE1, 0x00080056, + 0x007D01D7, 0x00000005, 0x0057F99A, 0x00000CCC, 0x00080057, 0x008401D7, 0xFFCB0005, 0x00580666, + 0xFDDE1333, 0x00080058, 0xFFE501D7, 0x00380005, 0x00591666, 0x009FF112, 0x00080059, 0xFFAF01D4, + 0x003D0005, 0x005ADC44, 0xFE8308EF, 0x0008005A, 0xFFBA01C2, 0xFFF40005, 0x005BDC44, 0x02FAE533, + 0x0008005B, 0xFE9C01C2, 0x001F0005, 0x005C1AE1, 0xFDC3EE15, 0x0008005C, 0xFE5A01C4, 0x003A0005, + 0x005DF70B, 0x02FC08F5, 0x0008005D, 0xFE5501D7, 0xFFFF0005, 0x005EF112, 0x01DDF889, 0x0008005E, + 0xFE8D01D4, 0xFFCE0008, 0x0079007B, 0x01D70000, 0x00010001, 0x00050003, 0x0000FDFD, 0xFDBB0008, + 0x0003FF2D, 0x01B80004, 0x00050030, 0x0000FEE5, 0x053E0008, 0x00300024, 0x01C90005, 0x00050037, + 0x000002EB, 0x03E90008, 0x00370022, 0x0207FFB2, 0x00050049, 0xEEF0016C, 0x11100008, 0x004900B4, + 0x018C0030, 0x0005004A, 0x09990199, 0xF6670008, 0x004A007C, 0x018E0030, 0x0005004B, 0x0888FF0E, + 0x08880008, 0x004B007B, 0x018FFFFE, 0x0005004C, 0xE687FE96, 0xE6870008, 0x004C00B2, 0x0186FFD1, + 0x0005004D, 0x147A01B4, 0x00000008, 0x004DFE83, 0x018A0003, 0x0005004F, 0x13330000, 0x13330008, + 0x004F0012, 0x00A00000, 0x00050050, 0x14E50000, 0x00000008, 0x0050000F, 0x00A00031, 0x00050051, + 0x0000FF02, 0xEE150008, 0x00510045, 0x00A0002D, 0x00050052, 0xF3340000, 0x00000008, 0x00520011, + 0x00A2FFCF, 0x00050054, 0x025301B4, 0x04A70008, 0x005400B2, 0x01DD0030, 0x00050055, 0x1999016B, + 0xF7780008, 0x0055007A, 0x01DA0044, 0x00050056, 0x0000FF26, 0x1EB80008, 0x0056007E, 0x01DD0000, + 0x00050057, 0xF8B00000, 0x0EA00008, 0x00570085, 0x01DDFFCA, 0x00050058, 0x0750FD90, 0x15F10008, + 0x0058FFE5, 0x01DD0039, 0x00050059, 0x199900B5, 0xEEF00008, 0x0059FFAE, 0x01DA003F, 0x0005005A, + 0xD729FE4D, 0x0A350008, 0x005AFFBB, 0x01C6FFF2, 0x0005005B, 0xD7290367, 0xE15F0008, 0x005BFE9F, + 0x01C6001C, 0x0005005C, 0x1EB8FD71, 0xEB860008, 0x005CFE5B, 0x01C8003B, 0x0005005D, 0xF5C30369, + 0x0A3D0008, 0x005DFE55, 0x01DDFFFF, 0x0005005E, 0xEEF00221, 0xF7780008, 0x005EFE8D, 0x01DAFFCE, + 0x00080079, 0x007B01DE, 0x00000001, 0x00010005, 0x00030000, 0xFDB9FD63, 0x00080003, 0xFF2E01B8, + 0x00040005, 0x00300000, 0xFEC105CB, 0x00080030, 0x002301CA, 0x00050005, 0x00370000, 0x034C0461, + 0x00080037, 0x0023020B, 0xFFB30005, 0x0049EC17, 0x01A813E9, 0x00080049, 0x00B5018B, 0x00300005, + 0x004A0CCC, 0x0222F334, 0x0008004A, 0x007C018D, 0x00300005, 0x004B0B60, 0xFEBD0B60, 0x0008004B, + 0x007A018E, 0xFFFE0005, 0x004CE358, 0xFE69E358, 0x0008004C, 0x00B30184, 0xFFD10005, 0x004D170A, + 0x01EB0000, 0x0008004D, 0xFE820189, 0x00030005, 0x004F1666, 0x00001666, 0x0008004F, 0x0012009E, + 0x00000005, 0x00501782, 0x00000000, 0x00080050, 0x000F009F, 0x00310005, 0x00510000, 0xFEDDEB86, + 0x00080051, 0x0045009F, 0x002D0005, 0x0052F001, 0x00000000, 0x00080052, 0x001100A1, 0xFFCF0005, + 0x005402EC, 0x01EB05D8, 0x00080054, 0x00B201E4, 0x002F0005, 0x00551CCC, 0x0199F667, 0x00080055, + 0x007A01E0, 0x00460005, 0x00560000, 0xFF0B228F, 0x00080056, 0x007E01E4, 0x00000005, 0x0057F7C6, + 0x00001074, 0x00080057, 0x008601E4, 0xFFCA0005, 0x0058083A, 0xFD4218AF, 0x00080058, 0xFFE501E4, + 0x003A0005, 0x00591CCC, 0x00CCECCD, 0x00080059, 0xFFAD01E0, 0x00410005, 0x005AD20E, 0xFE160B7C, + 0x0008005A, 0xFFBC01C9, 0xFFF00005, 0x005BD20E, 0x03D4DD8A, 0x0008005B, 0xFEA201C9, 0x001A0005, + 0x005C228F, 0xFD1FE8F6, 0x0008005C, 0xFE5B01CC, 0x003C0005, 0x005DF47B, 0x03D70B85, 0x0008005D, + 0xFE5501E4, 0xFFFF0005, 0x005EECCD, 0x0265F667, 0x0008005E, 0xFE8E01E0, 0xFFCD0008, 0x0079007B, + 0x01E40000, 0x00010001, 0x00050003, 0x0000FD74, 0xFD080008, 0x0003FF2F, 0x01B90005, 0x00050030, + 0x0000FE9D, 0x06530008, 0x00300022, 0x01CA0006, 0x00050037, 0x000003AE, 0x04D80008, 0x00370023, + 0x020FFFB4, 0x00050049, 0xE93F01E5, 0x16C10008, 0x004900B6, 0x0189002F, 0x0005004A, 0x0FFF02AA, + 0xF0010008, 0x004A007B, 0x018C0030, 0x0005004B, 0x0E38FE6C, 0x0E380008, 0x004B0079, 0x018DFFFD, + 0x0005004C, 0xE029FE3C, 0xE0290008, 0x004C00B3, 0x0181FFD1, 0x0005004D, 0x19990222, 0x00000008, + 0x004DFE81, 0x01880004, 0x0005004F, 0x19990000, 0x19990008, 0x004F0012, 0x009D0000, 0x00050050, + 0x1A1F0000, 0x00000008, 0x0050000E, 0x009E0031, 0x00050051, 0x0000FEB9, 0xE8F60008, 0x00510045, + 0x009D002C, 0x00050052, 0xECCD0000, 0x00000008, 0x00520011, 0x009FFFCF, 0x00050054, 0x03950222, + 0x072A0008, 0x005400B3, 0x01EA002F, 0x00050055, 0x1FFF01C6, 0xF5560008, 0x00550079, 0x01E50049, + 0x00050056, 0x0000FEEF, 0x26660008, 0x0056007E, 0x01EAFFFF, 0x00050057, 0xF6DC0000, 0x12490008, + 0x00570087, 0x01EAFFC9, 0x00050058, 0x0924FCF4, 0x1B6D0008, 0x0058FFE5, 0x01EA003B, 0x00050059, + 0x1FFF00E3, 0xEAAB0008, 0x0059FFAC, 0x01E50043, 0x0005005A, 0xCCF3FDE0, 0x0CC30008, 0x005AFFBC, + 0x01CCFFEF, 0x0005005B, 0xCCF30441, 0xD9B60008, 0x005BFEA4, 0x01CC0017, 0x0005005C, 0x2666FCCD, + 0xE6670008, 0x005CFE5B, 0x01CF003D, 0x0005005D, 0xF3340444, 0x0CCC0008, 0x005DFE54, 0x01EAFFFE, + 0x0005005E, 0xEAAB02A9, 0xF5560008, 0x005EFE8E, 0x01E5FFCD, 0x00080079, 0x007A01EA, 0x00000001, + 0x00010005, 0x00030000, 0xFD2EFCA9, 0x00080003, 0xFF3001B9, 0x00060005, 0x00300000, 0xFE7806D6, + 0x00080030, 0x002201CB, 0x00070005, 0x00370000, 0x0411054E, 0x00080037, 0x00240213, 0xFFB50005, + 0x0049E667, 0x02221999, 0x00080049, 0x00B70188, 0x002F0005, 0x004A1333, 0x0333ECCD, 0x0008004A, + 0x007B018A, 0x00300005, 0x004B1110, 0xFE1B1110, 0x0008004B, 0x0079018C, 0xFFFC0005, 0x004CDCFA, + 0xFE0EDCFA, 0x0008004C, 0x00B4017F, 0xFFD20005, 0x004D1C28, 0x02580000, 0x0008004D, 0xFE810186, + 0x00040005, 0x004F1CCC, 0x00001CCC, 0x0008004F, 0x0012009B, 0x00000005, 0x00501CBB, 0x00000000, + 0x00080050, 0x000E009C, 0x00310005, 0x00510000, 0xFE94E667, 0x00080051, 0x0045009C, 0x002B0005, + 0x0052E99A, 0x00000000, 0x00080052, 0x0010009E, 0xFFCF0005, 0x0054044E, 0x0258089C, 0x00080054, + 0x00B301F0, 0x002F0005, 0x00552332, 0x01F4F445, 0x00080055, 0x007901EA, 0x004B0005, 0x00560000, + 0xFED42A3D, 0x00080056, 0x007F01F0, 0xFFFF0005, 0x0057F5F2, 0x0000141D, 0x00080057, 0x008801F0, + 0xFFC80005, 0x00580A0E, 0xFCA61E2B, 0x00080058, 0xFFE401F0, 0x003C0005, 0x00592332, 0x00FAE889, + 0x00080059, 0xFFAB01EA, 0x00440005, 0x005AC7D8, 0xFDA90E0A, 0x0008005A, 0xFFBD01D0, 0xFFED0005, + 0x005BC7D8, 0x04AED5E2, 0x0008005B, 0xFEA701D0, 0x00150005, 0x005C2A3D, 0xFC7BE3D8, 0x0008005C, + 0xFE5C01D3, 0x003E0005, 0x005DF1EC, 0x04B10E14, 0x0008005D, 0xFE5401F0, 0xFFFE0005, 0x005EE889, + 0x02EEF445, 0x0008005E, 0xFE8F01EA, 0xFFCD0008, 0x0079007A, 0x01EF0000, 0x00010001, 0x00050003, + 0x0000FCE8, 0xFC470008, 0x0003FF30, 0x01B90007, 0x00050030, 0x0000FE54, 0x07540008, 0x00300021, + 0x01CB0007, 0x00050037, 0x00000474, 0x05C30008, 0x00370025, 0x0216FFB6, 0x00050049, 0xE38F025E, + 0x1C710008, 0x004900B7, 0x0186002F, 0x0005004A, 0x166603BB, 0xE99A0008, 0x004A007B, 0x0189002F, + 0x0005004B, 0x13E9FDCA, 0x13E90008, 0x004B0078, 0x018BFFFC, 0x0005004C, 0xD9CAFDE1, 0xD9CA0008, + 0x004C00B4, 0x017BFFD2, 0x0005004D, 0x1EB8028F, 0x00000008, 0x004DFE80, 0x01840004, 0x0005004F, + 0x1FFF0000, 0x1FFF0008, 0x004F0012, 0x00990000, 0x00050050, 0x1F580000, 0x00000008, 0x0050000D, + 0x009B0031, 0x00050051, 0x0000FE70, 0xE3D80008, 0x00510045, 0x009A002B, 0x00050052, 0xE6670000, + 0x00000008, 0x00520010, 0x009CFFCF, 0x00050054, 0x0516028F, 0x0A2C0008, 0x005400B3, 0x01F6002F, + 0x00050055, 0x26660221, 0xF3340008, 0x00550079, 0x01EE004D, 0x00050056, 0x0000FEB9, 0x2E140008, + 0x0056007F, 0x01F6FFFF, 0x00050057, 0xF5080000, 0x15F10008, 0x00570089, 0x01F6FFC8, 0x00050058, + 0x0AF8FC58, 0x20E90008, 0x0058FFE4, 0x01F6003D, 0x00050059, 0x26660110, 0xE6670008, 0x0059FFAA, + 0x01EE0046, 0x0005005A, 0xC2BDFD73, 0x0F500008, 0x005AFFBE, 0x01D3FFEB, 0x0005005B, 0xC2BD051A, + 0xD20E0008, 0x005BFEAA, 0x01D30012, 0x0005005C, 0x2E14FC29, 0xE1480008, 0x005CFE5C, 0x01D60040, + 0x0005005D, 0xF0A4051E, 0x0F5C0008, 0x005DFE54, 0x01F6FFFE, 0x0005005E, 0xE6670332, 0xF3340008, + 0x005EFE8F, 0x01EEFFCC, 0x00080079, 0x007A01F5, 0x00000001, 0x00010005, 0x00030000, 0xFCA0FBE1, + 0x00080003, 0xFF3101B9, 0x00080005, 0x00300000, 0xFE3007CD, 0x00080030, 0x002101CC, 0x00080005, + 0x00370000, 0x04D80636, 0x00080037, 0x00260219, 0xFFB70005, 0x0049E0B7, 0x029B1F49, 0x00080049, + 0x00B80184, 0x002F0005, 0x004A1999, 0x0444E667, 0x0008004A, 0x007B0186, 0x002F0005, 0x004B16C1, + 0xFD7916C1, 0x0008004B, 0x00770189, 0xFFFB0005, 0x004CD69B, 0xFDB4D69B, 0x0008004C, 0x00B50178, + 0xFFD20005, 0x004D2147, 0x02C50000, 0x0008004D, 0xFE7F0182, 0x00050005, 0x004F2332, 0x00002332, + 0x0008004F, 0x00120096, 0x00000005, 0x005021F5, 0x00000000, 0x00080050, 0x000D0099, 0x00310005, + 0x00510000, 0xFE4CE148, 0x00080051, 0x00450098, 0x002A0005, 0x0052E334, 0x00000000, 0x00080052, + 0x0010009A, 0xFFCF0005, 0x005405ED, 0x02C50BDA, 0x00080054, 0x00B401FB, 0x002F0005, 0x00552999, + 0x024EF223, 0x00080055, 0x007801F3, 0x00500005, 0x00560000, 0xFE9E31EB, 0x00080056, 0x008001FB, + 0xFFFF0005, 0x0057F41E, 0x000017C5, 0x00080057, 0x008A01FB, 0xFFC70005, 0x00580BE2, 0xFC0A23A7, + 0x00080058, 0xFFE401FB, 0x003E0005, 0x00592999, 0x0127E445, 0x00080059, 0xFFA901F3, 0x00480005, + 0x005ABDA2, 0xFD3D1097, 0x0008005A, 0xFFBF01D6, 0xFFE90005, 0x005BBDA2, 0x0587CE3A, 0x0008005B, + 0xFEAD01D6, 0x00100005, 0x005C31EB, 0xFBD8DEB9, 0x0008005C, 0xFE5D01D9, 0x00410005, 0x005DEF5D, + 0x058B10A3, 0x0008005D, 0xFE5401FB, 0xFFFE0005, 0x005EE445, 0x0376F223, 0x0008005E, 0xFE9001F3, + 0xFFCC0008, 0x0079007A, 0x01FA0000, 0x00010001, 0x00050003, 0x0000FC58, 0xFB770008, 0x0003FF32, + 0x01B90008, 0x00050030, 0x0000FE0B, 0x08420008, 0x00300021, 0x01CC0009, 0x00050037, 0x0000053C, + 0x06A70008, 0x00370026, 0x021DFFB8, 0x00050049, 0xDDDF02D8, 0x22210008, 0x004900B9, 0x0182002F, + 0x0005004A, 0x1CCC04CC, 0xE3340008, 0x004A007A, 0x0184002F, 0x0005004B, 0x1999FD28, 0x19990008, + 0x004B0077, 0x0188FFFA, 0x0005004C, 0xD36CFD86, 0xD36C0008, 0x004C00B5, 0x0175FFD2, 0x0005004D, + 0x23D602FC, 0x00000008, 0x004DFE7E, 0x01800005, 0x0005004F, 0x26660000, 0x26660008, 0x004F0012, + 0x00940000, 0x00050050, 0x24920000, 0x00000008, 0x0050000D, 0x00970031, 0x00050051, 0x0000FE27, + 0xDEB90008, 0x00510046, 0x0096002A, 0x00050052, 0xE0010000, 0x00000008, 0x00520010, 0x0097FFCF, + 0x00050054, 0x06D202FC, 0x0DA50008, 0x005400B4, 0x0201002E, 0x00050055, 0x2CCC027C, 0xF1120008, + 0x00550078, 0x01F70052, 0x00050056, 0x0000FE82, 0x35C20008, 0x00560080, 0x0201FFFE, 0x00050057, + 0xF3340000, 0x19990008, 0x0057008C, 0x0201FFC7, 0x00050058, 0x0CCCFBBC, 0x26660008, 0x0058FFE3, + 0x0201003F, 0x00050059, 0x2CCC013E, 0xE2230008, 0x0059FFA8, 0x01F7004A, 0x0005005A, 0xB887FD06, + 0x11DE0008, 0x005AFFBF, 0x01D8FFE7, 0x0005005B, 0xB88705F4, 0xCA650008, 0x005BFEAF, 0x01D8000D, + 0x0005005C, 0x35C2FB86, 0xDC2A0008, 0x005CFE5D, 0x01DC0042, 0x0005005D, 0xEE1505F9, 0x11EB0008, + 0x005DFE53, 0x0201FFFE, 0x0005005E, 0xE22303BA, 0xF1120008, 0x005EFE90, 0x01F7FFCB, 0x00080079, + 0x007A01FF, 0x00000001, 0x00010005, 0x00030000, 0xFC10FB0A, 0x00080003, 0xFF3301B9, 0x00090005, + 0x00300000, 0xFDE608B2, 0x00080030, 0x002001CC, 0x00090005, 0x00370000, 0x05A10717, 0x00080037, + 0x00270220, 0xFFB90005, 0x0049DB06, 0x031424FA, 0x00080049, 0x00BA017F, 0x002E0005, 0x004A1FFF, + 0x0555E001, 0x0008004A, 0x007A0181, 0x002F0005, 0x004B1C71, 0xFCD71C71, 0x0008004B, 0x00760186, + 0xFFFA0005, 0x004CD03D, 0xFD59D03D, 0x0008004C, 0x00B60171, 0xFFD30005, 0x004D2666, 0x03330000, + 0x0008004D, 0xFE7D017E, 0x00060005, 0x004F2999, 0x00002999, 0x0008004F, 0x00120091, 0x00000005, + 0x0050272E, 0x00000000, 0x00080050, 0x000C0096, 0x00310005, 0x00510000, 0xFE03DC2A, 0x00080051, + 0x00460094, 0x00290005, 0x0052DCCE, 0x00000000, 0x00080052, 0x000F0095, 0xFFCF0005, 0x005407C6, + 0x03330F8D, 0x00080054, 0x00B50206, 0x002E0005, 0x00552FFF, 0x02A9F001, 0x00080055, 0x007801FB, + 0x00540005, 0x00560000, 0xFE673999, 0x00080056, 0x00810206, 0xFFFE0005, 0x0057F24A, 0x00001B6D, + 0x00080057, 0x008D0206, 0xFFC60005, 0x00580DB6, 0xFB6E2924, 0x00080058, 0xFFE30206, 0x00400005, + 0x00592FFF, 0x0154E001, 0x00080059, 0xFFA701FB, 0x004B0005, 0x005AB36C, 0xFCD01325, 0x0008005A, + 0xFFC001DB, 0xFFE60005, 0x005BB36C, 0x0661C691, 0x0008005B, 0xFEB201DB, 0x000A0005, 0x005C3999, + 0xFB34D99A, 0x0008005C, 0xFE5D01DF, 0x00430005, 0x005DECCD, 0x06661333, 0x0008005D, 0xFE530206, + 0xFFFD0005, 0x005EE001, 0x03FEF001, 0x0008005E, 0xFE9101FB, 0xFFCB0008, 0x00790079, 0x02030000, + 0x00010001, 0x00050003, 0x0000FBC6, 0xFA9A0008, 0x0003FF34, 0x01B9000A, 0x00050030, 0x0000FDC2, + 0x091F0008, 0x00300020, 0x01CD000A, 0x00050037, 0x00000607, 0x07860008, 0x00370028, 0x0223FFBA, + 0x00050049, 0xD82E0351, 0x27D20008, 0x004900BB, 0x017D002E, 0x0005004A, 0x233205DD, 0xDCCE0008, + 0x004A007A, 0x017F002E, 0x0005004B, 0x1F49FC87, 0x1F490008, 0x004B0075, 0x0184FFF9, 0x0005004C, + 0xCD0EFD2C, 0xCD0E0008, 0x004C00B6, 0x016DFFD3, 0x0005004D, 0x28F50369, 0x00000008, 0x004DFE7D, + 0x017B0006, 0x0005004F, 0x2CCC0000, 0x2CCC0008, 0x004F0012, 0x008E0000, 0x00050050, 0x29CB0000, + 0x00000008, 0x0050000C, 0x00930031, 0x00050051, 0x0000FDDE, 0xD99A0008, 0x00510046, 0x00920028, + 0x00050052, 0xD99A0000, 0x00000008, 0x0052000F, 0x0092FFCF, 0x00050054, 0x08C80369, 0x11900008, + 0x005400B5, 0x020B002E, 0x00050055, 0x333202D7, 0xEEF00008, 0x00550077, 0x01FF0057, 0x00050056, + 0x0000FE4C, 0x3D700008, 0x00560081, 0x020BFFFE, 0x00050057, 0xF1600000, 0x1D410008, 0x0057008E, + 0x020BFFC6, 0x00050058, 0x0EA0FB20, 0x2BE20008, 0x0058FFE3, 0x020B0041, 0x00050059, 0x3332016B, + 0xDDDF0008, 0x0059FFA6, 0x01FF004D, 0x0005005A, 0xAE51FC99, 0x146B0008, 0x005AFFC1, 0x01DEFFE4, + 0x0005005B, 0xAE5106CE, 0xC2BD0008, 0x005BFEB5, 0x01DE0008, 0x0005005C, 0x3D70FAE2, 0xD70B0008, + 0x005CFE5E, 0x01E10044, 0x0005005D, 0xEB8606D3, 0x147A0008, 0x005DFE53, 0x020BFFFD, 0x0005005E, + 0xDDDF0442, 0xEEF00008, 0x005EFE91, 0x01FFFFCA, 0x00080079, 0x00790208, 0x00000001, 0x00010005, + 0x00030000, 0xFB7CFA25, 0x00080003, 0xFF3501B8, 0x000B0005, 0x00300000, 0xFD9D0987, 0x00080030, + 0x001F01CD, 0x000B0005, 0x00370000, 0x066D07F3, 0x00080037, 0x00280225, 0xFFBB0005, 0x0049D556, + 0x038E2AAA, 0x00080049, 0x00BC017A, 0x002E0005, 0x004A2666, 0x0666D99A, 0x0008004A, 0x007A017B, + 0x002E0005, 0x004B2221, 0xFC362221, 0x0008004B, 0x00750182, 0xFFF90005, 0x004CC9DE, 0xFCFFC9DE, + 0x0008004C, 0x00B70168, 0xFFD30005, 0x004D2B84, 0x03A00000, 0x0008004D, 0xFE7C0179, 0x00060005, + 0x004F2FFF, 0x00002FFF, 0x0008004F, 0x0012008A, 0x00000005, 0x00502C68, 0x00000000, 0x00080050, + 0x000B0091, 0x00310005, 0x00510000, 0xFDBAD70B, 0x00080051, 0x00460090, 0x00280005, 0x0052D667, + 0x00000000, 0x00080052, 0x000F008F, 0xFFCF0005, 0x005409D6, 0x03A013AD, 0x00080054, 0x00B50210, + 0x002E0005, 0x00553665, 0x0304EDDF, 0x00080055, 0x00770202, 0x00590005, 0x00560000, 0xFE304147, + 0x00080056, 0x00820210, 0xFFFD0005, 0x0057F076, 0x00001F15, 0x00080057, 0x008F0210, 0xFFC50005, + 0x00580F8A, 0xFAD22EA0, 0x00080058, 0xFFE30210, 0x00420005, 0x00593665, 0x0182DBBD, 0x00080059, + 0xFFA50202, 0x004F0005, 0x005AA936, 0xFC6315B2, 0x0008005A, 0xFFC101E0, 0xFFE20005, 0x005BA936, + 0x073BBEE9, 0x0008005B, 0xFEB701E0, 0x00050005, 0x005C4147, 0xFA90D47C, 0x0008005C, 0xFE5E01E4, + 0x00460005, 0x005DEA3E, 0x074015C2, 0x0008005D, 0xFE520210, 0xFFFD0005, 0x005EDBBD, 0x0487EDDF, + 0x0008005E, 0xFE920202, 0xFFCA0008, 0x00790079, 0x020C0000, 0x00010001, 0x00050003, 0x0000FB32, + 0xF9AE0008, 0x0003FF35, 0x01B8000C, 0x00050030, 0x0000FD78, 0x09EC0005, 0x00370000, 0x06D3085E, + 0x00080037, 0x00290228, 0xFFBC0005, 0x0049D27E, 0x03CA2D82, 0x00080049, 0x00BD0177, 0x002E0005, + 0x004A2999, 0x06EED667, 0x0008004A, 0x00790178, 0x002E0005, 0x004B24FA, 0xFBE524FA, 0x0008004B, + 0x0074017F, 0xFFF80005, 0x004CC6AF, 0xFCD1C6AF, 0x0008004C, 0x00B70164, 0xFFD30005, 0x004D2E14, + 0x03D70000, 0x0008004D, 0xFE7B0176, 0x00070005, 0x004F3332, 0x00003332, 0x0008004F, 0x00120087, + 0x00000005, 0x00502F04, 0x00000000, 0x00080050, 0x000B008F, 0x00310005, 0x00510000, 0xFD96D47C, + 0x00080051, 0x0046008D, 0x00270005, 0x0052D334, 0x00000000, 0x00080052, 0x000F008B, 0xFFCF0005, + 0x00540AF2, 0x03D715E5, 0x00080054, 0x00B60214, 0x002E0005, 0x00553999, 0x0332ECCD, 0x00080055, + 0x00770206, 0x005B0005, 0x00560000, 0xFE15451E, 0x00080056, 0x00820214, 0xFFFD0005, 0x0057EF8C, + 0x000020E9, 0x00080057, 0x00900214, 0xFFC40005, 0x00581074, 0xFA84315E, 0x00080058, 0xFFE20214, + 0x00430005, 0x00593999, 0x0199D99A, 0x00080059, 0xFFA40206, 0x00510005, 0x005AA41B, 0xFC2C16F9, + 0x0008005A, 0xFFC201E2, 0xFFE00005, 0x005BA41B, 0x07A8BB14, 0x0008005B, 0xFEBA01E2, 0x00030005, + 0x005C451E, 0xFA3ED1EC, 0x0008005C, 0xFE5F01E6, 0x00470005, 0x005DE8F6, 0x07AE170A, 0x0008005D, + 0xFE520214, 0xFFFD0005, 0x005ED99A, 0x04CBECCD, 0x0008005E, 0xFE920206, 0xFFC90008, 0x00790079, + 0x02100000, 0x00010001, 0x00050003, 0x0000FAE7, 0xF9330008, 0x0003FF36, 0x01B8000D, 0x00050030, + 0x0000FD53, 0x0A4E0008, 0x0030001F, 0x01CC000C, 0x00050037, 0x0000073A, 0x08C80008, 0x00370029, + 0x022AFFBD, 0x00050049, 0xCFA60407, 0x305A0008, 0x004900BE, 0x0174002D, 0x0005004A, 0x2CCC0777, + 0xD3340008, 0x004A0079, 0x0175002E, 0x0005004B, 0x27D2FB94, 0x27D20008, 0x004B0073, 0x017DFFF7, + 0x0005004C, 0xC380FCA4, 0xC3800008, 0x004C00B8, 0x015FFFD3, 0x0005004D, 0x30A3040D, 0x00000008, + 0x004DFE7A, 0x01730007, 0x0005004F, 0x36650000, 0x36650008, 0x004F0012, 0x00830000, 0x00050050, + 0x31A10000, 0x00000008, 0x0050000A, 0x008C0031, 0x00050051, 0x0000FD71, 0xD1EC0008, 0x00510046, + 0x008A0027, 0x00050052, 0xD0010000, 0x00000008, 0x0052000E, 0x0088FFCF, 0x00050054, 0x0C1B040D, + 0x18360008, 0x005400B6, 0x0219002D, 0x00050055, 0x3CCC035F, 0xEBBC0008, 0x00550076, 0x0209005E, + 0x00050056, 0x0000FDFA, 0x48F50008, 0x00560083, 0x0219FFFD, 0x00050057, 0xEEA20000, 0x22BD0008, + 0x00570091, 0x0219FFC4, 0x00050058, 0x115EFA36, 0x341C0008, 0x0058FFE2, 0x02190044, 0x00050059, + 0x3CCC01AF, 0xD7780008, 0x0059FFA3, 0x02090052, 0x0005005A, 0x9F00FBF6, 0x18400008, 0x005AFFC3, + 0x01E4FFDE, 0x0005005B, 0x9F000815, 0xB7400008, 0x005BFEBD, 0x01E40000, 0x0005005C, 0x48F5F9EC, + 0xCF5D0008, 0x005CFE5F, 0x01E80048, 0x0005005D, 0xE7AF081B, 0x18510008, 0x005DFE52, 0x0219FFFD, + 0x0005005E, 0xD778050F, 0xEBBC0008, 0x005EFE93, 0x0209FFC9, 0x00080079, 0x00790214, 0x00000001, + 0x00010005, 0x00030000, 0xFA9BF8B4, 0x00080003, 0xFF3701B7, 0x000D0005, 0x00300000, 0xFD2E0AAC, + 0x00080030, 0x001E01CC, 0x000D0005, 0x00370000, 0x07A2092F, 0x00080037, 0x002A022D, 0xFFBE0005, + 0x0049CCCE, 0x04443332, 0x00080049, 0x00BF0171, 0x002D0005, 0x004A2FFF, 0x07FFD001, 0x0008004A, + 0x00790171, 0x002D0005, 0x004B2AAA, 0xFB432AAA, 0x0008004B, 0x0073017A, 0xFFF60005, 0x004CC051, + 0xFC77C051, 0x0008004C, 0x00B8015A, 0xFFD40005, 0x004D3332, 0x04440000, 0x0008004D, 0xFE790170, + 0x00080005, 0x004F3999, 0x00003999, 0x0008004F, 0x0012007F, 0x00000005, 0x0050343E, 0x00000000, + 0x00080050, 0x000A008A, 0x00310005, 0x00510000, 0xFD4DCF5D, 0x00080051, 0x00460087, 0x00260005, + 0x0052CCCE, 0x00000000, 0x00080052, 0x000E0084, 0xFFCF0005, 0x00540D4F, 0x04441A9F, 0x00080054, + 0x00B7021D, 0x002D0005, 0x00553FFF, 0x038DEAAB, 0x00080055, 0x0076020C, 0x00600005, 0x00560000, + 0xFDDE4CCC, 0x00080056, 0x0084021D, 0xFFFC0005, 0x0057EDB7, 0x00002492, 0x00080057, 0x0092021D, + 0xFFC30005, 0x00581249, 0xF9E836DB, 0x00080058, 0xFFE2021D, 0x00450005, 0x00593FFF, 0x01C6D556, + 0x00080059, 0xFFA2020C, 0x00540005, 0x005A99E5, 0xFBBF1986, 0x0008005A, 0xFFC301E6, 0xFFDD0005, + 0x005B99E5, 0x0882B36C, 0x0008005B, 0xFEBF01E6, 0xFFFE0005, 0x005C4CCC, 0xF99ACCCE, 0x0008005C, + 0xFE5F01EA, 0x00490005, 0x005DE667, 0x08881999, 0x0008005D, 0xFE51021D, 0xFFFC0005, 0x005ED556, + 0x0553EAAB, 0x0008005E, 0xFE93020C, 0xFFC80008, 0x00790078, 0x02180000, 0x00010001, 0x00050003, + 0x0000FA4F, 0xF8330008, 0x0003FF37, 0x01B7000E, 0x00050030, 0x0000FD09, 0x0B080005, 0x00370000, + 0x08090996, 0x00080037, 0x002B022F, 0xFFBE0005, 0x0049C9F6, 0x0480360A, 0x00080049, 0x00BF016D, + 0x002D0005, 0x004A3332, 0x0888CCCE, 0x0008004A, 0x0079016D, 0x002D0005, 0x004B2D82, 0xFAF22D82, + 0x0008004B, 0x00720177, 0xFFF60005, 0x004CBD22, 0xFC49BD22, 0x0008004C, 0x00B90155, 0xFFD40005, + 0x004D35C2, 0x047A0000, 0x0008004D, 0xFE79016D, 0x00080005, 0x004F3CCC, 0x00003CCC, 0x0008004F, + 0x0012007B, 0x00000005, 0x005036DB, 0x00000000, 0x00080050, 0x000A0087, 0x00310005, 0x00510000, + 0xFD28CCCE, 0x00080051, 0x00460084, 0x00250005, 0x0052C99B, 0x00000000, 0x00080052, 0x000E0080, + 0xFFCF0005, 0x00540E90, 0x047A1D20, 0x00080054, 0x00B70221, 0x002D0005, 0x00554332, 0x03BAE99A, + 0x00080055, 0x0076020E, 0x00620005, 0x00560000, 0xFDC350A3, 0x00080056, 0x00840221, 0xFFFC0005, + 0x0057ECCD, 0x00002666, 0x00080057, 0x00930221, 0xFFC30005, 0x00581333, 0xF99A3999, 0x00080058, + 0xFFE10221, 0x00460005, 0x00594332, 0x01DDD334, 0x00080059, 0xFFA1020E, 0x00560005, 0x005A94CA, + 0xFB891ACD, 0x0008005A, 0xFFC401E8, 0xFFDB0005, 0x005B94CA, 0x08EFAF98, 0x0008005B, 0xFEC201E8, + 0xFFFC0005, 0x005C50A3, 0xF948CA3E, 0x0008005C, 0xFE6001EC, 0x004A0005, 0x005DE51F, 0x08F51AE1, + 0x0008005D, 0xFE510221, 0xFFFC0005, 0x005ED334, 0x0597E99A, 0x0008005E, 0xFE94020E, 0xFFC70008, + 0x00790078, 0x021B0000, 0x00010001, 0x00050003, 0x0000FA02, 0xF7AD0008, 0x0003FF38, 0x01B6000F, + 0x00050030, 0x0000FCE4, 0x0B600008, 0x0030001E, 0x01CC000E, 0x00050037, 0x00000871, 0x09FA0008, + 0x0037002B, 0x0231FFBF, 0x00050049, 0xC71D04BD, 0x38E30008, 0x004900C0, 0x0169002D, 0x0005004A, + 0x36650910, 0xC99B0008, 0x004A0078, 0x0168002D, 0x0005004B, 0x305AFAA1, 0x305A0008, 0x004B0071, + 0x0174FFF5, 0x0005004C, 0xB9F3FC1C, 0xB9F30008, 0x004C00B9, 0x0150FFD4, 0x0005004D, 0x385104B1, + 0x00000008, 0x004DFE78, 0x016A0008, 0x0005004F, 0x3FFF0000, 0x3FFF0008, 0x004F0012, 0x00760000, + 0x00050050, 0x39770000, 0x00000008, 0x00500009, 0x00840031, 0x00050051, 0x0000FD04, 0xCA3E0008, + 0x00510046, 0x00810025, 0x00050052, 0xC6670000, 0x00000008, 0x0052000E, 0x007CFFCF, 0x00050054, + 0x0FDB04B1, 0x1FB70008, 0x005400B7, 0x0225002D, 0x00050055, 0x466503E8, 0xE8890008, 0x00550075, + 0x02110065, 0x00050056, 0x0000FDA8, 0x547A0008, 0x00560085, 0x0225FFFC, 0x00050057, 0xEBE30000, + 0x283A0008, 0x00570094, 0x0225FFC2, 0x00050058, 0x141DF94C, 0x3C570008, 0x0058FFE1, 0x02250047, + 0x00050059, 0x466501F4, 0xD1120008, 0x0059FFA0, 0x02110058, 0x0005005A, 0x8FAFFB52, 0x1C140008, + 0x005AFFC5, 0x01E9FFD9, 0x0005005B, 0x8FAF095C, 0xABC30008, 0x005BFEC5, 0x01E9FFF9, 0x0005005C, + 0x547AF8F6, 0xC7AF0008, 0x005CFE60, 0x01EE004C, 0x0005005D, 0xE3D80962, 0x1C280008, 0x005DFE51, + 0x0225FFFC, 0x0005005E, 0xD11205DC, 0xE8890008, 0x005EFE94, 0x0211FFC7, 0x00080079, 0x0078021F, + 0x00000001, 0x00010005, 0x00030000, 0xF9B5F725, 0x00080003, 0xFF3901B5, 0x00100005, 0x00300000, + 0xFCBE0BB6, 0x00080030, 0x001D01CB, 0x000F0005, 0x00370000, 0x08DA0A5C, 0x00080037, 0x002C0233, + 0xFFC00005, 0x0049C445, 0x04FA3BBB, 0x00080049, 0x00C10166, 0x002D0005, 0x004A3999, 0x0999C667, + 0x0008004A, 0x00780164, 0x002D0005, 0x004B3332, 0xFA503332, 0x0008004B, 0x00710170, 0xFFF50005, + 0x004CB6C3, 0xFBEFB6C3, 0x0008004C, 0x00BA014A, 0xFFD40005, 0x004D3AE0, 0x04E80000, 0x0008004D, + 0xFE770166, 0x00090005, 0x004F4332, 0x00004332, 0x0008004F, 0x00120072, 0x00000005, 0x00503C14, + 0x00000000, 0x00080050, 0x00090080, 0x00310005, 0x00510000, 0xFCE0C7AF, 0x00080051, 0x0046007E, + 0x00240005, 0x0052C334, 0x00000000, 0x00080052, 0x000D0077, 0xFFCF0005, 0x00541132, 0x04E82265, + 0x00080054, 0x00B80229, 0x002D0005, 0x00554999, 0x0415E778, 0x00080055, 0x00750213, 0x00670005, + 0x00560000, 0xFD8C5851, 0x00080056, 0x00860229, 0xFFFB0005, 0x0057EAF9, 0x00002A0E, 0x00080057, + 0x00950229, 0xFFC20005, 0x00581507, 0xF8FE3F15, 0x00080058, 0xFFE10229, 0x00480005, 0x00594999, + 0x020ACEF0, 0x00080059, 0xFF9F0213, 0x00590005, 0x005A8A94, 0xFB1C1D5B, 0x0008005A, 0xFFC601EB, + 0xFFD70005, 0x005B8A94, 0x09C9A7EF, 0x0008005B, 0xFEC701EB, 0xFFF70005, 0x005C5851, 0xF8A4C520, + 0x0008005C, 0xFE6101EF, 0x004D0005, 0x005DE290, 0x09D01D70, 0x0008005D, 0xFE510229, 0xFFFC0005, + 0x005ECEF0, 0x0620E778, 0x0008005E, 0xFE950213, 0xFFC60008, 0x00790078, 0x02220000, 0x00010001, + 0x00050003, 0x0000F968, 0xF6990008, 0x0003FF39, 0x01B40011, 0x00050030, 0x0000FC99, 0x0C0A0005, + 0x00370000, 0x09430ABD, 0x00080037, 0x002C0235, 0xFFC10005, 0x0049C16D, 0x05363E93, 0x00080049, + 0x00C20162, 0x002C0005, 0x004A3CCC, 0x0A22C334, 0x0008004A, 0x0078015F, 0x002C0005, 0x004B360A, + 0xF9FF360A, 0x0008004B, 0x0070016D, 0xFFF40005, 0x004CB394, 0xFBC2B394, 0x0008004C, 0x00BA0145, + 0xFFD50005, 0x004D3D70, 0x051E0000, 0x0008004D, 0xFE760163, 0x00090005, 0x004F4665, 0x00004665, + 0x0008004F, 0x0012006D, 0x00000005, 0x00503EB1, 0x00000000, 0x00080050, 0x0008007D, 0x00310005, + 0x00510000, 0xFCBBC520, 0x00080051, 0x0047007A, 0x00240005, 0x0052C001, 0x00000000, 0x00080052, + 0x000D0073, 0xFFCF0005, 0x00541294, 0x051E2528, 0x00080054, 0x00B8022C, 0x002C0005, 0x00554CCC, + 0x0442E667, 0x00080055, 0x00750215, 0x00690005, 0x00560000, 0xFD715C28, 0x00080056, 0x0087022C, + 0xFFFB0005, 0x0057EA0F, 0x00002BE2, 0x00080057, 0x0096022C, 0xFFC10005, 0x005815F1, 0xF8B041D3, + 0x00080058, 0xFFE1022C, 0x00490005, 0x00594CCC, 0x0221CCCE, 0x00080059, 0xFF9E0215, 0x005B0005, + 0x005A8579, 0xFAE61EA1, 0x0008005A, 0xFFC601EC, 0xFFD50005, 0x005B8579, 0x0A35A41B, 0x0008005B, + 0xFECA01EC, 0xFFF40005, 0x005C5C28, 0xF852C290, 0x0008005C, 0xFE6101F0, 0x004E0005, 0x005DE148, + 0x0A3D1EB8, 0x0008005D, 0xFE50022C, 0xFFFC0005, 0x005ECCCE, 0x0664E667, 0x0008005E, 0xFE950215, + 0xFFC50008, 0x00790078, 0x02250000, 0x00010001, 0x00050003, 0x0000F91B, 0xF6090008, 0x0003FF3A, + 0x01B30012, 0x00050030, 0x0000FC73, 0x0C5C0008, 0x0030001D, 0x01CA0010, 0x00050037, 0x000009AC, + 0x0B1B0008, 0x0037002D, 0x0236FFC2, 0x00050049, 0xBE950573, 0x416B0008, 0x004900C3, 0x015D002C, + 0x0005004A, 0x3FFF0AAA, 0xC0010008, 0x004A0078, 0x015A002C, 0x0005004B, 0x38E3F9AE, 0x38E30008, + 0x004B006F, 0x0169FFF3, 0x0005004C, 0xB065FB94, 0xB0650008, 0x004C00BB, 0x013FFFD5, 0x0005004D, + 0x3FFF0555, 0x00000008, 0x004DFE75, 0x015F000A, 0x0005004F, 0x49990000, 0x49990008, 0x004F0012, + 0x00670000, 0x00050050, 0x414D0000, 0x00000008, 0x00500008, 0x00790031, 0x00050051, 0x0000FC97, + 0xC2900008, 0x00510047, 0x00770023, 0x00050052, 0xBCCE0000, 0x00000008, 0x0052000D, 0x006EFFCF, + 0x00050054, 0x13FF0555, 0x27FF0008, 0x005400B9, 0x0230002C, 0x00050055, 0x4FFF0470, 0xE5560008, + 0x00550074, 0x0217006B, 0x00050056, 0x0000FD56, 0x5FFF0008, 0x00560087, 0x0230FFFA, 0x00050057, + 0xE9250000, 0x2DB60008, 0x00570097, 0x0230FFC0, 0x00050058, 0x16DBF862, 0x44910008, 0x0058FFE0, + 0x0230004A, 0x00050059, 0x4FFF0238, 0xCAAC0008, 0x0059FF9D, 0x0217005D, 0x0005005A, 0x805EFAAF, + 0x1FE80008, 0x005AFFC7, 0x01EEFFD4, 0x0005005B, 0x805E0AA2, 0xA0470008, 0x005BFECD, 0x01EEFFF1, + 0x0005005C, 0x5FFFF801, 0xC0010008, 0x005CFE61, 0x01F1004F, 0x0005005D, 0xE0010AAA, 0x1FFF0008, + 0x005DFE50, 0x0230FFFB, 0x0005005E, 0xCAAC06A8, 0xE5560008, 0x005EFE96, 0x0217FFC5, 0x00080079, + 0x00770228, 0x00000001, 0x00010005, 0x00030000, 0xF8CEF577, 0x00080003, 0xFF3A01B2, 0x00130005, + 0x00300000, 0xFC4E0CAC, 0x00080030, 0x001D01C9, 0x00110005, 0x00370000, 0x0A160B78, 0x00080037, + 0x002D0238, 0xFFC30005, 0x0049BBBD, 0x05B04443, 0x00080049, 0x00C40159, 0x002C0005, 0x004A4332, + 0x0B33BCCE, 0x0008004A, 0x00770155, 0x002C0005, 0x004B3BBB, 0xF95D3BBB, 0x0008004B, 0x006F0165, + 0xFFF20005, 0x004CAD36, 0xFB67AD36, 0x0008004C, 0x00BB0139, 0xFFD50005, 0x004D428E, 0x058B0000, + 0x0008004D, 0xFE75015B, 0x000A0005, 0x004F4CCC, 0x00004CCC, 0x0008004F, 0x00120062, 0x00000005, + 0x005043EA, 0x00000000, 0x00080050, 0x00080076, 0x00310005, 0x00510000, 0xFC72C001, 0x00080051, + 0x00470073, 0x00220005, 0x0052B99B, 0x00000000, 0x00080052, 0x000D0069, 0xFFCF0005, 0x00541575, + 0x058B2AEA, 0x00080054, 0x00B90233, 0x002C0005, 0x00555332, 0x049DE445, 0x00080055, 0x00740219, + 0x006E0005, 0x00560000, 0xFD3B63D6, 0x00080056, 0x00880233, 0xFFFA0005, 0x0057E83B, 0x00002F8A, + 0x00080057, 0x00980233, 0xFFC00005, 0x005817C5, 0xF814474F, 0x00080058, 0xFFE00233, 0x004B0005, + 0x00595332, 0x024EC889, 0x00080059, 0xFF9C0219, 0x005F0005, 0x005A7B40, 0xFA79212F, 0x0008005A, + 0xFFC801EF, 0xFFD20005, 0x005B7B40, 0x0B0F9C73, 0x0008005B, 0xFED001EF, 0xFFEF0005, 0x005C63D6, + 0xF7AFBD72, 0x0008005C, 0xFE6201F2, 0x00500005, 0x005DDEB9, 0x0B172147, 0x0008005D, 0xFE500233, + 0xFFFB0005, 0x005EC889, 0x06ECE445, 0x0008005E, 0xFE960219, 0xFFC40008, 0x00790077, 0x022A0000, + 0x00010001, 0x00050003, 0x0000F880, 0xF4E20008, 0x0003FF3A, 0x01B10014, 0x00050030, 0x0000FC28, + 0x0CFB0008, 0x0030001C, 0x01C90011, 0x00050037, 0x00000A80, 0x0BD30008, 0x0037002E, 0x0239FFC4, + 0x00050049, 0xB8E505EC, 0x471B0008, 0x004900C5, 0x0154002C, 0x0005004A, 0x46650BBB, 0xB99B0008, + 0x004A0077, 0x0150002C, 0x0005004B, 0x3E93F90D, 0x3E930008, 0x004B006E, 0x0161FFF2, 0x0005004C, + 0xAA07FB3A, 0xAA070008, 0x004C00BC, 0x0132FFD5, 0x0005004D, 0x451E05C2, 0x00000008, 0x004DFE74, + 0x0157000A, 0x0005004F, 0x4FFF0000, 0x4FFF0008, 0x004F0012, 0x005C0000, 0x00050050, 0x46870000, + 0x00000008, 0x00500007, 0x00720031, 0x00050051, 0x0000FC4E, 0xBD720008, 0x00510047, 0x006F0022, + 0x00050052, 0xB6670000, 0x00000008, 0x0052000C, 0x0063FFCF, 0x00050054, 0x16F405C2, 0x2DE80008, + 0x005400B9, 0x0236002C, 0x00050055, 0x566504CB, 0xE3340008, 0x00550074, 0x021B0070, 0x00050056, + 0x0000FD1F, 0x67AD0008, 0x00560089, 0x0236FFF9, 0x00050057, 0xE7510000, 0x315E0008, 0x00570099, + 0x0236FFBF, 0x00050058, 0x18AFF7C6, 0x4A0E0008, 0x0058FFE0, 0x0236004C, 0x00050059, 0x56650265, + 0xC6670008, 0x0059FF9B, 0x021B0060, 0x0005005A, 0x7625FA42, 0x22760008, 0x005AFFC8, 0x01F0FFD0, + 0x0005005B, 0x76250B7C, 0x989E0008, 0x005BFED2, 0x01F0FFEC, 0x0005005C, 0x67ADF75D, 0xBAE20008, + 0x005CFE62, 0x01F30052, 0x0005005D, 0xDD710B85, 0x228F0008, 0x005DFE4F, 0x0236FFFB, 0x0005005E, + 0xC6670730, 0xE3340008, 0x005EFE97, 0x021BFFC3, 0x00080079, 0x0077022D, 0x00000001, 0x00010005, + 0x00030000, 0xF833F449, 0x00080003, 0xFF3B01B0, 0x00150005, 0x00300000, 0xFC020D48, 0x00080030, + 0x001C01C8, 0x00120005, 0x00370000, 0x0AEA0C2C, 0x00080037, 0x002E023A, 0xFFC50005, 0x0049B60C, + 0x062949F4, 0x00080049, 0x00C6014F, 0x002B0005, 0x004A4999, 0x0C44B667, 0x0008004A, 0x0077014A, + 0x002B0005, 0x004B416B, 0xF8BC416B, 0x0008004B, 0x006D015D, 0xFFF10005, 0x004CA6D7, 0xFB0CA6D7, + 0x0008004C, 0x00BC012C, 0xFFD60005, 0x004D47AD, 0x05F90000, 0x0008004D, 0xFE730153, 0x000B0005, + 0x004F5332, 0x00005332, 0x0008004F, 0x00120056, 0x00000005, 0x00504924, 0x00000000, 0x00080050, + 0x0007006E, 0x00310005, 0x00510000, 0xFC29BAE2, 0x00080051, 0x0047006B, 0x00210005, 0x0052B334, + 0x00000000, 0x00080052, 0x000C005E, 0xFFCF0005, 0x0054187C, 0x05F930F8, 0x00080054, 0x00BA0239, + 0x002C0005, 0x00555998, 0x04F8E223, 0x00080055, 0x0073021C, 0x00720005, 0x00560000, 0xFD046B84, + 0x00080056, 0x008A0239, 0xFFF90005, 0x0057E667, 0x00003332, 0x00080057, 0x009B0239, 0xFFBF0005, + 0x00581999, 0xF7784CCC, 0x00080058, 0xFFDF0239, 0x004D0005, 0x00595998, 0x027CC445, 0x00080059, + 0xFF9A021C, 0x00620005, 0x005A710A, 0xFA0C23BC, 0x0008005A, 0xFFC901F1, 0xFFCE0005, 0x005B710A, + 0x0BE994CA, 0x0008005B, 0xFED501F1, 0xFFEA0005, 0x005C6B84, 0xF70BB853, 0x0008005C, 0xFE6301F3, + 0x00530005, 0x005DDC2A, 0x0BF223D6, 0x0008005D, 0xFE4F0239, 0xFFFB0005, 0x005EC445, 0x0775E223, + 0x0008005E, 0xFE97021C, 0xFFC20008, 0x00790077, 0x022F0000, 0x00010001, 0x00050003, 0x0000F7E5, + 0xF3AE0008, 0x0003FF3B, 0x01AF0015, 0x00050030, 0x0000FBDC, 0x0D930008, 0x0030001C, 0x01C70013, + 0x00050037, 0x00000B55, 0x0C820008, 0x0037002E, 0x023BFFC6, 0x00050049, 0xB3340666, 0x4CCC0008, + 0x004900C7, 0x014B002B, 0x0005004A, 0x4CCC0CCC, 0xB3340008, 0x004A0077, 0x0145002B, 0x0005004B, + 0x4443F86B, 0x44430008, 0x004B006D, 0x0158FFF1, 0x0005004C, 0xA3A8FADF, 0xA3A80008, 0x004C00BD, + 0x0125FFD6, 0x0005004D, 0x4A3C062F, 0x00000008, 0x004DFE72, 0x014E000B, 0x0005004F, 0x56650000, + 0x56650008, 0x004F0012, 0x00500000, 0x00050050, 0x4BC00000, 0x00000008, 0x00500006, 0x00690031, + 0x00050051, 0x0000FC05, 0xB8530008, 0x00510047, 0x00670021, 0x00050052, 0xB0010000, 0x00000008, + 0x0052000C, 0x0058FFCF, 0x00050054, 0x1A0C062F, 0x34190008, 0x005400BA, 0x023C002B, 0x00050055, + 0x5CCC0526, 0xE1120008, 0x00550073, 0x021D0075, 0x00050056, 0x0000FCE9, 0x6F5B0008, 0x0056008B, + 0x023CFFF8, 0x00050057, 0xE57D0000, 0x35060008, 0x0057009C, 0x023CFFBE, 0x00050058, 0x1A83F72A, + 0x4F8A0008, 0x0058FFDF, 0x023C004E, 0x00050059, 0x5CCC0293, 0xC2230008, 0x0059FF99, 0x021D0064, + 0x0005005A, 0x6BEFF9D5, 0x25030008, 0x005AFFCA, 0x01F1FFCC, 0x0005005B, 0x6BEF0C56, 0x90F60008, + 0x005BFED8, 0x01F1FFE7, 0x0005005C, 0x6F5BF6B9, 0xB5C40008, 0x005CFE63, 0x01F30054, 0x0005005D, + 0xDAE20C5F, 0x251E0008, 0x005DFE4F, 0x023CFFFB, 0x0005005E, 0xC22307B9, 0xE1120008, 0x005EFE98, + 0x021DFFC2, 0x00080079, 0x00760231, 0x00000001, 0x00010005, 0x00030000, 0xF798F30F, 0x00080003, + 0xFF3B01AE, 0x00160005, 0x00300000, 0xFBB60DDE, 0x00080030, 0x001C01C6, 0x00130005, 0x00370000, + 0x0BC00CD7, 0x00080037, 0x002F023C, 0xFFC70005, 0x0049B05C, 0x06A34FA4, 0x00080049, 0x00C70145, + 0x002B0005, 0x004A4FFF, 0x0D55B001, 0x0008004A, 0x0076013F, 0x002B0005, 0x004B471B, 0xF81A471B, + 0x0008004B, 0x006C0154, 0xFFF00005, 0x004CA079, 0xFAB2A079, 0x0008004C, 0x00BD011E, 0xFFD60005, + 0x004D4CCC, 0x06660000, 0x0008004D, 0xFE71014A, 0x000C0005, 0x004F5998, 0x00005998, 0x0008004F, + 0x0012004A, 0x00000005, 0x00504E5D, 0x00000000, 0x00080050, 0x00060065, 0x00310005, 0x00510000, + 0xFBE1B5C4, 0x00080051, 0x00470063, 0x00200005, 0x0052ACCE, 0x00000000, 0x00080052, 0x000C0052, + 0xFFCF0005, 0x00541BA5, 0x0666374B, 0x00080054, 0x00BB023F, 0x002B0005, 0x00555FFF, 0x0553E001, + 0x00080055, 0x0073021F, 0x00770005, 0x00560000, 0xFCCD7332, 0x00080056, 0x008C023F, 0xFFF80005, + 0x0057E493, 0x000036DB, 0x00080057, 0x009D023F, 0xFFBE0005, 0x00581B6D, 0xF6DC5248, 0x00080058, + 0xFFDF023F, 0x004F0005, 0x00595FFF, 0x02A9C001, 0x00080059, 0xFF98021F, 0x00660005, 0x005A66D4, + 0xF99F264A, 0x0008005A, 0xFFCA01F2, 0xFFCB0005, 0x005B66D4, 0x0CC38D22, 0x0008005B, 0xFEDA01F2, + 0xFFE40005, 0x005C7332, 0xF667B334, 0x0008005C, 0xFE6301F4, 0x00550005, 0x005DD99A, 0x0CCC2666, + 0x0008005D, 0xFE4E023F, 0xFFFA0005, 0x005EC001, 0x07FDE001, 0x0008005E, 0xFE98021F, 0xFFC10008, + 0x00790076, 0x02330000, 0x00010001, 0x00050003, 0x0000F74C, 0xF26E0008, 0x0003FF3B, 0x01AC0017, + 0x00050030, 0x0000FB90, 0x0E270008, 0x0030001C, 0x01C50014, 0x00050037, 0x00000C2B, 0x0D290008, + 0x0037002F, 0x023DFFC8, 0x00050049, 0xAD8406DF, 0x527C0008, 0x004900C8, 0x0140002B, 0x0005004A, + 0x53320DDD, 0xACCE0008, 0x004A0076, 0x0139002B, 0x0005004B, 0x49F4F7C9, 0x49F40008, 0x004B006B, + 0x014FFFEF, 0x0005004C, 0x9D4AFA85, 0x9D4A0008, 0x004C00BE, 0x0118FFD6, 0x0005004D, 0x4F5B069C, + 0x00000008, 0x004DFE71, 0x0145000C, 0x0005004F, 0x5CCC0000, 0x5CCC0008, 0x004F0012, 0x00430000, + 0x00050050, 0x50FA0000, 0x00000008, 0x00500006, 0x00600031, 0x00050051, 0x0000FBBC, 0xB3340008, + 0x00510047, 0x005E001F, 0x00050052, 0xA99B0000, 0x00000008, 0x0052000B, 0x004CFFCF, 0x00050054, + 0x1D46069C, 0x3A8C0008, 0x005400BB, 0x0241002B, 0x00050055, 0x63320581, 0xDEF00008, 0x00550072, + 0x02200079, 0x00050056, 0x0000FCB2, 0x77090008, 0x0056008D, 0x0241FFF7, 0x00050057, 0xE3A90000, + 0x38AF0008, 0x0057009E, 0x0241FFBD, 0x00050058, 0x1C57F68E, 0x55060008, 0x0058FFDF, 0x02410050, + 0x00050059, 0x633202C0, 0xBDDF0008, 0x0059FF97, 0x02200067, 0x0005005A, 0x61B9F968, 0x27910008, + 0x005AFFCB, 0x01F3FFC9, 0x0005005B, 0x61B90D30, 0x894D0008, 0x005BFEDD, 0x01F3FFE2, 0x0005005C, + 0x7709F615, 0xB0A50008, 0x005CFE64, 0x01F30056, 0x0005005D, 0xD8530D39, 0x27AD0008, 0x005DFE4E, + 0x0241FFFA, 0x0005005E, 0xBDDF0841, 0xDEF00008, 0x005EFE99, 0x0220FFC0, 0x00080079, 0x00760235, + 0x00000001, 0x00010005, 0x00030000, 0xF6FFF1CB, 0x00080003, 0xFF3B01AB, 0x00180005, 0x00300000, + 0xFB6A0E6D, 0x00080030, 0x001B01C4, 0x00150005, 0x00370000, 0x0C970D79, 0x00080037, 0x0030023E, + 0xFFC90005, 0x0049AAAC, 0x071C5554, 0x00080049, 0x00C9013B, 0x002B0005, 0x004A5665, 0x0E66A99B, + 0x0008004A, 0x00760132, 0x002A0005, 0x004B4CCC, 0xF7784CCC, 0x0008004B, 0x006B014A, 0xFFEE0005, + 0x004C9A1B, 0xFA579A1B, 0x0008004C, 0x00BE0110, 0xFFD70005, 0x004D51EA, 0x06D30000, 0x0008004D, + 0xFE700141, 0x000C0005, 0x004F5FFF, 0x00005FFF, 0x0008004F, 0x0012003C, 0x00000005, 0x00505396, + 0x00000000, 0x00080050, 0x0005005B, 0x00310005, 0x00510000, 0xFB98B0A5, 0x00080051, 0x0047005A, + 0x001F0005, 0x0052A668, 0x00000000, 0x00080052, 0x000B0045, 0xFFCF0005, 0x00541EEE, 0x06D33DDD, + 0x00080054, 0x00BB0244, 0x002B0005, 0x00556665, 0x05AEDDDF, 0x00080055, 0x00720221, 0x007C0005, + 0x00560000, 0xFC977AE0, 0x00080056, 0x008D0244, 0xFFF70005, 0x0057E2BF, 0x00003A83, 0x00080057, + 0x009F0244, 0xFFBC0005, 0x00581D41, 0xF64057C4, 0x00080058, 0xFFDE0244, 0x00510005, 0x00596665, + 0x02D7BBBD, 0x00080059, 0xFF960221, 0x00690005, 0x005A5C9E, 0xF93228D7, 0x0008005A, 0xFFCC01F3, + 0xFFC70005, 0x005B5C9E, 0x0D9D8579, 0x0008005B, 0xFEE001F3, 0xFFDF0005, 0x005C7AE0, 0xF5C3AE16, + 0x0008005C, 0xFE6401F3, 0x00580005, 0x005DD70B, 0x0DA728F5, 0x0008005D, 0xFE4E0244, 0xFFFA0005, + 0x005EBBBD, 0x0885DDDF, 0x0008005E, 0xFE990221, 0xFFBF0008, 0x00790076, 0x02370000, 0x00010001, + 0x00050003, 0x0000F6B3, 0xF1250008, 0x0003FF3B, 0x01AA0019, 0x00050030, 0x0000FB43, 0x0EB00008, + 0x0030001B, 0x01C30016, 0x00050037, 0x00000D03, 0x0DC60008, 0x00370030, 0x023EFFCA, 0x00050049, + 0xA7D40759, 0x582C0008, 0x004900CA, 0x0135002A, 0x0005004A, 0x59980EEE, 0xA6680008, 0x004A0076, + 0x012C002A, 0x0005004B, 0x4FA4F727, 0x4FA40008, 0x004B006A, 0x0145FFEE, 0x0005004C, 0x96ECFA2A, + 0x96EC0008, 0x004C00BF, 0x0109FFD7, 0x0005004D, 0x547A070A, 0x00000008, 0x004DFE6F, 0x013C000D, + 0x0005004F, 0x63320000, 0x63320008, 0x004F0012, 0x00350000, 0x00050050, 0x56330000, 0x00000008, + 0x00500005, 0x00560031, 0x00050051, 0x0000FB73, 0xAE160008, 0x00510047, 0x0055001E, 0x00050052, + 0xA3340000, 0x00000008, 0x0052000B, 0x003EFFCF, 0x00050054, 0x209D070A, 0x413B0008, 0x005400BC, + 0x0246002B, 0x00050055, 0x699805DC, 0xDCCE0008, 0x00550072, 0x0222007E, 0x00050056, 0x0000FC7B, + 0x7EB70008, 0x0056008E, 0x0246FFF6, 0x00050057, 0xE1D50000, 0x3C570008, 0x005700A0, 0x0246FFBC, + 0x00050058, 0x1E2BF5F2, 0x5A820008, 0x0058FFDE, 0x02460052, 0x00050059, 0x699802EE, 0xB99B0008, + 0x0059FF95, 0x0222006B, 0x0005005A, 0x5783F8FB, 0x2A1E0008, 0x005AFFCD, 0x01F3FFC5, 0x0005005B, + 0x57830E0A, 0x81A50008, 0x005BFEE2, 0x01F3FFDD, 0x0005005C, 0x7EB7F571, 0xAB860008, 0x005CFE65, + 0x01F30059, 0x0005005D, 0xD5C30E14, 0x2A3D0008, 0x005DFE4E, 0x0246FFFA, 0x0005005E, 0xB99B08CA, + 0xDCCE0008, 0x005EFE9A, 0x0222FFBE, 0x00080079, 0x00760238, 0x00000001, 0x00010005, 0x00030000, + 0xF668F07C, 0x00080003, 0xFF3B01A8, 0x001A0005, 0x00300000, 0xFB1D0EF0, 0x00080030, 0x001B01C2, + 0x00160005, 0x00370000, 0x0D700E10, 0x00080037, 0x0030023F, 0xFFCA0005, 0x0049A4FC, 0x07955B04, + 0x00080049, 0x00CB012F, 0x002A0005, 0x004A5CCC, 0x0F77A334, 0x0008004A, 0x00750125, 0x002A0005, + 0x004B527C, 0xF6D6527C, 0x0008004B, 0x0069013F, 0xFFED0005, 0x004C93BC, 0xF9FD93BC, 0x0008004C, + 0x00BF0102, 0xFFD70005, 0x004D5709, 0x07400000, 0x0008004D, 0xFE6E0137, 0x000D0005, 0x004F6665, + 0x00006665, 0x0008004F, 0x0012002D, 0x00000005, 0x005058D0, 0x00000000, 0x00080050, 0x00040051, + 0x00310005, 0x00510000, 0xFB4FAB86, 0x00080051, 0x00480050, 0x001E0005, 0x0052A001, 0x00000000, + 0x00080052, 0x000B0038, 0xFFCF0005, 0x00542253, 0x074044A7, 0x00080054, 0x00BC0248, 0x002A0005, + 0x00556CCB, 0x0609DBBD, 0x00080055, 0x00710222, 0x00800005, 0x00560000, 0xFC608291, 0x00080056, + 0x008F0248, 0xFFF60005, 0x0057E0EB, 0x00003E2B, 0x00080057, 0x00A10248, 0xFFBB0005, 0x00581F15, + 0xF5A45D41, 0x00080058, 0xFFDE0248, 0x00530005, 0x00596CCB, 0x0304B779, 0x00080059, 0xFF940222, + 0x006D0005, 0x005A5268, 0xF8C52B65, 0x0008005A, 0xFFCD01F3, 0xFFC30005, 0x005B5268, 0x0E777DCE, + 0x0008005B, 0xFEE501F3, 0xFFDA0005, 0x005C8291, 0xF51FA8F7, 0x0008005C, 0xFE6501F3, 0x005A0005, + 0x005DD47C, 0x0E812B84, 0x0008005D, 0xFE4D0248, 0xFFFA0005, 0x005EB779, 0x090EDBBD, 0x0008005E, + 0xFE9A0222, 0xFFBD0008, 0x00790075, 0x023A0000, 0x00010001, 0x00050003, 0x0000F61E, 0xEFD20008, + 0x0003FF3B, 0x01A6001B, 0x00050030, 0x0000FAF6, 0x0F2C0008, 0x0030001B, 0x01C10017, 0x00050037, + 0x00000DDD, 0x0E580008, 0x00370031, 0x023FFFCB, 0x00050049, 0xA22307D2, 0x5DDD0008, 0x004900CC, + 0x0129002A, 0x0005004A, 0x5FFF0FFF, 0xA0010008, 0x004A0075, 0x011E002A, 0x0005004B, 0x5554F685, + 0x55540008, 0x004B0069, 0x013AFFED, 0x0005004C, 0x908DF9CF, 0x908D0008, 0x004C00C0, 0x00FAFFD7, + 0x0005004D, 0x59980777, 0x00000008, 0x004DFE6D, 0x0131000E, 0x0005004F, 0x69980000, 0x69980008, + 0x004F0012, 0x00250000, 0x00050050, 0x5B6D0000, 0x00000008, 0x00500004, 0x004B0031, 0x00050051, + 0x0000FB2B, 0xA8F70008, 0x00510048, 0x004B001D, 0x00050052, 0x9CCE0000, 0x00000008, 0x0052000A, + 0x0031FFCF, 0x00050054, 0x24100777, 0x48200008, 0x005400BD, 0x024A002A, 0x00050055, 0x6FFF0636, + 0xDAAB0008, 0x00550071, 0x02230083, 0x00050056, 0x0000FC45, 0x86680008, 0x00560090, 0x024AFFF5, + 0x00050057, 0xE0010000, 0x3FFF0008, 0x005700A2, 0x024AFFBB, 0x00050058, 0x1FFFF556, 0x5FFF0008, + 0x0058FFDD, 0x024A0054, 0x00050059, 0x6FFF031B, 0xB5560008, 0x0059FF93, 0x0223006E, 0x0005005A, + 0x4D4DF88E, 0x2CAC0008, 0x005AFFCE, 0x01F4FFC2, 0x0005005B, 0x4D4D0EE4, 0x79F90008, 0x005BFEE8, + 0x01F4FFD7, 0x0005005C, 0x8668F4CD, 0xA6680008, 0x005CFE65, 0x01F2005B, 0x0005005D, 0xD3340EEE, + 0x2CCC0008, 0x005DFE4D, 0x024AFFF9, 0x0005005E, 0xB5560952, 0xDAAB0008, 0x005EFE9B, 0x0223FFBC, + 0x00080079, 0x0075023B, 0x00000001, 0x00010005, 0x00030000, 0xF5D4EF25, 0x00080003, 0xFF3B01A5, + 0x001B0005, 0x00300000, 0xFACF0F66, 0x00080030, 0x001B01C0, 0x00180005, 0x00370000, 0x0E4B0E9E, + 0x00080037, 0x0031023F, 0xFFCC0005, 0x00499F4B, 0x080F60B5, 0x00080049, 0x00CD0123, 0x002A0005, + 0x004A6332, 0x10889CCE, 0x0008004A, 0x00750118, 0x00290005, 0x004B582C, 0xF634582C, 0x0008004B, + 0x00680134, 0xFFEC0005, 0x004C8D5E, 0xF9A28D5E, 0x0008004C, 0x00C000F3, 0xFFD80005, 0x004D5C28, + 0x07AE0000, 0x0008004D, 0xFE6D012C, 0x000E0005, 0x004F6CCB, 0x00006CCB, 0x0008004F, 0x0012001D, + 0x00000005, 0x00505E09, 0x00000000, 0x00080050, 0x00040046, 0x00310005, 0x00510000, 0xFB06A668, + 0x00080051, 0x00480046, 0x001D0005, 0x0052999B, 0x00000000, 0x00080052, 0x000A0029, 0xFFCF0005, + 0x005425D2, 0x07AE4BA4, 0x00080054, 0x00BD024C, 0x002A0005, 0x00557332, 0x0664D99A, 0x00080055, + 0x00710224, 0x00850005, 0x00560000, 0xFC298A3F, 0x00080056, 0x0091024C, 0xFFF50005, 0x0057DF17, + 0x000041D3, 0x00080057, 0x00A3024C, 0xFFBA0005, 0x005820E9, 0xF50862BD, 0x00080058, 0xFFDD024C, + 0x00550005, 0x00597332, 0x0332B334, 0x00080059, 0xFF920224, 0x00700005, 0x005A4832, 0xF8582DF2, + 0x0008005A, 0xFFCF01F3, 0xFFC00005, 0x005B4832, 0x0F507625, 0x0008005B, 0xFEEA01F3, 0xFFD50005, + 0x005C8A3F, 0xF47BA3D8, 0x0008005C, 0xFE6601F1, 0x005C0005, 0x005DD1EC, 0x0F5C2E14, 0x0008005D, + 0xFE4D024C, 0xFFF90005, 0x005EB334, 0x0996D99A, 0x0008005E, 0xFE9B0224, 0xFFBB0008, 0x00790075, + 0x023C0000, 0x00010001, 0x00050003, 0x0000F58B, 0xEE760008, 0x0003FF3B, 0x01A3001C, 0x00050030, + 0x0000FAA8, 0x0F9D0008, 0x0030001A, 0x01BE0018, 0x00050037, 0x00000EB9, 0x0EE10008, 0x00370031, + 0x0240FFCD, 0x00050049, 0x9C73084B, 0x638D0008, 0x004900CE, 0x011C0029, 0x0005004A, 0x66651110, + 0x999B0008, 0x004A0075, 0x01100029, 0x0005004B, 0x5B04F5E4, 0x5B040008, 0x004B0067, 0x012EFFEB, + 0x0005004C, 0x8A2FF975, 0x8A2F0008, 0x004C00C1, 0x00EBFFD8, 0x0005004D, 0x5EB707E4, 0x00000008, + 0x004DFE6C, 0x0127000E, 0x0005004F, 0x6FFF0000, 0x6FFF0008, 0x004F0012, 0x00150000, 0x00050050, + 0x60A60000, 0x00000008, 0x00500003, 0x00400031, 0x00050051, 0x0000FAE2, 0xA3D80008, 0x00510048, + 0x0040001C, 0x00050052, 0x96680000, 0x00000008, 0x0052000A, 0x0022FFCF, 0x00050054, 0x279907E4, + 0x4F330008, 0x005400BD, 0x024E002A, 0x00050055, 0x76650691, 0xD8890008, 0x00550070, 0x02240087, + 0x00050056, 0x0000FC0E, 0x8E160008, 0x00560092, 0x024EFFF4, 0x00050057, 0xDE2D0000, 0x43A70008, + 0x005700A4, 0x024EFFBA, 0x00050058, 0x21D3F4BA, 0x657B0008, 0x0058FFDD, 0x024E0056, 0x00050059, + 0x76650348, 0xB1120008, 0x0059FF91, 0x02240072, 0x0005005A, 0x4318F822, 0x2F390008, 0x005AFFCF, + 0x01F3FFBE, 0x0005005B, 0x43180FBD, 0x72510008, 0x005BFEED, 0x01F3FFD2, 0x0005005C, 0x8E16F42A, + 0xA1490008, 0x005CFE66, 0x01F1005E, 0x0005005D, 0xD0A50FC9, 0x2F5B0008, 0x005DFE4C, 0x024EFFF9, + 0x0005005E, 0xB11209DA, 0xD8890008, 0x005EFE9C, 0x0224FFBA, 0x00080079, 0x0075023E, 0x00000001, + 0x00010005, 0x00030000, 0xF543EDC6, 0x00080003, 0xFF3B01A1, 0x001D0005, 0x00300000, 0xFA800FD1, + 0x00080030, 0x001A01BD, 0x00190005, 0x00370000, 0x0F270F21, 0x00080037, 0x00320240, 0xFFCE0005, + 0x0049999B, 0x08886665, 0x00080049, 0x00CF0116, 0x00290005, 0x004A6998, 0x11999668, 0x0008004A, + 0x00740109, 0x00290005, 0x004B5DDD, 0xF5935DDD, 0x0008004B, 0x00670128, 0xFFEA0005, 0x004C8700, + 0xF9488700, 0x0008004C, 0x00C100E3, 0xFFD80005, 0x004D6146, 0x081B0000, 0x0008004D, 0xFE6B0121, + 0x000F0005, 0x004F7332, 0x00007332, 0x0008004F, 0x0012000D, 0x00000005, 0x00506343, 0x00000000, + 0x00080050, 0x0003003A, 0x00310005, 0x00510000, 0xFABDA149, 0x00080051, 0x0048003B, 0x001B0005, + 0x00529335, 0x00000000, 0x00080052, 0x000A001A, 0xFFCF0005, 0x00542966, 0x081B52CD, 0x00080054, + 0x00BE024F, 0x002A0005, 0x00557998, 0x06BFD778, 0x00080055, 0x00700224, 0x008A0005, 0x00560000, + 0xFBF391ED, 0x00080056, 0x0093024F, 0xFFF40005, 0x0057DD43, 0x0000457B, 0x00080057, 0x00A5024F, + 0xFFB90005, 0x005822BD, 0xF46C6839, 0x00080058, 0xFFDD024F, 0x00570005, 0x00597998, 0x035FAEF0, + 0x00080059, 0xFF900224, 0x00740005, 0x005A3DFD, 0xF7EB3080, 0x0008005A, 0xFFD001F2, 0xFFBC0005, + 0x005B3DFD, 0x102A6E7D, 0x0008005B, 0xFEF001F2, 0xFFD00005, 0x005C91ED, 0xF3D89EBA, 0x0008005C, + 0xFE6701F0, 0x005F0005, 0x005DCF5D, 0x103630A3, 0x0008005D, 0xFE4C024F, 0xFFF90005, 0x005EAEF0, + 0x0A1ED778, 0x0008005E, 0xFE9C0224, 0xFFB90008, 0x00790075, 0x023F0000, 0x00010001, 0x00050003, + 0x0000F4FC, 0xED140008, 0x0003FF3A, 0x01A0001E, 0x00050030, 0x0000FA59, 0x10030008, 0x0030001A, + 0x01BB001A, 0x00050037, 0x00000F96, 0x0F600008, 0x00370032, 0x023FFFCF, 0x00050049, 0x96C308C5, + 0x693D0008, 0x004900CF, 0x010F0029, 0x0005004A, 0x6CCB1221, 0x93350008, 0x004A0074, 0x01020029, + 0x0005004B, 0x60B5F542, 0x60B50008, 0x004B0066, 0x0122FFEA, 0x0005004C, 0x83D1F91A, 0x83D10008, + 0x004C00C2, 0x00DBFFD8, 0x0005004D, 0x63D60851, 0x00000008, 0x004DFE6A, 0x011B000F, 0x0005004F, + 0x76650000, 0x76650008, 0x004F0012, 0x00040000, 0x00050050, 0x65DF0000, 0x00000008, 0x00500002, + 0x00330031, 0x00050051, 0x0000FA99, 0x9EBA0008, 0x00510048, 0x0035001B, 0x00050052, 0x90010000, + 0x00000008, 0x00520009, 0x0012FFCF, 0x00050054, 0x2B380851, 0x56700008, 0x005400BE, 0x02500029, + 0x00050055, 0x7CCB06EC, 0xD6670008, 0x00550070, 0x0225008C, 0x00050056, 0x0000FBD8, 0x95C40008, + 0x00560094, 0x0250FFF3, 0x00050057, 0xDC590000, 0x474F0008, 0x005700A6, 0x0250FFB8, 0x00050058, + 0x23A7F41E, 0x6AF70008, 0x0058FFDC, 0x02500058, 0x00050059, 0x7CCB0376, 0xACCE0008, 0x0059FF8F, + 0x02250075, 0x0005005A, 0x38E2F7B5, 0x31C60008, 0x005AFFD1, 0x01F1FFBA, 0x0005005B, 0x38E21097, + 0x6AA90008, 0x005BFEF3, 0x01F1FFCD, 0x0005005C, 0x95C4F386, 0x9C2A0008, 0x005CFE67, 0x01EE0060, + 0x0005005D, 0xCE1510A3, 0x31EB0008, 0x005DFE4C, 0x0250FFF9, 0x0005005E, 0xACCE0A63, 0xD6670008, + 0x005EFE9D, 0x0225FFB8, 0x00080079, 0x0074023F, 0x00000001, 0x00010005, 0x00030000, 0xF4B6EC60, + 0x00080003, 0xFF3A019E, 0x001E0005, 0x00300000, 0xFA311031, 0x00080030, 0x001A01BA, 0x001A0005, + 0x00370000, 0x10050F9B, 0x00080037, 0x0032023F, 0xFFD00005, 0x004993EB, 0x09016C15, 0x00080049, + 0x00D00108, 0x00290005, 0x004A6FFF, 0x12AA9001, 0x0008004A, 0x007400FA, 0x00280005, 0x004B638D, + 0xF4F1638D, 0x0008004B, 0x0065011B, 0xFFE90005, 0x004C80A1, 0xF8ED80A1, 0x0008004C, 0x00C200D3, + 0xFFD90005, 0x004D6665, 0x08880000, 0x0008004D, 0xFE690115, 0x00100005, 0x004F7998, 0x00007998, + 0x0008004F, 0x0012FFFC, 0x00000005, 0x0050687C, 0x00000000, 0x00080050, 0x0002002D, 0x00310005, + 0x00510000, 0xFA759C2A, 0x00080051, 0x00480030, 0x001A0005, 0x00528CCE, 0x00000000, 0x00080052, + 0x0009000A, 0xFFCF0005, 0x00542D0D, 0x08885A1B, 0x00080054, 0x00BF0252, 0x00290005, 0x00558001, + 0x071AD556, 0x00080055, 0x006F0225, 0x008E0005, 0x00560000, 0xFBBC999B, 0x00080056, 0x00950252, + 0xFFF20005, 0x0057DB6E, 0x00004924, 0x00080057, 0x00A70252, 0xFFB80005, 0x00582492, 0xF3D06DB6, + 0x00080058, 0xFFDC0252, 0x00590005, 0x00598001, 0x038DAAAC, 0x00080059, 0xFF8E0225, 0x00770005, + 0x005A33C7, 0xF77E330D, 0x0008005A, 0xFFD101F0, 0xFFB90005, 0x005B33C7, 0x110466D4, 0x0008005B, + 0xFEF501F0, 0xFFCB0005, 0x005C999B, 0xF334999B, 0x0008005C, 0xFE6701ED, 0x00610005, 0x005DCCCE, + 0x11103332, 0x0008005D, 0xFE4B0252, 0xFFF80005, 0x005EAAAC, 0x0AA7D556, 0x0008005E, 0xFE9D0225, + 0xFFB70008, 0x00790074, 0x02400000, 0x00010001, 0x00050003, 0x0000F471, 0xEBAB0008, 0x0003FF3A, + 0x019C001F, 0x00050030, 0x0000FA08, 0x105D0008, 0x0030001A, 0x01B8001B, 0x00050037, 0x00001075, + 0x0FD60008, 0x00370033, 0x023FFFD1, 0x00050049, 0x9112093E, 0x6EEE0008, 0x004900D1, 0x01010029, + 0x0005004A, 0x73321333, 0x8CCE0008, 0x004A0074, 0x00F30028, 0x0005004B, 0x6665F4A0, 0x66650008, + 0x004B0065, 0x0115FFE8, 0x0005004C, 0x8001F8E4, 0x80010008, 0x004C00C3, 0x00D3FFD9, 0x0005004D, + 0x68F408BF, 0x00000008, 0x004DFE69, 0x010F0010, 0x0005004F, 0x7CCB0000, 0x7CCB0008, 0x004F0012, + 0xFFF20000, 0x00050050, 0x6B190000, 0x00000008, 0x00500001, 0x00260031, 0x00050051, 0x0000FA50, + 0x999B0008, 0x00510048, 0x002A001A, 0x00050052, 0x899B0000, 0x00000008, 0x00520009, 0x0002FFCF, + 0x00050054, 0x2EE708BF, 0x5DCF0008, 0x005400BF, 0x02530029, 0x00050055, 0x83350747, 0xD4450008, + 0x0055006F, 0x02250091, 0x00050056, 0x0000FBA1, 0x9D720008, 0x00560096, 0x0253FFF2, 0x00050057, + 0xDA840000, 0x4AF80008, 0x005700A8, 0x0253FFB7, 0x00050058, 0x257CF382, 0x70740008, 0x0058FFDC, + 0x0253005A, 0x00050059, 0x833503A3, 0xA88A0008, 0x0059FF8D, 0x02250079, 0x0005005A, 0x2EACF748, + 0x34540008, 0x005AFFD2, 0x01EFFFB7, 0x0005005B, 0x2EAC1171, 0x63000008, 0x005BFEF8, 0x01EFFFC8, + 0x0005005C, 0x9D72F2E2, 0x970C0008, 0x005CFE68, 0x01EC0062, 0x0005005D, 0xCB86117E, 0x347A0008, + 0x005DFE4B, 0x0253FFF8, 0x0005005E, 0xA88A0AEB, 0xD4450008, 0x005EFE9E, 0x0225FFB6, 0x00080079, + 0x00740241, 0x00000001, 0x00010005, 0x00030000, 0xF42EEAF5, 0x00080003, 0xFF39019A, 0x00200005, + 0x00300000, 0xF9E01086, 0x00080030, 0x001A01B7, 0x001C0005, 0x00370000, 0x10E51011, 0x00080037, + 0x0033023F, 0xFFD20005, 0x00498E3A, 0x097B71C6, 0x00080049, 0x00D200FA, 0x00280005, 0x004A7665, + 0x13BB899B, 0x0008004A, 0x007300EB, 0x00280005, 0x004B693D, 0xF44F693D, 0x0008004B, 0x0064010E, + 0xFFE80005, 0x004D6B84, 0x08F50000, 0x0008004D, 0xFE680109, 0x00100005, 0x004F8001, 0x00008001, + 0x0008004F, 0x0012FFE9, 0x00000005, 0x00506DB6, 0x00000000, 0x00080050, 0x0001001F, 0x00310005, + 0x00510000, 0xFA2C970C, 0x00080051, 0x00480024, 0x00190005, 0x00528668, 0x00000000, 0x00080052, + 0x0009FFFA, 0xFFCF0005, 0x005430C5, 0x08F5618A, 0x00080054, 0x00BF0254, 0x00290005, 0x00558668, + 0x0775D334, 0x00080055, 0x006F0225, 0x00930005, 0x00560000, 0xFB86A149, 0x00080056, 0x00970254, + 0xFFF10005, 0x0057D99A, 0x00004CCC, 0x00080057, 0x00AA0254, 0xFFB70005, 0x00582666, 0xF3347332, + 0x00080058, 0xFFDB0254, 0x005B0005, 0x00598668, 0x03BAA668, 0x00080059, 0xFF8C0225, 0x007B0005, + 0x005A2991, 0xF711359B, 0x0008005A, 0xFFD301ED, 0xFFB50005, 0x005B2991, 0x11DE5F2C, 0x0008005B, + 0xFEFB01ED, 0xFFC50005, 0x005CA149, 0xF290947C, 0x0008005C, 0xFE6801EA, 0x00640005, 0x005DCA3E, + 0x11EB35C2, 0x0008005D, 0xFE4B0254, 0xFFF80005, 0x005EA668, 0x0B2FD334, 0x0008005E, 0xFE9E0225, + 0xFFB50001, 0x00010005, 0x00030000, 0xF3ECEA3F, 0x00080003, 0xFF390198, 0x00200005, 0x00300000, + 0xF9B710AD, 0x00080030, 0x001901B5, 0x001C0005, 0x00370000, 0x1155104C, 0x00080037, 0x0033023E, + 0xFFD30005, 0x00498B62, 0x09B7749E, 0x00080049, 0x00D300F2, 0x00280005, 0x004A7998, 0x14448668, + 0x0008004A, 0x007300E3, 0x00280005, 0x004B6C15, 0xF3FE6C15, 0x0008004B, 0x00630107, 0xFFE70005, + 0x004D6E13, 0x092C0000, 0x0008004D, 0xFE670103, 0x00110005, 0x00507052, 0x00000000, 0x00080050, + 0x00010018, 0x00310005, 0x00510000, 0xFA07947C, 0x00080051, 0x0048001E, 0x00180005, 0x00528335, + 0x00000000, 0x00080052, 0x0008FFF2, 0xFFCF0005, 0x005432A5, 0x092C654A, 0x00080054, 0x00C00255, + 0x00290005, 0x0055899B, 0x07A2D223, 0x00080055, 0x006E0225, 0x00950005, 0x00560000, 0xFB6AA520, + 0x00080056, 0x00980255, 0xFFF10005, 0x0057D8B0, 0x00004EA0, 0x00080057, 0x00AB0255, 0xFFB60005, + 0x00582750, 0xF2E675F0, 0x00080058, 0xFFDB0255, 0x005C0005, 0x0059899B, 0x03D1A445, 0x00080059, + 0xFF8B0225, 0x007C0005, 0x005A2476, 0xF6DB36E1, 0x0008005A, 0xFFD401EB, 0xFFB30005, 0x005B2476, + 0x124B5B58, 0x0008005B, 0xFEFD01EB, 0xFFC30005, 0x005CA520, 0xF23E91ED, 0x0008005C, 0xFE6901E9, + 0x00650005, 0x005DC8F7, 0x12583709, 0x0008005D, 0xFE4B0255, 0xFFF80005, 0x005EA445, 0x0B73D223, + 0x0008005E, 0xFE9F0225, 0xFFB40008, 0x00790074, 0x02420000, 0x00010001, 0x00050003, 0x0000F3AB, + 0xE9870008, 0x0003FF38, 0x01960021, 0x00050030, 0x0000F98E, 0x10D10008, 0x00300019, 0x01B3001D, + 0x00050037, 0x000011C5, 0x10880008, 0x00370033, 0x023EFFD4, 0x00050049, 0x888A09F4, 0x77760008, + 0x004900D4, 0x00EA0028, 0x0005004A, 0x7CCB14CC, 0x83350008, 0x004A0073, 0x00DB0027, 0x0005004B, + 0x6EEEF3AD, 0x6EEE0008, 0x004B0063, 0x0100FFE6, 0x0005004D, 0x70A20962, 0x00000008, 0x004DFE66, + 0x00FC0011, 0x00050050, 0x72EF0000, 0x00000008, 0x00500000, 0x00100031, 0x00050051, 0x0000F9E3, + 0x91ED0008, 0x00510049, 0x00170018, 0x00050052, 0x80010000, 0x00000008, 0x00520008, 0xFFE9FFCF, + 0x00050054, 0x34880962, 0x69110008, 0x005400C0, 0x02550028, 0x00050055, 0x8CCE07D0, 0xD1120008, + 0x0055006E, 0x02250098, 0x00050056, 0x0000FB4F, 0xA8F70008, 0x00560099, 0x0255FFF0, 0x00050057, + 0xD7C60000, 0x50740008, 0x005700AC, 0x0255FFB6, 0x00050058, 0x283AF298, 0x78AE0008, 0x0058FFDB, + 0x0255005D, 0x00050059, 0x8CCE03E8, 0xA2230008, 0x0059FF8A, 0x0225007E, 0x0005005A, 0x1F5BF6A4, + 0x38280008, 0x005AFFD4, 0x01E9FFB2, 0x0005005B, 0x1F5B12B8, 0x57830008, 0x005BFF00, 0x01E9FFC0, + 0x0005005C, 0xA8F7F1EC, 0x8F5E0008, 0x005CFE69, 0x01E70066, 0x0005005D, 0xC7AF12C5, 0x38510008, + 0x005DFE4A, 0x0255FFF8, 0x0005005E, 0xA2230BB8, 0xD1120008, 0x005EFE9F, 0x0225FFB3, 0x00080079, + 0x00730242, 0x00000001, 0x00010005, 0x00030000, 0xF36CE8CF, 0x00080003, 0xFF370194, 0x00220005, + 0x00300000, 0xF96410F2, 0x00080030, 0x001901B1, 0x001D0005, 0x00370000, 0x123410C3, 0x00080037, + 0x0034023D, 0xFFD50005, 0x004985B2, 0x0A317A4E, 0x00080049, 0x00D500E3, 0x00280005, 0x004A8001, + 0x15558001, 0x0008004A, 0x007300D3, 0x00270005, 0x004B71C6, 0xF35C71C6, 0x0008004B, 0x006200F9, + 0xFFE60005, 0x004D7332, 0x09990000, 0x0008004D, 0xFE6500F6, 0x00120005, 0x0050758C, 0x00000000, + 0x00080050, 0x00000009, 0x00310005, 0x00510000, 0xF9BF8F5E, 0x00080051, 0x00490011, 0x00170005, + 0x0054366E, 0x09996CDC, 0x00080054, 0x00C10256, 0x00280005, 0x00559001, 0x07FDD001, 0x00080055, + 0x006E0226, 0x009A0005, 0x00560000, 0xFB34ACCE, 0x00080056, 0x009A0256, 0xFFEF0005, 0x0057D6DC, + 0x00005248, 0x00080057, 0x00AD0256, 0xFFB50005, 0x00582924, 0xF24A7B6C, 0x00080058, 0xFFDB0256, + 0x005E0005, 0x00599001, 0x03FEA001, 0x00080059, 0xFF890226, 0x00800005, 0x005A1A40, 0xF66E396F, + 0x0008005A, 0xFFD501E7, 0xFFB00005, 0x005B1A40, 0x132553AF, 0x0008005B, 0xFF0301E7, 0xFFBE0005, + 0x005CACCE, 0xF19A8CCE, 0x0008005C, 0xFE6901E5, 0x00670005, 0x005DC667, 0x13333999, 0x0008005D, + 0xFE4A0256, 0xFFF70005, 0x005EA001, 0x0BFCD001, 0x0008005E, 0xFEA00226, 0xFFB20008, 0x00790073, + 0x02430000, 0x00010001, 0x00050003, 0x0000F32F, 0xE8170008, 0x0003FF37, 0x01920022, 0x00050030, + 0x0000F93A, 0x11110008, 0x00300019, 0x01AF001E, 0x00050037, 0x000012A4, 0x10FF0008, 0x00370034, + 0x023CFFD5, 0x00050049, 0x82DA0A6D, 0x7D260008, 0x004900D6, 0x00DB0027, 0x0005004B, 0x749EF30B, + 0x749E0008, 0x004B0061, 0x00F1FFE5, 0x0005004D, 0x75C109D0, 0x00000008, 0x004DFE65, 0x00EF0012, + 0x00050050, 0x78280000, 0x00000008, 0x00500000, 0x00010031, 0x00050051, 0x0000F99A, 0x8CCE0008, + 0x00510049, 0x000A0017, 0x00050054, 0x385509D0, 0x70AB0008, 0x005400C1, 0x02570028, 0x00050055, + 0x9335082A, 0xCEF00008, 0x0055006D, 0x0225009C, 0x00050056, 0x0000FB18, 0xB0A50008, 0x0056009B, + 0x0257FFEF, 0x00050057, 0xD5F20000, 0x541C0008, 0x005700AE, 0x0257FFB4, 0x00050058, 0x2A0EF1FC, + 0x7E2A0008, 0x0058FFDA, 0x0257005F, 0x00050059, 0x93350415, 0x9DDF0008, 0x0059FF88, 0x02250082, + 0x0005005A, 0x1525F637, 0x3AB60008, 0x005AFFD6, 0x01E4FFAE, 0x0005005B, 0x15251392, 0x4FDB0008, + 0x005BFF05, 0x01E4FFBB, 0x0005005C, 0xB0A5F148, 0x8A3F0008, 0x005CFE6A, 0x01E20068, 0x0005005D, + 0xC52013A0, 0x3AE00008, 0x005DFE4A, 0x0257FFF7, 0x0005005E, 0x9DDF0C40, 0xCEF00008, 0x005EFEA0, + 0x0225FFB1, 0x00010001, 0x00050003, 0x0000F2F3, 0xE75E0008, 0x0003FF36, 0x01900023, 0x00050030, + 0x0000F910, 0x112D0008, 0x00300019, 0x01AD001F, 0x00050037, 0x00001314, 0x113C0008, 0x00370034, + 0x023BFFD6, 0x00050049, 0x80010AAA, 0x80010008, 0x004900D7, 0x00D30027, 0x0005004B, 0x7776F2BA, + 0x77760008, 0x004B0061, 0x00E9FFE4, 0x0005004D, 0x78500A06, 0x00000008, 0x004DFE64, 0x00E80012, + 0x00050050, 0x7AC50000, 0x00000008, 0x00500000, 0xFFFA0031, 0x00050051, 0x0000F976, 0x8A3F0008, + 0x00510049, 0x00040016, 0x00050054, 0x3A3E0A06, 0x747D0005, 0x00559668, 0x0858CDDF, 0x00080055, + 0x006D0225, 0x009F0005, 0x00560000, 0xFAFDB47C, 0x00080056, 0x009C0257, 0xFFEE0005, 0x0057D508, + 0x000055F0, 0x00080057, 0x00AF0257, 0xFFB40005, 0x00582AF8, 0xF1AE80EC, 0x00080058, 0xFFDA0257, + 0x00600005, 0x00599668, 0x042C9BBD, 0x00080059, 0xFF870225, 0x00830005, 0x005A100A, 0xF6013BFC, + 0x0008005A, 0xFFD601E2, 0xFFAC0005, 0x005B100A, 0x13FE4C07, 0x0008005B, 0xFF0801E2, 0xFFB80005, + 0x005CB47C, 0xF0F687B0, 0x0008005C, 0xFE6A01E0, 0x006A0005, 0x005DC3D8, 0x140D3C28, 0x0008005D, + 0xFE490257, 0xFFF70005, 0x005E9BBD, 0x0C84CDDF, 0x0008005E, 0xFEA10225, 0xFFB00001, 0x00010005, + 0x00030000, 0xF2B9E6A5, 0x00080003, 0xFF35018E, 0x00230005, 0x00300000, 0xF8E51146, 0x00080030, + 0x001901AB, 0x001F0005, 0x00370000, 0x13841178, 0x00080037, 0x0034023B, 0xFFD70005, 0x004B7A4E, + 0xF26A7A4E, 0x0008004B, 0x006000E2, 0xFFE40005, 0x004D7AE0, 0x0A3D0000, 0x0008004D, 0xFE6300E1, + 0x00130005, 0x00507D62, 0x00000000, 0x00080050, 0x0000FFF1, 0x00310005, 0x00510000, 0xF95187B0, + 0x00080051, 0x0049FFFE, 0x00150005, 0x00543C29, 0x0A3D7852, 0x00080054, 0x00C20257, 0x00280005, + 0x0055999B, 0x0885CCCE, 0x00080055, 0x006D0225, 0x00A10005, 0x00560000, 0xFAE2B853, 0x00080056, + 0x009D0257, 0xFFEE0005, 0x0057D41E, 0x000057C4, 0x00080057, 0x00B00257, 0xFFB30005, 0x00582BE2, + 0xF16083AA, 0x00080058, 0xFFDA0257, 0x00610005, 0x0059999B, 0x0442999B, 0x00080059, 0xFF860225, + 0x00850005, 0x005A0AEF, 0xF5CB3D43, 0x0008005A, 0xFFD701DE, 0xFFAA0005, 0x005B0AEF, 0x146B4832, + 0x0008005B, 0xFF0B01DE, 0xFFB60005, 0x005CB853, 0xF0A48520, 0x0008005C, 0xFE6B01DE, 0x006B0005, + 0x005DC290, 0x147A3D70, 0x0005005E, 0x999B0CC8, 0xCCCE0008, 0x005EFEA1, 0x0225FFAF, 0x00010001, + 0x00050003, 0x0000F280, 0xE5ED0008, 0x0003FF34, 0x018C0024, 0x00050030, 0x0000F8BA, 0x115E0008, + 0x00300019, 0x01A90020, 0x00050037, 0x000013F3, 0x11B50008, 0x00370035, 0x023AFFD8, 0x0005004B, + 0x7D26F219, 0x7D260008, 0x004B005F, 0x00DAFFE3, 0x0005004D, 0x7D6F0A73, 0x00000008, 0x004DFE62, + 0x00DA0013, 0x00050050, 0x80010000, 0x00000008, 0x0050FFFF, 0xFFE90031, 0x00050051, 0x0000F92D, + 0x85200008, 0x00510049, 0xFFF70015, 0x00050054, 0x3E140A73, 0x7C280008, 0x005400C2, 0x02570027, + 0x00050055, 0x9CCE08B3, 0xCBBD0008, 0x0055006C, 0x022400A3, 0x00050056, 0x0000FAC7, 0xBC2A0008, + 0x0056009E, 0x0257FFED, 0x00050057, 0xD3340000, 0x59980008, 0x005700B1, 0x0257FFB3, 0x00050058, + 0x2CCCF112, 0x86680008, 0x0058FFD9, 0x02570062, 0x00050059, 0x9CCE0459, 0x97790008, 0x0059FF85, + 0x02240087, 0x0005005A, 0x05D4F594, 0x3E8A0008, 0x005AFFD8, 0x01DBFFA9, 0x0005005B, 0x05D414D8, + 0x445E0008, 0x005BFF0D, 0x01DBFFB3, 0x0005005C, 0xBC2AF053, 0x82910008, 0x005CFE6B, 0x01DB006C, + 0x0005005D, 0xC14914E7, 0x3EB70005, 0x005E9779, 0x0D0DCBBD, 0x0008005E, 0xFEA20224, 0xFFAE0008, + 0x00790072, 0x02430000, 0x00010001, 0x00050003, 0x0000F249, 0xE5350008, 0x0003FF33, 0x018A0024, + 0x00050030, 0x0000F88F, 0x11720008, 0x00300019, 0x01A60021, 0x00050037, 0x00001462, 0x11F20008, + 0x00370035, 0x0239FFD9, 0x0005004B, 0x8001F1C8, 0x80010008, 0x004B005F, 0x00D2FFE2, 0x0005004D, + 0x80010AAA, 0x00000008, 0x004DFE61, 0x00D30014, 0x00050051, 0x0000F909, 0x82910008, 0x00510049, + 0xFFF00014, 0x00050054, 0x3FFF0AAA, 0x80010008, 0x005400C3, 0x02580027, 0x00050055, 0xA00108E0, + 0xCAAC0008, 0x0055006C, 0x022300A6, 0x00050056, 0x0000FAAB, 0xC0010008, 0x005600A0, 0x0258FFEC, + 0x00050057, 0xD24A0000, 0x5B6D0008, 0x005700B2, 0x0258FFB2, 0x00050058, 0x2DB6F0C4, 0x89260008, + 0x0058FFD9, 0x02580063, 0x00050059, 0xA0010470, 0x95570008, 0x0059FF84, 0x02230089, 0x0005005A, + 0x00B9F55E, 0x3FD10008, 0x005AFFD8, 0x01D8FFA7, 0x0005005B, 0x00B91545, 0x408A0008, 0x005BFF10, + 0x01D8FFB1, 0x0005005C, 0xC001F001, 0x80010008, 0x005CFE6B, 0x01D8006D, 0x0005005D, 0xC0011555, + 0x3FFF0008, 0x005DFE48, 0x0258FFF6, 0x0005005E, 0x95570D51, 0xCAAC0008, 0x005EFEA2, 0x0223FFAD, + 0x00080079, 0x00720244, 0x00000001, 0x00010005, 0x00030000, 0xF214E47D, 0x00080003, 0xFF330188, + 0x00250005, 0x001D0000, 0x000000FE, 0x00050030, 0x0000F863, 0x11850008, 0x00300018, 0x01A40021, + 0x00050037, 0x000014D2, 0x122F0008, 0x00370035, 0x0238FFDA, 0x00050051, 0x0000F8E4, 0x80010008, + 0x00510049, 0xFFE90014, 0x00050054, 0x41EA0AE1, 0x83D80008, 0x005400C3, 0x02570027, 0x00050055, + 0xA334090E, 0xC99B0008, 0x0055006C, 0x022200A8, 0x00050056, 0x0000FA90, 0xC3D80008, 0x005600A1, + 0x0257FFEC, 0x00050057, 0xD1600000, 0x5D410008, 0x005700B3, 0x0257FFB2, 0x00050058, 0x2EA0F076, + 0x8BE40008, 0x0058FFD9, 0x02570064, 0x00050059, 0xA3340487, 0x93350008, 0x0059FF83, 0x0222008A, + 0x0005005A, 0xFB9FF527, 0x41170008, 0x005AFFD9, 0x01D4FFA5, 0x0005005B, 0xFB9F15B2, 0x3CB60008, + 0x005BFF13, 0x01D4FFAE, 0x0005005C, 0xC3D8EFAF, 0x7D6F0008, 0x005CFE6C, 0x01D5006E, 0x0005005D, + 0xBEB915C2, 0x41470008, 0x005DFE48, 0x0257FFF6, 0x0005005E, 0x93350D95, 0xC99B0008, 0x005EFEA3, + 0x0222FFAC, 0x00080079, 0x00720243, 0x00000001, 0x00010005, 0x00030000, 0xF1E1E3C7, 0x00080003, + 0xFF320186, 0x00250005, 0x001D0000, 0x000001FD, 0x00050030, 0x0000F837, 0x11940008, 0x00300018, + 0x01A20022, 0x00050037, 0x00001541, 0x126C0008, 0x00370035, 0x0236FFDB, 0x00050054, 0x43D50B17, + 0x87AE0005, 0x0055A668, 0x093BC889, 0x00080055, 0x006B0221, 0x00AA0005, 0x00560000, 0xFA75C7AF, + 0x00080056, 0x00A20257, 0xFFEB0005, 0x0057D076, 0x00005F15, 0x00080057, 0x00B40257, 0xFFB10005, + 0x00582F8A, 0xF0288EA2, 0x00080058, 0xFFD90257, 0x00650005, 0x0059A668, 0x049D9112, 0x00080059, + 0xFF820221, 0x008C0005, 0x005AF684, 0xF4F1425E, 0x0008005A, 0xFFDA01D0, 0xFFA30005, 0x005BF684, + 0x161F38E2, 0x0008005B, 0xFF1601D0, 0xFFAB0005, 0x005CC7AF, 0xEF5D7AE0, 0x0008005C, 0xFE6C01D1, + 0x00700005, 0x005DBD72, 0x162F428E, 0x0005005E, 0x91120DD9, 0xC8890008, 0x005EFEA3, 0x0221FFAB, + 0x00010001, 0x00050003, 0x0000F1B0, 0xE3110008, 0x0003FF31, 0x01830025, 0x0005001D, 0x00000000, + 0x02FC0005, 0x00300000, 0xF80A11A2, 0x00080030, 0x0018019F, 0x00230005, 0x00370000, 0x15AF12AA, + 0x00080037, 0x00350235, 0xFFDC0005, 0x005445C0, 0x0B4E8B83, 0x00080054, 0x00C40257, 0x00270005, + 0x0055A99B, 0x0969C778, 0x00080055, 0x006B0220, 0x00AD0005, 0x00560000, 0xFA59CB86, 0x00080056, + 0x00A30257, 0xFFEB0005, 0x0057CF8C, 0x000060E9, 0x00080057, 0x00B50257, 0xFFB00005, 0x00583074, + 0xEFDA9160, 0x00080058, 0xFFD80257, 0x00660005, 0x0059A99B, 0x04B48EF0, 0x00080059, 0xFF810220, + 0x008E0005, 0x005AF169, 0xF4BA43A5, 0x0008005A, 0xFFDA01CB, 0xFFA10005, 0x005BF169, 0x168C350D, + 0x0008005B, 0xFF1801CB, 0xFFA90005, 0x005CCB86, 0xEF0B7850, 0x0008005C, 0xFE6D01CE, 0x00710005, + 0x005DBC2A, 0x169C43D6, 0x0005005E, 0x8EF00E1D, 0xC7780008, 0x005EFEA4, 0x0220FFAA, 0x00080079, + 0x00710243, 0x00000001, 0x00010005, 0x00030000, 0xF180E25C, 0x00080003, 0xFF300181, 0x00260005, + 0x001D0000, 0x000003FB, 0x00050030, 0x0000F7DD, 0x11AD0008, 0x00300018, 0x019D0023, 0x00050037, + 0x0000161E, 0x12E80008, 0x00370035, 0x0234FFDD, 0x00050054, 0x47A90B85, 0x8F550008, 0x005400C4, + 0x02570026, 0x00050055, 0xACCE0996, 0xC6670008, 0x0055006B, 0x021E00AF, 0x00050056, 0x0000FA3E, + 0xCF5D0008, 0x005600A4, 0x0257FFEA, 0x00050057, 0xCEA20000, 0x62BD0008, 0x005700B6, 0x0257FFB0, + 0x00050058, 0x315EEF8C, 0x941F0008, 0x0058FFD8, 0x02570067, 0x00050059, 0xACCE04CB, 0x8CCE0008, + 0x0059FF80, 0x021E0090, 0x0005005A, 0xEC4EF484, 0x44EC0008, 0x005AFFDB, 0x01C7FFA0, 0x0005005B, + 0xEC4E16F9, 0x31390008, 0x005BFF1B, 0x01C7FFA6, 0x0005005C, 0xCF5DEEB9, 0x75C10008, 0x005CFE6D, + 0x01CA0072, 0x0005005D, 0xBAE2170A, 0x451E0008, 0x005DFE47, 0x0257FFF6, 0x0005005E, 0x8CCE0E61, + 0xC6670008, 0x005EFEA4, 0x021EFFA9, 0x00010001, 0x00050003, 0x0000F152, 0xE1A80008, 0x0003FF2F, + 0x017F0026, 0x0005001D, 0x00000000, 0x04FA0005, 0x00300000, 0xF7AF11B6, 0x00080030, 0x0018019A, + 0x00240005, 0x00370000, 0x168C1326, 0x00080037, 0x00350233, 0xFFDE0005, 0x00544990, 0x0BBB9324, + 0x00080054, 0x00C50256, 0x00260005, 0x0055B001, 0x09C4C556, 0x00080055, 0x006A021C, 0x00B10005, + 0x00560000, 0xFA23D334, 0x00080056, 0x00A50256, 0xFFEA0005, 0x0057CDB8, 0x00006491, 0x00080057, + 0x00B70256, 0xFFAF0005, 0x00583248, 0xEF3E96DD, 0x00080058, 0xFFD80256, 0x00680005, 0x0059B001, + 0x04E28AAC, 0x00080059, 0xFF7F021C, 0x00910005, 0x005AE733, 0xF44D4632, 0x0008005A, 0xFFDC01C2, + 0xFF9E0005, 0x005BE733, 0x17662D65, 0x0008005B, 0xFF1E01C2, 0xFFA40005, 0x005CD334, 0xEE677332, + 0x0008005C, 0xFE6D01C6, 0x00730005, 0x005DB99B, 0x17774665, 0x0008005D, 0xFE470256, 0xFFF50005, + 0x005E8AAC, 0x0EA6C556, 0x0008005E, 0xFEA5021C, 0xFFA70008, 0x00790071, 0x02420000, 0x00010001, + 0x00050003, 0x0000F126, 0xE0F60008, 0x0003FF2E, 0x017D0026, 0x0005001D, 0x00000000, 0x05F90005, + 0x00300000, 0xF78111BC, 0x00080030, 0x00180197, 0x00240005, 0x00370000, 0x16FA1364, 0x00080037, + 0x00360231, 0xFFDF0005, 0x00544B76, 0x0BF296EF, 0x00050055, 0xB33409F1, 0xC4450008, 0x0055006A, + 0x021A00B4, 0x00050056, 0x0000FA07, 0xD70B0008, 0x005600A6, 0x0256FFE9, 0x00050057, 0xCCCE0000, + 0x66650008, 0x005700B9, 0x0255FFAF, 0x00050058, 0x3332EEF0, 0x999B0008, 0x0058FFD7, 0x02550069, + 0x00050059, 0xB33404F8, 0x888A0008, 0x0059FF7E, 0x021A0093, 0x0005005A, 0xE218F417, 0x47790008, + 0x005AFFDD, 0x01BDFF9C, 0x0005005B, 0xE21817D3, 0x29910008, 0x005BFF20, 0x01BDFFA1, 0x0005005C, + 0xD70BEE15, 0x70A20008, 0x005CFE6E, 0x01C20074, 0x0005005D, 0xB85317E4, 0x47AD0005, 0x005E888A, + 0x0EEAC445, 0x0008005E, 0xFEA5021A, 0xFFA60001, 0x00010005, 0x00030000, 0xF0FBE045, 0x00080003, + 0xFF2D017B, 0x00260005, 0x001D0000, 0x000006F7, 0x00050030, 0x0000F752, 0x11C00008, 0x00300018, + 0x01950025, 0x00050037, 0x00001768, 0x13A30008, 0x00370036, 0x0230FFE0, 0x00050054, 0x4D590C28, + 0x9AB60008, 0x005400C5, 0x02550026, 0x00050055, 0xB6670A1E, 0xC3340008, 0x0055006A, 0x021800B6, + 0x00050056, 0x0000F9EC, 0xDAE20008, 0x005600A7, 0x0255FFE8, 0x00050057, 0xCBE40000, 0x68390008, + 0x005700BA, 0x0255FFAE, 0x00050058, 0x341CEEA2, 0x9C590008, 0x0058FFD7, 0x0255006A, 0x00050059, + 0xB667050F, 0x86680008, 0x0059FF7D, 0x02180095, 0x0005005A, 0xDCFDF3E0, 0x48C00008, 0x005AFFDD, + 0x01B8FF9A, 0x0005005B, 0xDCFD1840, 0x25BC0008, 0x005BFF23, 0x01B8FF9E, 0x0005005C, 0xDAE2EDC3, + 0x6E130008, 0x005CFE6E, 0x01BE0076, 0x0005005D, 0xB70B1851, 0x48F50008, 0x005DFE46, 0x0255FFF5, + 0x0005005E, 0x86680F2E, 0xC3340008, 0x005EFEA6, 0x0218FFA5, 0x00080079, 0x00710241, 0x00000001, + 0x00010005, 0x00030000, 0xF0D2DF95, 0x00080003, 0xFF2C0179, 0x00270005, 0x001D0000, 0x000007F6, + 0x00050030, 0x0000F723, 0x11C20008, 0x00300017, 0x01920026, 0x00050037, 0x000017D5, 0x13E20008, + 0x00370036, 0x022EFFE2, 0x00050054, 0x4F390C5F, 0x9E760008, 0x005400C6, 0x02540026, 0x00050055, + 0xB99B0A4C, 0xC2230008, 0x00550069, 0x021600B8, 0x00050056, 0x0000F9D1, 0xDEB90008, 0x005600A8, + 0x0254FFE8, 0x00050057, 0xCAFA0000, 0x6A0D0008, 0x005700BB, 0x0254FFAE, 0x00050058, 0x3506EE54, + 0x9F170008, 0x0058FFD7, 0x0254006B, 0x00050059, 0xB99B0526, 0x84460008, 0x0059FF7C, 0x02160097, + 0x0005005A, 0xD7E2F3AA, 0x4A070008, 0x005AFFDE, 0x01B2FF98, 0x0005005B, 0xD7E218AD, 0x21E80008, + 0x005BFF26, 0x01B2FF9C, 0x0005005C, 0xDEB9ED71, 0x6B840008, 0x005CFE6F, 0x01B90077, 0x0005005D, + 0xB5C418BE, 0x4A3C0008, 0x005DFE46, 0x0254FFF5, 0x0005005E, 0x84460F72, 0xC2230008, 0x005EFEA6, + 0x0216FFA4, 0x00080079, 0x00700241, 0x00000001, 0x00010005, 0x00030000, 0xF0ABDEE7, 0x00080003, + 0xFF2B0177, 0x00270005, 0x001D0000, 0x000008F5, 0x00050030, 0x0000F6F4, 0x11C10008, 0x00300017, + 0x018F0026, 0x00050037, 0x00001842, 0x14210008, 0x00370036, 0x022CFFE3, 0x00050054, 0x51170C96, + 0xA2310008, 0x005400C6, 0x02530025, 0x00050055, 0xBCCE0A79, 0xC1120008, 0x00550069, 0x021300BB, + 0x00050056, 0x0000F9B5, 0xE2900008, 0x005600A9, 0x0253FFE7, 0x00050057, 0xCA100000, 0x6BE10008, + 0x005700BC, 0x0253FFAD, 0x00050058, 0x35F0EE06, 0xA1D50008, 0x0058FFD7, 0x0253006C, 0x00050059, + 0xBCCE053C, 0x82240008, 0x0059FF7B, 0x02130098, 0x0005005A, 0xD2C7F374, 0x4B4D0008, 0x005AFFDF, + 0x01ADFF97, 0x0005005B, 0xD2C71919, 0x1E140008, 0x005BFF28, 0x01ADFF99, 0x0005005C, 0xE290ED1F, + 0x68F40008, 0x005CFE6F, 0x01B40078, 0x0005005D, 0xB47C192C, 0x4B840008, 0x005DFE46, 0x0253FFF5, + 0x0005005E, 0x82240FB6, 0xC1120008, 0x005EFEA7, 0x0213FFA3, 0x00080079, 0x00700240, 0x00000001, + 0x00010005, 0x00030000, 0xF086DE3C, 0x00080003, 0xFF290174, 0x00270008, 0x000E0000, 0xFE0C0000, + 0x00080012, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x0005001D, 0x00000000, 0x09F40008, + 0x00220000, 0x00000000, 0x00050030, 0x0000F6C3, 0x11BE0008, 0x00300017, 0x018C0027, 0x00050037, + 0x000018AE, 0x14600008, 0x00370036, 0x022BFFE4, 0x0008003C, 0x00000000, 0x00000008, 0x00420000, + 0x00000000, 0x00050054, 0x52F10CCC, 0xA5E50008, 0x005400C7, 0x02520025, 0x00050055, 0xC0010AA7, + 0xC0010008, 0x00550069, 0x021000BD, 0x00050056, 0x0000F99A, 0xE6670008, 0x005600AA, 0x0252FFE7, + 0x00050057, 0xC9250000, 0x6DB60008, 0x005700BD, 0x0252FFAC, 0x00050058, 0x36DBEDB7, 0xA4940008, + 0x0058FFD6, 0x0252006D, 0x00050059, 0xC0010553, 0x80010008, 0x0059FF7A, 0x0210009A, 0x0005005A, + 0xCDACF33D, 0x4C940008, 0x005AFFDF, 0x01A7FF95, 0x0005005B, 0xCDAC1986, 0x1A400008, 0x005BFF2B, + 0x01A7FF97, 0x0005005C, 0xE667ECCD, 0x66650008, 0x005CFE6F, 0x01AF0079, 0x0005005D, 0xB3341999, + 0x4CCC0008, 0x005DFE45, 0x0252FFF4, 0x0005005E, 0x80010FFB, 0xC0010008, 0x005EFEA7, 0x0210FFA2, + 0x0008006F, 0x0000FE0C, 0x00000008, 0x00700000, 0xFE0C0000, 0x00080073, 0x0000FE0C, 0x00000008, + 0x00740000, 0xFE0C0000, 0x00080075, 0x0000FE0C, 0x00000008, 0x00760000, 0xFE0C0000, 0x00080077, + 0x0000FE0C, 0x00000008, 0x00780000, 0xFE0C0000, 0x00080079, 0x0070023F, 0x00000001, 0x00010005, + 0x00030000, 0xF06BDE84, 0x00080003, 0xFF2A0175, 0x00270005, 0x00150000, 0x0000004F, 0x00080015, + 0xFFA200EA, 0x00000005, 0x00300000, 0xF69211B9, 0x00080030, 0x00170189, 0x00270005, 0x00370000, + 0x191A14A0, 0x00080037, 0x00360229, 0xFFE50005, 0x003A0000, 0x0000FF50, 0x0008003A, 0xFEDA00E2, + 0xFFFF0005, 0x0045028F, 0x0000FD71, 0x00080045, 0x004B00BD, 0xFFCF0008, 0x0046FF51, 0x00BAFFCF, + 0x00050047, 0x00000036, 0x00000008, 0x0047FE89, 0x00BD0000, 0x0005004E, 0x00000000, 0x004F0008, + 0x004EFFA2, 0x00EA0000, 0x00050054, 0x54C60D03, 0xA9900008, 0x005400C7, 0x02510025, 0x00050055, + 0xC3340AD4, 0xBEF00008, 0x00550068, 0x020E00BF, 0x00050056, 0x0000F97F, 0xEA3E0008, 0x005600AB, + 0x0251FFE6, 0x00050057, 0xC83B0000, 0x6F8A0008, 0x005700BE, 0x0251FFAC, 0x00050058, 0x37C5ED69, + 0xA7520008, 0x0058FFD6, 0x0251006E, 0x00050059, 0xC334056A, 0x7DDC0008, 0x0059FF79, 0x020E009C, + 0x0005005A, 0xC891F307, 0x4DDB0008, 0x005AFFE0, 0x01A0FF93, 0x0005005B, 0xC89119F3, 0x166C0008, + 0x005BFF2E, 0x01A0FF94, 0x0005005C, 0xEA3EEC7C, 0x63D60008, 0x005CFE70, 0x01AA007A, 0x0005005D, + 0xB1ED1A06, 0x4E130008, 0x005DFE45, 0x0251FFF4, 0x0005005E, 0x7DDC103F, 0xBEF00008, 0x005EFEA8, + 0x020EFFA1, 0x00080079, 0x0070023E, 0x00000001, 0x00010005, 0x00030000, 0xF051DEC9, 0x00080003, + 0xFF2B0177, 0x00280005, 0x00150000, 0x00000098, 0x00080015, 0xFFA200E9, 0x00000008, 0x001D0060, + 0x00320057, 0x00050030, 0x0000F661, 0x11B10008, 0x00300017, 0x01860028, 0x00050037, 0x00001986, + 0x14E00008, 0x00370036, 0x0227FFE6, 0x0005003A, 0x00000000, 0xFEAF0008, 0x003AFEDB, 0x00E0FFFF, + 0x00050045, 0x051E0000, 0xFAE20008, 0x0046FF51, 0x00B6FFCF, 0x00050047, 0x0000006D, 0x00000005, + 0x004E0000, 0x00000098, 0x0008004E, 0xFFA200E9, 0x00000005, 0x00545698, 0x0D39AD33, 0x00080054, + 0x00C7024F, 0x00250005, 0x0055C667, 0x0B02BDDF, 0x00080055, 0x0068020A, 0x00C20005, 0x00560000, + 0xF964EE15, 0x00080056, 0x00AC024F, 0xFFE50005, 0x0057C751, 0x0000715E, 0x00080057, 0x00BF024F, + 0xFFAB0005, 0x005838AF, 0xED1BAA10, 0x00080058, 0xFFD6024F, 0x006F0005, 0x0059C667, 0x05817BBA, + 0x00080059, 0xFF78020A, 0x009E0005, 0x005AC376, 0xF2D04F22, 0x0008005A, 0xFFE1019A, 0xFF910005, + 0x005BC376, 0x1A601297, 0x0008005B, 0xFF30019A, 0xFF910005, 0x005CEE15, 0xEC2A6146, 0x0008005C, + 0xFE7001A5, 0x007C0005, 0x005DB0A5, 0x1A734F5B, 0x0008005D, 0xFE45024F, 0xFFF40005, 0x005E7BBA, + 0x1083BDDF, 0x0008005E, 0xFEA8020A, 0xFFA00008, 0x00790070, 0x023D0000, 0x00010001, 0x00050003, + 0x0000F03A, 0xDF0A0008, 0x0003FF2B, 0x01780028, 0x00050015, 0x00000000, 0x00DC0008, 0x0015FFA2, + 0x00E80000, 0x0008001D, 0x00610032, 0x00570005, 0x00300000, 0xF62F11A8, 0x00080030, 0x00170183, + 0x00290005, 0x00370000, 0x19F11520, 0x00080037, 0x00360225, 0xFFE70005, 0x003A0000, 0x0000FE1C, + 0x0008003A, 0xFEDC00DE, 0xFFFF0005, 0x004507AE, 0x0000F852, 0x00080046, 0xFF5100B3, 0xFFCF0005, + 0x00470000, 0x00A30000, 0x0005004E, 0x00000000, 0x00DC0008, 0x004EFFA2, 0x00E80000, 0x00050054, + 0x58650D70, 0xB0CD0008, 0x005400C8, 0x024E0025, 0x00050055, 0xC99B0B2F, 0xBCCE0008, 0x00550068, + 0x020700C4, 0x00050056, 0x0000F948, 0xF1EC0008, 0x005600AD, 0x024EFFE5, 0x00050057, 0xC6670000, + 0x73320008, 0x005700C0, 0x024EFFAB, 0x00050058, 0x3999ECCD, 0xACCE0008, 0x0058FFD5, 0x024E0070, + 0x00050059, 0xC99B0597, 0x79980008, 0x0059FF77, 0x0207009F, 0x0005005A, 0xBE5BF29A, 0x50680008, + 0x005AFFE1, 0x0193FF8F, 0x0005005B, 0xBE5B1ACD, 0x0EC30008, 0x005BFF33, 0x0193FF8F, 0x0005005C, + 0xF1ECEBD8, 0x5EB70008, 0x005CFE71, 0x019F007D, 0x0005005D, 0xAF5D1AE1, 0x50A30008, 0x005DFE45, + 0x024EFFF4, 0x0005005E, 0x799810C7, 0xBCCE0008, 0x005EFEA9, 0x0207FF9E, 0x00080079, 0x006F023B, + 0x00000001, 0x00010005, 0x00030000, 0xF024DF45, 0x00080003, 0xFF2C0179, 0x00290005, 0x00150000, + 0x0000011B, 0x00080015, 0xFFA200E7, 0x00000005, 0x00300000, 0xF5FD119C, 0x00080030, 0x00170180, + 0x00290005, 0x00370000, 0x1A5B1560, 0x00080037, 0x00360223, 0xFFE80005, 0x003A0000, 0x0000FD97, + 0x0008003A, 0xFEDC00DD, 0xFFFF0005, 0x00450A3D, 0x0000F5C3, 0x00080045, 0x004B00BC, 0xFFCF0008, + 0x0046FF51, 0x00B0FFCF, 0x00050047, 0x000000DA, 0x00000008, 0x0047FE89, 0x00BC0000, 0x0005004E, + 0x00000000, 0x011B0008, 0x004EFFA2, 0x00E70000, 0x00050054, 0x5A2C0DA7, 0xB45C0008, 0x005400C8, + 0x024C0024, 0x00050055, 0xCCCE0B5D, 0xBBBD0008, 0x00550067, 0x020400C6, 0x00050056, 0x0000F92D, + 0xF5C30008, 0x005600AE, 0x024CFFE4, 0x00050057, 0xC57D0000, 0x75060008, 0x005700C1, 0x024CFFAA, + 0x00050058, 0x3A83EC7F, 0xAF8C0008, 0x0058FFD5, 0x024C0071, 0x00050059, 0xCCCE05AE, 0x77760008, + 0x0059FF76, 0x020400A1, 0x0005005A, 0xB940F263, 0x51AF0008, 0x005AFFE2, 0x018CFF8E, 0x0005005B, + 0xB9401B3A, 0x0AEF0008, 0x005BFF36, 0x018CFF8C, 0x0005005C, 0xF5C3EB86, 0x5C280008, 0x005CFE71, + 0x0199007E, 0x0005005D, 0xAE161B4E, 0x51EA0008, 0x005DFE44, 0x024CFFF4, 0x0005005E, 0x7776110B, + 0xBBBD0008, 0x005EFEA9, 0x0204FF9D, 0x00080079, 0x006F023A, 0x00000001, 0x00010005, 0x00030000, + 0xF011DF7A, 0x00050015, 0x00000000, 0x01550008, 0x0015FFA1, 0x00E60000, 0x0008001D, 0x00620033, + 0x00570005, 0x00300000, 0xF5CA118D, 0x00080030, 0x0017017D, 0x002A0005, 0x00370000, 0x1AC515A1, + 0x00080037, 0x00360221, 0xFFE90005, 0x003A0000, 0x0000FD1F, 0x0008003A, 0xFEDC00DC, 0xFFFF0005, + 0x00450CCC, 0x0000F334, 0x00080045, 0x004B00BB, 0xFFCF0008, 0x0046FF51, 0x00AEFFCF, 0x00050047, + 0x00000111, 0x00000008, 0x0047FE89, 0x00BB0000, 0x0005004E, 0x00000000, 0x01550008, 0x004EFFA1, + 0x00E60000, 0x00050054, 0x5BEE0DDD, 0xB7E00008, 0x005400C9, 0x024B0024, 0x00050055, 0xD0010B8A, + 0xBAAC0008, 0x00550067, 0x020000C9, 0x00050056, 0x0000F912, 0xF99A0008, 0x005600AF, 0x024BFFE4, + 0x00050057, 0xC4930000, 0x76DA0008, 0x005700C2, 0x024AFFAA, 0x00050058, 0x3B6DEC31, 0xB24A0008, + 0x0058FFD5, 0x024A0072, 0x00050059, 0xD00105C5, 0x75540008, 0x0059FF75, 0x020000A3, 0x0005005A, + 0xB425F22D, 0x52F60008, 0x005AFFE3, 0x0185FF8C, 0x0005005B, 0xB4251BA7, 0x071B0008, 0x005BFF39, + 0x0185FF8A, 0x0005005C, 0xF99AEB34, 0x59980008, 0x005CFE71, 0x0193007F, 0x0005005D, 0xACCE1BBB, + 0x53320008, 0x005DFE44, 0x024BFFF3, 0x0005005E, 0x7554114F, 0xBAAC0008, 0x005EFEAA, 0x0200FF9C, + 0x00080079, 0x006F0239, 0x00000001, 0x00010005, 0x00030000, 0xF000DFA8, 0x00080003, 0xFF2C017A, + 0x00290005, 0x00150000, 0x0000018A, 0x00080015, 0xFFA100E5, 0x00000005, 0x00300000, 0xF596117D, + 0x00080030, 0x0017017A, 0x002A0005, 0x00370000, 0x1B2F15E2, 0x00080037, 0x0036021F, 0xFFEA0005, + 0x003A0000, 0x0000FCB3, 0x0008003A, 0xFEDD00DA, 0xFFFF0005, 0x00450F5C, 0x0000F0A4, 0x00080045, + 0x004B00BA, 0xFFCF0008, 0x0046FF51, 0x00ACFFCF, 0x00050047, 0x00000147, 0x00000008, 0x0047FE89, + 0x00BA0000, 0x0005004E, 0x00000000, 0x018A0008, 0x004EFFA1, 0x00E50000, 0x00050054, 0x5DAB0E14, + 0xBB590008, 0x005400C9, 0x02490024, 0x00050055, 0xD3340BB8, 0xB99B0008, 0x00550067, 0x01FC00CB, + 0x00050056, 0x0000F8F6, 0xFD710008, 0x005600B0, 0x0249FFE3, 0x00050057, 0xC3A90000, 0x78AE0008, + 0x005700C3, 0x0249FFA9, 0x00050058, 0x3C57EBE3, 0xB5080008, 0x0058FFD5, 0x02490073, 0x00050059, + 0xD33405DC, 0x73320008, 0x0059FF74, 0x01FC00A5, 0x0005005A, 0xAF0AF1F6, 0x543D0008, 0x005AFFE4, + 0x017EFF8A, 0x0005005B, 0xAF0A1C14, 0x03460008, 0x005BFF3B, 0x017EFF87, 0x0005005C, 0xFD71EAE2, + 0x57090008, 0x005CFE72, 0x018C0080, 0x0005005D, 0xAB861C28, 0x547A0008, 0x005DFE44, 0x0249FFF3, + 0x0005005E, 0x73321194, 0xB99B0008, 0x005EFEAA, 0x01FCFF9B, 0x00080079, 0x006F0237, 0x00000001, + 0x00010005, 0x00030000, 0xEFF3DFCD, 0x00080003, 0xFF2D017B, 0x00290005, 0x00150000, 0x000001BB, + 0x0008001D, 0x00630033, 0x00570005, 0x00300000, 0xF562116A, 0x00080030, 0x00160177, 0x002B0005, + 0x00370000, 0x1B981623, 0x00080037, 0x0036021D, 0xFFEC0005, 0x003A0000, 0x0000FC53, 0x0008003A, + 0xFEDD00D9, 0xFFFF0005, 0x004511EB, 0x0000EE15, 0x00080045, 0x004B00B9, 0xFFCF0008, 0x0046FF51, + 0x00AAFFCF, 0x00050047, 0x0000017E, 0x00000008, 0x0047FE89, 0x00B90000, 0x0005004E, 0x00000000, + 0x01BB0005, 0x00545F61, 0x0E4ABEC5, 0x00080054, 0x00C90247, 0x00240005, 0x0055D667, 0x0BE5B88A, + 0x00080055, 0x006601F8, 0x00CD0005, 0x00560000, 0xF8DB0147, 0x00080056, 0x00B10247, 0xFFE30005, + 0x0057C2BF, 0x00007A82, 0x00080057, 0x00C40247, 0xFFA80005, 0x00583D41, 0xEB95B7C7, 0x00080058, + 0xFFD40247, 0x00740005, 0x0059D667, 0x05F27110, 0x00080059, 0xFF7301F8, 0x00A60005, 0x005AA9EF, + 0xF1C05583, 0x0008005A, 0xFFE40176, 0xFF880005, 0x005BA9EF, 0x1C81FF73, 0x0008005B, 0xFF3E0176, + 0xFF850005, 0x005C0147, 0xEA90547A, 0x0008005C, 0xFE720186, 0x00820005, 0x005DAA3F, 0x1C9555C1, + 0x0008005D, 0xFE430247, 0xFFF30005, 0x005E7110, 0x11D8B88A, 0x0008005E, 0xFEAB01F8, 0xFF9A0008, + 0x0079006F, 0x02350000, 0x00010001, 0x00050003, 0x0000EFE9, 0xDFE90008, 0x0003FF2D, 0x017B002A, + 0x00050015, 0x00000000, 0x01E70008, 0x0015FFA1, 0x00E40000, 0x00050030, 0x0000F52D, 0x11550008, + 0x00300016, 0x0173002B, 0x00050037, 0x00001C00, 0x16640008, 0x00370036, 0x021BFFED, 0x0005003A, + 0x00000000, 0xFBFE0008, 0x003AFEDD, 0x00D8FFFF, 0x00050045, 0x147A0000, 0xEB860008, 0x0045004B, + 0x00B7FFCF, 0x00080046, 0xFF5100A8, 0xFFCF0005, 0x00470000, 0x01B40000, 0x00080047, 0xFE8900B7, + 0x00000005, 0x004E0000, 0x000001E7, 0x0008004E, 0xFFA100E4, 0x00000005, 0x00546110, 0x0E81C223, + 0x00080054, 0x00CA0245, 0x00240005, 0x0055D99A, 0x0C13B779, 0x00080055, 0x006601F4, 0x00D00005, + 0x00560000, 0xF8C0051E, 0x00080056, 0x00B20245, 0xFFE20005, 0x0057C1D5, 0x00007C56, 0x00080057, + 0x00C50244, 0xFFA80005, 0x00583E2B, 0xEB47BA85, 0x00080058, 0xFFD40244, 0x00750005, 0x0059D99A, + 0x06096EEE, 0x00080059, 0xFF7201F4, 0x00A80005, 0x005AA4D4, 0xF18956CA, 0x0008005A, 0xFFE5016F, + 0xFF860005, 0x005BA4D4, 0x1CEEFB9F, 0x0008005B, 0xFF41016F, 0xFF820005, 0x005C051E, 0xEA3E51EA, + 0x0008005C, 0xFE73017F, 0x00830005, 0x005DA8F7, 0x1D035709, 0x0008005D, 0xFE430245, 0xFFF30005, + 0x005E6EEE, 0x121CB779, 0x0008005E, 0xFEAB01F4, 0xFF990008, 0x0079006E, 0x02330000, 0x00010001, + 0x00050003, 0x0000EFE3, 0xDFFB0005, 0x00150000, 0x0000020F, 0x00080015, 0xFFA100E3, 0x00000008, + 0x001D0064, 0x00340057, 0x00050030, 0x0000F4F7, 0x113D0008, 0x00300016, 0x0170002C, 0x00050037, + 0x00001C68, 0x16A60008, 0x00370036, 0x0219FFEE, 0x0005003A, 0x00000000, 0xFBB40008, 0x003AFEDD, + 0x00D7FFFF, 0x00050045, 0x170A0000, 0xE8F60008, 0x0045004B, 0x00B6FFCF, 0x00080046, 0xFF5100A6, + 0xFFCF0005, 0x00470000, 0x01EB0000, 0x00080047, 0xFE8900B6, 0x00000005, 0x004E0000, 0x0000020F, + 0x0008004E, 0xFFA100E3, 0x00000005, 0x005462B8, 0x0EB8C574, 0x00080054, 0x00CA0242, 0x00230005, + 0x0055DCCE, 0x0C40B667, 0x00080055, 0x006601EF, 0x00D20005, 0x00560000, 0xF8A408F5, 0x00080056, + 0x00B20242, 0xFFE20005, 0x0057C0EB, 0x00007E2A, 0x00080057, 0x00C60242, 0xFFA70005, 0x00583F15, + 0xEAF9BD43, 0x00080058, 0xFFD40242, 0x00760005, 0x0059DCCE, 0x06206CCB, 0x00080059, 0xFF7101EF, + 0x00AA0005, 0x005A9FB9, 0xF1535811, 0x0008005A, 0xFFE60167, 0xFF850005, 0x005B9FB9, 0x1D5BF7CB, + 0x0008005B, 0xFF430167, 0xFF7F0005, 0x005C08F5, 0xE9EC4F5B, 0x0008005C, 0xFE730178, 0x00840005, + 0x005DA7AF, 0x1D705851, 0x0008005D, 0xFE430242, 0xFFF30005, 0x005E6CCB, 0x1260B667, 0x0008005E, + 0xFEAC01EF, 0xFF980008, 0x0079006E, 0x02320000, 0x00010001, 0x00050003, 0x0000EFE0, 0xE0010008, + 0x0003FF2D, 0x017C002A, 0x00050015, 0x00000000, 0x02330005, 0x00300000, 0xF4C11124, 0x00080030, + 0x0016016D, 0x002D0005, 0x00370000, 0x1CCF16E8, 0x00080037, 0x00360216, 0xFFEF0005, 0x003A0000, + 0x0000FB73, 0x00050045, 0x19990000, 0xE6670008, 0x0045004B, 0x00B4FFCF, 0x00080046, 0xFF5100A5, + 0xFFCF0005, 0x00470000, 0x02220000, 0x00080047, 0xFE8900B4, 0x00000005, 0x004E0000, 0x00000233, + 0x00050054, 0x64590EEE, 0xC8B50008, 0x005400CB, 0x02400023, 0x00050055, 0xE0010C6D, 0xB5560008, + 0x00550065, 0x01EB00D4, 0x00050056, 0x0000F889, 0x0CCC0008, 0x005600B3, 0x0240FFE1, 0x00050057, + 0xC0010000, 0x80010008, 0x005700C8, 0x0240FFA7, 0x00050058, 0x3FFFEAAB, 0xC0010008, 0x0058FFD3, + 0x02400077, 0x00050059, 0xE0010636, 0x6AA90008, 0x0059FF70, 0x01EB00AC, 0x0005005A, 0x9A9EF11C, + 0x59580008, 0x005AFFE6, 0x015EFF83, 0x0005005B, 0x9A9E1DC8, 0xF3F60008, 0x005BFF46, 0x015EFF7D, + 0x0005005C, 0x0CCCE99A, 0x4CCC0008, 0x005CFE73, 0x01700085, 0x0005005D, 0xA6681DDD, 0x59980008, + 0x005DFE42, 0x0240FFF2, 0x0005005E, 0x6AA912A4, 0xB5560008, 0x005EFEAC, 0x01EBFF97, 0x00080079, + 0x006E022F, 0x00000001, 0x00010005, 0x00030000, 0xEFE3DFF9, 0x00080003, 0xFF2D017B, 0x002A0005, + 0x00150000, 0x00000254, 0x00080015, 0xFFA000E2, 0x00000005, 0x00300000, 0xF48A1108, 0x00080030, + 0x00160169, 0x002D0005, 0x00370000, 0x1D36172A, 0x00080037, 0x00360214, 0xFFF10005, 0x003A0000, + 0x0000FB3C, 0x0008003A, 0xFEDE00D6, 0xFFFF0005, 0x00451C28, 0x0000E3D8, 0x00080045, 0x004B00B2, + 0xFFCF0008, 0x0046FF51, 0x00A4FFCF, 0x00050047, 0x00000258, 0x00000008, 0x0047FE89, 0x00B20000, + 0x0005004E, 0x00000000, 0x02540008, 0x004EFFA0, 0x00E20000, 0x00050054, 0x65F20F25, 0xCBE70008, + 0x005400CB, 0x023D0023, 0x00050055, 0xE3340C9B, 0xB4450008, 0x00550065, 0x01E600D7, 0x00050056, + 0x0000F86E, 0x10A30008, 0x005600B4, 0x023DFFE1, 0x00050057, 0xBF170000, 0x81D60008, 0x005700C9, + 0x023DFFA6, 0x00050058, 0x40E9EA5D, 0xC2BF0008, 0x0058FFD3, 0x023D0078, 0x00050059, 0xE334064D, + 0x68870008, 0x0059FF6F, 0x01E600AD, 0x0005005A, 0x9583F0E6, 0x5A9E0008, 0x005AFFE7, 0x0156FF81, + 0x0005005B, 0x95831E34, 0xF0220008, 0x005BFF49, 0x0156FF7A, 0x0005005C, 0x10A3E948, 0x4A3C0008, + 0x005CFE74, 0x01680086, 0x0005005D, 0xA5201E4A, 0x5AE00008, 0x005DFE42, 0x023DFFF2, 0x0005005E, + 0x688712E9, 0xB4450008, 0x005EFEAD, 0x01E6FF96, 0x00080079, 0x006E022D, 0x00000001, 0x00010005, + 0x00030000, 0xEFEBDFE4, 0x00050015, 0x00000000, 0x02710005, 0x00300000, 0xF45310E9, 0x00080030, + 0x00160166, 0x002E0005, 0x00370000, 0x1D9C176D, 0x00080037, 0x00360211, 0xFFF20005, 0x003A0000, + 0x0000FB0C, 0x00050045, 0x1EB80000, 0xE1480008, 0x0045004B, 0x00B0FFCF, 0x00080046, 0xFF5100A3, + 0xFFCF0005, 0x00470000, 0x028F0000, 0x00080047, 0xFE8900B0, 0x00000005, 0x004E0000, 0x00000271, + 0x00050054, 0x67820F5C, 0xCF080008, 0x005400CB, 0x023A0023, 0x00050055, 0xE6670CC8, 0xB3340008, + 0x00550065, 0x01E100D9, 0x00050056, 0x0000F852, 0x147A0008, 0x005600B5, 0x023AFFE0, 0x00050057, + 0xBE2D0000, 0x83AA0008, 0x005700CA, 0x023BFFA6, 0x00050058, 0x41D3EA0F, 0xC57D0008, 0x0058FFD3, + 0x023B0079, 0x00050059, 0xE6670664, 0x66650008, 0x0059FF6E, 0x01E100AF, 0x0005005A, 0x9068F0B0, + 0x5BE50008, 0x005AFFE8, 0x014DFF7F, 0x0005005B, 0x90681EA1, 0xEC4E0008, 0x005BFF4B, 0x014DFF78, + 0x0005005C, 0x147AE8F6, 0x47AD0008, 0x005CFE74, 0x01600088, 0x0005005D, 0xA3D81EB8, 0x5C280008, + 0x005DFE42, 0x023AFFF2, 0x0005005E, 0x6665132D, 0xB3340008, 0x005EFEAD, 0x01E1FF95, 0x00080079, + 0x006E022B, 0x00000001, 0x00010005, 0x00030000, 0xEFF6DFC3, 0x00080003, 0xFF2D017B, 0x00290005, + 0x00150000, 0x0000028A, 0x0008001D, 0x00650034, 0x00570005, 0x00300000, 0xF41B10C9, 0x00080030, + 0x00160162, 0x002E0005, 0x00370000, 0x1E0117AF, 0x00080037, 0x0036020F, 0xFFF30005, 0x003A0000, + 0x0000FAE5, 0x0008003A, 0xFEDE00D5, 0xFFFF0005, 0x00452147, 0x0000DEB9, 0x00080045, 0x004B00AE, + 0xFFCF0008, 0x0046FF51, 0x00A2FFCF, 0x00050047, 0x000002C5, 0x00000008, 0x0047FE89, 0x00AE0000, + 0x0005004E, 0x00000000, 0x028A0005, 0x0054690A, 0x0F92D218, 0x00080054, 0x00CC0237, 0x00230005, + 0x0055E99A, 0x0CF6B223, 0x00080055, 0x006401DC, 0x00DB0005, 0x00560000, 0xF8371851, 0x00080056, + 0x00B60237, 0xFFE00005, 0x0057BD43, 0x0000857E, 0x00080057, 0x00CB0238, 0xFFA50005, 0x005842BD, + 0xE9C1C83B, 0x00080058, 0xFFD30238, 0x007A0005, 0x0059E99A, 0x067B6443, 0x00080059, 0xFF6D01DC, + 0x00B10005, 0x005A8B4E, 0xF0795D2C, 0x0008005A, 0xFFE80144, 0xFF7D0005, 0x005B8B4E, 0x1F0EE87A, + 0x0008005B, 0xFF4E0144, 0xFF750005, 0x005C1851, 0xE8A5451E, 0x0008005C, 0xFE750158, 0x00890005, + 0x005DA291, 0x1F255D6F, 0x0008005D, 0xFE420237, 0xFFF20005, 0x005E6443, 0x1371B223, 0x0008005E, + 0xFEAE01DC, 0xFF930008, 0x0079006D, 0x02290000, 0x00010001, 0x00050003, 0x0000F006, 0xDF990008, + 0x0003FF2C, 0x017A0029, 0x00050015, 0x00000000, 0x02A00008, 0x0015FFA0, 0x00E10000, 0x00050030, + 0x0000F3E2, 0x10A60008, 0x00300016, 0x015F002F, 0x00050037, 0x00001E65, 0x17F20008, 0x00370036, + 0x020CFFF4, 0x0005003A, 0x00000000, 0xFAC50005, 0x004523D6, 0x0000DC2A, 0x00080045, 0x004B00AB, + 0xFFCF0008, 0x0046FF51, 0x00A1FFCF, 0x00050047, 0x000002FC, 0x00000008, 0x0047FE89, 0x00AB0000, + 0x0005004E, 0x00000000, 0x02A00008, 0x004EFFA0, 0x00E10000, 0x00050054, 0x6A890FC9, 0xD5160008, + 0x005400CC, 0x02340022, 0x00050055, 0xECCD0D23, 0xB1120008, 0x00550064, 0x01D600DE, 0x00050056, + 0x0000F81C, 0x1C280008, 0x005600B7, 0x0234FFDF, 0x00050057, 0xBC590000, 0x87520008, 0x005700CC, + 0x0235FFA4, 0x00050058, 0x43A7E973, 0xCAFA0008, 0x0058FFD2, 0x0235007B, 0x00050059, 0xECCD0691, + 0x62210008, 0x0059FF6C, 0x01D600B3, 0x0005005A, 0x8633F043, 0x5E720008, 0x005AFFE9, 0x013BFF7C, + 0x0005005B, 0x86331F7B, 0xE4A60008, 0x005BFF51, 0x013BFF72, 0x0005005C, 0x1C28E853, 0x428E0008, + 0x005CFE75, 0x0150008A, 0x0005005D, 0xA1491F92, 0x5EB70008, 0x005DFE41, 0x0234FFF2, 0x0005005E, + 0x622113B5, 0xB1120008, 0x005EFEAE, 0x01D6FF92, 0x00080079, 0x006D0226, 0x00000001, 0x00010005, + 0x00030000, 0xF018DF67, 0x00080003, 0xFF2C0179, 0x00290005, 0x00150000, 0x000002B4, 0x00080028, + 0x0000FE0C, 0x00000008, 0x00290000, 0x00000000, 0x00050030, 0x0000F3A8, 0x10810008, 0x00300016, + 0x015B002F, 0x00050037, 0x00001EC9, 0x18350008, 0x00370036, 0x020AFFF6, 0x0005003A, 0x00000000, + 0xFAAC0008, 0x003AFEDE, 0x00D4FFFF, 0x00050045, 0x26660000, 0xD99A0008, 0x0045004B, 0x00A9FFCF, + 0x00050047, 0x00000333, 0x00000008, 0x0047FE89, 0x00A90000, 0x0005004E, 0x00000000, 0x02B40005, + 0x00546BFF, 0x0FFFD801, 0x00080054, 0x00CD0231, 0x00220005, 0x0055F001, 0x0D51B001, 0x00080055, + 0x006401D0, 0x00E00005, 0x00560000, 0xF8011FFF, 0x00080056, 0x00B80231, 0xFFDF0005, 0x0057BB6F, + 0x00008926, 0x00080057, 0x00CD0232, 0xFFA40005, 0x00584491, 0xE925CDB8, 0x00080058, 0xFFD20232, + 0x007C0005, 0x0059F001, 0x06A85FFF, 0x00080059, 0xFF6B01D0, 0x00B40005, 0x005A8118, 0xF00C5FB9, + 0x0008005A, 0xFFEA0132, 0xFF7A0005, 0x005B8118, 0x1FE8E0D1, 0x0008005B, 0xFF530132, 0xFF700005, + 0x005C1FFF, 0xE8013FFF, 0x0008005C, 0xFE750147, 0x008B0005, 0x005DA001, 0x1FFF5FFF, 0x0008005D, + 0xFE410231, 0xFFF10005, 0x005E5FFF, 0x13F9B001, 0x0008005E, 0xFEAF01D0, 0xFF910008, 0x00710000, + 0xFE0C0000, 0x00080079, 0x006D0223, 0x00000001, 0x00010005, 0x00030000, 0xF02CDF2F, 0x00080003, + 0xFF2B0178, 0x00280005, 0x00150000, 0x000002C5, 0x0005001D, 0x00000000, 0x094A0008, 0x001D0065, + 0x00300057, 0x0005002A, 0x00000000, 0x00A90005, 0x00300000, 0xF36E105A, 0x00080030, 0x00160157, + 0x00300005, 0x00370000, 0x1F2D1879, 0x00080037, 0x00360207, 0xFFF70005, 0x003A0000, 0x0000FA99, + 0x00050045, 0x28F50000, 0xD70B0008, 0x0045004B, 0x00A6FFCF, 0x00080046, 0xFF5100A0, 0xFFCF0005, + 0x00470000, 0x03690000, 0x00080047, 0xFE8900A6, 0x00000005, 0x004E0000, 0x000002C5, 0x00050054, + 0x6D6A1036, 0xDAD80008, 0x005400CD, 0x022E0022, 0x00050055, 0xF3340D7E, 0xAEF00008, 0x00550063, + 0x01CB00E2, 0x00050056, 0x0000F7E5, 0x23D60008, 0x005600B8, 0x022EFFDE, 0x00050057, 0xBA850000, + 0x8AFA0008, 0x005700CE, 0x022FFFA3, 0x00050058, 0x457BE8D7, 0xD0760008, 0x0058FFD2, 0x022F007D, + 0x00050059, 0xF33406BF, 0x5DDD0008, 0x0059FF6A, 0x01CB00B6, 0x0005005A, 0x7BFAEFD6, 0x61000008, + 0x005AFFEB, 0x0128FF78, 0x0005005B, 0x7BFA2055, 0xDCFD0008, 0x005BFF56, 0x0128FF6D, 0x0005005C, + 0x23D6E7AF, 0x3D700008, 0x005CFE76, 0x013E008C, 0x0005005D, 0x9EBA206C, 0x61460008, 0x005DFE41, + 0x022EFFF1, 0x0005005E, 0x5DDD143D, 0xAEF00008, 0x005EFEAF, 0x01CBFF90, 0x00080079, 0x006D0220, + 0x00000001, 0x00010005, 0x00030000, 0xF042DEF3, 0x00080003, 0xFF2B0177, 0x00280005, 0x00150000, + 0x000002D3, 0x00080015, 0xFFA000E0, 0x00000005, 0x001D0000, 0x000008A0, 0x0008001D, 0x0065002C, + 0x00570005, 0x002A0000, 0x00000153, 0x00050030, 0x0000F333, 0x10300008, 0x00300016, 0x01540030, + 0x00050037, 0x00001F8F, 0x18BD0008, 0x00370036, 0x0204FFF8, 0x0005003A, 0x00000000, 0xFA8B0005, + 0x00452B84, 0x0000D47C, 0x00080045, 0x004B00A3, 0xFFCF0005, 0x00470000, 0x03A00000, 0x00080047, + 0xFE8900A3, 0x00000005, 0x004E0000, 0x000002D3, 0x0008004E, 0xFFA000E0, 0x00000005, 0x00546ECC, + 0x106DDD9B, 0x00080054, 0x00CD022A, 0x00220005, 0x0055F667, 0x0DACADDF, 0x00080055, 0x006301C5, + 0x00E50005, 0x00560000, 0xF7CA27AD, 0x00080056, 0x00B9022A, 0xFFDE0005, 0x0057B99B, 0x00008CCE, + 0x00080057, 0x00CF022B, 0xFFA30005, 0x00584665, 0xE889D334, 0x00080058, 0xFFD1022B, 0x007E0005, + 0x0059F667, 0x06D65BBB, 0x00080059, 0xFF6901C5, 0x00B80005, 0x005A76DF, 0xEF9F6247, 0x0008005A, + 0xFFEB011E, 0xFF760005, 0x005B76DF, 0x20C2D929, 0x0008005B, 0xFF59011E, 0xFF6B0005, 0x005C27AD, + 0xE75D3AE0, 0x0008005C, 0xFE760134, 0x008E0005, 0x005D9D72, 0x20DA628E, 0x0008005D, 0xFE40022A, + 0xFFF10005, 0x005E5BBB, 0x1482ADDF, 0x0008005E, 0xFEB001C5, 0xFF8F0008, 0x0079006C, 0x021D0000, + 0x00010001, 0x00050003, 0x0000F059, 0xDEB60008, 0x0003FF2A, 0x01760028, 0x00050015, 0x00000000, + 0x02DF0005, 0x001D0000, 0x000007F6, 0x0008001D, 0x00650028, 0x00570005, 0x002A0000, 0x000001FD, + 0x00050030, 0x0000F2F8, 0x10040008, 0x00300016, 0x01500031, 0x00050037, 0x00001FF1, 0x19010008, + 0x00370036, 0x0201FFFA, 0x0005003A, 0x00000000, 0xFA820005, 0x00452E14, 0x0000D1EC, 0x00080045, + 0x004B00A0, 0xFFCF0005, 0x00470000, 0x03D70000, 0x00080047, 0xFE8900A0, 0x00000005, 0x004E0000, + 0x000002DF, 0x00050054, 0x702310A3, 0xE0490008, 0x005400CE, 0x02260022, 0x00050055, 0xF99A0DD9, + 0xACCE0008, 0x00550063, 0x01BE00E7, 0x00050056, 0x0000F7AF, 0x2B840008, 0x005600BA, 0x0226FFDD, + 0x00050057, 0xB8B10000, 0x8EA20008, 0x005700D0, 0x0228FFA2, 0x00050058, 0x474FE83B, 0xD5F20008, + 0x0058FFD1, 0x0228007F, 0x00050059, 0xF99A06EC, 0x59980008, 0x0059FF68, 0x01BE00BA, 0x0005005A, + 0x71C4EF69, 0x638D0008, 0x005AFFEC, 0x0114FF74, 0x0005005B, 0x71C4212F, 0xD5550008, 0x005BFF5C, + 0x0114FF68, 0x0005005C, 0x2B84E70B, 0x38510008, 0x005CFE77, 0x012A008F, 0x0005005D, 0x9C2A2147, + 0x63D60008, 0x005DFE40, 0x0226FFF1, 0x0005005E, 0x599814C6, 0xACCE0008, 0x005EFEB0, 0x01BEFF8E, + 0x00080079, 0x006C021A, 0x00000001, 0x00010005, 0x00030000, 0xF070DE78, 0x00080003, 0xFF2A0175, + 0x00270005, 0x00150000, 0x000002E9, 0x0005001D, 0x00000000, 0x074C0008, 0x001D0065, 0x00240057, + 0x0005002A, 0x00000000, 0x02A70005, 0x00300000, 0xF2BC0FD6, 0x00080030, 0x0016014C, 0x00310005, + 0x00370000, 0x20521945, 0x00080037, 0x003601FF, 0xFFFB0005, 0x003A0000, 0x0000FA7C, 0x00050045, + 0x30A30000, 0xCF5D0008, 0x0045004B, 0x009DFFCF, 0x00050047, 0x0000040D, 0x00000008, 0x0047FE89, + 0x009D0000, 0x0005004E, 0x00000000, 0x02E90005, 0x0054716E, 0x10DAE2E0, 0x00080054, 0x00CE0223, + 0x00210005, 0x0055FCCD, 0x0E07ABBD, 0x00080055, 0x006201B8, 0x00E90005, 0x00560000, 0xF7932F5B, + 0x00080056, 0x00BB0223, 0xFFDD0005, 0x0057B7C7, 0x00009076, 0x00080057, 0x00D10224, 0xFFA20005, + 0x00584839, 0xE7EDD8B0, 0x00080058, 0xFFD10224, 0x00800005, 0x0059FCCD, 0x07035776, 0x00080059, + 0xFF6701B8, 0x00BB0005, 0x005A6CA9, 0xEF3264D4, 0x0008005A, 0xFFED010A, 0xFF730005, 0x005B6CA9, + 0x219CD180, 0x0008005B, 0xFF5E010A, 0xFF650005, 0x005C2F5B, 0xE6B935C2, 0x0008005C, 0xFE770120, + 0x00900005, 0x005D9AE3, 0x21B4651D, 0x0008005D, 0xFE400223, 0xFFF10005, 0x005E5776, 0x150AABBD, + 0x0008005E, 0xFEB101B8, 0xFF8D0008, 0x0079006C, 0x02170000, 0x00010001, 0x00050003, 0x0000F086, + 0xDE3C0008, 0x0003FF29, 0x01740027, 0x00050015, 0x00000000, 0x02F10005, 0x001D0000, 0x000006A3, + 0x0008001D, 0x00650020, 0x00570005, 0x002A0000, 0x00000351, 0x00050030, 0x0000F27F, 0x0FA50008, + 0x00300016, 0x01480032, 0x00050037, 0x000020B3, 0x198A0008, 0x00370036, 0x01FCFFFC, 0x0005003A, + 0x00000000, 0xFA7B0005, 0x00453332, 0x0000CCCE, 0x00080045, 0x004B0099, 0xFFCF0005, 0x00470000, + 0x04440000, 0x00080047, 0xFE890099, 0x00000005, 0x004E0000, 0x000002F1, 0x00050054, 0x72AF1110, + 0xE5610008, 0x005400CF, 0x021E0021, 0x00050055, 0x00000E34, 0xAAAC0008, 0x00550062, 0x01B100EC, + 0x00050056, 0x0000F778, 0x33320008, 0x005600BB, 0x021EFFDD, 0x00050057, 0xB6DC0000, 0x924B0008, + 0x005700D2, 0x0220FFA1, 0x00050058, 0x4924E79F, 0xDB6F0008, 0x0058FFD1, 0x02200081, 0x00050059, + 0x0000071A, 0x55540008, 0x0059FF66, 0x01B100BD, 0x0005005A, 0x678EEEFC, 0x661B0008, 0x005AFFED, + 0x0100FF71, 0x0005005B, 0x678E2209, 0xCDAC0008, 0x005BFF61, 0x0100FF63, 0x0005005C, 0x3332E667, + 0x33320008, 0x005CFE77, 0x01160091, 0x0005005D, 0x999B2221, 0x66650008, 0x005DFE3F, 0x021EFFF0, + 0x0005005E, 0x5554154E, 0xAAAC0008, 0x005EFEB1, 0x01B1FF8C, 0x00080079, 0x006C0214, 0x00000001, + 0x00010005, 0x00030000, 0xF06EDE7C, 0x00080003, 0xFF2A0175, 0x00270005, 0x00150000, 0x000002F7, + 0x0005001D, 0x00000000, 0x05F90008, 0x001D0065, 0x001C0057, 0x0005002A, 0x00000000, 0x03FB0005, + 0x00300000, 0xF2420F73, 0x00080030, 0x00160144, 0x00320005, 0x00370000, 0x211219CF, 0x00080037, + 0x003601F9, 0xFFFE0005, 0x003A0000, 0x0000FA70, 0x00050045, 0x35C20000, 0xCA3E0008, 0x0045004B, + 0x0096FFCF, 0x00050046, 0x0000FF78, 0x03330008, 0x0046FF51, 0x009FFFCF, 0x00050047, 0x0000047A, + 0x00000008, 0x0047FE89, 0x00960000, 0x0008004D, 0xFE6100D2, 0x00140005, 0x004E0000, 0x000002F7, + 0x00050054, 0x73E31147, 0xE7CA0008, 0x005400CF, 0x021A0021, 0x00050055, 0x03330E61, 0xA99B0008, + 0x00550062, 0x01AB00EE, 0x00050056, 0x0000F75D, 0x37090008, 0x005600BC, 0x021AFFDC, 0x00050057, + 0xB5F20000, 0x941F0008, 0x005700D3, 0x021CFFA0, 0x00050058, 0x4A0EE751, 0xDE2D0008, 0x0058FFD0, + 0x021C0082, 0x00050059, 0x03330730, 0x53320008, 0x0059FF65, 0x01AB00BF, 0x0005005A, 0x6273EEC5, + 0x67620008, 0x005AFFEE, 0x00F5FF6F, 0x0005005B, 0x62732276, 0xC9D80008, 0x005BFF64, 0x00F5FF60, + 0x0005005C, 0x3709E615, 0x30A30008, 0x005CFE78, 0x010B0092, 0x0005005D, 0x9853228F, 0x67AD0008, + 0x005DFE3F, 0x021AFFF0, 0x0005005E, 0x53321592, 0xA99B0008, 0x005EFEB2, 0x01ABFF8B, 0x00080079, + 0x006C0210, 0x00000001, 0x00010005, 0x00030000, 0xF058DEB8, 0x00080003, 0xFF2A0176, 0x00280005, + 0x00150000, 0x000002FB, 0x0005001D, 0x00000000, 0x054F0008, 0x001D0065, 0x00180057, 0x0005002A, + 0x00000000, 0x04A50005, 0x00300000, 0xF2040F3D, 0x00080030, 0x00160140, 0x00330005, 0x00370000, + 0x21711A14, 0x00080037, 0x003601F6, 0xFFFF0005, 0x003A0000, 0x0000FA5E, 0x0008003A, 0xFEDE00D3, + 0xFFFF0005, 0x00453851, 0x0000C7AF, 0x00080045, 0x004B0092, 0xFFCF0005, 0x00460000, 0xFEEF0666, + 0x00050047, 0x000004B1, 0x00000008, 0x0047FE89, 0x00920000, 0x0005004E, 0x00000000, 0x02FB0005, + 0x0054750C, 0x117EEA1B, 0x00080054, 0x00CF0216, 0x00210005, 0x00550666, 0x0E8FA88A, 0x00080055, + 0x006101A4, 0x00F00005, 0x00560000, 0xF7413AE0, 0x00080056, 0x00BD0216, 0xFFDC0005, 0x0057B508, + 0x000095F3, 0x00080057, 0x00D40218, 0xFFA00005, 0x00584AF8, 0xE703E0EB, 0x00080058, 0xFFD00218, + 0x00830005, 0x00590666, 0x07475110, 0x00080059, 0xFF6401A4, 0x00C10005, 0x005A5D58, 0xEE8F68A8, + 0x0008005A, 0xFFEF00EA, 0xFF6D0005, 0x005B5D58, 0x22E2C604, 0x0008005B, 0xFF6600EA, 0xFF5E0005, + 0x005C3AE0, 0xE5C32E14, 0x0008005C, 0xFE780100, 0x00940005, 0x005D970C, 0x22FC68F4, 0x0008005D, + 0xFE3F0216, 0xFFF00005, 0x005E5110, 0x15D7A88A, 0x0008005E, 0xFEB201A4, 0xFF8A0008, 0x0079006B, + 0x020C0000, 0x00010001, 0x00050003, 0x0000F045, 0xDEEA0008, 0x0003FF2B, 0x01770028, 0x00050015, + 0x00000000, 0x02FF0005, 0x001D0000, 0x000004A5, 0x0008001D, 0x00650014, 0x00570005, 0x002A0000, + 0x0000054F, 0x00050030, 0x0000F1C5, 0x0F060008, 0x00300016, 0x013D0033, 0x00050037, 0x000021D0, + 0x1A5A0008, 0x00370036, 0x01F30000, 0x0005003A, 0x00000000, 0xFA450005, 0x00453AE0, 0x0000C520, + 0x00080045, 0x004B008F, 0xFFCF0005, 0x00460000, 0xFE670999, 0x00080046, 0xFF51009E, 0xFFCF0005, + 0x00470000, 0x04E80000, 0x00080047, 0xFE89008F, 0x00000005, 0x004E0000, 0x000002FF, 0x00050054, + 0x762811B4, 0xEC530008, 0x005400D0, 0x02110021, 0x00050055, 0x09990EBC, 0xA7790008, 0x00550061, + 0x019C00F3, 0x00050056, 0x0000F726, 0x3EB70008, 0x005600BD, 0x0211FFDC, 0x00050057, 0xB41E0000, + 0x97C70008, 0x005700D5, 0x0214FF9F, 0x00050058, 0x4BE2E6B5, 0xE3A90008, 0x0058FFD0, 0x02140084, + 0x00050059, 0x0999075E, 0x4EEE0008, 0x0059FF63, 0x019C00C2, 0x0005005A, 0x583DEE59, 0x69EF0008, + 0x005AFFEF, 0x00DFFF6C, 0x0005005B, 0x583D234F, 0xC22F0008, 0x005BFF69, 0x00DFFF5B, 0x0005005C, + 0x3EB7E571, 0x2B840008, 0x005CFE79, 0x00F50095, 0x0005005D, 0x95C42369, 0x6A3C0008, 0x005DFE3F, + 0x0211FFF0, 0x0005005E, 0x4EEE161B, 0xA7790008, 0x005EFEB3, 0x019CFF89, 0x00080079, 0x006B0208, + 0x00000001, 0x00010005, 0x00030000, 0xF039DF0C, 0x00080003, 0xFF2B0178, 0x00280005, 0x00150000, + 0x00000301, 0x0005001D, 0x00000000, 0x03FB0008, 0x001D0066, 0x00100057, 0x0005002A, 0x00000000, + 0x05F90005, 0x00300000, 0xF1860ECC, 0x00080030, 0x00160139, 0x00340005, 0x00370000, 0x222D1A9F, + 0x00080037, 0x003601F0, 0x00010005, 0x003A0000, 0x0000FA25, 0x00050045, 0x3D700000, 0xC2900008, + 0x0045004B, 0x008BFFCF, 0x00050046, 0x0000FDDE, 0x0CCC0008, 0x0046FF51, 0x009DFFCF, 0x00050047, + 0x0000051E, 0x00000008, 0x0047FE89, 0x008B0000, 0x0005004E, 0x00000000, 0x03010005, 0x00547736, + 0x11EBEE70, 0x00080054, 0x00D0020C, 0x00200005, 0x00550CCC, 0x0EEAA668, 0x00080055, 0x00610195, + 0x00F50005, 0x00560000, 0xF70B428E, 0x00080056, 0x00BE020C, 0xFFDB0005, 0x0057B334, 0x0000999B, + 0x00080057, 0x00D70210, 0xFF9F0005, 0x00584CCC, 0xE667E667, 0x00080058, 0xFFCF0210, 0x00850005, + 0x00590CCC, 0x07754CCC, 0x00080059, 0xFF620195, 0x00C40005, 0x005A5322, 0xEE226B36, 0x0008005A, + 0xFFF000D4, 0xFF6A0005, 0x005B5322, 0x23BCBE5B, 0x0008005B, 0xFF6C00D4, 0xFF580005, 0x005C428E, + 0xE51F28F5, 0x0008005C, 0xFE7900EA, 0x00960005, 0x005D947C, 0x23D66B84, 0x0008005D, 0xFE3E020C, + 0xFFF00005, 0x005E4CCC, 0x165FA668, 0x0008005E, 0xFEB30195, 0xFF880008, 0x0079006B, 0x02040000, + 0x00010001, 0x00050003, 0x0000F034, 0xDF190005, 0x00150000, 0x00000302, 0x0005001D, 0x00000000, + 0x03510008, 0x001D0066, 0x000C0057, 0x0005002A, 0x00000000, 0x06A30005, 0x00300000, 0xF1460E8F, + 0x00080030, 0x00160135, 0x00340005, 0x00370000, 0x228A1AE6, 0x00080037, 0x003601ED, 0x00020005, + 0x003A0000, 0x0000F9FE, 0x0008003A, 0xFEDE00D2, 0xFFFF0005, 0x00453FFF, 0x0000C001, 0x00080045, + 0x004B0087, 0xFFCF0005, 0x00460000, 0xFD560FFF, 0x00080046, 0xFF51009B, 0xFFCF0005, 0x00470000, + 0x05550000, 0x00080047, 0xFE890087, 0x00000005, 0x004E0000, 0x00000302, 0x00050054, 0x78381221, + 0xF0730008, 0x005400D1, 0x02070020, 0x00050055, 0x0FFF0F17, 0xA5570008, 0x00550060, 0x018D00F7, + 0x00050056, 0x0000F6F0, 0x46650008, 0x005600BE, 0x0207FFDB, 0x00050057, 0xB24A0000, 0x9B6F0008, + 0x005700D8, 0x020BFF9E, 0x00050058, 0x4DB6E619, 0xE9250008, 0x0058FFCF, 0x020B0086, 0x00050059, + 0x0FFF078B, 0x4AAA0008, 0x0059FF61, 0x018D00C6, 0x0005005A, 0x4E07EDEC, 0x6C7D0008, 0x005AFFF1, + 0x00C8FF68, 0x0005005B, 0x4E072429, 0xBA870008, 0x005BFF6E, 0x00C8FF56, 0x0005005C, 0x4665E4CE, + 0x26660008, 0x005CFE79, 0x00DE0097, 0x0005005D, 0x93352443, 0x6CCB0008, 0x005DFE3E, 0x0207FFEF, + 0x0005005E, 0x4AAA16A3, 0xA5570008, 0x005EFEB4, 0x018DFF87, 0x00080079, 0x006B0200, 0x00000001, + 0x00010005, 0x00030000, 0xF039DF0A, 0x0008000B, 0x0000FFFF, 0x00000005, 0x00150000, 0x00000303, + 0x0005001D, 0x00000000, 0x02A70008, 0x001D0067, 0x00080057, 0x0005002A, 0x00000000, 0x074C0005, + 0x00300000, 0xF1050E51, 0x00080030, 0x00160130, 0x00350005, 0x00370000, 0x22E61B2C, 0x00080037, + 0x003601E9, 0x00040005, 0x003A0000, 0x0000F9D1, 0x0008003A, 0xFEDE00D1, 0xFFFF0005, 0x0045428E, + 0x0000BD72, 0x00080045, 0x004B0083, 0xFFCF0005, 0x00460000, 0xFCCD1333, 0x00080046, 0xFF51009A, + 0xFFCF0005, 0x00470000, 0x058B0000, 0x00080047, 0xFE890083, 0x00000008, 0x004DFE61, 0x00D10014, + 0x0005004E, 0x00000000, 0x03030005, 0x0054792C, 0x1258F25B, 0x00080054, 0x00D10202, 0x00200005, + 0x00551333, 0x0F45A445, 0x00080055, 0x00600186, 0x00FA0005, 0x00560000, 0xF6D44A3C, 0x00080056, + 0x00BF0202, 0xFFDB0005, 0x0057B160, 0x00009D43, 0x00080057, 0x00D90206, 0xFF9E0005, 0x00584EA0, + 0xE5CBEBE3, 0x00080058, 0xFFCF0206, 0x00870005, 0x00591333, 0x07A24887, 0x00080059, 0xFF600186, + 0x00C80005, 0x005A48EC, 0xEDB56DC3, 0x0008005A, 0xFFF200BC, 0xFF660005, 0x005B48EC, 0x2496B6B3, + 0x0008005B, 0xFF7100BC, 0xFF530005, 0x005C4A3C, 0xE47C23D6, 0x0008005C, 0xFE7A00D1, 0x00980005, + 0x005D91ED, 0x24B16E13, 0x0008005D, 0xFE3E0202, 0xFFEF0005, 0x005E4887, 0x16E7A445, 0x0008005E, + 0xFEB40186, 0xFF860008, 0x0079006B, 0x01FC0000, 0x00010001, 0x00050003, 0x0000F047, 0xDEE40008, + 0x0003FF2B, 0x01770028, 0x0005001D, 0x00000000, 0x01FD0008, 0x001D0067, 0x00040057, 0x0005002A, + 0x00000000, 0x07F60005, 0x00300000, 0xF0C40E10, 0x00080030, 0x0016012C, 0x00350005, 0x00370000, + 0x23411B73, 0x00080037, 0x003601E6, 0x00050005, 0x003A0000, 0x0000F99D, 0x0008003A, 0xFEDE00D0, + 0xFFFF0005, 0x0045451E, 0x0000BAE2, 0x00080045, 0x004B007E, 0xFFCF0005, 0x00460000, 0xFC451666, + 0x00080046, 0xFF510098, 0xFFCF0005, 0x00470000, 0x05C20000, 0x00080047, 0xFE89007E, 0x00000005, + 0x00547A11, 0x128FF426, 0x00080054, 0x00D101FD, 0x00200005, 0x00551666, 0x0F72A334, 0x00080055, + 0x0060017D, 0x00FC0005, 0x00560000, 0xF6B94E13, 0x00080056, 0x00BF01FD, 0xFFDA0005, 0x0057B076, + 0x00009F17, 0x00080057, 0x00DA0202, 0xFF9D0005, 0x00584F8A, 0xE57DEEA2, 0x00080058, 0xFFCF0202, + 0x00880005, 0x00591666, 0x07B94665, 0x00080059, 0xFF5F017D, 0x00C90005, 0x005A43D1, 0xED7F6F0A, + 0x0008005A, 0xFFF200B0, 0xFF640005, 0x005B43D1, 0x2503B2DF, 0x0008005B, 0xFF7400B0, 0xFF510005, + 0x005C4E13, 0xE42A2147, 0x0008005C, 0xFE7A00C5, 0x009A0005, 0x005D90A5, 0x251E6F5B, 0x0008005D, + 0xFE3D01FD, 0xFFEF0005, 0x005E4665, 0x172CA334, 0x0008005E, 0xFEB5017D, 0xFF860008, 0x0079006A, + 0x01F70000, 0x00010001, 0x00050003, 0x0000F05B, 0xDEB00008, 0x0003FF2A, 0x01760028, 0x0008000B, + 0x0000FFFE, 0x00000005, 0x001D0000, 0x00000153, 0x0008001D, 0x00680000, 0x00570005, 0x002A0000, + 0x000008A0, 0x00050030, 0x0000F082, 0x0DCC0008, 0x00300016, 0x01280036, 0x00050037, 0x0000239C, + 0x1BBA0008, 0x00370036, 0x01E30007, 0x0005003A, 0x00000000, 0xF9620008, 0x003AFEDF, 0x00CFFFFF, + 0x00050045, 0x47AD0000, 0xB8530008, 0x0045004B, 0x007AFFCF, 0x00050046, 0x0000FBBC, 0x19990008, + 0x0046FF51, 0x0095FFCF, 0x00050047, 0x000005F9, 0x00000008, 0x0047FE89, 0x007A0000, 0x0008004D, + 0xFE6100D0, 0x00140005, 0x00547AE8, 0x12C5F5D4, 0x00080054, 0x00D201F7, 0x00200005, 0x00551999, + 0x0FA0A223, 0x00080055, 0x005F0175, 0x00FE0005, 0x00560000, 0xF69E51EA, 0x00080056, 0x00C001F7, + 0xFFDA0005, 0x0057AF8C, 0x0000A0EB, 0x00080057, 0x00DB01FD, 0xFF9C0005, 0x00585074, 0xE52FF160, + 0x00080058, 0xFFCE01FD, 0x00890005, 0x00591999, 0x07D04443, 0x00080059, 0xFF5E0175, 0x00CB0005, + 0x005A3EB6, 0xED487051, 0x0008005A, 0xFFF300A4, 0xFF630005, 0x005B3EB6, 0x2570AF0A, 0x0008005B, + 0xFF7600A4, 0xFF4E0005, 0x005C51EA, 0xE3D81EB8, 0x0008005C, 0xFE7B00B8, 0x009B0005, 0x005D8F5E, + 0x258B70A2, 0x0008005D, 0xFE3D01F7, 0xFFEF0005, 0x005E4443, 0x1770A223, 0x0008005E, 0xFEB50175, + 0xFF850008, 0x0079006A, 0x01F30000, 0x00010001, 0x00050003, 0x0000F071, 0xDE750008, 0x0003FF2A, + 0x01750027, 0x0005001D, 0x00000000, 0x00A90008, 0x001D0068, 0xFFFD0057, 0x0005002A, 0x00000000, + 0x094A0005, 0x00300000, 0xF0400D86, 0x00080030, 0x00160124, 0x00360005, 0x00370000, 0x23F51C01, + 0x00080037, 0x003601E0, 0x00080005, 0x003A0000, 0x0000F921, 0x0008003A, 0xFEDF00CE, 0xFFFF0005, + 0x00454A3C, 0x0000B5C4, 0x00080045, 0x004B0075, 0xFFCF0005, 0x00460000, 0xFB341CCC, 0x00080046, + 0xFF510093, 0xFFCF0005, 0x00470000, 0x062F0000, 0x00080047, 0xFE890075, 0x00000005, 0x00547BB0, + 0x12FCF764, 0x00080054, 0x00D201F1, 0x001F0005, 0x00551CCC, 0x0FCDA112, 0x00080055, 0x005F016D, + 0x01010005, 0x00560000, 0xF68255C1, 0x00080056, 0x00C001F1, 0xFFDA0005, 0x0057AEA2, 0x0000A2BF, + 0x00080057, 0x00DC01F7, 0xFF9C0005, 0x0058515E, 0xE4E1F41E, 0x00080058, 0xFFCE01F7, 0x008A0005, + 0x00591CCC, 0x07E64221, 0x00080059, 0xFF5D016D, 0x00CD0005, 0x005A399B, 0xED127198, 0x0008005A, + 0xFFF40098, 0xFF610005, 0x005B399B, 0x25DDAB36, 0x0008005B, 0xFF790098, 0xFF4B0005, 0x005C55C1, + 0xE3861C28, 0x0008005C, 0xFE7B00AB, 0x009C0005, 0x005D8E16, 0x25F871EA, 0x0008005D, 0xFE3D01F1, + 0xFFEF0005, 0x005E4221, 0x17B4A112, 0x0008005E, 0xFEB6016D, 0xFF840008, 0x0079006A, 0x01EE0000, + 0x00010001, 0x00050003, 0x0000F086, 0xDE3C0008, 0x0003FF29, 0x01740027, 0x0008000B, 0x0000FFFD, + 0x00000005, 0x001D0000, 0x00000000, 0x0008001D, 0x0069FFF8, 0x00570005, 0x002A0000, 0x000009F4, + 0x00050030, 0x0000EFFD, 0x0D3E0008, 0x00300016, 0x01200036, 0x00050037, 0x0000244E, 0x1C490008, + 0x00370036, 0x01DC000A, 0x0005003A, 0x00000000, 0xF8D90008, 0x003AFEDF, 0x00CDFFFF, 0x00050045, + 0x4CCC0000, 0xB3340008, 0x0045004B, 0x0071FFCF, 0x00050046, 0x0000FAAB, 0x1FFF0008, 0x0046FF51, + 0x0090FFCF, 0x00050047, 0x00000666, 0x00000008, 0x0047FE89, 0x00710000, 0x0008004D, 0xFE6100CF, + 0x00140005, 0x00547C69, 0x1333F8D6, 0x00080054, 0x00D301EB, 0x001F0005, 0x00551FFF, 0x0FFBA001, + 0x00080055, 0x005F0164, 0x01030005, 0x00560000, 0xF6675998, 0x00080056, 0x00C101EB, 0xFFDA0005, + 0x0057ADB8, 0x0000A494, 0x00080057, 0x00DD01F2, 0xFF9B0005, 0x00585248, 0xE493F6DC, 0x00080058, + 0xFFCE01F2, 0x008B0005, 0x00591FFF, 0x07FD3FFF, 0x00080059, 0xFF5C0164, 0x00CF0005, 0x005A3480, + 0xECDB72DE, 0x0008005A, 0xFFF4008B, 0xFF5F0005, 0x005B3480, 0x264AA762, 0x0008005B, 0xFF7C008B, + 0xFF490005, 0x005C5998, 0xE3341999, 0x0008005C, 0xFE7B009D, 0x009D0005, 0x005D8CCE, 0x26667332, + 0x0008005D, 0xFE3C01EB, 0xFFEE0005, 0x005E3FFF, 0x17F8A001, 0x0008005E, 0xFEB60164, 0xFF830008, + 0x0079006A, 0x01E90000, 0x00010001, 0x0008000B, 0x0000FFFC, 0x00000005, 0x0015005B, 0x00000306, + 0x0005002B, 0x00000000, 0xFF020005, 0x00300000, 0xF0770B38, 0x00080030, 0x001A0120, 0x00350005, + 0x00370000, 0x24A61C91, 0x00080037, 0x003601D9, 0x000B0005, 0x003A0000, 0x0000F88B, 0x0008003A, + 0xFEDF00CC, 0xFFFF0005, 0x00454F5B, 0x0000B0A5, 0x00080045, 0x004B006C, 0xFFCF0005, 0x00460000, + 0xFA232332, 0x00080046, 0xFF51008D, 0xFFCF0005, 0x00470000, 0x069C0000, 0x00080047, 0xFE89006C, + 0x00000008, 0x004DFE61, 0x00CE0014, 0x0005004E, 0x005B0000, 0x03060005, 0x00547D12, 0x1369FA28, + 0x00080054, 0x00D301E5, 0x001F0005, 0x00552332, 0x10289EF0, 0x00080055, 0x005E015B, 0x01050005, + 0x00560000, 0xF64C5D6F, 0x00080056, 0x00C101E5, 0xFFD90005, 0x0057ACCE, 0x0000A668, 0x00080057, + 0x00DE01ED, 0xFF9B0005, 0x00585332, 0xE445F99A, 0x00080058, 0xFFCD01ED, 0x008C0005, 0x00592332, + 0x08143DDD, 0x00080059, 0xFF5B015B, 0x00D00005, 0x005A2F65, 0xECA57425, 0x0008005A, 0xFFF5007E, + 0xFF5D0005, 0x005B2F65, 0x26B7A38E, 0x0008005B, 0xFF7F007E, 0xFF460005, 0x005C5D6F, 0xE2E2170A, + 0x0008005C, 0xFE7C008F, 0x009E0005, 0x005D8B87, 0x26D37479, 0x0008005D, 0xFE3C01E5, 0xFFEE0005, + 0x005E3DDD, 0x183C9EF0, 0x0008005E, 0xFEB7015B, 0xFF820008, 0x0079006A, 0x01E40000, 0x00010001, + 0x00050015, 0x00B60000, 0x03100008, 0x0015FFA0, 0x00DF0000, 0x0005002B, 0x00000000, 0xFE030005, + 0x00300000, 0xF0F8092A, 0x00080030, 0x001D0121, 0x00340005, 0x00370000, 0x24FE1CDA, 0x00080037, + 0x003601D5, 0x000D0005, 0x003A0000, 0x0000F837, 0x0008003A, 0xFEDF00CA, 0xFFFF0005, 0x004551EA, + 0x0000AE16, 0x00080045, 0x004B0067, 0xFFCF0005, 0x00460000, 0xF99A2666, 0x00080046, 0xFF51008A, + 0xFFCF0005, 0x00470000, 0x06D30000, 0x00080047, 0xFE890067, 0x00000005, 0x004E00B6, 0x00000310, + 0x0008004E, 0xFFA000DF, 0x00000005, 0x00547DAB, 0x13A0FB59, 0x00080054, 0x00D301DF, 0x001F0005, + 0x00552666, 0x10559DDF, 0x00080055, 0x005E0152, 0x01080005, 0x00560000, 0xF6306146, 0x00080056, + 0x00C101DF, 0xFFD90005, 0x0057ABE4, 0x0000A83C, 0x00080057, 0x00DF01E7, 0xFF9A0005, 0x0058541C, + 0xE3F7FC58, 0x00080058, 0xFFCD01E7, 0x008D0005, 0x00592666, 0x082A3BBB, 0x00080059, 0xFF5A0152, + 0x00D20005, 0x005A2A4A, 0xEC6E756C, 0x0008005A, 0xFFF60071, 0xFF5B0005, 0x005B2A4A, 0x27249FB9, + 0x0008005B, 0xFF810071, 0xFF440005, 0x005C6146, 0xE290147A, 0x0008005C, 0xFE7C0081, 0x00A00005, + 0x005D8A3F, 0x274075C1, 0x0008005D, 0xFE3C01DF, 0xFFEE0005, 0x005E3BBB, 0x18809DDF, 0x0008005E, + 0xFEB70152, 0xFF810008, 0x00790069, 0x01DF0000, 0x00010001, 0x0008000B, 0x0000FFFB, 0x00000005, + 0x00150111, 0x00000321, 0x00080015, 0xFFA000DF, 0x00010005, 0x002B0000, 0x0000FD04, 0x00050030, + 0x0000F181, 0x071A0008, 0x00300021, 0x01220032, 0x00050037, 0x00002555, 0x1D220008, 0x00370036, + 0x01D2000E, 0x0005003A, 0x00000000, 0xF7DD0008, 0x003AFEDF, 0x00C9FFFF, 0x00050045, 0x547A0000, + 0xAB860008, 0x0045004B, 0x0062FFCF, 0x00050046, 0x0000F912, 0x29990008, 0x0046FF51, 0x0086FFCF, + 0x00050047, 0x0000070A, 0x00000008, 0x0047FE89, 0x00620000, 0x0008004D, 0xFE6100CD, 0x00140005, + 0x004E0111, 0x00000321, 0x0008004E, 0xFFA000DF, 0x00010005, 0x00547E33, 0x13D6FC6A, 0x00080054, + 0x00D401D8, 0x001F0005, 0x00552999, 0x10839CCE, 0x00080055, 0x005E0149, 0x010A0005, 0x00560000, + 0xF615651D, 0x00080056, 0x00C201D8, 0xFFD90005, 0x0057AAFA, 0x0000AA10, 0x00080057, 0x00E001E1, + 0xFF9A0005, 0x00585506, 0xE3A9FF16, 0x00080058, 0xFFCD01E1, 0x008E0005, 0x00592999, 0x08413999, + 0x00080059, 0xFF590149, 0x00D40005, 0x005A252F, 0xEC3876B3, 0x0008005A, 0xFFF60064, 0xFF5A0005, + 0x005B252F, 0x27919BE5, 0x0008005B, 0xFF840064, 0xFF410005, 0x005C651D, 0xE23E11EB, 0x0008005C, + 0xFE7D0072, 0x00A10005, 0x005D88F7, 0x27AD7709, 0x0008005D, 0xFE3C01D8, 0xFFEE0005, 0x005E3999, + 0x18C59CCE, 0x0008005E, 0xFEB80149, 0xFF800008, 0x00790069, 0x01D90000, 0x00010001, 0x0008000B, + 0x0000FFFA, 0x00000005, 0x0015016C, 0x00000338, 0x0005002B, 0x00000000, 0xFC050005, 0x00300000, + 0xF211050B, 0x00080030, 0x00260122, 0x00310005, 0x00370000, 0x25AA1D6C, 0x00080037, 0x003601CE, + 0x00100005, 0x003A0000, 0x0000F77C, 0x0008003A, 0xFEDF00C7, 0xFFFF0005, 0x00455709, 0x0000A8F7, + 0x00080045, 0x004B005D, 0xFFCF0005, 0x00460000, 0xF8892CCC, 0x00080046, 0xFF510083, 0xFFCF0005, + 0x00470000, 0x07400000, 0x00080047, 0xFE89005D, 0x00000008, 0x004DFE61, 0x00CC0014, 0x0005004E, + 0x016C0000, 0x03380005, 0x00547EAB, 0x140DFD59, 0x00080054, 0x00D401D2, 0x001E0005, 0x00552CCC, + 0x10B09BBD, 0x00080055, 0x005D0140, 0x010C0005, 0x00560000, 0xF5FA68F4, 0x00080056, 0x00C201D2, + 0xFFD90005, 0x0057AA10, 0x0000ABE4, 0x00080057, 0x00E101DB, 0xFF990005, 0x005855F0, 0xE35B01D4, + 0x00080058, 0xFFCD01DB, 0x008F0005, 0x00592CCC, 0x08583777, 0x00080059, 0xFF580140, 0x00D60005, + 0x005A2014, 0xEC0277F9, 0x0008005A, 0xFFF70056, 0xFF580005, 0x005B2014, 0x27FD9811, 0x0008005B, + 0xFF870056, 0xFF3F0005, 0x005C68F4, 0xE1EC0F5C, 0x0008005C, 0xFE7D0063, 0x00A20005, 0x005D87B0, + 0x281A7850, 0x0008005D, 0xFE3B01D2, 0xFFEE0005, 0x005E3777, 0x19099BBD, 0x0008005E, 0xFEB80140, + 0xFF800008, 0x00790069, 0x01D30000, 0x00010001, 0x0008000B, 0x0000FFF9, 0x00000005, 0x001501C7, + 0x00000356, 0x00080015, 0xFFA000DE, 0x00010005, 0x002B0000, 0x0000FB06, 0x00050030, 0x0000F2A7, + 0x03020008, 0x0030002A, 0x01220030, 0x00050037, 0x000025FF, 0x1DB50008, 0x00370036, 0x01CB0012, + 0x0005003A, 0x00000000, 0xF7160008, 0x003AFEDF, 0x00C6FFFF, 0x00050045, 0x59980000, 0xA6680008, + 0x0045004B, 0x0058FFCF, 0x00050046, 0x0000F801, 0x2FFF0008, 0x0046FF51, 0x007FFFCF, 0x00050047, + 0x00000777, 0x00000008, 0x0047FE89, 0x00580000, 0x0008004D, 0xFE6100CB, 0x00140005, 0x004E01C7, + 0x00000356, 0x0008004E, 0xFFA000DE, 0x00010005, 0x00547F11, 0x1444FE25, 0x00080054, 0x00D501CB, + 0x001E0005, 0x00552FFF, 0x10DE9AAC, 0x00080055, 0x005D0136, 0x010F0005, 0x00560000, 0xF5DE6CCB, + 0x00080056, 0x00C201CB, 0xFFD90005, 0x0057A926, 0x0000ADB8, 0x00080057, 0x00E201D5, 0xFF980005, + 0x005856DA, 0xE30D0492, 0x00080058, 0xFFCC01D5, 0x00900005, 0x00592FFF, 0x086F3554, 0x00080059, + 0xFF570136, 0x00D70005, 0x005A1AF9, 0xEBCB7940, 0x0008005A, 0xFFF80049, 0xFF560005, 0x005B1AF9, + 0x286A943D, 0x0008005B, 0xFF890049, 0xFF3C0005, 0x005C6CCB, 0xE19A0CCC, 0x0008005C, 0xFE7D0054, + 0x00A30005, 0x005D8668, 0x28887998, 0x0008005D, 0xFE3B01CB, 0xFFED0005, 0x005E3554, 0x194D9AAC, + 0x0008005E, 0xFEB90136, 0xFF7F0008, 0x00790069, 0x01CE0000, 0x00010001, 0x0008000B, 0x0000FFF8, + 0x00000005, 0x00150222, 0x00000379, 0x00080015, 0xFF9F00DE, 0x00020005, 0x002B0000, 0x0000FA07, + 0x00050030, 0x0000F341, 0x01040008, 0x0030002F, 0x01220030, 0x00050037, 0x00002654, 0x1DFF0008, + 0x00370036, 0x01C70013, 0x0005003A, 0x00000000, 0xF6AA0008, 0x003AFEE0, 0x00C4FFFF, 0x00050045, + 0x5C280000, 0xA3D80008, 0x0045004B, 0x0053FFCF, 0x00050046, 0x0000F778, 0x33320008, 0x0046FF51, + 0x007BFFCF, 0x00050047, 0x000007AE, 0x00000008, 0x0047FE89, 0x00530000, 0x0008004D, 0xFE6100CA, + 0x00140005, 0x004E0222, 0x00000379, 0x0008004E, 0xFF9F00DE, 0x00020005, 0x00547F65, 0x147AFECE, + 0x00080054, 0x00D501C3, 0x001E0005, 0x00553332, 0x110B999B, 0x00080055, 0x005D012C, 0x01110005, + 0x00560000, 0xF5C370A2, 0x00080056, 0x00C201C3, 0xFFD90005, 0x0057A83C, 0x0000AF8C, 0x00080057, + 0x00E301CF, 0xFF980005, 0x005857C4, 0xE2BF0750, 0x00080058, 0xFFCC01CF, 0x00910005, 0x00593332, + 0x08853332, 0x00080059, 0xFF56012C, 0x00D90005, 0x005A15DE, 0xEB957A87, 0x0008005A, 0xFFF9003B, + 0xFF540005, 0x005B15DE, 0x28D79068, 0x0008005B, 0xFF8C003B, 0xFF390005, 0x005C70A2, 0xE1480A3D, + 0x0008005C, 0xFE7E0044, 0x00A40005, 0x005D8520, 0x28F57AE0, 0x0008005D, 0xFE3B01C3, 0xFFED0005, + 0x005E3332, 0x1991999B, 0x0008005E, 0xFEB9012C, 0xFF7E0008, 0x00790069, 0x01C80000, 0x00010001, + 0x0008000B, 0x0000FFF7, 0x00000005, 0x0015027D, 0x000003A3, 0x00080015, 0xFF9F00DD, 0x00020005, + 0x002B0000, 0x0000F909, 0x00050030, 0x0000F3DD, 0xFF170008, 0x00300034, 0x0122002F, 0x00050037, + 0x000026A7, 0x1E490008, 0x00370036, 0x01C40015, 0x0005003A, 0x00000000, 0xF6380008, 0x003AFEE0, + 0x00C2FFFF, 0x00050045, 0x5EB70000, 0xA1490008, 0x0045004B, 0x004EFFCF, 0x00050046, 0x0000F6F0, + 0x36650008, 0x0046FF51, 0x0076FFCF, 0x00050047, 0x000007E4, 0x00000008, 0x0047FE89, 0x004E0000, + 0x0008004D, 0xFE6100C9, 0x00140005, 0x004E027D, 0x000003A3, 0x0008004E, 0xFF9F00DD, 0x00020005, + 0x00547FA8, 0x14B1FF53, 0x00080054, 0x00D501BC, 0x001E0005, 0x00553665, 0x1139988A, 0x00080055, + 0x005C0122, 0x01130005, 0x00560000, 0xF5A87479, 0x00080056, 0x00C201BC, 0xFFD90005, 0x0057A752, + 0x0000B160, 0x00080057, 0x00E401C8, 0xFF970005, 0x005858AE, 0xE2710A0E, 0x00080058, 0xFFCC01C8, + 0x00920005, 0x00593665, 0x089C3110, 0x00080059, 0xFF550122, 0x00DB0005, 0x005A10C3, 0xEB5E7BCE, + 0x0008005A, 0xFFF9002D, 0xFF520005, 0x005B10C3, 0x29448C94, 0x0008005B, 0xFF8F002D, 0xFF370005, + 0x005C7479, 0xE0F707AE, 0x0008005C, 0xFE7E0034, 0x00A60005, 0x005D83D9, 0x29627C27, 0x0008005D, + 0xFE3A01BC, 0xFFED0005, 0x005E3110, 0x19D5988A, 0x0008005E, 0xFEBA0122, 0xFF7E0008, 0x00790068, + 0x01C20000, 0x00010001, 0x0008000B, 0x0000FFF6, 0x00000005, 0x001502D8, 0x000003D2, 0x00080015, + 0xFF9F00DC, 0x00030005, 0x002B0000, 0x0000F80A, 0x00050030, 0x0000F47A, 0xFD3B0008, 0x00300039, + 0x0122002E, 0x00050037, 0x000026FA, 0x1E940008, 0x00370036, 0x01C00016, 0x0005003A, 0x00000000, + 0xF5C10008, 0x003AFEE0, 0x00C0FFFF, 0x00050045, 0x61460000, 0x9EBA0008, 0x0045004B, 0x0048FFCF, + 0x00050046, 0x0000F667, 0x39990008, 0x0046FF51, 0x0072FFCF, 0x00050047, 0x0000081B, 0x00000008, + 0x0047FE89, 0x00480000, 0x0008004D, 0xFE6100C8, 0x00140005, 0x004E02D8, 0x000003D2, 0x0008004E, + 0xFF9F00DC, 0x00030005, 0x00547FD8, 0x14E7FFB3, 0x00080054, 0x00D601B4, 0x001E0005, 0x00553999, + 0x11669779, 0x00080055, 0x005C0118, 0x01160005, 0x00560000, 0xF58D7850, 0x00080056, 0x00C201B4, + 0xFFD90005, 0x0057A668, 0x0000B334, 0x00080057, 0x00E601C2, 0xFF970005, 0x00585998, 0xE2230CCC, + 0x00080058, 0xFFCB01C2, 0x00930005, 0x00593999, 0x08B32EEE, 0x00080059, 0xFF540118, 0x00DD0005, + 0x005A0BA8, 0xEB287D14, 0x0008005A, 0xFFFA001F, 0xFF510005, 0x005B0BA8, 0x29B188C0, 0x0008005B, + 0xFF91001F, 0xFF340005, 0x005C7850, 0xE0A5051E, 0x0008005C, 0xFE7F0024, 0x00A70005, 0x005D8291, + 0x29CF7D6F, 0x0008005D, 0xFE3A01B4, 0xFFED0005, 0x005E2EEE, 0x1A1A9779, 0x0008005E, 0xFEBA0118, + 0xFF7D0008, 0x00790068, 0x01BB0000, 0x00010001, 0x0008000B, 0x0000FFF5, 0x00000005, 0x00150333, + 0x00000406, 0x0005002B, 0x00000000, 0xF70B0005, 0x00300000, 0xF517FB75, 0x00080030, 0x003E0121, + 0x002E0005, 0x00370000, 0x274C1EDF, 0x00080037, 0x003601BC, 0x00180005, 0x003A0000, 0x0000F544, + 0x0008003A, 0xFEE000BE, 0xFFFF0005, 0x004563D6, 0x00009C2A, 0x00080045, 0x004B0043, 0xFFCF0005, + 0x00460000, 0xF5DE3CCC, 0x00080046, 0xFF51006E, 0xFFCF0005, 0x00470000, 0x08510000, 0x00080047, + 0xFE890043, 0x00000008, 0x004DFE61, 0x00C60014, 0x0005004E, 0x03330000, 0x04060005, 0x00547FF5, + 0x151EFFED, 0x00080054, 0x00D601AD, 0x001D0005, 0x00553CCC, 0x11949668, 0x00080055, 0x005C010D, + 0x01180005, 0x00560000, 0xF5717C27, 0x00080056, 0x00C201AD, 0xFFD90005, 0x0057A57E, 0x0000B508, + 0x00080057, 0x00E701BB, 0xFF960005, 0x00585A82, 0xE1D50F8A, 0x00080058, 0xFFCB01BB, 0x00940005, + 0x00593CCC, 0x08CA2CCC, 0x00080059, 0xFF53010D, 0x00DE0005, 0x005A068D, 0xEAF17E5B, 0x0008005A, + 0xFFFB0010, 0xFF4F0005, 0x005B068D, 0x2A1E84EC, 0x0008005B, 0xFF940010, 0xFF320005, 0x005C7C27, + 0xE053028F, 0x0008005C, 0xFE7F0013, 0x00A80005, 0x005D8149, 0x2A3D7EB7, 0x0008005D, 0xFE3A01AD, + 0xFFED0005, 0x005E2CCC, 0x1A5E9668, 0x0008005E, 0xFEBB010D, 0xFF7C0008, 0x00790068, 0x01B50000, + 0x00010001, 0x0008000B, 0x0000FFF3, 0x00000005, 0x0015038E, 0x00000440, 0x00080015, 0xFF9F00DB, + 0x00030005, 0x002B0000, 0x0000F60C, 0x00050030, 0x0000F5B1, 0xF9C80008, 0x00300044, 0x0120002E, + 0x00050037, 0x0000279E, 0x1F2A0008, 0x00370036, 0x01B9001A, 0x0005003A, 0x00000000, 0xF4C30008, + 0x003AFEE0, 0x00BCFFFF, 0x00050045, 0x66650000, 0x999B0008, 0x0045004B, 0x003DFFCF, 0x00050046, + 0x0000F556, 0x3FFF0008, 0x0046FF51, 0x0069FFCF, 0x00050047, 0x00000888, 0x00000008, 0x0047FE89, + 0x003D0000, 0x0008004D, 0xFE6100C5, 0x00140005, 0x004E038E, 0x00000440, 0x0008004E, 0xFF9F00DB, + 0x00030005, 0x00548001, 0x15550000, 0x00080054, 0x00D701A5, 0x001D0005, 0x00553FFF, 0x11C19557, + 0x00080055, 0x005B0103, 0x011A0005, 0x00560000, 0xF5568001, 0x00080056, 0x00C301A5, 0xFFD80005, + 0x0057A493, 0x0000B6DC, 0x00080057, 0x00E801B4, 0xFF960005, 0x00585B6D, 0xE1871249, 0x00080058, + 0xFFCB01B4, 0x00950005, 0x00593FFF, 0x08E02AAA, 0x00080059, 0xFF520103, 0x00E00005, 0x005A0172, + 0xEABB7FA2, 0x0008005A, 0xFFFB0002, 0xFF4D0005, 0x005B0172, 0x2A8B8118, 0x0008005B, 0xFF970002, + 0xFF2F0005, 0x005C8001, 0xE0010000, 0x0008005C, 0xFE7F0002, 0x00A90005, 0x005D8001, 0x2AAA8001, + 0x0008005D, 0xFE3901A5, 0xFFEC0005, 0x005E2AAA, 0x1AA29557, 0x0008005E, 0xFEBB0103, 0xFF7C0008, + 0x00790068, 0x01AE0000, 0x00010001, 0x00050003, 0x0000F087, 0xDE3A0008, 0x000B0000, 0xFFF20000, + 0x00050015, 0x03E90000, 0x047D0008, 0x0015FF9F, 0x00DA0004, 0x00050030, 0xFFD3F634, 0xFA170008, + 0x00300046, 0x0122002D, 0x00050037, 0x000027EE, 0x1F760008, 0x00370036, 0x01B5001B, 0x0005003A, + 0x00000000, 0xF43D0008, 0x003AFEE0, 0x00B9FFFF, 0x00050045, 0x68F40000, 0x970C0008, 0x0045004B, + 0x0038FFCF, 0x00050046, 0x0000F4CD, 0x43320008, 0x0046FF51, 0x0064FFCF, 0x00050047, 0x000008BF, + 0x00000008, 0x0047FE89, 0x00380000, 0x0008004D, 0xFE6100C4, 0x00140005, 0x004E03E9, 0x0000047D, + 0x0008004E, 0xFF9F00DA, 0x00040005, 0x00554332, 0x11EF9446, 0x00080055, 0x005B00F8, 0x011D0005, + 0x0057A3A9, 0x0000B8B1, 0x00080057, 0x00E901AD, 0xFF950005, 0x00585C57, 0xE1391507, 0x00080058, + 0xFFCB01AD, 0x00960005, 0x00594332, 0x08F72888, 0x00080059, 0xFF5100F8, 0x00E20005, 0x005A0000, + 0xEAAB8001, 0x0008005A, 0xFFFB0002, 0xFF4C0005, 0x005B0000, 0x2AAA8001, 0x0008005B, 0xFF970002, + 0xFF2E0005, 0x005E2888, 0x1AE69446, 0x0008005E, 0xFEBC00F8, 0xFF7B0008, 0x00790067, 0x01A70000, + 0x00010001, 0x00050003, 0x0000F089, 0xDE360008, 0x0003FF2A, 0x01740027, 0x0008000B, 0x0000FFF1, + 0x00000005, 0x00150444, 0x000004B9, 0x00080015, 0xFF9F00D9, 0x00040005, 0x0030FFA5, 0xF6B3FA68, + 0x00080030, 0x00480123, 0x002C0005, 0x00370000, 0x283E1FC3, 0x00080037, 0x003701B1, 0x001D0005, + 0x003A0000, 0x0000F3B1, 0x0008003A, 0xFEE000B7, 0xFFFF0005, 0x00456B84, 0x0000947C, 0x00080045, + 0x004B0032, 0xFFCF0005, 0x00460000, 0xF4454665, 0x00080046, 0xFF51005F, 0xFFCF0005, 0x00470000, + 0x08F50000, 0x00080047, 0xFE890032, 0x00000008, 0x004DFE61, 0x00C20014, 0x0005004E, 0x04440000, + 0x04B90008, 0x004EFF9F, 0x00D90004, 0x00050055, 0x4665121C, 0x93350008, 0x0055005B, 0x00ED011F, + 0x00050057, 0xA2BF0000, 0xBA850008, 0x005700EA, 0x01A5FF94, 0x00050058, 0x5D41E0EB, 0x17C50008, + 0x0058FFCA, 0x01A50097, 0x00050059, 0x4665090E, 0x26660008, 0x0059FF50, 0x00ED00E4, 0x0005005E, + 0x26661B2A, 0x93350008, 0x005EFEBC, 0x00EDFF7A, 0x00080079, 0x006701A0, 0x00000001, 0x00010005, + 0x00030000, 0xF08CDE2F, 0x0008000B, 0x0000FFEF, 0x00000005, 0x0015049F, 0x000004F6, 0x00080015, + 0xFF9E00D7, 0x00050005, 0x0030FF78, 0xF72CFABE, 0x00080030, 0x004B0125, 0x002B0005, 0x00370000, + 0x288D200F, 0x00080037, 0x003701AD, 0x001F0005, 0x003A0000, 0x0000F322, 0x0008003A, 0xFEE000B4, + 0xFFFF0005, 0x00456E13, 0x000091ED, 0x00080045, 0x004B002C, 0xFFCF0005, 0x00460000, 0xF3BC4999, + 0x00080046, 0xFF51005A, 0xFFCF0005, 0x00470000, 0x092C0000, 0x00080047, 0xFE89002C, 0x00000008, + 0x004DFE61, 0x00C10014, 0x0005004E, 0x049F0000, 0x04F60008, 0x004EFF9E, 0x00D70005, 0x00050055, + 0x49991249, 0x92230008, 0x0055005A, 0x00E20121, 0x00050057, 0xA1D50000, 0xBC590008, 0x005700EB, + 0x019EFF94, 0x00050058, 0x5E2BE09D, 0x1A830008, 0x0058FFCA, 0x019E0098, 0x00050059, 0x49990924, + 0x24430008, 0x0059FF4F, 0x00E200E5, 0x0005005E, 0x24431B6E, 0x92230008, 0x005EFEBD, 0x00E2FF7A, + 0x00080079, 0x00670199, 0x00000001, 0x00010005, 0x00030000, 0xF090DE26, 0x0008000B, 0x0000FFEE, + 0x00000005, 0x001504FA, 0x00000531, 0x00080015, 0xFF9E00D6, 0x00050005, 0x0030FF4A, 0xF7A1FB18, + 0x00080030, 0x004D0126, 0x002A0005, 0x00370000, 0x28DB205C, 0x00080037, 0x003701AA, 0x00200005, + 0x003A0000, 0x0000F28E, 0x0008003A, 0xFEE000B2, 0xFFFF0005, 0x004570A2, 0x00008F5E, 0x00080045, + 0x004B0026, 0xFFCF0005, 0x00460000, 0xF3344CCC, 0x00080046, 0xFF510055, 0xFFCF0005, 0x00470000, + 0x09620000, 0x00080047, 0xFE890026, 0x00000008, 0x004DFE61, 0x00BF0014, 0x0005004E, 0x04FA0000, + 0x05310008, 0x004EFF9E, 0x00D60005, 0x00050055, 0x4CCC1277, 0x91120008, 0x0055005A, 0x00D60124, + 0x00050057, 0xA0EB0000, 0xBE2D0008, 0x005700EC, 0x0196FF93, 0x00050058, 0x5F15E04F, 0x1D410008, + 0x0058FFCA, 0x01960099, 0x00050059, 0x4CCC093B, 0x22210008, 0x0059FF4E, 0x00D600E7, 0x0005005E, + 0x22211BB3, 0x91120008, 0x005EFEBD, 0x00D6FF79, 0x00080079, 0x00670191, 0x00000001, 0x00010005, + 0x00030000, 0xF095DE1A, 0x00080003, 0xFF2B0174, 0x00280008, 0x000B0000, 0xFFEC0000, 0x00050015, + 0x05550000, 0x056D0008, 0x0015FF9E, 0x00D40005, 0x00050030, 0xFF1DF810, 0xFB770008, 0x0030004F, + 0x0126002A, 0x00050037, 0x00002929, 0x20AA0008, 0x00370037, 0x01A60022, 0x0005003A, 0x00000000, + 0xF1F70008, 0x003AFEE0, 0x00AFFFFF, 0x00050045, 0x73320000, 0x8CCE0008, 0x0045004B, 0x0020FFCF, + 0x00050046, 0x0000F2AB, 0x4FFF0008, 0x0046FF51, 0x0050FFCF, 0x00050047, 0x00000999, 0x00000008, + 0x0047FE89, 0x00200000, 0x0008004D, 0xFE6100BE, 0x00140005, 0x004E0555, 0x0000056D, 0x0008004E, + 0xFF9E00D4, 0x00050005, 0x00554FFF, 0x12A49001, 0x00080055, 0x005A00CA, 0x01260005, 0x0057A001, + 0x0000C001, 0x00080057, 0x00ED018E, 0xFF930005, 0x00585FFF, 0xE0011FFF, 0x00080058, 0xFFC9018E, + 0x009A0005, 0x00594FFF, 0x09521FFF, 0x00080059, 0xFF4D00CA, 0x00E90005, 0x005E1FFF, 0x1BF79001, + 0x0008005E, 0xFEBE00CA, 0xFF790008, 0x00790067, 0x018A0000, 0x00010001, 0x00050003, 0x0000F09B, + 0xDDD30008, 0x0003FF2A, 0x01730028, 0x0008000B, 0x0000FFEA, 0x00000005, 0x001505B0, 0x000005A8, + 0x00080015, 0xFF9E00D3, 0x00060005, 0x0030FEEF, 0xF87BFBDC, 0x00080030, 0x00520127, 0x00290005, + 0x00370000, 0x297620F8, 0x00080037, 0x003701A2, 0x00240005, 0x003A0000, 0x0000F15B, 0x0008003A, + 0xFEE000AD, 0xFFFF0005, 0x004575C1, 0x00008A3F, 0x00080045, 0x004B001A, 0xFFCF0005, 0x00460000, + 0xF2235332, 0x00080046, 0xFF51004B, 0xFFCF0005, 0x00470000, 0x09D00000, 0x00080047, 0xFE89001A, + 0x00000008, 0x004DFE61, 0x00BC0014, 0x0005004E, 0x05B00000, 0x05A80008, 0x004EFF9E, 0x00D30006, + 0x00050055, 0x533212D2, 0x8EF00008, 0x00550059, 0x00BE0128, 0x00050057, 0x9F170000, 0xC1D50008, + 0x005700EE, 0x0186FF92, 0x00050058, 0x60E9DFB3, 0x22BD0008, 0x0058FFC9, 0x0186009B, 0x00050059, + 0x53320969, 0x1DDD0008, 0x0059FF4C, 0x00BE00EB, 0x0005005E, 0x1DDD1C3B, 0x8EF00008, 0x005EFEBE, + 0x00BEFF78, 0x00080079, 0x00660182, 0x00000001, 0x00010005, 0x00030000, 0xF0A2DD88, 0x00080003, + 0xFF2A0172, 0x00280008, 0x000B0000, 0xFFE90000, 0x00050015, 0x060B0000, 0x05E20008, 0x0015FF9E, + 0x00D10006, 0x00050030, 0xFEC2F8E1, 0xFC460008, 0x00300054, 0x01270028, 0x00050037, 0x000029C2, + 0x21470008, 0x00370037, 0x019E0026, 0x0005003A, 0x00000000, 0xF0BC0008, 0x003AFEE0, 0x00AAFFFF, + 0x00050045, 0x78500000, 0x87B00008, 0x0045004B, 0x0014FFCF, 0x00050046, 0x0000F19A, 0x56650008, + 0x0046FF51, 0x0046FFCF, 0x00050047, 0x00000A06, 0x00000008, 0x0047FE89, 0x00140000, 0x0008004D, + 0xFE6100BA, 0x00140005, 0x004E060B, 0x000005E2, 0x0008004E, 0xFF9E00D1, 0x00060005, 0x00555665, + 0x12FF8DDF, 0x00080055, 0x005900B2, 0x012B0005, 0x00579E2D, 0x0000C3A9, 0x00080057, 0x00EF017E, + 0xFF920005, 0x005861D3, 0xDF65257C, 0x00080058, 0xFFC9017E, 0x009C0005, 0x00595665, 0x097F1BBB, + 0x00080059, 0xFF4B00B2, 0x00EC0005, 0x005E1BBB, 0x1C7F8DDF, 0x0008005E, 0xFEBF00B2, 0xFF780008, + 0x00790066, 0x017A0000, 0x00010001, 0x00050003, 0x0000F0AA, 0xDD3B0008, 0x0003FF2A, 0x01710029, + 0x0008000B, 0x0000FFE7, 0x00000005, 0x00150666, 0x0000061C, 0x00080015, 0xFF9E00CF, 0x00070005, + 0x0030FE94, 0xF942FCB1, 0x00080030, 0x00560127, 0x00280005, 0x00370000, 0x2A0D2196, 0x00080037, + 0x0037019A, 0x00270005, 0x003A0000, 0x0000F01A, 0x0008003A, 0xFEE000A7, 0xFFFF0005, 0x00457AE0, + 0x00008520, 0x00080045, 0x004B000E, 0xFFCF0005, 0x00460000, 0xF1125998, 0x00080046, 0xFF510040, + 0xFFCF0005, 0x00470000, 0x0A3D0000, 0x00080047, 0xFE89000E, 0x00000008, 0x004DFE61, 0x00B80014, + 0x0005004E, 0x06660000, 0x061C0008, 0x004EFF9E, 0x00CF0007, 0x00050055, 0x5998132D, 0x8CCE0008, + 0x00550059, 0x00A6012D, 0x00050057, 0x9D430000, 0xC57D0008, 0x005700F0, 0x0176FF91, 0x00050058, + 0x62BDDF17, 0x283A0008, 0x0058FFC9, 0x0176009D, 0x00050059, 0x59980996, 0x19990008, 0x0059FF4A, + 0x00A600EE, 0x0005005E, 0x19991CC3, 0x8CCE0008, 0x005EFEBF, 0x00A6FF77, 0x00080079, 0x00660172, + 0x00000001, 0x00010005, 0x00030000, 0xF0B3DCEA, 0x00080003, 0xFF2A016F, 0x00290008, 0x000B0000, + 0xFFE50000, 0x00050015, 0x06C10000, 0x06540008, 0x0015FF9E, 0x00CD0007, 0x00050030, 0xFE67F99F, + 0xFD1C0008, 0x00300058, 0x01260027, 0x00050037, 0x00002A58, 0x21E60008, 0x00370037, 0x01960029, + 0x0005003A, 0x00000000, 0xEF750008, 0x003AFEE0, 0x00A4FFFF, 0x00050045, 0x7D6F0000, 0x82910008, + 0x0045004B, 0x0008FFCF, 0x00050046, 0x0000F089, 0x5CCC0008, 0x0046FF51, 0x003BFFCF, 0x00050047, + 0x00000A73, 0x00000008, 0x0047FE89, 0x00080000, 0x0008004D, 0xFE6100B7, 0x00140005, 0x004E06C1, + 0x00000654, 0x0008004E, 0xFF9E00CD, 0x00070005, 0x00555CCC, 0x135A8BBD, 0x00080055, 0x00580099, + 0x012F0005, 0x00579C59, 0x0000C751, 0x00080057, 0x00F1016D, 0xFF900005, 0x005863A7, 0xDEC92AF8, + 0x00080058, 0xFFC8016D, 0x009E0005, 0x00595CCC, 0x09AD1777, 0x00080059, 0xFF490099, 0x00F00005, + 0x005E1777, 0x1D088BBD, 0x0008005E, 0xFEC00099, 0xFF770008, 0x00790066, 0x01690000, 0x00010001, + 0x00050003, 0x0000F0BE, 0xDC960008, 0x0003FF2A, 0x016E0029, 0x0008000B, 0x0000FFE3, 0x00000005, + 0x0015071C, 0x0000068C, 0x00080015, 0xFF9E00CB, 0x00070005, 0x0030FE39, 0xF9F7FD84, 0x00080030, + 0x005A0125, 0x00260005, 0x00370000, 0x2AA22236, 0x00080037, 0x00370192, 0x002B0005, 0x003A0000, + 0x0000EECE, 0x0008003A, 0xFEDF00A1, 0xFFFF0005, 0x00458001, 0x00008001, 0x00080045, 0x004B0002, + 0xFFCF0005, 0x00460000, 0xF0015FFF, 0x00080046, 0xFF510036, 0xFFCF0005, 0x00470000, 0x0AAA0000, + 0x00080047, 0xFE890002, 0x00000008, 0x004DFE61, 0x00B50014, 0x0005004E, 0x071C0000, 0x068C0008, + 0x004EFF9E, 0x00CB0007, 0x00050055, 0x5FFF1388, 0x8AAC0008, 0x00550058, 0x008D0132, 0x00050057, + 0x9B6F0000, 0xC9260008, 0x005700F2, 0x0164FF90, 0x00050058, 0x6491DE7B, 0x2DB60008, 0x0058FFC8, + 0x0164009F, 0x00050059, 0x5FFF09C4, 0x15550008, 0x0059FF48, 0x008D00F2, 0x0005005E, 0x15551D4C, + 0x8AAC0008, 0x005EFEC0, 0x008DFF77, 0x00080079, 0x00660160, 0x00000001, 0x00010005, 0x00030000, + 0xF0CBDC3B, 0x00080003, 0xFF2B016D, 0x002A0008, 0x000B0000, 0xFFE10000, 0x00050015, 0x07770000, + 0x06C30008, 0x0015FF9D, 0x00C90008, 0x00050030, 0xFE0CFA4B, 0xFDE60008, 0x0030005C, 0x01240026, + 0x00050037, 0x00002A9E, 0x22250008, 0x00370037, 0x018E002B, 0x0005003A, 0x00000000, 0xEE240008, + 0x003AFEDF, 0x009EFFFF, 0x00050046, 0x0000EF78, 0x63320008, 0x0046FF51, 0x0030FFCF, 0x0008004D, + 0xFE6100B3, 0x00140005, 0x004E0777, 0x000006C3, 0x0008004E, 0xFF9D00C9, 0x00080005, 0x00556332, + 0x13B5899B, 0x00080055, 0x00580080, 0x01340005, 0x00579A85, 0x0000CAFA, 0x00080057, 0x00F3015B, + 0xFF8F0005, 0x0058657B, 0xDE2D3074, 0x00080058, 0xFFC8015B, 0x00A00005, 0x00596332, 0x09DA1333, + 0x00080059, 0xFF470080, 0x00F30005, 0x005E1333, 0x1D90899B, 0x0008005E, 0xFEC10080, 0xFF760008, + 0x00790065, 0x01580000, 0x00010001, 0x00050003, 0x0000F0DD, 0xDBD60008, 0x0003FF2B, 0x016C002A, + 0x0008000B, 0x0000FFDF, 0x00000005, 0x001507D2, 0x000006F9, 0x00080015, 0xFF9D00C6, 0x00080005, + 0x0030FDDE, 0xFA9BFE40, 0x00080030, 0x005E0122, 0x00250005, 0x00370000, 0x2A9A2214, 0x00080037, + 0x0036018A, 0x002B0005, 0x003A0000, 0x0000ED78, 0x0008003A, 0xFEDF009B, 0xFFFF0005, 0x00460000, + 0xEEF06665, 0x00080046, 0xFF51002B, 0xFFCF0008, 0x004DFE61, 0x00B10014, 0x0005004E, 0x07D20000, + 0x06F90008, 0x004EFF9D, 0x00C60008, 0x00050055, 0x666513E3, 0x888A0008, 0x00550057, 0x00730136, + 0x00050057, 0x999B0000, 0xCCCE0008, 0x005700F5, 0x0152FF8F, 0x00050058, 0x6665DDDF, 0x33320008, + 0x0058FFC7, 0x015200A1, 0x00050059, 0x666509F1, 0x11100008, 0x0059FF46, 0x007300F5, 0x0005005E, + 0x11101DD4, 0x888A0008, 0x005EFEC1, 0x0073FF76, 0x00080079, 0x0065014F, 0x00000001, 0x00010005, + 0x00030000, 0xF0F4DB67, 0x00080003, 0xFF2B016A, 0x002B0008, 0x000B0000, 0xFFDD0000, 0x00050015, + 0x082D0000, 0x072D0008, 0x0015FF9D, 0x00C40009, 0x00050030, 0xFDB1FAE6, 0xFE930008, 0x00300061, + 0x01200025, 0x00050037, 0x00002A97, 0x22020008, 0x00370035, 0x0186002B, 0x0005003A, 0x00000000, + 0xECCB0008, 0x003AFEDF, 0x0098FFFF, 0x00050046, 0x0000EE67, 0x69980008, 0x0046FF51, 0x0026FFCF, + 0x0008004D, 0xFE6100AF, 0x00140005, 0x004E082D, 0x0000072D, 0x0008004E, 0xFF9D00C4, 0x00090005, + 0x00556998, 0x14108779, 0x00080055, 0x00570065, 0x01390005, 0x005798B1, 0x0000CEA2, 0x00080057, + 0x00F60149, 0xFF8E0005, 0x0058674F, 0xDD9135F0, 0x00080058, 0xFFC70149, 0x00A20005, 0x00596998, + 0x0A080EEE, 0x00080059, 0xFF450065, 0x00F70005, 0x005E0EEE, 0x1E188779, 0x0008005E, 0xFEC20065, + 0xFF760008, 0x00790065, 0x01450000, 0x00010001, 0x00050003, 0x0000F10E, 0xDAEF0008, 0x0003FF2B, + 0x0168002B, 0x0008000B, 0x0000FFDB, 0x00000005, 0x00150888, 0x00000760, 0x00080015, 0xFF9D00C1, + 0x00090005, 0x0030FD83, 0xFB2EFEDE, 0x00080030, 0x0063011E, 0x00240005, 0x00370000, 0x2A9321F0, + 0x00080037, 0x00350183, 0x002B0005, 0x003A0000, 0x0000EC1C, 0x0008003A, 0xFEDE0095, 0xFFFF0005, + 0x00460000, 0xEDDF6CCB, 0x00080046, 0xFF510020, 0xFFCF0008, 0x004DFE61, 0x00AD0014, 0x0005004E, + 0x08880000, 0x07600008, 0x004EFF9D, 0x00C10009, 0x00050055, 0x6CCB143D, 0x86680008, 0x00550057, + 0x0058013B, 0x00050057, 0x97C70000, 0xD0760008, 0x005700F7, 0x013FFF8E, 0x00050058, 0x6839DD43, + 0x38AF0008, 0x0058FFC7, 0x013F00A3, 0x00050059, 0x6CCB0A1E, 0x0CCC0008, 0x0059FF44, 0x005800F8, + 0x0005005E, 0x0CCC1E5C, 0x86680008, 0x005EFEC2, 0x0058FF75, 0x00080079, 0x0065013C, 0x00000001, + 0x00010005, 0x00030000, 0xF12EDA6D, 0x00080003, 0xFF2A0166, 0x002B0008, 0x000B0000, 0xFFD90000, + 0x00050015, 0x08E30000, 0x07920008, 0x0015FF9D, 0x00BF0009, 0x00050030, 0xFD56FB71, 0xFF220008, + 0x00300065, 0x011C0023, 0x00050037, 0x00002A90, 0x21DD0008, 0x00370034, 0x017F002B, 0x0005003A, + 0x00000000, 0xEB6C0008, 0x003AFEDE, 0x0092FFFF, 0x00050046, 0x0000ED56, 0x6FFF0008, 0x0046FF51, + 0x001BFFCF, 0x0008004D, 0xFE6100AA, 0x00140005, 0x004E08E3, 0x00000792, 0x0008004E, 0xFF9D00BF, + 0x00090005, 0x00556FFF, 0x146B8557, 0x00080055, 0x0056004A, 0x013D0005, 0x005796DD, 0x0000D24A, + 0x00080057, 0x00F80136, 0xFF8D0005, 0x00586923, 0xDCF53B6D, 0x00080058, 0xFFC70136, 0x00A40005, + 0x00596FFF, 0x0A350AAA, 0x00080059, 0xFF43004A, 0x00FA0005, 0x005E0AAA, 0x1EA18557, 0x0008005E, + 0xFEC3004A, 0xFF750008, 0x00790065, 0x01320000, 0x00010001, 0x00050003, 0x0000F151, 0xD9E30008, + 0x0003FF2A, 0x0164002C, 0x0008000B, 0x0000FFD7, 0x00000005, 0x0015093E, 0x000007C2, 0x00080015, + 0xFF9D00BC, 0x000A0005, 0x0030FD28, 0xFBB0FF5E, 0x00080030, 0x0067011A, 0x00230005, 0x00370000, + 0x2A8E21C9, 0x00080037, 0x0034017B, 0x002B0005, 0x003A0000, 0x0000EABB, 0x0008003A, 0xFEDE008F, + 0xFFFF0005, 0x00460000, 0xECCD7332, 0x00080046, 0xFF510016, 0xFFCF0008, 0x004DFE61, 0x00A80014, + 0x0005004E, 0x093E0000, 0x07C20008, 0x004EFF9D, 0x00BC000A, 0x00050055, 0x73321498, 0x84460008, + 0x00550056, 0x003C0140, 0x00050057, 0x95F30000, 0xD41E0008, 0x005700F9, 0x012CFF8C, 0x00050058, + 0x6A0DDCA7, 0x3E2B0008, 0x0058FFC6, 0x012C00A5, 0x00050059, 0x73320A4C, 0x08880008, 0x0059FF42, + 0x003C00FC, 0x0005005E, 0x08881EE5, 0x84460008, 0x005EFEC3, 0x003CFF75, 0x00080079, 0x00640128, + 0x00000001, 0x00010005, 0x00030000, 0xF179D951, 0x00080003, 0xFF2A0162, 0x002C0008, 0x000B0000, + 0xFFD50000, 0x00050015, 0x09990000, 0x07F10008, 0x0015FF9D, 0x00B9000A, 0x00050030, 0xFCFBFBEC, + 0xFF920008, 0x00300069, 0x01170022, 0x00050037, 0x00002A8C, 0x21B50008, 0x00370033, 0x0177002B, + 0x0005003A, 0x00000000, 0xEA0A0008, 0x003AFEDD, 0x008CFFFF, 0x00050046, 0x0000EC45, 0x76650008, + 0x0046FF51, 0x0011FFCF, 0x0008004D, 0xFE6100A6, 0x00140005, 0x004E0999, 0x000007F1, 0x0008004E, + 0xFF9D00B9, 0x000A0005, 0x00557665, 0x14C68335, 0x00080055, 0x0056002D, 0x01420005, 0x00579509, + 0x0000D5F2, 0x00080057, 0x00FA0122, 0xFF8C0005, 0x00586AF7, 0xDC5940E9, 0x00080058, 0xFFC60122, + 0x00A60005, 0x00597665, 0x0A630666, 0x00080059, 0xFF41002D, 0x00FE0005, 0x005E0666, 0x1F298335, + 0x0008005E, 0xFEC4002D, 0xFF750008, 0x00790064, 0x011E0000, 0x00010001, 0x00050003, 0x0000F1A6, + 0xD8B70008, 0x0003FF2A, 0x0160002C, 0x0008000B, 0x0000FFD2, 0x00000005, 0x001509F4, 0x0000081E, + 0x00080015, 0xFF9D00B6, 0x000A0005, 0x0030FCCD, 0xFC24FFBF, 0x00080030, 0x006B0114, 0x00220005, + 0x00370000, 0x2A8921A0, 0x00080037, 0x00320173, 0x002B0005, 0x003A0000, 0x0000E958, 0x0008003A, + 0xFEDD0089, 0xFFFF0005, 0x00460000, 0xEBBC7998, 0x00080046, 0xFF51000B, 0xFFCF0008, 0x004DFE61, + 0x00A30014, 0x0005004E, 0x09F40000, 0x081E0008, 0x004EFF9D, 0x00B6000A, 0x00050055, 0x799814F3, + 0x82240008, 0x00550055, 0x001F0144, 0x00050057, 0x941F0000, 0xD7C60008, 0x005700FB, 0x0117FF8B, + 0x00050058, 0x6BE1DC0B, 0x43A70008, 0x0058FFC6, 0x011700A7, 0x00050059, 0x79980A79, 0x04440008, + 0x0059FF40, 0x001F00FF, 0x0005005E, 0x04441F6D, 0x82240008, 0x005EFEC4, 0x001FFF75, 0x00080079, + 0x00640114, 0x00000001, 0x00010005, 0x00030000, 0xF1D6D817, 0x00080003, 0xFF29015E, 0x002C0008, + 0x000B0000, 0xFFD00000, 0x00050015, 0x0A4F0000, 0x08490008, 0x0015FF9D, 0x00B3000B, 0x00050030, + 0xFCA0FC58, 0xFFE40008, 0x0030006D, 0x01120021, 0x00050037, 0x00002A88, 0x218B0008, 0x00370032, + 0x016F002B, 0x0005003A, 0x00000000, 0xE8A70008, 0x003AFEDC, 0x0085FFFF, 0x00050046, 0x0000EB34, + 0x7CCB0008, 0x0046FF51, 0x0006FFCF, 0x0008004D, 0xFE6100A1, 0x00140005, 0x004E0A4F, 0x00000849, + 0x0008004E, 0xFF9D00B3, 0x000B0005, 0x00557CCB, 0x15218113, 0x00080055, 0x00550010, 0x01470005, + 0x00579335, 0x0000D99A, 0x00080057, 0x00FC010D, 0xFF8B0005, 0x00586CCB, 0xDBBD4665, 0x00080058, + 0xFFC5010D, 0x00A80005, 0x00597CCB, 0x0A900222, 0x00080059, 0xFF3F0010, 0x01010005, 0x005E0222, + 0x1FB18113, 0x0008005E, 0xFEC50010, 0xFF750008, 0x00790064, 0x01090000, 0x00010001, 0x00050003, + 0x0000F20B, 0xD7700008, 0x0003FF29, 0x015C002C, 0x0008000B, 0x0000FFCE, 0x00000005, 0x00150AAA, + 0x00000872, 0x00080015, 0xFF9D00B0, 0x000B0005, 0x0030FC72, 0xFC890000, 0x00080030, 0x006F010F, + 0x00210005, 0x00370000, 0x2A862174, 0x00080037, 0x0031016B, 0x002B0005, 0x003A0000, 0x0000E7F6, + 0x0008003A, 0xFEDC0082, 0xFFFF0005, 0x00460000, 0xEAAB8001, 0x00080046, 0xFF510002, 0xFFCF0008, + 0x004DFE61, 0x009F0014, 0x0005004E, 0x0AAA0000, 0x08720008, 0x004EFF9D, 0x00B0000B, 0x00050055, + 0x8001154E, 0x80010008, 0x00550055, 0x00020149, 0x00050057, 0x924A0000, 0xDB6F0008, 0x005700FD, + 0x0102FF8A, 0x00050058, 0x6DB6DB6E, 0x49240008, 0x0058FFC5, 0x010200A9, 0x00050059, 0x80010AA7, + 0x00000008, 0x0059FF3E, 0x00020103, 0x0005005E, 0x00001FF6, 0x80010008, 0x005EFEC5, 0x0002FF75, + 0x00080079, 0x006400FF, 0x00000001, 0x00010005, 0x00030000, 0xF242D6C7, 0x00080003, 0xFF290159, + 0x002D0008, 0x000B0000, 0xFFCB0000, 0x00050015, 0x0B050000, 0x08990008, 0x0015FF9D, 0x00AD000C, + 0x00050030, 0xFC72FCB6, 0x00000008, 0x00300071, 0x01110020, 0x00050037, 0x00002B66, 0x1F5B0008, + 0x00370031, 0x016D002A, 0x0005003A, 0x00000000, 0xE7450008, 0x003AFEDB, 0x007FFFFF, 0x0008004D, + 0xFE61009C, 0x00140005, 0x004E0B05, 0x00000899, 0x0008004E, 0xFF9D00AD, 0x000C0005, 0x00558001, + 0x15558001, 0x00050057, 0x91600000, 0xDD430008, 0x005700FE, 0x00F7FF8A, 0x00050058, 0x6EA0DB20, + 0x4BE20008, 0x0058FFC5, 0x00F700AA, 0x00050059, 0x80010AAA, 0x00000008, 0x0059FF3D, 0x00020103, + 0x0005005E, 0x00001FFF, 0x80010008, 0x00790066, 0x01050000, 0x00010001, 0x00050003, 0x0000F27A, + 0xD61E0008, 0x0003FF28, 0x0156002D, 0x0008000B, 0x0000FFC9, 0x00000005, 0x00150B60, 0x000008BF, + 0x00080015, 0xFF9D00AA, 0x000C0005, 0x0030FC72, 0xFCE10000, 0x00080030, 0x00730112, 0x00200005, + 0x00370000, 0x2C451CF5, 0x00080037, 0x0031016F, 0x00280005, 0x003A0000, 0x0000E696, 0x0008003A, + 0xFEDA007C, 0xFFFF0008, 0x004DFE61, 0x009A0014, 0x0005004E, 0x0B600000, 0x08BF0008, 0x004EFF9D, + 0x00AA000C, 0x00050057, 0x90760000, 0xDF170008, 0x005700FF, 0x00ECFF89, 0x00050058, 0x6F8ADAD2, + 0x4EA00008, 0x0058FFC5, 0x00EC00AB, 0x00080079, 0x0069010B, 0x00000001, 0x00010005, 0x00030000, + 0xF2B3D576, 0x00080003, 0xFF280153, 0x002D0008, 0x000B0000, 0xFFC60000, 0x00050015, 0x0BBB0000, + 0x08E20008, 0x0015FF9D, 0x00A7000C, 0x00050030, 0xFC72FD08, 0x00000008, 0x00300074, 0x01130020, + 0x00050037, 0x00002D1B, 0x1A470008, 0x00370031, 0x01710027, 0x0005003A, 0x00000000, 0xE5E70008, + 0x003AFEDA, 0x0079FFFF, 0x0008004D, 0xFE610097, 0x00140005, 0x004E0BBB, 0x000008E2, 0x0008004E, + 0xFF9D00A7, 0x000C0005, 0x00578F8C, 0x0000E0EB, 0x00080057, 0x010000E1, 0xFF880005, 0x00587074, + 0xDA84515E, 0x00080058, 0xFFC400E1, 0x00AC0008, 0x0079006B, 0x01110000, 0x00010001, 0x00050003, + 0x0000F2ED, 0xD4CE0008, 0x0003FF27, 0x0150002D, 0x0008000B, 0x0000FFC3, 0x00000005, 0x00150C16, + 0x00000903, 0x00080015, 0xFF9D00A3, 0x000D0005, 0x0030FC72, 0xFD2C0000, 0x00080030, 0x00760114, + 0x00200005, 0x00370000, 0x2DDE175B, 0x00080037, 0x00320173, 0x00260005, 0x003A0000, 0x0000E53A, + 0x0008003A, 0xFED90075, 0xFFFF0008, 0x004DFE61, 0x00940014, 0x0005004E, 0x0C160000, 0x09030008, + 0x004EFF9D, 0x00A3000D, 0x00050057, 0x8EA20000, 0xE2BF0008, 0x00570101, 0x00D6FF88, 0x00050058, + 0x715EDA36, 0x541C0008, 0x0058FFC4, 0x00D600AD, 0x00080079, 0x006D0116, 0x00000001, 0x00010005, + 0x00030000, 0xF328D427, 0x00080003, 0xFF27014D, 0x002D0008, 0x000B0000, 0xFFC10000, 0x00050015, + 0x0C710000, 0x09220008, 0x0015FF9D, 0x00A0000D, 0x00050030, 0xFC72FD4D, 0x00000008, 0x00300078, + 0x01140020, 0x00050037, 0x00002E88, 0x14430008, 0x00370032, 0x01740025, 0x0005003A, 0x00000000, + 0xE48E0008, 0x003AFED9, 0x0072FFFF, 0x0008004D, 0xFE610092, 0x00140005, 0x004E0C71, 0x00000922, + 0x0008004E, 0xFF9D00A0, 0x000D0005, 0x00578DB8, 0x0000E493, 0x00080057, 0x010200CA, 0xFF870005, + 0x00587248, 0xD9E856DA, 0x00080058, 0xFFC400CA, 0x00AE0008, 0x00790070, 0x011B0000, 0x00010001, + 0x00050003, 0x0000F364, 0xD3810008, 0x0003FF26, 0x0149002D, 0x0008000B, 0x0000FFBE, 0x00000005, + 0x00150CCC, 0x0000093E, 0x00080015, 0xFF9D009D, 0x000E0005, 0x0030FC72, 0xFD6C0000, 0x00080030, + 0x00790114, 0x001F0005, 0x00370000, 0x2F13111B, 0x00080037, 0x00310175, 0x00240005, 0x003A0000, + 0x0000E3E4, 0x0008003A, 0xFED8006F, 0xFFFF0008, 0x004DFE61, 0x008F0014, 0x0005004E, 0x0CCC0000, + 0x093E0008, 0x004EFF9D, 0x009D000E, 0x00050057, 0x8CCE0000, 0xE6670008, 0x00570104, 0x00BEFF87, + 0x00050058, 0x7332D99A, 0x59980008, 0x0058FFC3, 0x00BE00AF, 0x00080079, 0x0072011F, 0x00000001, + 0x00010005, 0x00030000, 0xF3A1D2DC, 0x00080003, 0xFF260145, 0x002D0008, 0x000B0000, 0xFFBB0000, + 0x00050015, 0x0D270000, 0x09580008, 0x0015FF9D, 0x0099000E, 0x00050030, 0xFC72FD87, 0x00000008, + 0x0030007B, 0x0113001F, 0x00050037, 0x00002F7E, 0x0E060008, 0x00370031, 0x01760023, 0x0005003A, + 0x00000000, 0xE33C0008, 0x003AFED7, 0x006CFFFF, 0x0008004D, 0xFE61008C, 0x00140005, 0x004E0D27, + 0x00000958, 0x0008004E, 0xFF9D0099, 0x000E0005, 0x00578BE4, 0x0000E83B, 0x00080057, 0x010500B2, + 0xFF860005, 0x0058741C, 0xD94C5C57, 0x00080058, 0xFFC300B2, 0x00B00008, 0x00790075, 0x01230000, + 0x00010001, 0x00050003, 0x0000F3DE, 0xD2370008, 0x0003FF25, 0x0141002D, 0x0008000B, 0x0000FFB8, + 0x00000005, 0x00150D82, 0x0000096F, 0x00080015, 0xFF9D0095, 0x000E0005, 0x0030FC72, 0xFDA1FFFF, + 0x00080030, 0x007C0112, 0x001F0005, 0x00370000, 0x2FC80B2B, 0x00080037, 0x00310175, 0x00230005, + 0x003A0000, 0x0000E296, 0x0008003A, 0xFED60069, 0xFFFF0008, 0x004DFE61, 0x00890014, 0x0005004E, + 0x0D820000, 0x096F0008, 0x004EFF9D, 0x0095000E, 0x00050057, 0x8AFA0000, 0xEA0F0008, 0x00570106, + 0x00A6FF86, 0x00050058, 0x7506D8FE, 0x5F150008, 0x0058FFC3, 0x00A600B1, 0x00080079, 0x00780126, + 0x00000001, 0x00010005, 0x00030000, 0xF41CD194, 0x00080003, 0xFF24013D, 0x002D0008, 0x000B0000, + 0xFFB50000, 0x00050015, 0x0DDD0000, 0x09840008, 0x0015FF9D, 0x0092000F, 0x00050030, 0xFC72FDB7, + 0x00000008, 0x0030007D, 0x0111001F, 0x00050037, 0x00002FF7, 0x08B30008, 0x00370031, 0x01740023, + 0x0005003A, 0x00000000, 0xE1F20008, 0x003AFED6, 0x0066FFFF, 0x0008004D, 0xFE610086, 0x00140005, + 0x004E0DDD, 0x00000984, 0x0008004E, 0xFF9D0092, 0x000F0005, 0x00578A10, 0x0000EBE3, 0x00080057, + 0x01070099, 0xFF850005, 0x005875F0, 0xD8B061D3, 0x00080058, 0xFFC30099, 0x00B20008, 0x0079007A, + 0x01290000, 0x00010001, 0x00050003, 0x0000F45B, 0xD0F10008, 0x0003FF24, 0x0139002D, 0x0008000B, + 0x0000FFB3, 0x00000005, 0x00150E38, 0x00000996, 0x00080015, 0xFF9D008E, 0x000F0005, 0x0030FC72, + 0xFDCC0000, 0x00080030, 0x007F010F, 0x001F0005, 0x00370000, 0x300F06C2, 0x00080037, 0x00300173, + 0x00230005, 0x003A0000, 0x0000E151, 0x0008003A, 0xFED50063, 0xFFFF0008, 0x004DFE61, 0x00830014, + 0x0005004E, 0x0E380000, 0x09960008, 0x004EFF9D, 0x008E000F, 0x00050057, 0x89260000, 0xEDB80008, + 0x00570108, 0x008CFF84, 0x00050058, 0x76DAD862, 0x64910008, 0x0058FFC2, 0x008C00B3, 0x00080079, + 0x007D012B, 0x00000001, 0x00010005, 0x00030000, 0xF49BD050, 0x00080003, 0xFF230134, 0x002D0008, + 0x000B0000, 0xFFB00000, 0x00050015, 0x0E930000, 0x09A50008, 0x0015FF9D, 0x008B000F, 0x00050030, + 0xFC72FDDE, 0x00000008, 0x00300080, 0x010F001E, 0x00050037, 0x00003019, 0x054F0008, 0x00370030, + 0x01700022, 0x0005003A, 0x00000000, 0xE1520008, 0x003AFED3, 0x0066FFFF, 0x0008004D, 0xFE610080, + 0x00140005, 0x004E0E93, 0x000009A5, 0x0008004E, 0xFF9D008B, 0x000F0005, 0x0057883C, 0x0000EF8C, + 0x00080057, 0x0109007F, 0xFF840005, 0x005877C4, 0xD814674F, 0x00080058, 0xFFC2007F, 0x00B40008, + 0x0079007F, 0x012D0000, 0x00010001, 0x00050003, 0x0000F4DA, 0xCFB10008, 0x0003FF23, 0x0130002D, + 0x0008000B, 0x0000FFAC, 0x00000005, 0x00150EEE, 0x000009B1, 0x00080015, 0xFF9D0087, 0x00100005, + 0x0030FC72, 0xFDEE0000, 0x00080030, 0x0081010F, 0x001E0005, 0x00370000, 0x301C0437, 0x00080037, + 0x002F016D, 0x00220005, 0x003A0000, 0x0000E15A, 0x0008003A, 0xFED00069, 0xFFFF0008, 0x004DFE61, + 0x007D0014, 0x0005004E, 0x0EEE0000, 0x09B10008, 0x004EFF9D, 0x00870010, 0x00050057, 0x87520000, + 0xF1600008, 0x0057010A, 0x0072FF83, 0x00050058, 0x78AED7C6, 0x6A0D0008, 0x0058FFC2, 0x007200B5, + 0x00080079, 0x0082012F, 0x00000001, 0x00010005, 0x00030000, 0xF51ACF13, 0x00080003, 0xFF22012B, + 0x002D0008, 0x000B0000, 0xFFA90000, 0x00050015, 0x0F490000, 0x09BB0008, 0x0015FF9D, 0x00830010, + 0x00050030, 0xFC72FDFC, 0x00000008, 0x00300082, 0x010F001E, 0x00050037, 0x00003019, 0x03700008, + 0x0037002F, 0x016A0022, 0x0005003A, 0x00000000, 0xE1680008, 0x003AFECE, 0x006BFFFF, 0x0008004D, + 0xFE61007A, 0x00140005, 0x004E0F49, 0x000009BB, 0x0008004E, 0xFF9D0083, 0x00100005, 0x00578668, + 0x0000F334, 0x00080057, 0x010B0065, 0xFF830005, 0x00587998, 0xD7786CCB, 0x00080058, 0xFFC10065, + 0x00B60008, 0x00790084, 0x01300000, 0x00010001, 0x00050003, 0x0000F55B, 0xCE770008, 0x0003FF21, + 0x0126002D, 0x0008000B, 0x0000FFA6, 0x00000005, 0x00150FA4, 0x000009C1, 0x00080015, 0xFF9D007F, + 0x00110005, 0x0030FC72, 0xFE070000, 0x00050037, 0x00003013, 0x02F00008, 0x0037002E, 0x01660023, + 0x0005003A, 0x00000000, 0xE17C0008, 0x003AFECC, 0x006EFFFF, 0x0008004D, 0xFE610077, 0x00140005, + 0x004E0FA4, 0x000009C1, 0x0008004E, 0xFF9D007F, 0x00110005, 0x0057857E, 0x0000F508, 0x00080057, + 0x010C0057, 0xFF820005, 0x00587A82, 0xD72A6F8A, 0x00080058, 0xFFC10057, 0x00B70008, 0x00790087, + 0x01300000, 0x00010001, 0x00050003, 0x0000F59B, 0xCDDC0008, 0x0003FF20, 0x0121002D, 0x0008000B, + 0x0000FFA3, 0x00000005, 0x00150FFF, 0x000009C4, 0x00080015, 0xFF9D007B, 0x00110005, 0x0030FC72, + 0xFE110000, 0x00080030, 0x0083010F, 0x001E0005, 0x00370000, 0x300C02AD, 0x00080037, 0x002D0162, + 0x00230005, 0x003A0000, 0x0000E194, 0x0008003A, 0xFEC90070, 0xFFFF0008, 0x004DFE61, 0x00740014, + 0x0005004E, 0x0FFF0000, 0x09C40008, 0x004EFF9D, 0x007B0011, 0x00050057, 0x84940000, 0xF6DC0008, + 0x0057010D, 0x004AFF82, 0x00050058, 0x7B6CD6DC, 0x72480008, 0x0058FFC1, 0x004A00B8, 0x00080079, + 0x00890131, 0x00000001, 0x00010005, 0x00030000, 0xF5DCCD44, 0x00080003, 0xFF20011C, 0x002D0008, + 0x000B0000, 0xFFA00000, 0x00050015, 0x105A0000, 0x09C30008, 0x0015FF9D, 0x00770011, 0x00050030, + 0xFC72FE19, 0x00000008, 0x00300084, 0x010F001E, 0x00050037, 0x00003003, 0x029D0008, 0x0037002D, + 0x015E0023, 0x0005003A, 0x00000000, 0xE1B00008, 0x003AFEC7, 0x0072FFFF, 0x0008004D, 0xFE610070, + 0x00140005, 0x004E105A, 0x000009C3, 0x0008004E, 0xFF9D0077, 0x00110005, 0x005783AA, 0x0000F8B0, + 0x00080057, 0x010E003C, 0xFF810005, 0x00587C56, 0xD68E7506, 0x00080058, 0xFFC1003C, 0x00B90008, + 0x0079008C, 0x01300000, 0x00010001, 0x00050003, 0x0000F61C, 0xCCAF0008, 0x0003FF1F, 0x0117002D, + 0x0008000B, 0x0000FF9D, 0x00000005, 0x00130000, 0x0001012F, 0x00050014, 0x00010000, 0x012F0005, + 0x001510B5, 0x000009C0, 0x00080015, 0xFF9D0074, 0x00120005, 0x0030FC72, 0xFE1F0000, 0x00050037, + 0x00002FFA, 0x02B40008, 0x0037002C, 0x01590023, 0x0005003A, 0x00000000, 0xE1D00008, 0x003AFEC5, + 0x0073FFFF, 0x0008004D, 0xFE61006D, 0x00140005, 0x004E10B5, 0x000009C0, 0x0008004E, 0xFF9D0074, + 0x00120005, 0x005782C0, 0x0000FA84, 0x00080057, 0x010F002D, 0xFF800005, 0x00587D40, 0xD64077C4, + 0x00080058, 0xFFC0002D, 0x00BA0008, 0x0079008E, 0x012F0000, 0x00010001, 0x00050003, 0x0000F65C, + 0xCC1B0008, 0x0003FF1E, 0x0112002D, 0x0008000B, 0x0000FF99, 0x00000005, 0x00130000, 0x0007025E, + 0x00050014, 0x00060000, 0x025E0005, 0x00151110, 0x000009B9, 0x00080015, 0xFF9D0070, 0x00120005, + 0x0030FC72, 0xFE230000, 0x00050037, 0x00002FEF, 0x02E90008, 0x0037002B, 0x01550023, 0x0005003A, + 0x00000000, 0xE1F10008, 0x003AFEC3, 0x0075FFFF, 0x0008004D, 0xFE61006A, 0x00140005, 0x004E1110, + 0x000009B9, 0x0008004E, 0xFF9D0070, 0x00120005, 0x005781D6, 0x0000FC58, 0x00080057, 0x0110001F, + 0xFF800005, 0x00587E2A, 0xD5F27A82, 0x00080058, 0xFFC0001F, 0x00BB0008, 0x00790091, 0x012E0000, + 0x00010001, 0x00050003, 0x0000F69C, 0xCB8A0008, 0x0003FF1D, 0x010D002D, 0x0008000B, 0x0000FF96, + 0x00000005, 0x00130000, 0x0014038E, 0x00050014, 0x000E0000, 0x038E0005, 0x0015116B, 0x000009AE, + 0x00080015, 0xFF9D006C, 0x00120005, 0x0030FC72, 0xFE260000, 0x00050037, 0x00002FE4, 0x03300008, + 0x0037002B, 0x01500023, 0x0005003A, 0x00000000, 0xE2140008, 0x003AFEC1, 0x0076FFFF, 0x0008004D, + 0xFE610066, 0x00140005, 0x004E116B, 0x000009AE, 0x0008004E, 0xFF9D006C, 0x00120005, 0x005780EC, + 0x0000FE2C, 0x00080057, 0x01110010, 0xFF7F0005, 0x00587F14, 0xD5A47D40, 0x00080058, 0xFFC00010, + 0x00BC0008, 0x00790093, 0x012B0000, 0x00010001, 0x00050003, 0x0000F6DB, 0xCAFD0008, 0x0003FF1C, + 0x0108002D, 0x0008000B, 0x0000FF92, 0x00000005, 0x00130000, 0x002B04BD, 0x00050014, 0x001A0000, + 0x04BD0005, 0x001511C6, 0x000009A0, 0x00080015, 0xFF9D0068, 0x00130005, 0x0030FC72, 0xFE270000, + 0x00080030, 0x0085010F, 0x001E0005, 0x00370000, 0x2FD90380, 0x00080037, 0x002A014B, 0x00230005, + 0x003A0000, 0x0000E237, 0x0008003A, 0xFEBF0077, 0xFFFF0008, 0x004DFE61, 0x00630014, 0x0005004E, + 0x11C60000, 0x09A00008, 0x004EFF9D, 0x00680013, 0x00050057, 0x80010000, 0x00000008, 0x00570113, + 0x0002FF7F, 0x00050058, 0x8001D556, 0x80010008, 0x0058FFBF, 0x000200BD, 0x00080079, 0x00950129, + 0x00000001, 0x00010005, 0x00030000, 0xF71ACA72, 0x00080003, 0xFF1B0103, 0x002D0008, 0x000B0000, + 0xFF8F0000, 0x00050013, 0x0000004E, 0x05EC0005, 0x00140028, 0x000005EC, 0x00050015, 0x10B501AF, + 0x099A0008, 0x0015FFA1, 0x0068000E, 0x00050037, 0x00002FDD, 0x00C00008, 0x0037002A, 0x014A0023, + 0x0005003A, 0x00000000, 0xE25B0008, 0x003AFEBC, 0x0078FFFF, 0x0008004D, 0xFE61005F, 0x00140005, + 0x004E10B5, 0x01AF099A, 0x0008004E, 0xFFA10068, 0x000E0008, 0x00790098, 0x01260000, 0x00010001, + 0x00050003, 0x0000F758, 0xC9EA0008, 0x0003FF1A, 0x00FE002D, 0x0008000B, 0x0000FF8B, 0x00000005, + 0x00130000, 0x007F071C, 0x00050014, 0x003A0000, 0x071C0005, 0x00150FA4, 0x035F098C, 0x00080015, + 0xFFA40068, 0x00090005, 0x00370000, 0x2FCFFDC9, 0x00080037, 0x0029014A, 0x00230005, 0x003A0000, + 0x0000E27D, 0x0008003A, 0xFEBA0079, 0xFFFF0008, 0x004DFE61, 0x005C0014, 0x0005004E, 0x0FA4035F, + 0x098C0008, 0x004EFFA4, 0x00680009, 0x00080079, 0x009A0122, 0x00000001, 0x00010005, 0x00030000, + 0xF795C965, 0x00080003, 0xFF1900F9, 0x002D0008, 0x000B0000, 0xFF880000, 0x00050013, 0x000000C2, + 0x07E60005, 0x0014004F, 0x00000819, 0x00050015, 0x0E93050D, 0x09790008, 0x0015FFA8, 0x00670005, + 0x00050037, 0x00002FAC, 0xFAB60008, 0x00370029, 0x01490023, 0x0005003A, 0x00000000, 0xE29E0008, + 0x003AFEB8, 0x007AFFFF, 0x0008004D, 0xFE610058, 0x00140005, 0x004E0E93, 0x050D0979, 0x0008004E, + 0xFFA80067, 0x00050008, 0x0079009D, 0x011E0000, 0x00010001, 0x00050003, 0x0000F7D1, 0xC8E40008, + 0x0003FF18, 0x00F4002D, 0x0008000B, 0x0000FF84, 0x00000005, 0x00130000, 0x011808B0, 0x00050014, + 0x00670000, 0x09160005, 0x00150D82, 0x06B80961, 0x00080015, 0xFFAC0066, 0x00000005, 0x00370000, + 0x2F73F7A5, 0x00080037, 0x00280149, 0x00230005, 0x003A0000, 0x0000E2BC, 0x0008003A, 0xFEB6007A, + 0xFFFF0008, 0x004DFE61, 0x00540014, 0x0005004E, 0x0D8206B8, 0x09610008, 0x004EFFAC, 0x00660000, + 0x00080079, 0x00A0011A, 0x00000001, 0x00010005, 0x00030000, 0xF80CC867, 0x00080003, 0xFF1700F0, + 0x002C0008, 0x000B0000, 0xFF810000, 0x00050013, 0x00000184, 0x097B0005, 0x00140083, 0x00000A12, + 0x00050015, 0x0C71085E, 0x09460008, 0x0015FFB0, 0x0064FFFC, 0x00050037, 0x00002F26, 0xF4B30008, + 0x00370027, 0x01490024, 0x0005003A, 0x00000000, 0xE2D70008, 0x003AFEB4, 0x007BFFFF, 0x0008004D, + 0xFE610051, 0x00140005, 0x004E0C71, 0x085E0946, 0x0008004E, 0xFFB00064, 0xFFFC0008, 0x007900A2, + 0x01160000, 0x00010001, 0x00050003, 0x0000F846, 0xC7ED0008, 0x0003FF16, 0x00EB002C, 0x0008000B, + 0x0000FF7D, 0x00000005, 0x00130000, 0x02090A45, 0x00080013, 0xFE0F00D2, 0x005A0005, 0x001400A1, + 0x00000B0F, 0x00080014, 0xFE0F00D2, 0xFFA60005, 0x00150B60, 0x09FE092C, 0x00080015, 0xFFB40062, + 0xFFF60005, 0x00370000, 0x2EC9F1F7, 0x00080037, 0x00260148, 0x00240005, 0x003A0000, 0x0000E2F4, + 0x0008003A, 0xFEB1007B, 0xFFFF0008, 0x004DFE61, 0x004D0014, 0x0005004E, 0x0B6009FE, 0x092C0008, + 0x004EFFB4, 0x0062FFF6, 0x00080079, 0x00A50111, 0x00000001, 0x00010005, 0x00030000, 0xF87EC778, + 0x00080003, 0xFF1500E6, 0x002C0008, 0x000B0000, 0xFF790000, 0x00050013, 0x000002A9, 0x0B0F0008, + 0x0013FE11, 0x00D2005A, 0x00050014, 0x00C30000, 0x0C0C0008, 0x0014FE11, 0x00D2FFA6, 0x00050015, + 0x0A4F0B98, 0x09140008, 0x0015FFB8, 0x005FFFF1, 0x00050037, 0x00002E62, 0xEF830008, 0x00370026, + 0x01480025, 0x0005003A, 0x00000000, 0xE3180008, 0x003AFEAF, 0x007BFFFF, 0x0008004D, 0xFE610049, + 0x00140005, 0x004E0A4F, 0x0B980914, 0x0008004E, 0xFFB8005F, 0xFFF10008, 0x007900A7, 0x010D0000, + 0x00010001, 0x00050003, 0x0000F8B5, 0xC7060008, 0x0003FF14, 0x00E1002C, 0x0008000B, 0x0000FF75, + 0x00000005, 0x00130000, 0x03660BD9, 0x00080013, 0xFE1300D2, 0x005A0005, 0x001400E8, 0x00000D09, + 0x00080014, 0xFE1300D2, 0xFFA60005, 0x0015093E, 0x0D2808FF, 0x00080015, 0xFFBC005C, 0xFFEB0005, + 0x00370000, 0x2DF9ED64, 0x00080037, 0x00250147, 0x00260005, 0x003A0000, 0x0000E343, 0x0008003A, + 0xFEAD007A, 0xFFFF0008, 0x004DFE61, 0x00450014, 0x0005004E, 0x093E0D28, 0x08FF0008, 0x004EFFBC, + 0x005CFFEB, 0x00080079, 0x00AA0108, 0x00000001, 0x00010005, 0x00030000, 0xF8EBC698, 0x00080003, + 0xFF1300DD, 0x002B0008, 0x000B0000, 0xFF710000, 0x00050013, 0x00000444, 0x0CA40008, 0x0013FE16, + 0x00D2005A, 0x00050014, 0x010F0000, 0x0E060008, 0x0014FE16, 0x00D2FFA6, 0x00050015, 0x082D0EAF, + 0x08F10008, 0x0015FFC0, 0x0058FFE5, 0x00050037, 0x00002D94, 0xEBA20008, 0x00370024, 0x01460026, + 0x0005003A, 0x00000000, 0xE3730008, 0x003AFEAB, 0x0079FFFF, 0x0008004D, 0xFE610042, 0x00140005, + 0x004E082D, 0x0EAF08F1, 0x0008004E, 0xFFC00058, 0xFFE50008, 0x007900AC, 0x01030000, 0x00010001, + 0x00050003, 0x0000F91F, 0xC62F0008, 0x0003FF11, 0x00D8002B, 0x0008000B, 0x0000FF6E, 0x00000005, + 0x00130000, 0x05450D6E, 0x00080013, 0xFE1800D2, 0x005A0005, 0x0014013A, 0x00000F03, 0x00080014, + 0xFE1800D2, 0xFFA60005, 0x0015071C, 0x102B08EB, 0x00080015, 0xFFC40053, 0xFFDF0005, 0x00370000, + 0x2D3BEA42, 0x00080037, 0x00230144, 0x00270005, 0x003A0000, 0x0000E3A6, 0x0008003A, 0xFEA90078, + 0xFFFF0008, 0x004DFE61, 0x003E0014, 0x0005004E, 0x071C102B, 0x08EB0008, 0x004EFFC4, 0x0053FFDF, + 0x00080079, 0x00AF00FF, 0x00000001, 0x00010005, 0x00030000, 0xF951C5CA, 0x00080003, 0xFF1000D4, + 0x002B0008, 0x000B0000, 0xFF6A0000, 0x00050013, 0x0000066A, 0x0E380008, 0x0013FE1A, 0x00D2005A, + 0x00050014, 0x01680000, 0x0FFF0008, 0x0014FE1A, 0x00D2FFA6, 0x00050015, 0x060B10B5, 0x08000008, + 0x0015FFC8, 0x0052FFDE, 0x00050037, 0x00002D6A, 0xEB0A0008, 0x00370023, 0x01450026, 0x0005003A, + 0x00000000, 0xE3DD0008, 0x003AFEA7, 0x0077FFFF, 0x0008004D, 0xFE61003A, 0x00140005, 0x004E060B, + 0x10B50800, 0x0008004E, 0xFFC80052, 0xFFDE0008, 0x007900B1, 0x01020000, 0x00010001, 0x00050003, + 0x0000F981, 0xC56A0008, 0x0003FF0F, 0x00D0002A, 0x0008000B, 0x0000FF66, 0x00000005, 0x00130000, + 0x07B80F03, 0x00080013, 0xFE1D00D2, 0x005A0005, 0x00140199, 0x000010FC, 0x00080014, 0xFE1D00D2, + 0xFFA60005, 0x001504FA, 0x113E0710, 0x00080015, 0xFFCD004F, 0xFFDD0005, 0x00370000, 0x2D9FEBFA, + 0x00080037, 0x00230146, 0x00260005, 0x003A0000, 0x0000E416, 0x0008003A, 0xFEA50075, 0xFFFF0008, + 0x004DFE61, 0x00360014, 0x0005004E, 0x04FA113E, 0x07100008, 0x004EFFCD, 0x004FFFDD, 0x00080079, + 0x00B40106, 0x00000001, 0x00010005, 0x00030000, 0xF9AFC50E, 0x00080003, 0xFF0E00CC, 0x002A0008, + 0x000B0000, 0xFF620000, 0x00050013, 0x0000092F, 0x0FCD0008, 0x0013FE1F, 0x00D2005A, 0x00050014, + 0x01CE0000, 0x11F90008, 0x0014FE1F, 0x00D2FFA6, 0x00050015, 0x03E911C4, 0x061C0008, 0x0015FFD1, + 0x004DFFDD, 0x00050037, 0x00002DD7, 0xED0D0005, 0x003A0000, 0x0000E44F, 0x0008003A, 0xFEA30073, + 0xFFFF0008, 0x004DFE61, 0x00320014, 0x0005004E, 0x03E911C4, 0x061C0008, 0x004EFFD1, 0x004DFFDD, + 0x00080079, 0x00B60109, 0x00000001, 0x00010005, 0x00030000, 0xF9DCC4B7, 0x00080003, 0xFF0C00C8, + 0x002A0008, 0x000B0000, 0xFF5E0000, 0x00050013, 0x00000AD3, 0x10970008, 0x0013FE21, 0x00D2005A, + 0x00050014, 0x02050000, 0x12F60008, 0x0014FE21, 0x00D2FFA6, 0x00050015, 0x02D81249, 0x05230008, + 0x0015FFD5, 0x004BFFDC, 0x00050037, 0x00002E11, 0xEE3C0008, 0x00370024, 0x01460025, 0x0005003A, + 0x00000000, 0xE4890008, 0x003AFEA1, 0x0071FFFF, 0x0008004D, 0xFE61002E, 0x00140005, 0x004E02D8, + 0x12490523, 0x0008004E, 0xFFD5004B, 0xFFDC0008, 0x007900B9, 0x010D0000, 0x00010001, 0x00050003, + 0x0000FA06, 0xC4640008, 0x0003FF0B, 0x00C40029, 0x0008000B, 0x0000FF5A, 0x00000005, 0x00130000, + 0x0CA71161, 0x00080013, 0xFE2400D2, 0x005A0005, 0x0014023F, 0x000013F3, 0x00080014, 0xFE2400D2, + 0xFFA60005, 0x001501C7, 0x12CC0428, 0x00080015, 0xFFD90048, 0xFFDB0005, 0x00370000, 0x2E49EF82, + 0x0005003A, 0x00000000, 0xE4C10008, 0x003AFE9E, 0x006FFFFF, 0x0008004D, 0xFE61002A, 0x00140005, + 0x004E01C7, 0x12CC0428, 0x0008004E, 0xFFD90048, 0xFFDB0008, 0x007900BB, 0x01100000, 0x00010001, + 0x00050003, 0x0000FA07, 0xC4640008, 0x0003FF0B, 0x00C50028, 0x00050004, 0x0000FFFF, 0x00000008, + 0x000B0000, 0xFF550000, 0x00050013, 0x00000EAC, 0x122C0008, 0x0013FE26, 0x00D2005A, 0x00050014, + 0x027C0000, 0x14F00008, 0x0014FE26, 0x00D2FFA6, 0x00050015, 0x00B6134D, 0x032A0008, 0x0015FFDE, + 0x0045FFDA, 0x00050037, 0x00002E7F, 0xF0D70008, 0x00370024, 0x01450025, 0x0005003A, 0x00000000, + 0xE4F60008, 0x003AFE9C, 0x006DFFFF, 0x0008004D, 0xFE610025, 0x00140005, 0x004E00B6, 0x134D032A, + 0x0008004E, 0xFFDE0045, 0xFFDA0008, 0x007900BE, 0x01120000, 0x00010001, 0x00080003, 0xFF0B00C7, + 0x00280005, 0x00040000, 0xFFFC0000, 0x0008000B, 0x0000FF51, 0x00000005, 0x00130000, 0x10E512F6, + 0x00080013, 0xFE2800D2, 0x005A0005, 0x001402BC, 0x000015EC, 0x00080014, 0xFE2800D2, 0xFFA60005, + 0x0015FFA5, 0x13CB022B, 0x00080015, 0xFFE20042, 0xFFD90005, 0x00370000, 0x2EB1F234, 0x00080037, + 0x00240145, 0x00240005, 0x003A0000, 0x0000E528, 0x0008003A, 0xFE9A006B, 0xFFFF0008, 0x004DFE61, + 0x00210014, 0x0005004E, 0xFFA513CB, 0x022B0008, 0x004EFFE2, 0x0042FFD9, 0x00080079, 0x00C00114, + 0x00000001, 0x00010008, 0x0003FF0B, 0x00C80027, 0x00050004, 0x0000FFF5, 0x00000008, 0x000B0000, + 0xFF4D0000, 0x00050013, 0x00001355, 0x13C00008, 0x0013FE2B, 0x00D2005A, 0x00050014, 0x02FF0000, + 0x16E90008, 0x0014FE2B, 0x00D2FFA6, 0x00050015, 0xFE941446, 0x012C0008, 0x0015FFE6, 0x0040FFD9, + 0x00050037, 0x00002EDD, 0xF38E0008, 0x00370024, 0x01440024, 0x0005003A, 0x00000000, 0xE5550008, + 0x003AFE98, 0x0069FFFF, 0x0008004D, 0xFE61001D, 0x00140005, 0x004EFE94, 0x1446012C, 0x0008004E, + 0xFFE60040, 0xFFD90008, 0x007900C3, 0x01160000, 0x00010001, 0x00050003, 0x0000FA07, 0xC4630008, + 0x0003FF0B, 0x00C90026, 0x00050004, 0x0000FFED, 0x00000008, 0x000B0000, 0xFF490000, 0x00050013, + 0x000015FE, 0x148A0008, 0x0013FE2D, 0x00D2005A, 0x00050014, 0x03450000, 0x17E60008, 0x0014FE2D, + 0x00D2FFA6, 0x00050015, 0xFD8314BF, 0x002D0008, 0x0015FFEA, 0x003DFFD8, 0x00050037, 0x00002F02, + 0xF4DB0008, 0x00370024, 0x01430024, 0x0005003A, 0x00000000, 0xE57C0008, 0x003AFE96, 0x0067FFFF, + 0x0008004D, 0xFE610019, 0x00140005, 0x004EFD83, 0x14BF002D, 0x0008004E, 0xFFEA003D, 0xFFD80008, + 0x007900C5, 0x01170000, 0x00010001, 0x00080003, 0xFF0B00CA, 0x00260005, 0x00040000, 0xFFE20000, + 0x0008000B, 0x0000FF44, 0x00000005, 0x00130000, 0x18E31555, 0x00080013, 0xFE2F00D2, 0x005A0005, + 0x0014038E, 0x000018E3, 0x00080014, 0xFE2F00D2, 0xFFA60005, 0x0015FC72, 0x1535FF31, 0x00080015, + 0xFFEE003A, 0xFFD70005, 0x00370000, 0x2F21F613, 0x0005003A, 0x00000000, 0xE59C0008, 0x003AFE94, + 0x0064FFFF, 0x0008004D, 0xFE610015, 0x00140005, 0x004EFC72, 0x1535FF31, 0x0008004E, 0xFFEE003A, + 0xFFD70008, 0x007900C8, 0x01180000, 0x00010001, 0x00080003, 0xFF0B00CA, 0x00250005, 0x00040000, + 0xFFD40000, 0x0008000B, 0x0000FF46, 0x00000005, 0x0015FCA0, 0x15CCFF54, 0x00080015, 0xFFF2003A, + 0xFFD80005, 0x0037FF78, 0x2F29F65E, 0x0005003A, 0x00000000, 0xE5EF0008, 0x003AFE94, 0x0063FFFF, + 0x0008004D, 0xFE610016, 0x00140005, 0x004EFCA0, 0x15CCFF54, 0x0008004E, 0xFFF2003A, 0xFFD80008, + 0x007900CA, 0x01170000, 0x00010001, 0x00050003, 0x0000FA07, 0xC4640008, 0x0003FF0B, 0x00CB0024, + 0x00050004, 0x0000FFC3, 0x00000008, 0x000B0000, 0xFF470000, 0x00050015, 0xFCCD1662, 0xFF770008, + 0x0015FFF6, 0x003BFFD9, 0x00050037, 0xFEEF2F2F, 0xF6990005, 0x003A0000, 0x0000E640, 0x0008003A, + 0xFE940062, 0xFFFF0008, 0x004DFE61, 0x00170014, 0x0005004E, 0xFCCD1662, 0xFF770008, 0x004EFFF6, + 0x003BFFD9, 0x00080079, 0x00CD0116, 0x00000001, 0x00010008, 0x0003FF0B, 0x00CC0024, 0x00050004, + 0x0000FFB0, 0x00000008, 0x000B0000, 0xFF480000, 0x00050015, 0xFCFB16F7, 0xFF9B0008, 0x0015FFF9, + 0x003BFFDA, 0x00050037, 0xFE672F33, 0xF6C30008, 0x00370024, 0x01440024, 0x0005003A, 0x00000000, + 0xE68D0008, 0x004DFE61, 0x00180014, 0x0005004E, 0xFCFB16F7, 0xFF9B0008, 0x004EFFF9, 0x003BFFDA, + 0x00080079, 0x00CF0114, 0x00000001, 0x00010008, 0x0003FF0B, 0x00CC0023, 0x00050004, 0x0000FF9B, + 0x00000008, 0x000B0000, 0xFF490000, 0x00050015, 0xFD281789, 0xFFBF0008, 0x0015FFFD, 0x003CFFDA, + 0x00050037, 0xFDDE2F36, 0xF6DD0005, 0x003A0000, 0x0000E6D6, 0x0008003A, 0xFE950061, 0xFFFF0008, + 0x004DFE61, 0x001A0014, 0x0005004E, 0xFD281789, 0xFFBF0008, 0x004EFFFD, 0x003CFFDA, 0x00080079, + 0x00D20112, 0x00000001, 0x00010008, 0x0003FF0B, 0x00CD0022, 0x00050004, 0x0000FF82, 0x00000008, + 0x000B0000, 0xFF4A0000, 0x00050015, 0xFD56181A, 0xFFE50008, 0x00150000, 0x003CFFDB, 0x00050037, + 0xFD562F38, 0xF6E60005, 0x003A0000, 0x0000E71A, 0x0008003A, 0xFE950060, 0xFFFF0008, 0x004DFE61, + 0x001B0014, 0x0005004E, 0xFD56181A, 0xFFE50008, 0x004E0000, 0x003CFFDB, 0x00080079, 0x00D4010F, + 0x00000001, 0x00010005, 0x00030000, 0xFA06C464, 0x00050004, 0x0000FF67, 0x00000008, 0x000B0000, + 0xFF4B0000, 0x00050015, 0xFD8318A9, 0x000C0008, 0x00150003, 0x003CFFDC, 0x00050037, 0xFCCD2F38, + 0xF6DC0005, 0x003A0000, 0x0000E756, 0x0008003A, 0xFE95005F, 0xFFFF0008, 0x004DFE61, 0x001C0014, + 0x0005004E, 0xFD8318A9, 0x000C0008, 0x004E0003, 0x003CFFDC, 0x00080079, 0x00D7010C, 0x00000001, + 0x00010008, 0x0003FF0B, 0x00CE0021, 0x00050004, 0x0000FF4A, 0x00000008, 0x000B0000, 0xFF4C0000, + 0x00050015, 0xFDB11935, 0x00340008, 0x00150006, 0x003DFFDD, 0x00050037, 0xFC452F36, 0xF6C10005, + 0x003A0000, 0x0000E789, 0x0008003A, 0xFE95005E, 0xFFFF0005, 0x004EFDB1, 0x19350034, 0x0008004E, + 0x0006003D, 0xFFDD0008, 0x007900D9, 0x01090000, 0x00010001, 0x00080003, 0xFF0B00CE, 0x00200005, + 0x00040000, 0xFF290000, 0x00050015, 0xFDDE19BF, 0x005F0008, 0x0015000A, 0x003DFFDE, 0x00050037, + 0xFBBC2F33, 0xF6940005, 0x003A0000, 0x0000E7B3, 0x0008003A, 0xFE95005D, 0xFFFF0008, 0x004DFE61, + 0x001D0014, 0x0005004E, 0xFDDE19BF, 0x005F0008, 0x004E000A, 0x003DFFDE, 0x00080079, 0x00DC0105, + 0x00000001, 0x00010005, 0x00040000, 0xFF060000, 0x00050015, 0xFE0C1A45, 0x008D0008, 0x0015000D, + 0x003DFFDE, 0x00050037, 0xFB342F2E, 0xF6570008, 0x00370024, 0x01430024, 0x0005003A, 0x00000000, + 0xE7D00008, 0x003AFE96, 0x005CFFFF, 0x0005004E, 0xFE0C1A45, 0x008D0008, 0x004E000D, 0x003DFFDE, + 0x00080079, 0x00DE0102, 0x00000001, 0x00010008, 0x0003FF0B, 0x00CE001F, 0x00050004, 0x0000FEE0, + 0x00000005, 0x0015FE39, 0x1AC700BC, 0x00080015, 0x0010003D, 0xFFDF0005, 0x0037FAAB, 0x2F28F609, + 0x0005003A, 0x00000000, 0xE7DF0008, 0x003AFE96, 0x005BFFFF, 0x0008004D, 0xFE61001E, 0x00140005, + 0x004EFE39, 0x1AC700BC, 0x0008004E, 0x0010003D, 0xFFDF0008, 0x007900E1, 0x00FF0000, 0x00010001, + 0x00080003, 0xFF0B00CE, 0x001E0005, 0x00040000, 0xFEB70000, 0x00050015, 0xFE671B45, 0x00EF0008, + 0x00150013, 0x003DFFE0, 0x00050037, 0xFA232F20, 0xF5AB0008, 0x00370024, 0x01420024, 0x0005003A, + 0x00000000, 0xE8210008, 0x004DFE61, 0x001D0014, 0x0005004E, 0xFE671B45, 0x00EF0008, 0x004E0013, + 0x003DFFE0, 0x00010001, 0x00050004, 0x0000FE8B, 0x00000005, 0x0015FE94, 0x1BBF0124, 0x00080015, + 0x0016003D, 0xFFE10005, 0x0037F99A, 0x2F16F53F, 0x0005003A, 0x00000000, 0xE8540008, 0x003AFE96, + 0x005AFFFF, 0x0005004E, 0xFE941BBF, 0x01240008, 0x004E0016, 0x003DFFE1, 0x00010001, 0x00080003, + 0xFF0B00CE, 0x001D0005, 0x00040000, 0xFE5C0000, 0x00050015, 0xFEC21C35, 0x015D0008, 0x00150019, + 0x003DFFE1, 0x00050037, 0xF9122F0A, 0xF4C50008, 0x00370024, 0x01410024, 0x0005003A, 0x00000000, + 0xE87A0008, 0x004DFE61, 0x001C0014, 0x0005004E, 0xFEC21C35, 0x015D0008, 0x004E0019, 0x003DFFE1, + 0x00010001, 0x00080003, 0xFF0B00CD, 0x001C0005, 0x00040000, 0xFE2B0000, 0x0008000B, 0x0000FF4B, + 0x00000005, 0x0015FEEF, 0x1CA5019A, 0x00080015, 0x001B003C, 0xFFE20005, 0x0037F889, 0x2EFDF43D, + 0x0005003A, 0x00000000, 0xE8940008, 0x003AFE96, 0x0059FFFF, 0x0005004E, 0xFEEF1CA5, 0x019A0008, + 0x004E001B, 0x003CFFE2, 0x00010001, 0x00050004, 0x0000FDF6, 0x00000008, 0x000B0000, 0xFF4A0000, + 0x00050015, 0xFF1D1D10, 0x01DB0008, 0x0015001E, 0x003CFFE2, 0x00050037, 0xF8012EED, 0xF3AA0008, + 0x00370024, 0x01400024, 0x0005003A, 0x00000000, 0xE8A40008, 0x003AFE96, 0x0058FFFF, 0x0008004D, + 0xFE61001B, 0x00140005, 0x004EFF1D, 0x1D1001DB, 0x0008004E, 0x001E003C, 0xFFE20001, 0x00010008, + 0x0003FF0B, 0x00CC001B, 0x00050004, 0x0000FDBF, 0x00000008, 0x000B0000, 0xFF490000, 0x00050015, + 0xFF4A1D75, 0x021D0008, 0x00150020, 0x003BFFE3, 0x00050037, 0xF7782EDA, 0xF30B0008, 0x00370023, + 0x013F0024, 0x0005003A, 0x00000000, 0xE8AB0008, 0x003AFE96, 0x0057FFFF, 0x0008004D, 0xFE61001A, + 0x00140005, 0x004EFF4A, 0x1D75021D, 0x0008004E, 0x0020003B, 0xFFE30001, 0x00010008, 0x0003FF0B, + 0x00CC001A, 0x00050004, 0x0000FD84, 0x00000008, 0x000B0000, 0xFF480000, 0x00050015, 0xFF781DD4, + 0x02610008, 0x00150023, 0x003AFFE3, 0x00050037, 0xF6F02EC6, 0xF2610008, 0x00370023, 0x013E0024, + 0x0008004D, 0xFE610018, 0x00140005, 0x004EFF78, 0x1DD40261, 0x0008004E, 0x0023003A, 0xFFE30001, + 0x00010008, 0x0003FF0B, 0x00CB001A, 0x00050004, 0x0000FD47, 0x00000008, 0x000B0000, 0xFF470000, + 0x00050015, 0xFFA51E2C, 0x02A70008, 0x00150025, 0x0039FFE4, 0x00050037, 0xF6672EAE, 0xF1AE0008, + 0x00370023, 0x013D0024, 0x0005003A, 0x00000000, 0xE8A40008, 0x003AFE96, 0x0056FFFF, 0x0008004D, + 0xFE610017, 0x00140005, 0x004EFFA5, 0x1E2C02A7, 0x0008004E, 0x00250039, 0xFFE40001, 0x00010008, + 0x0003FF0B, 0x00CA0019, 0x00050004, 0x0000FD06, 0x00000008, 0x000B0000, 0xFF460000, 0x00050015, + 0xFFD31E7E, 0x02F00008, 0x00150027, 0x0037FFE4, 0x00050037, 0xF5DE2E95, 0xF0F20008, 0x00370023, + 0x013C0024, 0x0005003A, 0x00000000, 0xE8980008, 0x003AFE96, 0x0055FFFF, 0x0008004D, 0xFE610016, + 0x00140005, 0x004EFFD3, 0x1E7E02F0, 0x0008004E, 0x00270037, 0xFFE40001, 0x00010008, 0x0003FF0B, + 0x00C90018, 0x00050004, 0x0000FCC2, 0x00000008, 0x000B0000, 0xFF440000, 0x00050015, 0x00001EC8, + 0x03400008, 0x00150029, 0x0035FFE4, 0x00050037, 0xF5562E78, 0xF02E0008, 0x00370023, 0x013B0025, + 0x0005003A, 0x00000000, 0xE8880008, 0x003AFE96, 0x0054FFFF, 0x0008004D, 0xFE610015, 0x00140005, + 0x004E0000, 0x1EC80340, 0x0008004E, 0x00290035, 0xFFE40001, 0x00010008, 0x0003FF0B, 0x00C80018, + 0x00050004, 0x0000FC7B, 0x00000005, 0x00150000, 0x1F10030B, 0x00080015, 0x002B0035, 0xFFE40005, + 0x0037F4CD, 0x2E8CF0AB, 0x00080037, 0x0023013B, 0x00240005, 0x003A0000, 0x0000E8B5, 0x0005004E, + 0x00001F10, 0x030B0008, 0x004E002B, 0x0035FFE4, 0x00010001, 0x00080003, 0xFF0B00C7, 0x00170005, + 0x00040000, 0xFC310000, 0x00050015, 0x00001F51, 0x02CD0008, 0x0015002D, 0x0034FFE4, 0x00050037, + 0xF4452E9E, 0xF1260008, 0x00370023, 0x013C0024, 0x0005003A, 0x00000000, 0xE8DE0005, 0x004E0000, + 0x1F5102CD, 0x0008004E, 0x002D0034, 0xFFE40001, 0x00010008, 0x0003FF0B, 0x00C60016, 0x00050004, + 0x0000FBE4, 0x00000005, 0x00150000, 0x1F8B0286, 0x00080015, 0x002F0034, 0xFFE50005, 0x0037F3BC, + 0x2EB0F19B, 0x00080037, 0x0023013D, 0x00240005, 0x003A0000, 0x0000E906, 0x0005004E, 0x00001F8B, + 0x02860008, 0x004E002F, 0x0034FFE5, 0x00010001, 0x00080003, 0xFF0B00C5, 0x00160005, 0x00040000, + 0xFB940000, 0x00050015, 0x00001FBC, 0x02380008, 0x00150031, 0x0033FFE5, 0x00050037, 0xF3342EBF, + 0xF2090008, 0x00370023, 0x013E0024, 0x0005003A, 0x00000000, 0xE92B0008, 0x003AFE97, 0x0054FFFF, + 0x0005004E, 0x00001FBC, 0x02380008, 0x004E0031, 0x0033FFE5, 0x00010001, 0x00080003, 0xFF0B00C4, + 0x00150005, 0x00040000, 0xFB410000, 0x00050015, 0x00001FE6, 0x01E30008, 0x00150033, 0x0033FFE4, + 0x00050037, 0xF2AB2ECD, 0xF26D0005, 0x003A0000, 0x0000E94E, 0x0005004E, 0x00001FE6, 0x01E30008, + 0x004E0033, 0x0033FFE4, 0x00010001, 0x00050004, 0x0000FAEA, 0x00000005, 0x00150000, 0x20060188, + 0x00080015, 0x00350032, 0xFFE40005, 0x0037F223, 0x2ED9F2C5, 0x00080037, 0x0023013F, 0x00240005, + 0x003A0000, 0x0000E96F, 0x0005004E, 0x00002006, 0x01880008, 0x004E0035, 0x0032FFE4, 0x00010001, + 0x00050004, 0x0000FA90, 0x00000005, 0x00150000, 0x201E0129, 0x00080015, 0x00360031, 0xFFE40005, + 0x0037F19A, 0x2EE3F30E, 0x0005003A, 0x00000000, 0xE98E0005, 0x004E0000, 0x201E0129, 0x0008004E, + 0x00360031, 0xFFE40001, 0x00010005, 0x00040000, 0xFA330000, 0x00050015, 0x0000202C, 0x00C70008, + 0x00150038, 0x0031FFE4, 0x00050037, 0xF1122EEA, 0xF3450008, 0x00370023, 0x01400024, 0x0005003A, + 0x00000000, 0xE9AB0005, 0x004E0000, 0x202C00C7, 0x0008004E, 0x00380031, 0xFFE40001, 0x00010005, + 0x00040000, 0xF9D20000, 0x00050015, 0x00002031, 0x00640008, 0x00150039, 0x0030FFE4, 0x00050037, + 0xF0892EEF, 0xF3670005, 0x003A0000, 0x0000E9C5, 0x0005004E, 0x00002031, 0x00640008, 0x004E0039, + 0x0030FFE4, 0x00010001, 0x00050004, 0x0000F96E, 0x00000005, 0x00150000, 0x202D0000, 0x00080015, + 0x003A002F, 0xFFE30005, 0x0037F001, 0x2EF2F373, 0x0005003A, 0x00000000, 0xE9DE0005, 0x004E0000, + 0x202D0000, 0x0008004E, 0x003A002F, 0xFFE30001, 0x00010005, 0x00040000, 0xF9070000, 0x00050015, + 0x00002024, 0x00000005, 0x0037EF78, 0x2EF1F367, 0x0005003A, 0x00000000, 0xE9F50005, 0x004E0000, + 0x20240000, 0x00010001, 0x00050004, 0x0000F89C, 0x00000005, 0x00150000, 0x201C0000, 0x00080015, + 0x003B002F, 0xFFE20005, 0x0037EEF0, 0x2EEDF342, 0x0005003A, 0x00000000, 0xEA0A0005, 0x004E0000, + 0x201C0000, 0x0008004E, 0x003B002F, 0xFFE20001, 0x00010005, 0x00040000, 0xF82E0000, 0x00050015, + 0x00002015, 0x00000005, 0x0037EE67, 0x2EE7F308, 0x0005003A, 0x00000000, 0xEA1D0005, 0x004E0000, + 0x20150000, 0x00010001, 0x00050004, 0x0000F7BC, 0x00000005, 0x00150000, 0x200F0000, 0x00080015, + 0x003C002F, 0xFFE20005, 0x0037EDDF, 0x2EDEF2BD, 0x00080037, 0x0023013F, 0x00240005, 0x003A0000, + 0x0000EA2F, 0x0005004E, 0x0000200F, 0x00000008, 0x004E003C, 0x002FFFE2, 0x00010001, 0x00050004, + 0x0000F747, 0x00000005, 0x00150000, 0x200A0000, 0x00050037, 0xED562ED3, 0xF2630005, 0x003A0000, + 0x0000EA3E, 0x0005004E, 0x0000200A, 0x00000001, 0x00010005, 0x00040000, 0xF6CE0000, 0x00050015, + 0x00002006, 0x00000008, 0x0015003C, 0x002FFFE1, 0x00050037, 0xECCD2EC7, 0xF1FD0008, 0x00370023, + 0x013E0024, 0x0005003A, 0x00000000, 0xEA4D0005, 0x004E0000, 0x20060000, 0x0008004E, 0x003C002F, + 0xFFE10001, 0x00010005, 0x00040000, 0xF6520000, 0x00050015, 0x00002003, 0x00000005, 0x0037EC45, + 0x2EB9F18F, 0x00080037, 0x0023013D, 0x00240005, 0x003A0000, 0x0000EA59, 0x0005004E, 0x00002003, + 0x00000001, 0x00010005, 0x00040000, 0xF5D20000, 0x00050015, 0x00002001, 0x00000008, 0x0015003D, + 0x002FFFE1, 0x00050037, 0xEBBC2EA9, 0xF11B0005, 0x003A0000, 0x0000EA65, 0x0005004E, 0x00002001, + 0x00000008, 0x004E003D, 0x002FFFE1, 0x00010001, 0x00050004, 0x0000F54F, 0x00000005, 0x00150000, + 0x20000000, 0x00050037, 0xEB342E98, 0xF0A50008, 0x00370023, 0x013C0024, 0x0005003A, 0x00000000, + 0xEA6E0005, 0x004E0000, 0x20000000, 0x00010001, 0x00050004, 0x0000F4C8, 0x00000005, 0x00150000, + 0x1FFF0000, 0x00050037, 0xEAAB2E87, 0xF02E0005, 0x003A0000, 0x0000EA77, 0x0005004E, 0x00001FFF, + 0x00000001, 0x00010005, 0x00040000, 0xF43D0000, 0x0005003A, 0x00000000, 0xEA7E0001, 0x00010005, + 0x00040000, 0xF3AF0000, 0x0005003A, 0x00000000, 0xEA850008, 0x003AFE97, 0x0055FFFF, 0x00010001, + 0x00050004, 0x0000F31D, 0x00000005, 0x003A0000, 0x0000EA8B, 0x00010001, 0x00050004, 0x0000F287, + 0x00000005, 0x003A0000, 0x0000EA90, 0x00010001, 0x00050004, 0x0000F1EE, 0x00000005, 0x003A0000, + 0x0000EA94, 0x00010001, 0x00050004, 0x0000F150, 0x00000005, 0x003A0000, 0x0000EA98, 0x00010001, + 0x00050004, 0x0000F0AF, 0x00000005, 0x003A0000, 0x0000EA9B, 0x0008003A, 0xFE980055, 0xFFFF0001, + 0x00010005, 0x00040000, 0xF00A0000, 0x0005003A, 0x00000000, 0xEA9D0001, 0x00010005, 0x00040000, + 0xEF620000, 0x0005003A, 0x00000000, 0xEA9E0001, 0x00010005, 0x00040000, 0xEEB50000, 0x0005003A, + 0x00000000, 0xEA9F0001, 0x00010005, 0x00040000, 0xEE040000, 0x00010001, 0x00050004, 0x0000ED50, + 0x00000001, 0x00010005, 0x00040000, 0xEC970000, 0x00010001, 0x00050004, 0x0000EBDB, 0x00000001, + 0x00010005, 0x00040000, 0xEB1A0000, 0x00010001, 0x00050004, 0x0000EA56, 0x00000001, 0x00010005, + 0x00040000, 0xE98D0000, 0x00010001, 0x00050004, 0x0000E8C0, 0x00000001, 0x00010005, 0x00040000, + 0xE7EF0000, 0x00010001, 0x00050004, 0x0000E71A, 0x00000001, 0x00010005, 0x00040000, 0xE6410000, + 0x00010001, 0x00050004, 0x0000E563, 0x00000001, 0x00010005, 0x00040000, 0xE4820000, 0x00010001, + 0x00050004, 0x0000E39C, 0x00000001, 0x00010005, 0x00040000, 0xE2B10000, 0x00010001, 0x00050004, + 0x0000E1C3, 0x00000001, 0x00010005, 0x00040000, 0xE0D00000, 0x00010001, 0x00050004, 0x0000DFD8, + 0x00000001, 0x00010005, 0x00040000, 0xDEDD0000, 0x00010001, 0x00050004, 0x0000DDDD, 0x00000001, + 0x00010005, 0x00040000, 0xDCD80000, 0x00010001, 0x00050004, 0x0000DBCF, 0x00000001, 0x00010005, + 0x00040000, 0xDAC10000, 0x00010001, 0x00050004, 0x0000D9AF, 0x00000001, 0x00010005, 0x00040000, + 0xD8980000, 0x00010001, 0x00050004, 0x0000D77D, 0x00000001, 0x00010005, 0x00040000, 0xD65D0000, + 0x00010001, 0x00050004, 0x0000D538, 0x00000001, 0x00010005, 0x00040000, 0xD40F0000, 0x00010001, + 0x00050004, 0x0000D2E1, 0x00000001, 0x00010005, 0x00040000, 0xD1AE0000, 0x00010001, 0x00050004, + 0x0000D077, 0x00000001, 0x00010005, 0x00040000, 0xCF3A0000, 0x00010001, 0x00050004, 0x0000CDF9, + 0x00000001, 0x00010005, 0x00040000, 0xCCB30000, 0x00010001, 0x00050004, 0x0000CB69, 0x00000001, + 0x00010005, 0x00040000, 0xCA190000, 0x00010001, 0x00050004, 0x0000C8C4, 0x00000001, 0x00010005, + 0x00040000, 0xC76B0000, 0x00010001, 0x00050004, 0x0000C60C, 0x00000001, 0x00010005, 0x0004FFFE, + 0xC61C0000, 0x00010001, 0x00050004, 0xFFF5C62E, 0x00000001, 0x00010005, 0x0004FFE7, 0xC6430000, + 0x00010001, 0x00050004, 0xFFD4C659, 0x00000001, 0x00010005, 0x0004FFBC, 0xC6710000, 0x00010001, + 0x00050004, 0xFF9FC68A, 0x00000001, 0x00010005, 0x0004FF7F, 0xC6A20000, 0x00010001, 0x00050004, + 0xFF5BC6BA, 0x00000001, 0x00010005, 0x0004FF33, 0xC6D10000, 0x00010001, 0x00050004, 0xFF08C6E6, + 0x00000001, 0x00010005, 0x0004FEDA, 0xC6F80000, 0x00010001, 0x00050004, 0xFEAAC707, 0x00000001, + 0x00010005, 0x0004FE78, 0xC7130000, 0x00010001, 0x00050004, 0xFE43C71B, 0x00000001, 0x00010005, + 0x0004FE0D, 0xC71D0000, 0x00010001, 0x00050004, 0xFDD6C71B, 0x00000001, 0x00010005, 0x0004FD9E, + 0xC7130000, 0x00010001, 0x00050004, 0xFD66C707, 0x00000001, 0x00010005, 0x0004FD2D, 0xC6F80000, + 0x00010001, 0x00050004, 0xFCF4C6E5, 0x00000001, 0x00010005, 0x0004FCBC, 0xC6D00000, 0x00010001, + 0x00050004, 0xFC84C6B9, 0x00000001, 0x00010005, 0x0004FC4D, 0xC6A10000, 0x00010001, 0x00050004, + 0xFC18C689, 0x00000001, 0x00010005, 0x0004FBE4, 0xC6700000, 0x00010001, 0x00050004, 0xFBB3C658, + 0x00000001, 0x00010005, 0x0004FB83, 0xC6420000, 0x00010001, 0x00050004, 0xFB57C62D, 0x00000001, + 0x00010005, 0x0004FB2D, 0xC61B0000, 0x00010001, 0x00050004, 0xFB06C60C, 0x00000001, 0x00010005, + 0x0004FB1B, 0xC60C0000, 0x00010001, 0x00050004, 0xFB2CC60C, 0x00000001, 0x00010005, 0x0004FB3A, + 0xC60C0000, 0x00010001, 0x00050004, 0xFB46C60C, 0x00000001, 0x00010005, 0x0004FB4F, 0xC60C0000, + 0x00010001, 0x00050004, 0xFB56C60C, 0x00000001, 0x00010005, 0x0004FB5B, 0xC60C0000, 0x00010001, + 0x00050004, 0xFB5FC60C, 0x00000001, 0x00010005, 0x0004FB61, 0xC60C0000, 0x00010001, 0x00010001, + 0x00010001, 0x00050004, 0xFB5EC60C, 0x00000001, 0x00010005, 0x0004FB5B, 0xC60C0000, 0x00010001, + 0x00050004, 0xFB55C60C, 0x00000001, 0x00010005, 0x0004FB4E, 0xC60C0000, 0x00010001, 0x00050004, + 0xFB44C60C, 0x00000001, 0x00010005, 0x0004FB38, 0xC60C0000, 0x00010001, 0x00050004, 0xFB2AC60C, + 0x00000001, 0x00010005, 0x0004FB1A, 0xC60C0000, 0x00010001, 0x00050004, 0xFB06C60C, 0x00000001, + 0x0001000A, 0x00010001, 0x00030000, 0x00000000, +}; diff --git a/src/world/area_dgb/dgb_01/data0.c b/src/world/area_dgb/dgb_01/data0.c new file mode 100644 index 0000000000..25aa2e5747 --- /dev/null +++ b/src/world/area_dgb/dgb_01/data0.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C057F0_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x80246F70, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data1.c b/src/world/area_dgb/dgb_01/data1.c new file mode 100644 index 0000000000..d6041cfffa --- /dev/null +++ b/src/world/area_dgb/dgb_01/data1.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C06870_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x80247FF0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data2.c b/src/world/area_dgb/dgb_01/data2.c new file mode 100644 index 0000000000..f38daa142a --- /dev/null +++ b/src/world/area_dgb/dgb_01/data2.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C070F0_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x80249070, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data3.c b/src/world/area_dgb/dgb_01/data3.c new file mode 100644 index 0000000000..a350d9568d --- /dev/null +++ b/src/world/area_dgb/dgb_01/data3.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C07570_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x802498F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data4.c b/src/world/area_dgb/dgb_01/data4.c new file mode 100644 index 0000000000..40778519fc --- /dev/null +++ b/src/world/area_dgb/dgb_01/data4.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C079F0_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x80249D70, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data5.c b/src/world/area_dgb/dgb_01/data5.c new file mode 100644 index 0000000000..cb0ba6a192 --- /dev/null +++ b/src/world/area_dgb/dgb_01/data5.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C07E70_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x8024A1F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data6.c b/src/world/area_dgb/dgb_01/data6.c new file mode 100644 index 0000000000..a8f38603bb --- /dev/null +++ b/src/world/area_dgb/dgb_01/data6.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_00C07E70_11[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x8024A670, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/data7.c b/src/world/area_dgb/dgb_01/data7.c new file mode 100644 index 0000000000..db2de8b1ee --- /dev/null +++ b/src/world/area_dgb/dgb_01/data7.c @@ -0,0 +1,13 @@ +#include "dgb_01.h" + +Gfx D_8024B6F0_1[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(0x8024AEF0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; diff --git a/src/world/area_dgb/dgb_01/dgb_01.h b/src/world/area_dgb/dgb_01/dgb_01.h index d61d8f6a7e..7ab3faeaea 100644 --- a/src/world/area_dgb/dgb_01/dgb_01.h +++ b/src/world/area_dgb/dgb_01/dgb_01.h @@ -2,3 +2,35 @@ #include "map.h" #define NAMESPACE dgb_01 + +enum { + NPC_SENTINEL0, + NPC_SENTINEL1, + NPC_SENTINEL2, + NPC_SENTINEL3, + NPC_WORLD_TUBBA, +}; + +ApiStatus func_802CCCB0(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D2B6C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802CD348(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802CD3C0(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_80045838(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_80240000_BFD880)(void); +ApiStatus N(GetEntityPosition)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802422B0_BFFB30)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802430C0_C00940)(ScriptInstance* script, s32 isInitialCall); + +Script N(802449C4); +Script N(80244AD0); +Script N(main); +Script N(makeEntities); +Script N(D_80252F4C_C107CC); +Script N(D_802539A0_C11220); +NpcGroupList N(npcGroupList_80246E50); +NpcGroupList N(npcGroupList_80246ED4); +NpcGroupList N(npcGroupList_80246E8C); +NpcGroupList N(npcGroupList_80246F1C); diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 03a93b3c19..da34b3dfde 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -1,4 +1,417 @@ #include "dgb_02.h" +#include "sprite/npc/world_clubba.h" +#include "message_ids.h" + +extern s16 D_8009A634; +extern Npc* wPartnerNpc; + +enum { + NPC_WORLD_CLUBBA0 = 10, + NPC_WORLD_CLUBBA1, + NPC_WORLD_CLUBBA2 = 30, + NPC_WORLD_CLUBBA3, +}; + +EntryList N(entryList) = { + { -567.0f, 0.0f, 180.0f, 90.0f }, + { 567.0f, 0.0f, 180.0f, 270.0f }, + { -450.0f, 0.0f, 88.0f, 180.0f }, + { 450.0f, 0.0f, 88.0f, 180.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = 0x1900C2, +}; + +Script N(802414B0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_1548)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80241550) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 5; + SI_VAR(2) = 11; + SI_VAR(3) = 13; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_03", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_80241604) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 17; + SI_VAR(2) = 18; + SI_VAR(3) = 16; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 1); + sleep 100; +}); + +Script N(exitSingleDoor_802416B8) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 2; + SI_VAR(1) = 9; + SI_VAR(2) = 21; + SI_VAR(3) = 1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_07", 0); + sleep 100; +}); + +Script N(exitSingleDoor_8024176C) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 3; + SI_VAR(1) = 13; + SI_VAR(2) = 23; + SI_VAR(3) = 1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_11", 0); + sleep 100; +}); + +Script N(enterSingleDoor_80241820) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + UseDoorSounds(3); + SI_VAR(2) = 11; + SI_VAR(3) = 13; + await EnterDoubleDoor; + } + == 1 { + UseDoorSounds(3); + SI_VAR(2) = 18; + SI_VAR(3) = 16; + await EnterDoubleDoor; + } + == 2 { + UseDoorSounds(0); + SI_VAR(2) = 21; + SI_VAR(3) = 1; + await EnterSingleDoor; + } + == 3 { + UseDoorSounds(0); + SI_VAR(2) = 23; + SI_VAR(3) = 1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamEnabled(0, 1); + if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) { + MakeNpcs(1, N(npcGroupList_802425C8)); + } + bind N(exitDoubleDoor_80241550) to TRIGGER_WALL_PRESS_A 5; + bind N(exitDoubleDoor_80241604) to TRIGGER_WALL_PRESS_A 17; + bind N(exitSingleDoor_802416B8) to TRIGGER_WALL_PRESS_A 9; + bind N(exitSingleDoor_8024176C) to TRIGGER_WALL_PRESS_A 13; + spawn N(802414B0); + spawn N(enterSingleDoor_80241820); +}); + +static s32 N(pad_1AA8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(80241AB0) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +NpcAnimID N(extraAnimationList_80241B6C)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + ANIM_END, +}; + +NpcAnimID N(extraAnimationList_80241B94)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_80241B9C) = { + .moveSpeed = 1.5f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 85.0f, + .unk_10 = { .f = 65.0f }, + .unk_14 = 5, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 12, + .chaseRadius = 110.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 3, +}; + +Script N(npcAI_80241BCC) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 5); + SetSelfVar(2, 8); + SetSelfVar(3, 12); + N(func_8024061C_C2F1BC)(N(npcAISettings_80241B9C)); +}); + +NpcSettings N(npcSettings_80241C3C) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_80241BCC), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcAISettings N(npcAISettings_80241C68) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .unk_10 = { .f = 40.0f }, + .unk_14 = 10, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 15, + .chaseRadius = 200.0f, + .unk_28 = { .f = 160.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_80241C98) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 10); + SetSelfVar(2, 14); + SetSelfVar(3, 18); + N(func_802410D4_C2FC74)(N(npcAISettings_80241C68)); +}); + +NpcSettings N(npcSettings_80241D08) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_80241C98), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_80241D34) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(update_starpoints_display_C2EF5C)(); +}); + +NpcSettings N(npcSettings_80241DDC) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_80241D34), + .onDefeat = &N(80241AB0), + .level = 13, + .unk_2A = 8, +}; + +StaticNpc N(npcGroup_80241E08)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_80241C3C), + .pos = { -200.0f, 0.0f, 180.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -200, 0, 180, 40, 0, -32767, 0, -200, 0, 175, 250, 90, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80241B6C), + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_80241DDC), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_80241B94), + }, +}; + +StaticNpc N(npcGroup_802421E8)[] = { + { + .id = NPC_WORLD_CLUBBA2, + .settings = &N(npcSettings_80241D08), + .pos = { 375.0f, 0.0f, 100.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 375, 0, 100, 40, 0, -32767, 0, 320, 0, 175, 250, 90, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA3, + .settings = &N(npcSettings_80241DDC), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_80241B94), + }, +}; + +NpcGroupList N(npcGroupList_802425C8) = { + NPC_GROUP(N(npcGroup_80241E08), BATTLE_ID(15, 2, 0, 1)), + NPC_GROUP(N(npcGroup_802421E8), BATTLE_ID(15, 1, 0, 1)), + {}, +}; #include "world/common/UnkNpcAIFunc6.inc.c" @@ -8,24 +421,327 @@ #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240208_C2EDA8); +s32 N(func_80240208_C2EDA8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", update_starpoints_display_C2EF5C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024061C_C2F1BC); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802408D0_C2F470); + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240958_C2F4F8); + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240C10_C2F7B0); + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240C74_C2F814); + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240D1C_C2F8BC); + return ret; +} + +ApiStatus N(update_starpoints_display_C2EF5C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C2EDA8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +void N(func_802408D0_C2F470)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 1; + } +} + +void N(func_80240958_C2F4F8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 phi_s2 = FALSE; + s32 var; + f32 posX, posZ; + + if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { + if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || + (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || + (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || + (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || + (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { + phi_s2 = TRUE; + } + + if (playerData->currentPartner == 2) { + if (D_8010EBB0.unk_00 == playerData->currentPartner) { + phi_s2 = TRUE; + } + } + } + + if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || + ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + phi_s2 = TRUE; + } + } + + if (phi_s2) { + func_800494C0(npc, 0xB000000E, 0); + npc->currentAnim = enemy->animList[11]; + npc->duration = 10; + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + func_800494C0(npc, 0x2F4, 0x200000); + script->functionTemp[0].s = 2; + } + + npc->duration++; + if (npc->duration == 27) { + func_800494C0(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + func_800494C0(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(func_80240C10_C2F7B0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + } +} + +void N(func_80240C74_C2F814)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim = enemy->animList[0]; + script->functionTemp[1].s = (rand_int(1000) % 2) + 2; + script->functionTemp[0].s = 4; +} + +void N(func_80240D1C_C2F8BC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + var = enemy->varTable[7]; + if (var == 40) { + npc->duration = 20; + script->functionTemp[0].s = var; + } else if (var == 50) { + npc->duration = 25; + script->functionTemp[0].s = var; + } + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240E54_C2F9F4); -/* void N(func_80240E54_C2F9F4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); @@ -41,10 +757,141 @@ void N(func_80240E54_C2F9F4)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[0].s = 0x29; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240F00_C2FAA0); +void N(func_80240F00_C2FAA0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 var; -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80241078_C2FC18); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim = enemy->animList[0]; + npc->duration = 15; + enemy->varTable[7] = 50; + script->functionTemp[0].s = 3; + } else if (npc->unk_8C == 0) { + var = npc->yaw; + func_8004A784(npc, 5.0f, &var, 0, 0, 0); + npc->yaw = var; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802410D4_C2FC74); +void N(func_80241078_C2FC18)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->functionTemp[0].s = 0; + } + } +} + +ApiStatus N(func_802410D4_C2FC74)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 40.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 30; + npc->currentAnim = enemy->animList[10]; + npc->flags &= ~0x800; + enemy->varTable[0] = 0; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 40; + npc->currentAnim = enemy->animList[0]; + } + enemy->unk_B0 &= ~4; + } + + if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C2EDA8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802408D0_C2F470)(script, npcAISettings, territoryPtr); + break; + case 1: + N(func_80240958_C2F4F8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(func_80240C10_C2F7B0)(script, npcAISettings, territoryPtr); + break; + case 3: + N(func_80240C74_C2F814)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240D1C_C2F8BC)(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + npc->duration = 15; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + break; + case 30: + N(UnkNpcAIFunc6)(script); + if (script->functionTemp[0].s != 31) { + break; + } + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + break; + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 40: + N(func_80240E54_C2F9F4)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 41) { + break; + } + case 41: + N(func_80240F00_C2FAA0)(script, npcAISettings, territoryPtr); + break; + case 50: + N(func_80241078_C2FC18)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return 0; +} diff --git a/src/world/area_dgb/dgb_02/dgb_02.h b/src/world/area_dgb/dgb_02/dgb_02.h index 1ba072ae4b..0e2c96941f 100644 --- a/src/world/area_dgb/dgb_02/dgb_02.h +++ b/src/world/area_dgb/dgb_02/dgb_02.h @@ -2,3 +2,10 @@ #include "map.h" #define NAMESPACE dgb_02 + +ApiStatus N(func_8024061C_C2F1BC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802410D4_C2FC74)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(update_starpoints_display_C2EF5C)(ScriptInstance *script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_802425C8); +Script N(main); diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c index 5d958efbfb..c5563cf862 100644 --- a/src/world/area_dgb/dgb_03/C314E0.c +++ b/src/world/area_dgb/dgb_03/C314E0.c @@ -1,8 +1,52 @@ #include "dgb_03.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_80240000_C314E0); +ApiStatus N(func_80240000_C314E0)(ScriptInstance *script, s32 isInitialCall) { + s32 var = get_variable(script, *script->ptrReadPos); + PlayerStatus* playerStatus = &gPlayerStatus; + CollisionStatus* collisionStatus = &gCollisionStatus; -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802400BC_C3159C); + if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == 20)) || + playerStatus->enableCollisionOverlapsCheck || playerStatus->statusMenuCounterinputEnabledCounter) { + set_action_state(0); + script->varTable[0] = 0; + return ApiStatus_DONE2; + } + + if (collisionStatus->pushingAgainstWall != var) { + script->varTable[0] = 0; + } else if ((playerStatus->actionState != 20) && (playerStatus->actionState != 1) && + (playerStatus->actionState != 2)) { + script->varTable[0] = 0; + } else if (playerStatus->animFlags & 1) { + script->varTable[0] = 0; + } else { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802400BC_C3159C)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 posX, posY, posZ, posW; + + if (script->varTable[5] == 0) { + playerStatus->position.x = script->varTable[0]; + } else { + playerStatus->position.z = script->varTable[0]; + } + + posX = playerStatus->position.x; + posY = playerStatus->position.y + 10.0f; + posZ = playerStatus->position.z; + posW = 40.0f; + func_800DCB7C(0, &posX, &posY, &posZ, &posW); + playerStatus->position.x = posX; + playerStatus->position.y = posY; + playerStatus->position.z = posZ; + + return ApiStatus_DONE2; +} #include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index c41c6f9544..998cc7bc38 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -1,4 +1,742 @@ #include "dgb_03.h" +#include "sprite/npc/world_clubba.h" +#include "message_ids.h" + +extern s16 D_8009A634; +extern Npc* wPartnerNpc; + +enum { + NPC_WORLD_CLUBBA0, + NPC_WORLD_CLUBBA1, + NPC_WORLD_CLUBBA2, + NPC_WORLD_CLUBBA3, + NPC_WORLD_CLUBBA4, + NPC_WORLD_CLUBBA5, +}; + +EntryList N(entryList) = { + { -343.0f, 0.0f, 80.0f, 90.0f }, + { 343.0f, 0.0f, 80.0f, 270.0f }, + { -220.0f, 0.0f, -170.0f, 180.0f }, + { -343.0f, 210.0f, 80.0f, 90.0f }, + { 343.0f, 210.0f, 80.0f, 270.0f }, + { -220.0f, 210.0f, -170.0f, 180.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_03_tattle, +}; + +Script N(80242870) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_2908)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80242910) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 25; + SI_VAR(2) = 36; + SI_VAR(3) = 34; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_02", 0); + sleep 100; +}); + +Script N(exitDoubleDoor_802429C4) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 4; + SI_VAR(1) = 21; + SI_VAR(2) = 46; + SI_VAR(3) = 44; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_09", 0); + sleep 100; +}); + +Script N(exitDoubleDoor_80242A78) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 13; + SI_VAR(2) = 29; + SI_VAR(3) = 31; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_04", 0); + sleep 100; +}); + +Script N(exitWalk_80242B2C) = EXIT_WALK_SCRIPT(26, 2, "dgb_13", 0); + +Script N(exitSingleDoor_80242B88) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 2; + SI_VAR(1) = 33; + SI_VAR(2) = 49; + SI_VAR(3) = 1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_05", 0); + sleep 100; +}); + +Script N(exitDoubleDoor_80242C3C) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 3; + SI_VAR(1) = 17; + SI_VAR(2) = 39; + SI_VAR(3) = 41; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_14", 0); + sleep 100; +}); + +Script N(80242CF0) = SCRIPT({ + bind N(exitWalk_80242B2C) to TRIGGER_FLOOR_ABOVE 35; +}); + +Script N(enterDoubleDoor_80242D1C) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + UseDoorSounds(3); + SI_VAR(2) = 29; + SI_VAR(3) = 31; + await EnterDoubleDoor; + spawn N(80242CF0); + } + == 1 { + UseDoorSounds(3); + SI_VAR(2) = 36; + SI_VAR(3) = 34; + await EnterDoubleDoor; + spawn N(80242CF0); + } + == 2 { + UseDoorSounds(0); + SI_VAR(2) = 49; + SI_VAR(3) = 1; + await EnterSingleDoor; + spawn N(80242CF0); + } + == 3 { + UseDoorSounds(3); + SI_VAR(2) = 39; + SI_VAR(3) = 41; + await EnterDoubleDoor; + spawn N(80242CF0); + } + == 4 { + UseDoorSounds(3); + SI_VAR(2) = 46; + SI_VAR(3) = 44; + await EnterDoubleDoor; + spawn N(80242CF0); + } + == 5 { + SI_VAR(0) = N(80242CF0); + spawn EnterWalkShort; + sleep 1; + } + } +}); + +s32 N(itemList_80242F28)[] = { + ITEM_CASTLE_KEY1, + ITEM_NONE, +}; + +// *INDENT-OFF* +Script N(main) = { + SI_CMD(ScriptOpcode_SET, SI_SAVE_VAR(425), 15), + SI_CMD(ScriptOpcode_CALL, SetSpriteShading, -1), + SI_CMD(ScriptOpcode_CALL, SetCamPerspective, 0, 3, 25, 16, 4096), + SI_CMD(ScriptOpcode_CALL, SetCamBGColor, 0, 0, 0, 0), + SI_CMD(ScriptOpcode_CALL, SetCamEnabled, 0, 1), + SI_CMD(ScriptOpcode_IF_LT, SI_SAVE_VAR(0), -15), + SI_CMD(ScriptOpcode_CALL, MakeNpcs, 1, N(npcGroupList_80244988)), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(makeEntities)), + SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80243608)), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80242910), TRIGGER_WALL_PRESS_A, 25, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_802429C4), TRIGGER_WALL_PRESS_A, 21, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80242A78), TRIGGER_WALL_PRESS_A, 13, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitSingleDoor_80242B88), TRIGGER_WALL_PRESS_A, 33, 1, 0), + SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1043), 0), + SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80243740), TRIGGER_WALL_PRESS_A, 16384, N(itemList_80242F28), 0, 1), + SI_CMD(ScriptOpcode_ELSE), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80242C3C), TRIGGER_WALL_PRESS_A, 17, 1, 0), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(80242870)), + SI_CMD(ScriptOpcode_SPAWN_SCRIPT, N(enterDoubleDoor_80242D1C)), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +static s32 N(pad_30D8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(802430E0) = SCRIPT({ + group 0; + loop 20 { + GetCurrentPartner(SI_VAR(10)); + if (SI_VAR(10) != 0) { + SI_VAR(8) = -1; + return; + } + N(func_80240000_C314E0)(SI_VAR(9)); + if (SI_VAR(0) == 0) { + SI_VAR(8) = -1; + return; + } else { + SetPlayerActionState(20); + } + sleep 1; + } + GetCurrentPartner(SI_VAR(10)); + if (SI_VAR(10) != 0) { + SI_VAR(8) = -1; + return; + } + DisablePlayerInput(TRUE); + spawn { + ShakeCam(0, 0, 100, 0.6005859375); + } + spawn { + if (SI_VAR(6) >= SI_VAR(7)) { + InterpPlayerYaw(270, 0); + } else { + InterpPlayerYaw(90, 0); + } + SetPlayerActionState(20); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) = SI_VAR(0); + SI_VAR(2) = SI_VAR(7); + SI_VAR(2) -= SI_VAR(6); + SI_VAR(1) += SI_VAR(2); + MakeLerp(SI_VAR(0), SI_VAR(1), 100, 0); + loop { + SetPlayerActionState(20); + UpdateLerp(); + N(func_802400BC_C3159C)(); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + SetPlayerActionState(0); + DisablePlayerInput(FALSE); + } + MakeLerp(SI_VAR(6), SI_VAR(7), 100, 0); + PlaySoundAtCollider(27, 0x80000010, 0); + loop { + UpdateLerp(); + TranslateModel(51, SI_VAR(0), 0, 0); + UpdateColliderTransform(27); + UpdateColliderTransform(28); + UpdateColliderTransform(29); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + StopSound(0x80000010); +}); + +Script N(80243470) = SCRIPT({ + if (SI_SAVE_FLAG(1044) != 0) { + goto 90; + } + SI_VAR(6) = 0; + SI_VAR(7) = 48; + SI_VAR(8) = 0; + SI_VAR(9) = 27; + await N(802430E0); +90: + if (SI_VAR(8) != -1) { + SI_SAVE_FLAG(1045) = 0; + SI_SAVE_FLAG(1044) = 1; + unbind; + } +}); + +Script N(8024353C) = SCRIPT({ + if (SI_SAVE_FLAG(1044) != 0) { + goto 90; + } + SI_VAR(6) = 0; + SI_VAR(7) = -48; + SI_VAR(8) = 0; + SI_VAR(9) = 28; + await N(802430E0); +90: + if (SI_VAR(8) != -1) { + SI_SAVE_FLAG(1045) = 1; + SI_SAVE_FLAG(1044) = 1; + unbind; + } +}); + +Script N(80243608) = SCRIPT({ + ParentColliderToModel(27, 51); + ParentColliderToModel(28, 51); + ParentColliderToModel(29, 51); + if (SI_SAVE_FLAG(1044) == 0) { + bind N(80243470) to TRIGGER_WALL_PUSH 27; + bind N(8024353C) to TRIGGER_WALL_PUSH 28; + } else { + if (SI_SAVE_FLAG(1045) == 0) { + SI_VAR(0) = 48; + } else { + SI_VAR(0) = -48; + } + TranslateModel(51, SI_VAR(0), 0, 0); + UpdateColliderTransform(27); + UpdateColliderTransform(28); + UpdateColliderTransform(29); + } +}); + +static s32 N(pad_3738)[] = { + 0x00000000, 0x00000000, +}; + +Script N(80243740) = SCRIPT({ + group 0; + suspend group 1; + func_802D6420(); + if (SI_VAR(0) == 0) { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00D8), 160, 40); + func_802D6954(); + resume group 1; + return; + } + if (SI_VAR(0) == -1) { + func_802D6954(); + resume group 1; + return; + } + FindKeyItem(19, SI_VAR(0)); + RemoveKeyItemAt(SI_VAR(0)); + func_802D6954(); + SI_SAVE_FLAG(1043) = 1; + N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) = SI_MAP_VAR(0); + N(SetEntityFlags100000)(); + resume group 1; + unbind; +}); + +Script N(802438A8) = SCRIPT({ + bind N(exitDoubleDoor_80242C3C) to TRIGGER_WALL_PRESS_A 17; +}); + +Script N(makeEntities) = SCRIPT({ + if (SI_SAVE_FLAG(1043) == 0) { + MakeEntity(0x802BCD68, -355, 218, 75, 80, MAKE_ENTITY_END); + AssignScript(N(802438A8)); + SI_MAP_VAR(0) = SI_VAR(0); + } + MakeItemEntity(ITEM_STAR_PIECE, 0, 75, 100, 17, SI_SAVE_FLAG(1042)); +}); + +static s32 N(pad_3964)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(80243970) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +s32 N(unk_missing_80243A2C)[] = { + 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, + 0x00390012, 0xFFFFFFFF, +}; + +NpcAnimID N(extraAnimationList_80243A54)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_80243A5C) = { + .moveSpeed = 1.5f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 85.0f, + .unk_10 = { .f = 65.0f }, + .unk_14 = 5, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 12, + .chaseRadius = 110.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 3, +}; + +Script N(npcAI_80243A8C) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 5); + SetSelfVar(2, 8); + SetSelfVar(3, 12); + N(func_8024086C_C31D4C)(N(npcAISettings_80243A5C)); +}); + +NpcSettings N(npcSettings_80243AFC) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_80243A8C), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcAISettings N(npcAISettings_80243B28) = { + .moveSpeed = 1.5f, + .moveTime = 20, + .waitTime = 30, + .alertRadius = 85.0f, + .unk_10 = { .f = 65.0f }, + .unk_14 = 5, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 12, + .chaseRadius = 110.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 3, +}; + +Script N(npcAI_80243B58) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 5); + SetSelfVar(2, 8); + SetSelfVar(3, 12); + N(func_802419B0_C32E90)(N(npcAISettings_80243B28)); +}); + +NpcSettings N(npcSettings_80243BC8) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_80243B58), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcAISettings N(npcAISettings_80243BF4) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .unk_10 = { .f = 40.0f }, + .unk_14 = 10, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 15, + .chaseRadius = 200.0f, + .unk_28 = { .f = 160.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_80243C24) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 10); + SetSelfVar(2, 14); + SetSelfVar(3, 18); + N(func_80242480_C33960)(N(npcAISettings_80243BF4)); +}); + +NpcSettings N(npcSettings_80243C94) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_80243C24), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_80243CC0) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(func_8024060C_C31AEC)(); +}); + +NpcSettings N(npcSettings_80243D68) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_80243CC0), + .onDefeat = &N(80243970), + .level = 13, + .unk_2A = 8, +}; + +Script N(init_80243D94) = SCRIPT({ + GetEntryID(SI_VAR(0)); + if (SI_VAR(0) == 3) { + SetNpcPos(NPC_SELF, -330, 210, -20); + } +}); + +StaticNpc N(npcGroup_80243DE8)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_80243AFC), + .pos = { 180.0f, 0.0f, -122.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 180, 0, -122, 40, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_80243D68), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_80243A54), + }, +}; + +StaticNpc N(npcGroup_802441C8)[] = { + { + .id = NPC_WORLD_CLUBBA2, + .settings = &N(npcSettings_80243BC8), + .pos = { -272.0f, 0.0f, -135.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 2, -272, 0, -135, -171, 0, -135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 75, 355, 255, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA3, + .settings = &N(npcSettings_80243D68), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_80243A54), + }, +}; + +StaticNpc N(npcGroup_802445A8)[] = { + { + .id = NPC_WORLD_CLUBBA4, + .settings = &N(npcSettings_80243C94), + .pos = { -326.0f, 210.0f, 80.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_80243D94), + .yaw = 90, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -326, 210, 80, 0, 0, -32767, 0, 0, 0, 75, 355, 255, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA5, + .settings = &N(npcSettings_80243D68), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_80243A54), + }, +}; + +NpcGroupList N(npcGroupList_80244988) = { + NPC_GROUP(N(npcGroup_80243DE8), BATTLE_ID(15, 1, 0, 2)), + NPC_GROUP(N(npcGroup_802441C8), BATTLE_ID(15, 1, 0, 2)), + NPC_GROUP(N(npcGroup_802445A8), BATTLE_ID(15, 3, 0, 1)), + {}, +}; #include "world/common/UnkNpcAIFunc6.inc.c" @@ -8,15 +746,202 @@ #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240458_C31938); +s32 N(func_80240458_C31938)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024060C_C31AEC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024086C_C31D4C); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240B20_C32000); -/* -ApiStatus N(func_80240B20_C32000)(ScriptInstance* script, s32 isInitialCall) { + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(func_8024060C_C31AEC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_8024086C_C31D4C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_80240B20_C32000)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -50,10 +975,7 @@ ApiStatus N(func_80240B20_C32000)(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[0].s = 1; return 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240C78_C32158); -/* void N(func_80240C78_C32158)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -63,7 +985,7 @@ void N(func_80240C78_C32158)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -101,18 +1023,15 @@ void N(func_80240C78_C32158)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240FE0_C324C0); -/* void N(func_80240FE0_C324C0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -136,11 +1055,8 @@ void N(func_80240FE0_C324C0)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024119C_C3267C); -/* -ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -157,7 +1073,6 @@ ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, s32 isInitialCall) { script->functionTemp[0].s = 1; return 1; } -*/ #include "world/common/NpcJumpFunc2.inc.c" @@ -165,14 +1080,12 @@ ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024146C_C3294C); -/* -ApiStatus N(func_8024146C_C3294C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024146C_C3294C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; @@ -187,12 +1100,9 @@ ApiStatus N(func_8024146C_C3294C)(ScriptInstance* script, s32 isInitialCall) { } } } -*/ #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802415F4_C32AD4); -/* void N(func_802415F4_C32AD4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -210,24 +1120,306 @@ void N(func_802415F4_C32AD4)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[1].s = 0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802416B4_C32B94); +ApiStatus N(func_802416B4_C32B94)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802419B0_C32E90); + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241C7C_C3315C); + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241D04_C331E4); + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241FBC_C3349C); + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242020_C33500); + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802420C8_C335A8); + switch (script->functionTemp[0].s) { + case 0: + N(func_80240B20_C32000)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240C78_C32158)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240FE0_C324C0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024119C_C3267C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024146C_C3294C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_802415F4_C32AD4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_802419B0_C32E90)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240B20_C32000)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240C78_C32158)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240FE0_C324C0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024119C_C3267C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024146C_C3294C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +void N(func_80241C7C_C3315C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 1; + } +} + +void N(func_80241D04_C331E4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 phi_s2 = FALSE; + s32 var; + f32 posX, posZ; + + if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { + if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || + (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || + (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || + (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || + (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { + phi_s2 = TRUE; + } + + if (playerData->currentPartner == 2) { + if (D_8010EBB0.unk_00 == playerData->currentPartner) { + phi_s2 = TRUE; + } + } + } + + if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || + ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + phi_s2 = TRUE; + } + } + + if (phi_s2) { + func_800494C0(npc, 0xB000000E, 0); + npc->currentAnim = enemy->animList[11]; + npc->duration = 10; + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + func_800494C0(npc, 0x2F4, 0x200000); + script->functionTemp[0].s = 2; + } + + npc->duration++; + if (npc->duration == 27) { + func_800494C0(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + func_800494C0(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(func_80241FBC_C3349C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + } +} + +void N(func_80242020_C33500)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim = enemy->animList[0]; + script->functionTemp[1].s = (rand_int(1000) % 2) + 2; + script->functionTemp[0].s = 4; +} + +void N(func_802420C8_C335A8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + var = enemy->varTable[7]; + if (var == 40) { + npc->duration = 20; + script->functionTemp[0].s = var; + } else if (var == 50) { + npc->duration = 25; + script->functionTemp[0].s = var; + } + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242200_C336E0); -/* void N(func_80242200_C336E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); @@ -243,10 +1435,142 @@ void N(func_80242200_C336E0)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[0].s = 0x29; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802422AC_C3378C); +void N(func_802422AC_C3378C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 var; -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242424_C33904); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim = enemy->animList[0]; + npc->duration = 15; + enemy->varTable[7] = 50; + script->functionTemp[0].s = 3; + } else if (npc->unk_8C == 0) { + var = npc->yaw; + func_8004A784(npc, 5.0f, &var, 0, 0, 0); + npc->yaw = var; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242480_C33960); +void N(func_80242424_C33904)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->functionTemp[0].s = 0; + } + } +} + +ApiStatus N(func_80242480_C33960)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 40.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 30; + npc->currentAnim = enemy->animList[10]; + npc->flags &= ~0x800; + enemy->varTable[0] = 0; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 40; + npc->currentAnim = enemy->animList[0]; + } + enemy->unk_B0 &= ~4; + } + + if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240458_C31938)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80241C7C_C3315C)(script, npcAISettings, territoryPtr); + break; + case 1: + N(func_80241D04_C331E4)(script, npcAISettings, territoryPtr); + break; + case 2: + N(func_80241FBC_C3349C)(script, npcAISettings, territoryPtr); + break; + case 3: + N(func_80242020_C33500)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_802420C8_C335A8)(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + npc->duration = 15; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + break; + case 30: + N(UnkNpcAIFunc6)(script); + if (script->functionTemp[0].s != 31) { + break; + } + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + break; + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 40: + N(func_80242200_C336E0)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 41) { + break; + } + case 41: + N(func_802422AC_C3378C)(script, npcAISettings, territoryPtr); + break; + case 50: + N(func_80242424_C33904)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/area_dgb/dgb_03/dgb_03.h b/src/world/area_dgb/dgb_03/dgb_03.h index e340e551ae..b79e497f99 100644 --- a/src/world/area_dgb/dgb_03/dgb_03.h +++ b/src/world/area_dgb/dgb_03/dgb_03.h @@ -2,3 +2,18 @@ #include "map.h" #define NAMESPACE dgb_03 + +ApiStatus N(func_80240000_C314E0)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802400BC_C3159C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024060C_C31AEC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024086C_C31D4C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242480_C33960)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(GetEntityPosition)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_80244988); +Script N(80243608); +Script N(80243740); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index d14975a44a..2fe7647856 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -1,7 +1,401 @@ #include "dgb_04.h" +#include "sprite/npc/sentinel.h" +#include "message_ids.h" + +extern s32 D_800F7F00[]; +extern s32 D_800F7F40[]; +extern s32 D_8008EF20[11][4]; + +enum { + NPC_SENTINEL, +}; + +EntryList N(entryList) = { + { 575.0f, 0.0f, 180.0f, 270.0f }, + { 575.0f, -420.0f, 180.0f, 270.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_04_tattle, +}; + +Script N(80243170) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_3208)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_80243210) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 16; + SI_VAR(2) = 16; + SI_VAR(3) = 1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_06", 0); + sleep 100; +}); + +Script N(exitDoubleDoor_802432C4) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 20; + SI_VAR(2) = 13; + SI_VAR(3) = 11; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_03", 0); + sleep 100; +}); + +Script N(enterSingleDoor_80243378) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + UseDoorSounds(3); + SI_VAR(2) = 13; + SI_VAR(3) = 11; + await EnterDoubleDoor; + } + == 1 { + UseDoorSounds(0); + SI_VAR(2) = 16; + SI_VAR(3) = 1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) { + MakeNpcs(1, N(npcGroupList_80243D18)); + } + await N(makeEntities); + bind N(exitSingleDoor_80243210) to TRIGGER_WALL_PRESS_A 16; + bind N(exitDoubleDoor_802432C4) to TRIGGER_WALL_PRESS_A 20; + spawn N(80243170); + spawn N(enterSingleDoor_80243378); +}); + +static s32 N(pad_3558)[] = { + 0x00000000, 0x00000000, +}; + +f32 N(D_80243560_C39A90)[] = { + 4.5f, 3.5f, 2.6f, 2.0f, + 1.5f, 20.0f, +}; + +Script N(80243578) = SCRIPT({ + SetSelfEnemyFlagBits(((0x00100000 | 0x01000000 | 0x02000000 | 0x04000000 | 0x08000000 | 0x10000000 | 0x20000000)), TRUE); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT)), TRUE); +}); + +NpcAISettings N(npcAISettings_802435B4) = { + .moveSpeed = 1.5f, + .moveTime = 90, + .waitTime = 30, + .alertRadius = 240.0f, + .unk_14 = 1, + .chaseSpeed = 5.3f, + .unk_1C = { .s = 180 }, + .unk_20 = 1, + .chaseRadius = 240.0f, + .unk_2C = 1, +}; + +const char N(dgb_00_name_hack)[]; + +Script N(npcAI_802435E4) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(5, -650); + SetSelfVar(6, 30); + SetSelfVar(1, 600); + N(func_80242154_C38684)(N(npcAISettings_802435B4)); + DisablePlayerInput(TRUE); + sleep 2; +20: + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(4), SI_VAR(2)); + GetPlayerActionState(SI_VAR(0)); + if (SI_VAR(0) != 0) { + sleep 1; + goto 20; + } + DisablePlayerPhysics(TRUE); + func_802D2B6C(); + DisablePartnerAI(0); + group 0; + func_802D5830(1); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + SI_VAR(2) += 2; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_80045838(-1, 759, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + sleep 10; + SetPlayerAnimation(ANIM_80017); + sleep 10; + func_80045838(-1, 1838, 0); + spawn { + loop 100 { + GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + } + spawn { + SetNpcAnimation(NPC_PARTNER, 0x108); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + } + sleep 30; + GotoMap(N(dgb_00_name_hack), 2); + sleep 100; +}); + +Script N(80243A0C) = SCRIPT({ + GetOwnerEncounterTrigger(SI_VAR(0)); + match SI_VAR(0) { + == 1, 2, 4, 6 { + GetSelfAnimationFromTable(7, SI_VAR(0)); + await 0x800936DC; + } + } +}); + +Script N(80243A98) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + DoNpcDefeat(); + } + == 1 {} + == 2 { + } + } +}); + +NpcSettings N(npcSettings_80243AFC) = { + .height = 38, + .radius = 32, + .otherAI = &N(80243578), + .ai = &N(npcAI_802435E4), + .level = 99, +}; + +StaticNpc N(npcGroup_80243B28) = { + .id = NPC_SENTINEL, + .settings = &N(npcSettings_80243AFC), + .pos = { 70.0f, -220.0f, 186.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { 70, -220, 186, 15, 40, -32767, 1, 80, -220, 170, 80, 150, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, + .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, +}; + +NpcGroupList N(npcGroupList_80243D18) = { + NPC_GROUP(N(npcGroup_80243B28), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +s32 N(D_80243D30_C3A260)[] = { + 0x001D00F0, 0x001D00F1, +}; + +s16 N(D_80243D38_C3A268)[] = { + 0x0001, 0x0002, 0x0003, 0x0004, + 0x0009, 0x0006, 0x0007, 0x0008 +}; + +s32 N(D_80243D48_C3A278)[8][2] = { + {0x001D00E0, 0x001D00E1 }, {0x001D00E2, 0x001D00E3 }, + {0x001D00E4, 0x001D00E5 }, {0x001D00E6, 0x001D00E7 }, + {0x001D00E8, 0x001D00E9 }, {0x001D00EA, 0x001D00EB }, + {0x001D00EC, 0x001D00ED }, {0x001D00EE, 0x001D00EF } +}; + +f32 N(D_80243D88_C3A2B8)[] = { + 140.0f, 180.0f, 220.0f +}; + +Script N(80243D94) = SCRIPT({ + sleep 10; + PlaySound(0x212D); + N(func_80242914_C38E44)(SI_MAP_VAR(0)); + sleep 85; + spawn { + PlaySound(0x212E); + N(func_80242F08_C39438)(70, 70); + sleep 27; + PlaySound(SOUND_UNKNOWN_208E); + N(func_80242F08_C39438)(50, 50); + } + spawn { + sleep 3; + N(func_8024240C_C3893C)(SI_MAP_VAR(0)); + } + spawn { + sleep 47; + N(func_80242978_C38EA8)(); + N(UnkPartnerPosFunc)(); + sleep 5; + N(UnkPartnerPosFunc2)(); + sleep 5; + N(UnkPartnerPosFunc)(); + } + sleep 3; + N(func_802429D0_C38F00)(SI_MAP_VAR(0)); + sleep 30; +}); + +Script N(80243EF8) = SCRIPT({ + if (SI_SAVE_FLAG(1046) == 1) { + return; + } + IsStartingConversation(SI_VAR(0)); + if (SI_VAR(0) == 1) { + return; + } + N(func_802430D8_C39608)(); + if (SI_VAR(0) == 1) { + return; + } + func_802D585C(1, 2097152); + N(SetOverrideFlags_40)(); + DisablePlayerInput(TRUE); + DisablePartnerAI(0); + SetNpcFlagBits(NPC_PARTNER, ((NPC_FLAG_100)), TRUE); + N(func_80242850_C38D80)(SI_MAP_VAR(0), SI_VAR(9)); + FindKeyItem(15, SI_VAR(12)); + N(func_802424F0_C38A20)(); + if (SI_VAR(0) == -1) { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DC), 160, 40); + sleep 10; + N(func_802428E0_C38E10)(SI_VAR(9)); + DisablePlayerInput(FALSE); + EnablePartnerAI(); + func_802D585C(0, 2097152); + N(func_802423EC_C3891C)(); + return; + } + if (SI_SAVE_FLAG(438) == 0) { + SI_SAVE_FLAG(438) = 1; + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DA), 160, 40); + } else { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DB), 160, 40); + } + N(func_8024259C_C38ACC)(); + if (SI_VAR(0) == -1) { + N(func_802428E0_C38E10)(SI_VAR(9)); + DisablePlayerInput(FALSE); + EnablePartnerAI(); + func_802D585C(0, 2097152); + N(func_802423EC_C3891C)(); + return; + } + SI_VAR(10) = SI_VAR(0); + SI_VAR(11) = SI_VAR(1); + EnablePartnerAI(); + GetCurrentPartnerID(SI_VAR(0)); + if (SI_VAR(0) != SI_VAR(11)) { + N(func_802427EC_C38D1C)(SI_VAR(11)); + } else { + func_802CF56C(2); + } + sleep 10; + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DF), 160, 40); + ShowChoice(1966093); + CloseMessage(); + if (SI_VAR(0) != 0) { + N(func_802428E0_C38E10)(SI_VAR(9)); + DisablePlayerInput(FALSE); + EnablePartnerAI(); + func_802D585C(0, 2097152); + N(func_802423EC_C3891C)(); + return; + } + await N(80243D94); + N(func_80242438_C38968)(SI_VAR(11), SI_VAR(13)); + SI_SAVE_FLAG(1046) = 1; + N(func_802428E0_C38E10)(SI_VAR(9)); + N(func_80242818_C38D48)(); + if (SI_VAR(13) == 1) { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DD), 160, 40); + } else { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00DE), 160, 40); + } + DisablePlayerInput(FALSE); + EnablePartnerAI(); + func_802D585C(0, 2097152); + N(func_802423EC_C3891C)(); +}); + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802EA910, 500, -360, 110, 0, MAKE_ENTITY_END); + SI_MAP_VAR(0) = SI_VAR(0); + AssignBlockFlag(SI_SAVE_FLAG(1046)); + AssignScript(N(80243EF8)); +}); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240000_C36530); -/* void N(func_80240000_C36530)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -25,14 +419,153 @@ void N(func_80240000_C36530)(ScriptInstance* script, NpcAISettings* aiSettings, enemy->varTable[4] = npc->pos.y * 100.0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802401B0_C366E0); +#ifdef NON_MATCHING +// second func_800DCB7C call +void N(func_802401B0_C366E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f24; + f32 posX, posY, posZ, posW; + s32 var; + f32 temp_f0; + f32 phi_f4; + s32 phi_v0; + s32 phi_s4 = 0; + + f32 a = enemy->varTable[7]; + f32 temp_f2 = a / 100.0; + f32 b = enemy->varTable[3]; + f32 temp_f26 = b / 100.0; + f32 c = enemy->varTable[4]; + f32 temp_f20 = c / 100.0; + f32 d = enemy->varTable[1]; + f32 temp_f22 = d / 100.0; + + enemy->varTable[4] = npc->pos.y * 100.0; + temp_f24 = temp_f26 + temp_f2; + + if ((enemy->varTable[0] & 0x11) == 1) { + if (npc->flags & 8) { + if (temp_f22 < (temp_f24 - npc->pos.y)) { + enemy->varTable[0] |= 0x10; + } + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (temp_f22 < (temp_f26 - posW)) { + enemy->varTable[0] |= 0x10; + } + } + } + + if ((enemy->varTable[0] & 0x11) == 0x11) { + f64 test; + if (npc->flags & 8) { + phi_f4 = temp_f24; + test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + npc->pos.y = test; + } else { + posX = npc->pos.x; + posY = temp_f20; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + phi_f4 = posY; + phi_f4 += temp_f26; + d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + test = d; + npc->pos.y = test; + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + } + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + + if (fabsf(phi_f4 - npc->pos.y) < 1.0) { + npc->pos.y = phi_f4; + enemy->varTable[0] &= ~0x10; + } + } else if (enemy->varTable[1] > 0) { + temp_f0 = sin_deg(enemy->varTable[2]); + if (npc->flags & 8) { + phi_v0 = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + } + if (phi_v0) { + npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f0 * temp_f22); + } + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + + if (enemy->varTable[9] <= 0) { + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->moveToPos.y = npc->pos.y; + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } + script->functionTemp[1].s--; + } + } else { + enemy->varTable[9]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); + if (npc->moveSpeed < posW) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + phi_s4 = 1; + } + } + + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { + if (npc->unk_8C == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + return; + } + } + + enemy->varTable[4] = npc->pos.y * 100.0; + if (aiSettings->moveTime > 0) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + script->functionTemp[0].s = 2; + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) { + script->functionTemp[0].s = 0; + } + } + } +} +#else +INCLUDE_ASM(void, "world/area_dgb/dgb_04/C36530", dgb_04_func_802401B0_C366E0, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +#endif #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240898_C36DC8); -/* void N(func_80240898_C36DC8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -70,7 +603,7 @@ void N(func_80240898_C36DC8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -97,29 +630,23 @@ void N(func_80240898_C36DC8)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240C54_C37184); -/* void N(func_80240C54_C37184)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; + npc->pos.y += N(D_80243560_C39A90)[npc->duration++]; if (npc->duration >= 5) { script->functionTemp[0].s = 12; } } -*/ #include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240E58_C37388); -/* void N(func_80240E58_C37388)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -166,12 +693,12 @@ void N(func_80240E58_C37388)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); @@ -206,10 +733,7 @@ void N(func_80240E58_C37388)(ScriptInstance* script, NpcAISettings* aiSettings, npc->jumpVelocity = 0.0f; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802411E8_C37718); -/* void N(func_802411E8_C37718)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { f32 posX, posY, posZ, posW; s32 temp_a1; @@ -238,74 +762,777 @@ void N(func_802411E8_C37718)(Npc *npc, Enemy *enemy, ScriptInstance *script, Npc script->functionTemp[1].s = aiSettings->unk_14; enemy->unk_B0 |= 0x10; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_8024130C_C3783C); +ApiStatus N(func_8024130C_C3783C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802414F8_C37A28); + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241650_C37B80); + if (isInitialCall) { + N(func_802411E8_C37718)(npc, enemy, script, aiSettings); + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241754_C37C84); + npc->unk_AB = -2; -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802417F8_C37D28); + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241A94_C37FC4); + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_C36530)(script, aiSettings, territoryPtr); + case 1: + N(func_802401B0_C366E0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240898_C36DC8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240C54_C37184)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80240E58_C37388)(script, aiSettings, territoryPtr); + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241B4C_C3807C); + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241CCC_C381FC); +void N(func_802414F8_C37A28)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f0; + f32 phi_f20; -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241D14_C38244); + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= 0xFFDFFFFF; + npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); + npc->currentAnim = enemy->animList[8]; + npc->moveSpeed = aiSettings->chaseSpeed; + phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); + if (aiSettings->unk_1C.s < fabsf(temp_f0)) { + phi_f20 = npc->yaw; + if (temp_f0 < 0.0f) { + phi_f20 += -aiSettings->unk_1C.s; + } else { + phi_f20 += aiSettings->unk_1C.s; + } + } + npc->yaw = clamp_angle(phi_f20); + script->functionTemp[0].s = 13; + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241D94_C382C4); +void N(func_80241650_C37B80)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241E3C_C3836C); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { + npc->duration = 0; + script->functionTemp[0].s = 14; + } else { + npc->duration--; + if (npc->duration <= 0) { + npc->flags |= 0x200000; + script->functionTemp[0].s = 12; + } + } + } else { + script->functionTemp[0].s = 16; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242154_C38684); +} + +void N(func_80241754_C37C84)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + do { enemy->varTable[0] |= 0x100; npc->pos.x = gPlayerStatusPtr->position.x; } while (0); + npc->pos.z = gPlayerStatusPtr->position.z; + if (!(enemy->varTable[0] & 0x1000)) { + enemy->varTable[0] |= 0x1000; + } + sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + npc->duration = 0; + script->functionTemp[0].s = 15; +} + +void N(func_802417F8_C37D28)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + s32 temp_f8_2; + + sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + enemy->varTable[0] &= ~0x100; + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + script->functionTemp[0].s = 16; + } else { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + + npc->pos.x = (*playerStatus)->position.x; + npc->pos.z = (*playerStatus)->position.z + 2.0f; + npc->rotation.y += 25.0f; + if (npc->rotation.y > 360.0) { + npc->rotation.y -= 360.0; + } + temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); + func_802DE894(npc->unk_24, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); + + posX = (*playerStatus)->position.x; + posY = (*playerStatus)->position.y; + posZ = (*playerStatus)->position.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (fabsf(npc->pos.y - posY) > 24.0) { + npc->pos.y -= 1.8; + } else { + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + if (D_8010EBB0.unk_03 != 9) { + disable_player_input(); + func_800EF628(); + npc->duration = 0; + script->functionTemp[0].s = 20; + } else { + script->functionTemp[0].s = 16; + } + } + } +} + +void N(func_80241A94_C37FC4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + if (enemy->varTable[0] & 0x1000) { + sfx_stop_sound(0x80000011); + enemy->varTable[0] &= ~0x1000; + } + npc->currentAnim = enemy->animList[9]; + npc->duration = 20; + script->functionTemp[0].s = 17; +} + +void N(func_80241B4C_C3807C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 tmp = enemy->varTable[3]; + f32 temp_f20 = tmp / 100.0; + s32 var; + + npc->pos.y += 2.5; + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (!(npc->pos.y < (posY + temp_f20))) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc->pos.y = posY + temp_f20; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + npc->duration = 10; + script->functionTemp[0].s = 18; + } +} + +void N(func_80241CCC_C381FC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[0].s = 30; + } +} + +void N(func_80241D14_C38244)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration++; + if (npc->duration >= 3) { + if (D_8010EBB0.unk_03 != 9) { + npc->duration = 0; + script->functionTemp[0].s = 100; + } else { + enable_player_input(); + func_800EF600(); + script->functionTemp[0].s = 16; + } + } +} + +void N(func_80241D94_C382C4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + npc->flags &= 0xFFDFFFFF; + npc->moveSpeed = 2.0 * aiSettings->moveSpeed; + enemy->varTable[2] = 0; + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[1].s = 0x1E; +} + +void N(func_80241E3C_C3836C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX = npc->pos.x; + f32 posY = npc->pos.y; + f32 posZ = npc->pos.z; + f32 posW = 1000.0f; + f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; + f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); + f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; + f32 temp_f20 = sin_deg(enemy->varTable[2]); + s32 var; + s32 var2; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f20 * temp_f22); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + func_800494C0(npc, 0x2F4, 0x200000); + npc->moveToPos.y = npc->pos.y; + script->functionTemp[0].s = 12; + return; + } + } + + script->functionTemp[1].s--; + if (npc->unk_8C == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + if (posW <= (2.0f * npc->moveSpeed)) { + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + script->functionTemp[0].s = 2; + } + } +} + +ApiStatus N(func_80242154_C38684)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 125.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + N(func_802411E8_C37718)(npc, enemy, script, aiSettings); + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_C36530)(script, aiSettings, territoryPtr); + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + case 1: + N(func_802401B0_C366E0)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240898_C36DC8)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 12: + N(func_802414F8_C37A28)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + N(func_80241650_C37B80)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241754_C37C84)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s != 15) { + break; + } + case 15: + N(func_802417F8_C37D28)(script, aiSettings, territoryPtr); + break; + case 16: + N(func_80241A94_C37FC4)(script, aiSettings, territoryPtr); + case 17: + N(func_80241B4C_C3807C)(script, aiSettings, territoryPtr); + break; + case 18: + N(func_80241CCC_C381FC)(script, aiSettings, territoryPtr); + break; + case 20: + N(func_80241D14_C38244)(script, aiSettings, territoryPtr); + break; + case 30: + N(func_80241D94_C382C4)(script, aiSettings, territoryPtr); + case 31: + N(func_80241E3C_C3836C)(script, aiSettings, territoryPtr); + } + + return (script->functionTemp[0].s == 100) * ApiStatus_DONE2; +} #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423EC_C3891C); - -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_8024240C_C3893C); -/* -s) { - func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; +ApiStatus N(func_802423EC_C3891C)(ScriptInstance *script, s32 isInitialCall) { + OVERRIDE_FLAG_UNSET(0x40) + return ApiStatus_DONE2; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242438_C38968); - -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802424A4_C389D4); - -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802424F0_C38A20); - -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_8024259C_C38ACC); - -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802427EC_C38D1C); -/* -s) { - func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; +ApiStatus N(func_8024240C_C3893C)(ScriptInstance *script, s32 isInitialCall) { + func_802E5690(get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242818_C38D48); +ApiStatus N(func_80242438_C38968)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + s32 partnerIdx = get_variable(script, *args++); + s32 si_var = *args++; -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242850_C38D80); + playerData->partners[partnerIdx].level++; + set_variable(script, si_var, playerData->partners[partnerIdx].level); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802428E0_C38E10); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242914_C38E44); +#ifdef NON_MATCHING +s32 N(func_802424A4_C389D4)(s32 arg0, s16 arg1) { + PlayerData* playerData = &gPlayerData; + if (playerData->partners[arg0].enabled) { + if (playerData->partners[arg0].level <= arg1) { + return playerData->partners[arg0].level; + } + } + return -1; +} +#else +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", dgb_04_func_802424A4_C389D4, s32 arg0, s16 arg1) +#endif -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242978_C38EA8); +ApiStatus N(func_802424F0_C38A20)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802429D0_C38F00); + script->varTable[0] = -1; -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242F08_C39438); + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} + +#ifdef NON_MATCHING + +typedef struct { + s32 unk_00[8]; + char unk_20[0x64]; + s32 unk_84[8]; + char unk_A4[0x64]; + s32 unk_108[8]; + char unk_128[0x64]; + s32 unk_18C[8]; + char unk_1AC[0x64]; + s32 unk_210[8]; + char unk_230[0x64]; + s32 unk_294[8]; + char unk_2B4[0x64]; + s32 unk_318; + char unk_31C[8]; + s32 unk_324; + s32 unk_328; + s16 unk_32C; +} N(UnkStruct); + + +ApiStatus N(func_8024259C_C38ACC)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + N(UnkStruct)* structPtr; + N(UnkStruct)* ptr; + s32 i; + s32 temp_a0; + s32 var, partnerActiveCount; + + if (isInitialCall) { + script->functionTemp[2].s = heap_malloc(0x330); + structPtr = script->functionTemp[2].s; + + ptr = structPtr; + partnerActiveCount = 0; + var = script->varTable[12] >= 0; + + for (i = 0; i < 8; i++) { + s32 idx = *(N(D_80243D38_C3A268) + i); + + if (playerData->partners[idx].enabled) { + continue; + } + + ptr->unk_108[i] = idx; + ptr->unk_84[i] = **(D_8008EF20 + idx); + temp_a0 = N(func_802424A4_C389D4)(idx, var); + if (temp_a0 >= 0) { + ptr->unk_00[i] = *(D_800F7F00 + idx); + ptr->unk_18C[i] = 1; + ptr->unk_294[i] = *(temp_a0 + *(N(D_80243D48_C3A278) + i)); + } else { + ptr->unk_00[i] = *(D_800F7F40 + idx); + ptr->unk_18C[i] = 0; + ptr->unk_294[i] = *(N(D_80243D30_C3A260) + var); + } + ptr->unk_210[i] = playerData->partners[idx].level; + partnerActiveCount++; + } + + structPtr->unk_318 = 4; + structPtr->unk_324 = partnerActiveCount; + structPtr->unk_328 = 0; + func_800F4E40(structPtr); + script->functionTemp[0].s = 0; + } + + structPtr = script->functionTemp[2].s; + if (script->functionTemp[0].s == 0) { + script->functionTemp[1].s = structPtr->unk_32C; + if (script->functionTemp[1].s != 0) { + func_800F13B0(); + } else { + return ApiStatus_BLOCK; + } + } + + script->functionTemp[0].s++; + + if (script->functionTemp[0].s < 15) { + return ApiStatus_BLOCK; + } + + func_800F1538(); + if (script->functionTemp[1].s != 0xFF) { + script->varTable[0] = D_8008EF20[structPtr->unk_108[script->functionTemp[1].s - 1]][0]; + script->varTable[1] = structPtr->unk_108[script->functionTemp[1].s - 1]; + } else { + script->varTable[0] = -1; + } + + heap_free(script->functionTemp[2].s); + + return ApiStatus_DONE2; +} +#else +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", dgb_04_func_8024259C_C38ACC, ScriptInstance *script, s32 isInitialCall) +#endif + +ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall) { + s32 partnerID = get_variable(script, *script->ptrReadPos); + func_800EB168(partnerID); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_80242818_C38D48)(ScriptInstance *script, s32 isInitialCall) { + set_message_string(D_8008EF20[gPlayerData.currentPartner][0], 0); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_80242850_C38D80)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + s32 entityIdx = get_variable(script, *args++); + Entity* entity = get_entity_by_index(entityIdx); + s32 si_var = *args++; + Effect* effect = func_80071750(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f, 0); + + set_variable(script, si_var, effect); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802428E0_C38E10)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); + + effect->flags |= 0x10; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_80242914_C38E44)(ScriptInstance *script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(get_variable(script, *script->ptrReadPos)); + + func_80070BB0(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_80242978_C38EA8)(ScriptInstance *script, s32 isInitialCall) { + Npc *npc = get_npc_safe(-4); + + func_80070BB0(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E); + + return ApiStatus_DONE2; +} + +typedef struct { + s32 unk_00; + s32 unk_04; + Effect* unk_08[3]; + f32 unk_14[3]; + f32 unk_20[3]; + f32 unk_2C[3]; + f32 unk_38[3]; + f32 unk_44[3]; + f32 unk_50[3]; + Entity* unk_5C; + s32 unk_60; + s32 unk_64; +} UserData; + +Effect* func_800716F0(s32, f32, f32, f32, f32, s32); + +ApiStatus N(func_802429D0_C38F00)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; + + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} + +s32 N(func_80242F08_C39438)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + s32 ret = 0; + + if (isInitialCall) { + script->varTable[0] = get_variable(script, *args++); + script->varTable[1] = get_variable(script, *args++); + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 0; + set_transition_stencil_color(0, 0xD0, 0xD0, 0xD0); + } + + switch (script->functionTemp[0].s) { + case 0: + if (script->functionTemp[1].s == 0xFF) { + script->functionTemp[0].s = 1; + script->functionTemp[2].s = 0; + } + script->functionTemp[1].s += script->varTable[0]; + if (script->functionTemp[1].s >= 0x100) { + script->functionTemp[1].s = 0xFF; + } + break; + + case 1: + script->functionTemp[2].s++; + if (script->functionTemp[2].s >= 2) { + script->functionTemp[0].s = 2; + } + break; + + case 2: + if (script->functionTemp[1].s == 0) { + ret = 1; + } + script->functionTemp[1].s -= script->varTable[1]; + if (script->functionTemp[1].s < 0) { + script->functionTemp[1].s = 0; + } + break; + } + + set_transition_stencil_zoom_0(1, script->functionTemp[1].s); + + return ret; +} #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802430D8_C39608); +ApiStatus N(func_802430D8_C39608)(ScriptInstance *script, s32 isInitialCall) { + script->varTable[0] = 0; + if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +const char N(dgb_00_name_hack)[] = "dgb_00"; diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h index 6ff88df166..358cb4ffd6 100644 --- a/src/world/area_dgb/dgb_04/dgb_04.h +++ b/src/world/area_dgb/dgb_04/dgb_04.h @@ -2,3 +2,26 @@ #include "map.h" #define NAMESPACE dgb_04 + +ApiStatus N(SetOverrideFlags_40)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(UnkPartnerPosFunc)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802423EC_C3891C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024240C_C3893C)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_80242438_C38968)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802424F0_C38A20)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024259C_C38ACC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242818_C38D48)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242850_C38D80)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802428E0_C38E10)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242914_C38E44)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242978_C38EA8)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802429D0_C38F00)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80242F08_C39438)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802430D8_C39608)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_80243D18); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 220814d34e..ac311d8065 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -1,8 +1,352 @@ #include "dgb_05.h" +#include "sprite/npc/world_clubba.h" +#include "message_ids.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240000_C3AA10); +extern s16 D_8009A634; +extern Npc* wPartnerNpc; -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40); +enum { + NPC_WORLD_CLUBBA0, + NPC_WORLD_CLUBBA1, + NPC_WORLD_CLUBBA2 = 3, + NPC_WORLD_CLUBBA3, +}; + +EntryList N(entryList) = { + { 515.0f, 0.0f, 310.0f, 0.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_05_tattle, +}; + +Script N(802414E0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_1578)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_80241580) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 16; + SI_VAR(2) = 30; + SI_VAR(3) = -1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_03", 2); + sleep 100; +}); + +Script N(enterSingleDoor_80241634) = SCRIPT({ + UseDoorSounds(0); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 30; + SI_VAR(3) = -1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) { + MakeNpcs(1, N(npcGroupList_8024230C)); + } + await N(makeEntities); + spawn N(802417F0); + ModifyColliderFlags(0, 18, 0x7FFFFE00); + EnableModel(20, 0); + bind N(exitSingleDoor_80241580) to TRIGGER_WALL_PRESS_A 16; + spawn N(802414E0); + spawn N(enterSingleDoor_80241634); +}); + +static s32 N(pad_17E8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(802417F0) = SCRIPT({ + N(func_80240000_C3AA10)(); + func_802CA988(0, SI_VAR(2), SI_VAR(3), SI_VAR(4), SI_VAR(5)); + N(func_80240030_C3AA40)(); + SI_SAVE_FLAG(1047) = 1; + GotoMap("dgb_06", 1); + sleep 100; +}); + +static s32 N(pad_1868)[] = { + 0x00000000, 0x00000000, +}; + +Script N(makeEntities) = SCRIPT({ + if (SI_SAVE_FLAG(1047) == 0) { + MakeEntity(0x802BCE84, 510, -210, 100, 0, MAKE_ENTITY_END); + } +}); + +static s32 N(pad_18BC) = { + 0x00000000, +}; + +Script N(802418C0) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +s32 N(unk_missing_8024197C)[] = { + 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, + 0x00390012, 0xFFFFFFFF, +}; + +NpcAnimID N(extraAnimationList_802419A4)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_802419AC) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .unk_10 = { .f = 40.0f }, + .unk_14 = 10, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 15, + .chaseRadius = 200.0f, + .unk_28 = { .f = 160.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_802419DC) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 10); + SetSelfVar(2, 14); + SetSelfVar(3, 18); + N(func_80240E80_C3B890)(N(npcAISettings_802419AC)); +}); + +NpcSettings N(npcSettings_80241A4C) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_802419DC), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_80241A78) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(func_8024041C_C3AE2C)(); +}); + +NpcSettings N(npcSettings_80241B20) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_80241A78), + .onDefeat = &N(802418C0), + .level = 13, + .unk_2A = 8, +}; + +StaticNpc N(npcGroup_80241B4C)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_80241A4C), + .pos = { 132.0f, -110.0f, 238.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 132, -110, 238, 0, 0, -32767, 0, 325, 0, 185, 200 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_80241B20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802419A4), + }, +}; + +StaticNpc N(npcGroup_80241F2C)[] = { + { + .id = NPC_WORLD_CLUBBA2, + .settings = &N(npcSettings_80241A4C), + .pos = { 503.0f, -210.0f, 225.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 503, -210, 225, 0, 0, -32767, 0, 503, -210, 290, 200, 150, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA3, + .settings = &N(npcSettings_80241B20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802419A4), + }, +}; + +NpcGroupList N(npcGroupList_8024230C) = { + NPC_GROUP(N(npcGroup_80241B4C), BATTLE_ID(15, 1, 0, 3)), + NPC_GROUP(N(npcGroup_80241F2C), BATTLE_ID(15, 2, 0, 3)), + {}, +}; + +ApiStatus N(func_80240000_C3AA10)(ScriptInstance *script, s32 isInitialCall) { + if (gPlayerStatus.position.y >= -210.0f) { + return ApiStatus_BLOCK; + } + return ApiStatus_DONE2; +} + +ApiStatus N(func_80240030_C3AA40)(ScriptInstance *script, s32 isInitialCall) { + if (gPlayerStatus.position.y > -270.0f) { + return ApiStatus_BLOCK; + } + return ApiStatus_DONE2; +} #include "world/common/UnkNpcAIFunc6.inc.c" @@ -12,22 +356,242 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240030_C3AA40); #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240268_C3AC78); +s32 N(func_80240268_C3AC78)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024041C_C3AE2C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024067C_C3B08C); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240704_C3B114); + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802409BC_C3B3CC); + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240A20_C3B430); + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240AC8_C3B4D8); + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(func_8024041C_C3AE2C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +void N(func_8024067C_C3B08C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 1; + } +} + +void N(func_80240704_C3B114)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 phi_s2 = FALSE; + s32 var; + f32 posX, posZ; + + if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { + if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || + (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || + (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || + (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || + (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { + phi_s2 = TRUE; + } + + if (playerData->currentPartner == 2) { + if (D_8010EBB0.unk_00 == playerData->currentPartner) { + phi_s2 = TRUE; + } + } + } + + if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || + ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + phi_s2 = TRUE; + } + } + + if (phi_s2) { + func_800494C0(npc, 0xB000000E, 0); + npc->currentAnim = enemy->animList[11]; + npc->duration = 10; + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + func_800494C0(npc, 0x2F4, 0x200000); + script->functionTemp[0].s = 2; + } + + npc->duration++; + if (npc->duration == 27) { + func_800494C0(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + func_800494C0(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(func_802409BC_C3B3CC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + } +} + +void N(func_80240A20_C3B430)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim = enemy->animList[0]; + script->functionTemp[1].s = (rand_int(1000) % 2) + 2; + script->functionTemp[0].s = 4; +} + +void N(func_80240AC8_C3B4D8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + var = enemy->varTable[7]; + if (var == 40) { + npc->duration = 20; + script->functionTemp[0].s = var; + } else if (var == 50) { + npc->duration = 25; + script->functionTemp[0].s = var; + } + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240C00_C3B610); -/* void N(func_80240C00_C3B610)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); @@ -43,12 +607,227 @@ void N(func_80240C00_C3B610)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[0].s = 0x29; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240CAC_C3B6BC); +void N(func_80240CAC_C3B6BC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 var; -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240E24_C3B834); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim = enemy->animList[0]; + npc->duration = 15; + enemy->varTable[7] = 50; + script->functionTemp[0].s = 3; + } else if (npc->unk_8C == 0) { + var = npc->yaw; + func_8004A784(npc, 5.0f, &var, 0, 0, 0); + npc->yaw = var; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240E80_C3B890); +void N(func_80240E24_C3B834)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802411D0_C3BBE0); + if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->functionTemp[0].s = 0; + } + } +} + +ApiStatus N(func_80240E80_C3B890)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 40.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 30; + npc->currentAnim = enemy->animList[10]; + npc->flags &= ~0x800; + enemy->varTable[0] = 0; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 40; + npc->currentAnim = enemy->animList[0]; + } + enemy->unk_B0 &= ~4; + } + + if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240268_C3AC78)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_8024067C_C3B08C)(script, npcAISettings, territoryPtr); + break; + case 1: + N(func_80240704_C3B114)(script, npcAISettings, territoryPtr); + break; + case 2: + N(func_802409BC_C3B3CC)(script, npcAISettings, territoryPtr); + break; + case 3: + N(func_80240A20_C3B430)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240AC8_C3B4D8)(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + npc->duration = 0xF; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + break; + case 30: + N(UnkNpcAIFunc6)(script); + if (script->functionTemp[0].s != 31) { + break; + } + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + break; + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 40: + N(func_80240C00_C3B610)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 41) { + break; + } + case 41: + N(func_80240CAC_C3B6BC)(script, npcAISettings, territoryPtr); + break; + case 50: + N(func_80240E24_C3B834)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_802411D0_C3BBE0)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240268_C3AC78)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/area_dgb/dgb_05/dgb_05.h b/src/world/area_dgb/dgb_05/dgb_05.h index a22fd91d19..6ce7c0dbda 100644 --- a/src/world/area_dgb/dgb_05/dgb_05.h +++ b/src/world/area_dgb/dgb_05/dgb_05.h @@ -2,3 +2,13 @@ #include "map.h" #define NAMESPACE dgb_05 + +ApiStatus N(func_80240000_C3AA10)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80240030_C3AA40)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024041C_C3AE2C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80240E80_C3B890)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_8024230C); +Script N(802417F0); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index bf2fa930ca..153288e70b 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -1,9 +1,199 @@ #include "dgb_06.h" +#include "sprite/npc/boo.h" +#include "message_ids.h" + +enum { + NPC_BOO, +}; + +EntryList N(entryList) = { + { -575.0f, 0.0f, 175.0f, 90.0f }, + { -150.0f, 100.0f, -250.0f, 0.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_06_tattle, +}; + +Script N(80240320) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_3B8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_802403C0) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 12; + SI_VAR(2) = 5; + SI_VAR(3) = -1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_04", 1); + sleep 100; +}); + +Script N(enterSingleDoor_80240474) = SCRIPT({ + UseDoorSounds(0); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 5; + SI_VAR(3) = -1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(589824); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + MakeNpcs(1, N(npcGroupList_80240B44)); + await N(makeEntities); + if (SI_SAVE_FLAG(1047) == 0) { + EnableGroup(28, 0); + } else { + EnableGroup(25, 0); + } + bind N(exitSingleDoor_802403C0) to TRIGGER_WALL_PRESS_A 12; + spawn N(80240320); + spawn N(enterSingleDoor_80240474); +}); + +s32 N(D_80240620_C3D6A0) = { + 0x00000000, +}; + +Script N(80240624) = SCRIPT({ + group 0; + func_802D5830(2); + sleep 40; + ShowGotItem(SI_VAR(0), 0, 0); + func_802D5830(0); + return; +}); + +Script N(8024068C) = SCRIPT({ + DisablePlayerInput(TRUE); + SI_VAR(0) = SI_VAR(10); + if (SI_VAR(10) != 0) { + await N(80240624); + } + match SI_VAR(11) { + == 0 { + AddItem(SI_VAR(10), SI_VAR(0)); + } + == 1 { + AddKeyItem(SI_VAR(10)); + } + == 2 { + AddBadge(SI_VAR(10), SI_VAR(0)); + } + } + sleep 15; + DisablePlayerInput(FALSE); +}); + +Script N(8024076C) = SCRIPT({ + SI_VAR(10) = 19; + SI_VAR(11) = 1; + SI_SAVE_FLAG(1048) = 1; + await N(8024068C); +}); + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802EAE30, -300, 50, -200, 0, ITEM_NONE, MAKE_ENTITY_END); + AssignFlag(SI_SAVE_FLAG(1048)); + AssignScript(N(8024076C)); + MakeEntity(0x802EA7E0, -125, 60, 175, 0, MAKE_ENTITY_END); +}); + +static s32 N(pad_834)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +NpcSettings N(npcSettings_80240840) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +Script N(interact_8024086C) = SCRIPT({ + if (SI_AREA_FLAG(4) == 0) { + SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00F0)); + SI_AREA_FLAG(4) = 1; + } else { + SpeakToPlayer(NPC_SELF, NPC_ANIM(boo, Palette_01, Anim_4), NPC_ANIM(boo, Palette_01, Anim_1), 0, MESSAGE_ID(0x0E, 0x00F1)); + SI_AREA_FLAG(4) = 0; + } +}); + +Script N(init_802408FC) = SCRIPT({ + if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) { + SetNpcPos(NPC_SELF, 0, -1000, 0); + } + BindNpcInteract(NPC_SELF, N(interact_8024086C)); +}); + +StaticNpc N(npcGroup_80240954) = { + .id = NPC_BOO, + .settings = &N(npcSettings_80240840), + .pos = { -300.0f, 10.0f, 150.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_802408FC), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_2), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_1), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_0), + NPC_ANIM(boo, Palette_01, Anim_A), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + NPC_ANIM(boo, Palette_01, Anim_3), + }, + .tattle = MESSAGE_ID(0x1A, 0x00B3), +}; + +NpcGroupList N(npcGroupList_80240B44) = { + NPC_GROUP(N(npcGroup_80240954), BATTLE_ID(0, 0, 0, 0)), + {}, +}; -INCLUDE_ASM(s32, "world/area_dgb/dgb_06/C3D080", func_80240000_C3D080); -/* ApiStatus N(func_80240000_C3D080)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80240620_C3D6A0); s32 i; s32* test; @@ -17,13 +207,12 @@ ApiStatus N(func_80240000_C3D080)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80240620_C3D6A0); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } -*/ #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_dgb/dgb_06/dgb_06.h b/src/world/area_dgb/dgb_06/dgb_06.h index 4dcccf09f1..1938527b44 100644 --- a/src/world/area_dgb/dgb_06/dgb_06.h +++ b/src/world/area_dgb/dgb_06/dgb_06.h @@ -2,3 +2,7 @@ #include "map.h" #define NAMESPACE dgb_06 + +NpcGroupList N(npcGroupList_80240B44); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 2a7078945c..e0ecbd7990 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -1,4 +1,261 @@ #include "dgb_07.h" +#include "message_ids.h" +#include "sprite/npc/world_clubba.h" + +extern s16 D_8009A634; +extern Npc* wPartnerNpc; + +enum { + NPC_WORLD_CLUBBA0, + NPC_WORLD_CLUBBA1, +}; + +EntryList N(entryList) = { + { -450.0f, 0.0f, -40.0f, 0.0f }, + { 250.0f, 190.0f, -250.0f, 180.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_07_tattle, +}; + +Script N(80241490) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_1528)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_80241530) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 6; + SI_VAR(2) = 22; + SI_VAR(3) = -1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_02", 2); + sleep 100; +}); + +Script N(enterSingleDoor_802415E4) = SCRIPT({ + UseDoorSounds(0); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 22; + SI_VAR(3) = -1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) { + MakeNpcs(1, N(npcGroupList_80241E5C)); + } + await N(makeEntities); + bind N(exitSingleDoor_80241530) to TRIGGER_WALL_PRESS_A 6; + spawn N(80241490); + spawn N(enterSingleDoor_802415E4); +}); + +Script N(makeEntities) = SCRIPT({ + MakeItemEntity(ITEM_STAR_PIECE, -220, 75, -210, 17, SI_SAVE_FLAG(1050)); + MakeEntity(0x802EAED4, -370, 0, -200, 0, -1, MAKE_ENTITY_END); + MakeEntity(0x802EAED4, -410, 0, -200, 0, -1, MAKE_ENTITY_END); +}); + +static s32 N(pad_17E4)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(802417F0) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +NpcAnimID N(extraAnimationList_802418AC)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + ANIM_END, +}; + +NpcAnimID N(extraAnimationList_802418D4)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_802418DC) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .unk_10 = { .f = 40.0f }, + .unk_14 = 10, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 15, + .chaseRadius = 200.0f, + .unk_28 = { .f = 160.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_8024190C) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 10); + SetSelfVar(2, 14); + SetSelfVar(3, 18); + N(func_80240E20_C3EA10)(N(npcAISettings_802418DC)); +}); + +NpcSettings N(npcSettings_8024197C) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_8024190C), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_802419A8) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(update_starpoints_display_C3DFAC)(); +}); + +NpcSettings N(npcSettings_80241A50) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_802419A8), + .onDefeat = &N(802417F0), + .level = 13, + .unk_2A = 8, +}; + +StaticNpc N(npcGroup_80241A7C)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_8024197C), + .pos = { -500.0f, 0.0f, -240.0f }, + .flags = NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -500, 0, -240, 40, 0, -32767, 0, -500, 0, -240, 200, 0, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_802418AC), + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_80241A50), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418D4), + }, +}; + +NpcGroupList N(npcGroupList_80241E5C) = { + NPC_GROUP(N(npcGroup_80241A7C), BATTLE_ID(15, 1, 0, 3)), + {}, +}; + +static const s32 N(pad_1E74)[] = { + 0x00000000, 0x00000000 +}; #include "world/common/UnkNpcAIFunc6.inc.c" @@ -8,22 +265,242 @@ #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240208_C3DDF8); +s32 N(func_80240208_C3DDF8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", update_starpoints_display_C3DFAC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024061C_C3E20C); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802406A4_C3E294); + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_8024095C_C3E54C); + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_802409C0_C3E5B0); + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240A68_C3E658); + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(update_starpoints_display_C3DFAC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +void N(func_8024061C_C3E20C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 1; + } +} + +void N(func_802406A4_C3E294)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 phi_s2 = FALSE; + s32 var; + f32 posX, posZ; + + if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { + if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || + (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || + (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || + (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || + (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { + phi_s2 = TRUE; + } + + if (playerData->currentPartner == 2) { + if (D_8010EBB0.unk_00 == playerData->currentPartner) { + phi_s2 = TRUE; + } + } + } + + if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || + ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + phi_s2 = TRUE; + } + } + + if (phi_s2) { + func_800494C0(npc, 0xB000000E, 0); + npc->currentAnim = enemy->animList[11]; + npc->duration = 10; + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + func_800494C0(npc, 0x2F4, 0x200000); + script->functionTemp[0].s = 2; + } + + npc->duration++; + if (npc->duration == 27) { + func_800494C0(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + func_800494C0(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(func_8024095C_C3E54C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + } +} + +void N(func_802409C0_C3E5B0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim = enemy->animList[0]; + script->functionTemp[1].s = (rand_int(1000) % 2) + 2; + script->functionTemp[0].s = 4; +} + +void N(func_80240A68_C3E658)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + var = enemy->varTable[7]; + if (var == 40) { + npc->duration = 20; + script->functionTemp[0].s = var; + } else if (var == 50) { + npc->duration = 25; + script->functionTemp[0].s = var; + } + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240BA0_C3E790); -/* void N(func_80240BA0_C3E790)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); @@ -39,12 +516,227 @@ void N(func_80240BA0_C3E790)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[0].s = 0x29; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240C4C_C3E83C); +void N(func_80240C4C_C3E83C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 var; -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240DC4_C3E9B4); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim = enemy->animList[0]; + npc->duration = 15; + enemy->varTable[7] = 50; + script->functionTemp[0].s = 3; + } else if (npc->unk_8C == 0) { + var = npc->yaw; + func_8004A784(npc, 5.0f, &var, 0, 0, 0); + npc->yaw = var; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80240E20_C3EA10); +void N(func_80240DC4_C3E9B4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_07/C3DBF0", func_80241170_C3ED60); + if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->functionTemp[0].s = 0; + } + } +} + +ApiStatus N(func_80240E20_C3EA10)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 40.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 30; + npc->currentAnim = enemy->animList[10]; + npc->flags &= ~0x800; + enemy->varTable[0] = 0; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 40; + npc->currentAnim = enemy->animList[0]; + } + enemy->unk_B0 &= ~4; + } + + if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C3DDF8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_8024061C_C3E20C)(script, npcAISettings, territoryPtr); + break; + case 1: + N(func_802406A4_C3E294)(script, npcAISettings, territoryPtr); + break; + case 2: + N(func_8024095C_C3E54C)(script, npcAISettings, territoryPtr); + break; + case 3: + N(func_802409C0_C3E5B0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240A68_C3E658)(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + npc->duration = 15; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + break; + case 30: + N(UnkNpcAIFunc6)(script); + if (script->functionTemp[0].s != 31) { + break; + } + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + break; + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 40: + N(func_80240BA0_C3E790)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 41) { + break; + } + case 41: + N(func_80240C4C_C3E83C)(script, npcAISettings, territoryPtr); + break; + case 50: + N(func_80240DC4_C3E9B4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_80241170_C3ED60)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C3DDF8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/area_dgb/dgb_07/dgb_07.h b/src/world/area_dgb/dgb_07/dgb_07.h index 24d2aa4c41..ff5983d1f1 100644 --- a/src/world/area_dgb/dgb_07/dgb_07.h +++ b/src/world/area_dgb/dgb_07/dgb_07.h @@ -2,3 +2,10 @@ #include "map.h" #define NAMESPACE dgb_07 + +ApiStatus N(func_80240E20_C3EA10)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(update_starpoints_display_C3DFAC)(ScriptInstance *script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_80241E5C); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index f71b2414b8..b6e34310fb 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -1,8 +1,960 @@ #include "dgb_08.h" +#include "message_ids.h" +#include "sprite/npc/sentinel.h" +#include "sprite/npc/world_clubba.h" +#include "sprite/npc/world_tubba.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240000_C3FDB0); -/* -ApiStatus N(func_80240000_C3FDB0)(ScriptInstance* script, s32 isInitialCall) { +extern s16 D_8009A634; + +enum { + NPC_WORLD_CLUBBA7, + NPC_WORLD_CLUBBA0, + NPC_WORLD_CLUBBA1, + NPC_WORLD_CLUBBA2, + NPC_WORLD_CLUBBA3, + NPC_WORLD_CLUBBA4, + NPC_WORLD_CLUBBA5, + NPC_SENTINEL0, + NPC_SENTINEL1, + NPC_WORLD_TUBBA, + NPC_WORLD_CLUBBA6 = 11, +}; + +EntryList N(entryList) = { + { -575.0f, 0.0f, 180.0f, 90.0f }, + { -575.0f, 210.0f, 180.0f, 90.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_08_tattle, +}; + +Script N(80243CF0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_3D88)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80243D90) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 14; + SI_VAR(2) = 23; + SI_VAR(3) = 25; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 2); + sleep 100; +}); + +Script N(exitDoubleDoor_80243E44) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 18; + SI_VAR(2) = 18; + SI_VAR(3) = 20; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 4); + sleep 100; +}); + +const s32 N(pad_XXXX)[] = { + 0x00000000, 0x00000000, +}; + +Script N(enterDoubleDoor_80243EF8) = SCRIPT({ + UseDoorSounds(3); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 23; + SI_VAR(3) = 25; + await EnterDoubleDoor; + } + == 1 { + SI_VAR(2) = 18; + SI_VAR(3) = 20; + await EnterDoubleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamEnabled(0, 1); + match STORY_PROGRESS { + < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES { + MakeNpcs(1, N(npcGroupList_80246958)); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + MakeNpcs(1, N(npcGroupList_802469AC)); + } + < STORY_CH6_RETURNED_TO_TOAD_TOWN { + MakeNpcs(1, N(npcGroupList_802469C4)); + } + } + await N(802469E0); + bind N(exitDoubleDoor_80243D90) to TRIGGER_WALL_PRESS_A 14; + bind N(exitDoubleDoor_80243E44) to TRIGGER_WALL_PRESS_A 18; + spawn N(80243CF0); + spawn N(enterDoubleDoor_80243EF8); +}); + +static s32 N(pad_40FC) = { + 0x00000000, +}; + +NpcAISettings N(npcAI_80244100) = { + .moveSpeed = 4.5f, + .alertRadius = 170.0f, + .unk_10 = { .f = 90.0f }, + .unk_14 = 1, + .chaseSpeed = 3.9f, + .unk_1C = { .s = 180 }, + .unk_20 = 2, + .chaseRadius = 170.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 1, +}; + +Script N(80244130) = SCRIPT({ + N(func_80240B94_C40944)(N(npcAI_80244100)); +}); + +NpcSettings N(npcSettings_80244150) = { + .height = 90, + .radius = 65, + .ai = &N(80244130), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcSettings N(npcSettings_8024417C) = { + .height = 90, + .radius = 65, + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcSettings N(npcSettings_802441A8) = { + .height = 24, + .radius = 24, + .level = 13, +}; + +Script N(802441D4) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +NpcAnimID N(extraAnimationList_80244290)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + ANIM_END, +}; + +NpcAnimID N(extraAnimationList_802442B8)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_802442C0) = { + .moveSpeed = 1.5f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 85.0f, + .unk_10 = { .f = 65.0f }, + .unk_14 = 5, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 12, + .chaseRadius = 110.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 3, +}; + +Script N(npcAI_802442F0) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 5); + SetSelfVar(2, 8); + SetSelfVar(3, 12); + N(func_802414AC_C4125C)(N(npcAISettings_802442C0)); +}); + +NpcSettings N(npcSettings_80244360) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_802442F0), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_8024438C) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(func_8024124C_C40FFC)(); +}); + +NpcSettings N(npcSettings_80244434) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_8024438C), + .onDefeat = &N(802441D4), + .level = 13, + .unk_2A = 8, +}; + +f32 N(D_80244460_C44210)[] = { + 4.5f, 3.5f, 2.6f, 2.0f, + 1.5f, 20.0f, +}; + +Script N(80244478) = SCRIPT({ + SetSelfEnemyFlagBits(((0x00100000 | 0x01000000 | 0x02000000 | 0x04000000 | 0x08000000 | 0x10000000 | 0x20000000)), TRUE); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT)), TRUE); +}); + +NpcAISettings N(npcAISettings_802444B4) = { + .moveSpeed = 1.5f, + .moveTime = 90, + .waitTime = 30, + .alertRadius = 240.0f, + .unk_14 = 1, + .chaseSpeed = 5.3f, + .unk_1C = { .s = 180 }, + .unk_20 = 1, + .chaseRadius = 240.0f, + .unk_2C = 1, +}; + +const char N(dgb_00_name_hack)[]; + +Script N(npcAI_802444E4) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(5, -650); + SetSelfVar(6, 30); + SetSelfVar(1, 600); + N(func_802438F0_C436A0)(N(npcAISettings_802444B4)); + DisablePlayerInput(TRUE); + sleep 2; +20: + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(4), SI_VAR(2)); + GetPlayerActionState(SI_VAR(0)); + if (SI_VAR(0) != 0) { + sleep 1; + goto 20; + } + DisablePlayerPhysics(TRUE); + func_802D2B6C(); + DisablePartnerAI(0); + group 0; + func_802D5830(1); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + SI_VAR(2) += 2; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_80045838(-1, 759, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + sleep 10; + SetPlayerAnimation(ANIM_80017); + sleep 10; + func_80045838(-1, 1838, 0); + spawn { + loop 100 { + GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + } + spawn { + SetNpcAnimation(NPC_PARTNER, 0x108); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + } + sleep 30; + GotoMap(N(dgb_00_name_hack), 2); + sleep 100; +}); + +Script N(8024490C) = SCRIPT({ + GetOwnerEncounterTrigger(SI_VAR(0)); + match SI_VAR(0) { + == 1, 2, 4, 6 { + GetSelfAnimationFromTable(7, SI_VAR(0)); + await 0x800936DC; + } + } +}); + +Script N(80244998) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + DoNpcDefeat(); + } + == 1 {} + == 2 { + } + } +}); + +NpcSettings N(npcSettings_802449FC) = { + .height = 38, + .radius = 32, + .otherAI = &N(80244478), + .ai = &N(npcAI_802444E4), + .level = 99, +}; + +NpcSettings N(npcSettings_80244A28) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +Script N(idle_80244A54) = SCRIPT({ + loop { + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(0) >= -350) { + break loop; + } + sleep 1; + } + SI_SAVE_VAR(203) = 8; + STORY_PROGRESS = STORY_CH3_TUBBA_CHASED_MARIO_IN_HALL; + PlaySoundAtCollider(18, 455, 0); + MakeLerp(0, 80, 10, 0); + loop { + UpdateLerp(); + RotateModel(18, SI_VAR(0), 0, -1, 0); + RotateModel(20, SI_VAR(0), 0, 1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_A)); + SetNpcPos(NPC_SELF, -665, 210, 180); + SetNpcYaw(NPC_SELF, 90); + NpcMoveTo(NPC_SELF, -530, 180, 30); + spawn { + sleep 20; + MakeLerp(80, 0, 10, 0); + loop { + UpdateLerp(); + RotateModel(18, SI_VAR(0), 0, -1, 0); + RotateModel(20, SI_VAR(0), 0, 1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + PlaySoundAtCollider(18, 456, 0); + } + NpcMoveTo(NPC_SELF, -500, 80, 10); + BindNpcAI(NPC_SELF, N(npcAI_80244D7C)); +}); + +Script N(80244D08) = SCRIPT({ +10: + GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(1) > 0) { + sleep 1; + goto 10; + } + N(func_80243B98_C43948)(); +}); + +Script N(npcAI_80244D7C) = SCRIPT({ + N(func_80243C10_C439C0)(); + spawn N(80244D08); + spawn { + loop { + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + ShakeCam(0, 0, 5, 2.0); + sleep 5; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 4194304); + ShakeCam(0, 0, 2, 1.0); + sleep 8; + } + } + N(func_80240B94_C40944)(N(npcAI_80244100)); +}); + +const char N(dgb_01_name_hack)[]; + +Script N(defeat_80244E58) = SCRIPT({ + N(UnkFunc1)(); + GotoMap(N(dgb_01_name_hack), 2); + sleep 100; +}); + +Script N(init_80244E94) = SCRIPT({ + if (STORY_PROGRESS < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES) { + SetNpcPos(NPC_SELF, 0, -1000, 0); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE); + return; + } + if (STORY_PROGRESS >= STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER) { + SetNpcPos(NPC_SELF, 0, -1000, 0); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE); + return; + } + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + BindNpcDefeat(NPC_SELF, N(defeat_80244E58)); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + if (SI_SAVE_VAR(203) != 8) { + SetNpcPos(NPC_SELF, 0, -1000, 0); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_4)), TRUE); + } else { + SetNpcPos(NPC_SELF, -130, 0, 200); + BindNpcIdle(NPC_SELF, N(npcAI_80244D7C)); + } + } + == 1 { + if (SI_SAVE_VAR(203) != 8) { + BindNpcIdle(NPC_SELF, N(idle_80244A54)); + } else { + SetNpcPos(NPC_SELF, -130, 210, 80); + BindNpcIdle(NPC_SELF, N(npcAI_80244D7C)); + } + } + } +}); + +StaticNpc N(npcGroup_802450A0) = { + .id = NPC_WORLD_TUBBA, + .settings = &N(npcSettings_8024417C), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_4 | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .init = &N(init_80244E94), + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 10, -400, 210, 80, -100, 210, 80, 100, 210, 80, 400, 210, 80, 820, 100, 80, 820, 100, 260, 400, 0, 260, 100, 0, 200, -100, 0, 175, -450, 0, 175, -32767, 150, 0, 175, 1450, 200, 1 }, + .animations = { + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_A), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_19), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + }, + .unk_1E0 = { 00, 00, 00, 01, 00, 00, 00, 00}, +}; + +StaticNpc N(npcGroup_80245290)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_80244360), + .pos = { -250.0f, 0.0f, 135.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 90, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80244290), + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_80244434), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802442B8), + }, +}; + +StaticNpc N(npcGroup_80245670)[] = { + { + .id = NPC_WORLD_CLUBBA2, + .settings = &N(npcSettings_80244360), + .pos = { 220.0f, 0.0f, 155.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 220, 0, 155, 30, 0, -32767, 0, 220, 0, 155, 250, 0, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80244290), + }, + { + .id = NPC_WORLD_CLUBBA3, + .settings = &N(npcSettings_80244434), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802442B8), + }, +}; + +StaticNpc N(npcGroup_80245A50)[] = { + { + .id = NPC_WORLD_CLUBBA4, + .settings = &N(npcSettings_80244360), + .pos = { 825.0f, 100.0f, 200.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 825, 100, 200, 25, 0, -32767, 0, 825, 100, 200, 150, 0, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 03, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80244290), + }, + { + .id = NPC_WORLD_CLUBBA5, + .settings = &N(npcSettings_80244434), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802442B8), + }, +}; + +StaticNpc N(npcGroup_80245E30) = { + .id = NPC_SENTINEL0, + .settings = &N(npcSettings_802449FC), + .pos = { 75.0f, 310.0f, 85.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { 75, 310, 85, 30, 0, -32767, 0, 75, 0, 85, 250, 55, 1, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +StaticNpc N(npcGroup_80246020) = { + .id = NPC_SENTINEL1, + .settings = &N(npcSettings_802449FC), + .pos = { -451.0f, 310.0f, 81.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { -451, 310, 81, 30, 0, -32767, 0, -310, 0, 175, 250, 145, 1, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +Script N(idle_80246210) = SCRIPT({ +0: + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + sleep 30; + loop 15 { + N(func_80243C50_C43A00)(); + sleep 60; + } + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_C)); + sleep 20; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + sleep 30; + loop 5 { + N(func_80243C50_C43A00)(); + sleep 60; + } + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_C)); + sleep 15; + goto 0; +}); + +Script N(interact_80246310) = SCRIPT({ + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_8)); + PlaySoundAtNpc(NPC_SELF, 0x2F1, 0); + sleep 10; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_2)); + sleep 20; + GetNpcYaw(-1, SI_VAR(0)); + SI_VAR(0) += 180; + InterpNpcYaw(NPC_SELF, SI_VAR(0), 0); + sleep 10; + GetNpcYaw(-1, SI_VAR(0)); + SI_VAR(0) += 180; + InterpNpcYaw(NPC_SELF, SI_VAR(0), 0); + sleep 25; + GetNpcYaw(-1, SI_VAR(0)); + SI_VAR(0) += 180; + InterpNpcYaw(NPC_SELF, SI_VAR(0), 0); + sleep 15; + NpcFacePlayer(NPC_SELF, 0); + SpeakToPlayer(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_5), NPC_ANIM(world_clubba, Palette_00, Anim_2), 0, MESSAGE_ID(0x0E, 0x00F2)); + sleep 10; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_6)); + sleep 10; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); +}); + +Script N(init_802464C4) = SCRIPT({ + SetNpcCollisionSize(-1, 36, 30); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_clubba, Palette_00, Anim_7)); + BindNpcInteract(NPC_SELF, N(interact_80246310)); + BindNpcIdle(NPC_SELF, N(idle_80246210)); +}); + +StaticNpc N(npcGroup_80246528) = { + .id = NPC_WORLD_CLUBBA6, + .settings = &N(npcSettings_80244A28), + .pos = { 426.0f, 0.0f, 38.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_200000 | NPC_FLAG_400000, + .init = &N(init_802464C4), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .tattle = MESSAGE_ID(0x1A, 0x00B6), +}; + +Script N(idle_80246718) = SCRIPT({ + +}); + +Script N(init_80246728) = SCRIPT({ + BindNpcIdle(NPC_SELF, N(idle_80246718)); + SetNpcPos(NPC_SELF, 0, -1000, 0); +}); + +StaticNpc N(npcGroup_80246768) = { + .id = NPC_WORLD_CLUBBA7, + .settings = &N(npcSettings_80244360), + .pos = { -250.0f, 0.0f, 135.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS, + .init = &N(init_80246728), + .yaw = 90, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -250, 0, 135, 30, 0, -32767, 0, -250, 0, 135, 250, 0, 0, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_80244290), +}; + +NpcGroupList N(npcGroupList_80246958) = { + NPC_GROUP(N(npcGroup_80246768), BATTLE_ID(15, 2, 0, 3)), + NPC_GROUP(N(npcGroup_80245290), BATTLE_ID(15, 2, 0, 3)), + NPC_GROUP(N(npcGroup_80245670), BATTLE_ID(15, 2, 0, 3)), + NPC_GROUP(N(npcGroup_80245A50), BATTLE_ID(15, 3, 0, 3)), + NPC_GROUP(N(npcGroup_80245E30), BATTLE_ID(0, 0, 0, 0)), + NPC_GROUP(N(npcGroup_80246020), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +NpcGroupList N(npcGroupList_802469AC) = { + NPC_GROUP(N(npcGroup_802450A0), BATTLE_ID(15, 4, 0, 1)), + {}, +}; + +NpcGroupList N(npcGroupList_802469C4) = { + NPC_GROUP(N(npcGroup_80246528), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +static s32 N(pad_69DC) = { + 0x00000000, +}; + +Script N(802469E0) = SCRIPT({ + +}); + +ApiStatus N(func_80240000_C3FDB0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,12 +986,9 @@ ApiStatus N(func_80240000_C3FDB0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240158_C3FF08); -/* void N(func_80240158_C3FF08)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -49,7 +998,7 @@ void N(func_80240158_C3FF08)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -87,18 +1036,15 @@ void N(func_80240158_C3FF08)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802404C0_C40270); -/* void N(func_802404C0_C40270)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -122,11 +1068,8 @@ void N(func_802404C0_C40270)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024067C_C4042C); -/* -ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,9 +1084,8 @@ ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } -*/ #include "world/common/NpcJumpFunc2.inc.c" @@ -151,14 +1093,12 @@ ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024094C_C406FC); -/* -ApiStatus N(func_8024094C_C406FC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024094C_C406FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; @@ -173,12 +1113,9 @@ ApiStatus N(func_8024094C_C406FC)(ScriptInstance* script, s32 isInitialCall) { } } } -*/ #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240AD4_C40884); -/* void N(func_80240AD4_C40884)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -196,9 +1133,91 @@ void N(func_80240AD4_C40884)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[1].s = 0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944); +ApiStatus N(func_80240B94_C40944)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; + + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_C3FDB0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240158_C3FF08)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802404C0_C40270)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024067C_C4042C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024094C_C406FC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240AD4_C40884)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} #include "world/common/UnkNpcAIFunc6.inc.c" @@ -208,14 +1227,201 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240B94_C40944); #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241098_C40E48); +s32 N(func_80241098_C40E48)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024124C_C40FFC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802414AC_C4125C); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(func_8024124C_C40FFC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_802414AC_C4125C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241098_C40E48)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241760_C41510); -/* void N(func_80241760_C41510)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -239,16 +1445,153 @@ void N(func_80241760_C41510)(ScriptInstance* script, NpcAISettings* aiSettings, enemy->varTable[4] = npc->pos.y * 100.0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241910_C416C0); +#ifdef NON_MATCHING +// second func_800DCB7C call +void N(func_80241910_C416C0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f24; + f32 posX, posY, posZ, posW; + s32 var; + f32 temp_f0; + f32 phi_f4; + s32 phi_v0; + s32 phi_s4 = 0; -#define NAMESPACE dup_dgb_08 -#include "world/common/UnkNpcAIFunc1.inc.c" -#define NAMESPACE dgb_08 + f32 a = enemy->varTable[7]; + f32 temp_f2 = a / 100.0; + f32 b = enemy->varTable[3]; + f32 temp_f26 = b / 100.0; + f32 c = enemy->varTable[4]; + f32 temp_f20 = c / 100.0; + f32 d = enemy->varTable[1]; + f32 temp_f22 = d / 100.0; + + enemy->varTable[4] = npc->pos.y * 100.0; + temp_f24 = temp_f26 + temp_f2; + + if ((enemy->varTable[0] & 0x11) == 1) { + if (npc->flags & 8) { + if (temp_f22 < (temp_f24 - npc->pos.y)) { + enemy->varTable[0] |= 0x10; + } + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (temp_f22 < (temp_f26 - posW)) { + enemy->varTable[0] |= 0x10; + } + } + } + + if ((enemy->varTable[0] & 0x11) == 0x11) { + f64 test; + if (npc->flags & 8) { + phi_f4 = temp_f24; + test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + npc->pos.y = test; + } else { + posX = npc->pos.x; + posY = temp_f20; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + phi_f4 = posY; + phi_f4 += temp_f26; + d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + test = d; + npc->pos.y = test; + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + } + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + + if (fabsf(phi_f4 - npc->pos.y) < 1.0) { + npc->pos.y = phi_f4; + enemy->varTable[0] &= ~0x10; + } + } else if (enemy->varTable[1] > 0) { + temp_f0 = sin_deg(enemy->varTable[2]); + if (npc->flags & 8) { + phi_v0 = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + } + if (phi_v0) { + npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f0 * temp_f22); + } + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + + if (enemy->varTable[9] <= 0) { + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->moveToPos.y = npc->pos.y; + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } + script->functionTemp[1].s--; + } + } else { + enemy->varTable[9]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); + if (npc->moveSpeed < posW) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + phi_s4 = 1; + } + } + + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { + if (npc->unk_8C == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + return; + } + } + + enemy->varTable[4] = npc->pos.y * 100.0; + if (aiSettings->moveTime > 0) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + script->functionTemp[0].s = 2; + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) { + script->functionTemp[0].s = 0; + } + } + } +} +#else +INCLUDE_ASM(void, "world/area_dgb/dgb_08/C3FDB0", dgb_08_func_80241910_C416C0, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +#endif + +#include "world/common/UnkNpcAIFunc1_copy.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); -/* void N(func_80241FF8_C41DA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -286,7 +1629,7 @@ void N(func_80241FF8_C41DA8)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -313,29 +1656,23 @@ void N(func_80241FF8_C41DA8)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802423B4_C42164); -/* void N(func_802423B4_C42164)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; + npc->pos.y += N(D_80244460_C44210)[npc->duration++]; if (npc->duration >= 5) { script->functionTemp[0].s = 12; } } -*/ #include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802425B8_C42368); -/* void N(func_802425B8_C42368)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -382,12 +1719,12 @@ void N(func_802425B8_C42368)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); @@ -422,10 +1759,7 @@ void N(func_802425B8_C42368)(ScriptInstance* script, NpcAISettings* aiSettings, npc->jumpVelocity = 0.0f; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242948_C426F8); -/* void N(func_80242948_C426F8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { f32 posX, posY, posZ, posW; s32 temp_a1; @@ -454,36 +1788,413 @@ void N(func_80242948_C426F8)(Npc *npc, Enemy *enemy, ScriptInstance *script, Npc script->functionTemp[1].s = aiSettings->unk_14; enemy->unk_B0 |= 0x10; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242A6C_C4281C); +ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242C58_C42A08); + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242DB0_C42B60); + if (isInitialCall) { + N(func_80242948_C426F8)(npc, enemy, script, aiSettings); + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242EB4_C42C64); + npc->unk_AB = -2; -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242F94_C42D44); + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243230_C42FE0); + switch (script->functionTemp[0].s) { + case 0: + N(func_80241760_C41510)(script, aiSettings, territoryPtr); + case 1: + N(func_80241910_C416C0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1_copy)(script, aiSettings, territoryPtr); + case 3: + N(func_80241FF8_C41DA8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802423B4_C42164)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802425B8_C42368)(script, aiSettings, territoryPtr); + break; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802432E8_C43098); + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243468_C43218); +void N(func_80242C58_C42A08)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f0; + f32 phi_f20; -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802434B0_C43260); + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= 0xFFDFFFFF; + npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); + npc->currentAnim = enemy->animList[8]; + npc->moveSpeed = aiSettings->chaseSpeed; + phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); + if (aiSettings->unk_1C.s < fabsf(temp_f0)) { + phi_f20 = npc->yaw; + if (temp_f0 < 0.0f) { + phi_f20 += -aiSettings->unk_1C.s; + } else { + phi_f20 += aiSettings->unk_1C.s; + } + } + npc->yaw = clamp_angle(phi_f20); + script->functionTemp[0].s = 13; + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243530_C432E0); +void N(func_80242DB0_C42B60)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802435D8_C43388); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { + npc->duration = 0; + script->functionTemp[0].s = 14; + } else { + npc->duration--; + if (npc->duration <= 0) { + npc->flags |= 0x200000; + script->functionTemp[0].s = 12; + } + } + } else { + script->functionTemp[0].s = 16; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802438F0_C436A0); +} + +void N(func_80242EB4_C42C64)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 i; + + for (i = 7; i < 9; i++) { + if ((i != npc->npcID) && (get_enemy(i)->varTable[0] & 0x100)) { + return; + } + } + + enemy->varTable[0] |= 0x100; + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z; + if (!(enemy->varTable[0] & 0x1000)) { + enemy->varTable[0] |= 0x1000; + } + sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + npc->duration = 0; + script->functionTemp[0].s = 15; +} + +void N(func_80242F94_C42D44)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + s32 temp_f8_2; + + sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + enemy->varTable[0] &= ~0x100; + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + script->functionTemp[0].s = 16; + } else { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + + npc->pos.x = (*playerStatus)->position.x; + npc->pos.z = (*playerStatus)->position.z + 2.0f; + npc->rotation.y += 25.0f; + if (npc->rotation.y > 360.0) { + npc->rotation.y -= 360.0; + } + temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); + func_802DE894(npc->unk_24, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); + + posX = (*playerStatus)->position.x; + posY = (*playerStatus)->position.y; + posZ = (*playerStatus)->position.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (fabsf(npc->pos.y - posY) > 24.0) { + npc->pos.y -= 1.8; + } else { + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + if (D_8010EBB0.unk_03 != 9) { + disable_player_input(); + func_800EF628(); + npc->duration = 0; + script->functionTemp[0].s = 20; + } else { + script->functionTemp[0].s = 16; + } + } + } +} + +void N(func_80243230_C42FE0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + if (enemy->varTable[0] & 0x1000) { + sfx_stop_sound(0x80000011); + enemy->varTable[0] &= ~0x1000; + } + npc->currentAnim = enemy->animList[9]; + npc->duration = 20; + script->functionTemp[0].s = 17; +} + +void N(func_802432E8_C43098)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 tmp = enemy->varTable[3]; + f32 temp_f20 = tmp / 100.0; + s32 var; + + npc->pos.y += 2.5; + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (!(npc->pos.y < (posY + temp_f20))) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc->pos.y = posY + temp_f20; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + npc->duration = 10; + script->functionTemp[0].s = 18; + } +} + +void N(func_80243468_C43218)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[0].s = 30; + } +} + +void N(func_802434B0_C43260)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration++; + if (npc->duration >= 3) { + if (D_8010EBB0.unk_03 != 9) { + npc->duration = 0; + script->functionTemp[0].s = 100; + } else { + enable_player_input(); + func_800EF600(); + script->functionTemp[0].s = 16; + } + } +} + +void N(func_80243530_C432E0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + npc->flags &= 0xFFDFFFFF; + npc->moveSpeed = 2.0 * aiSettings->moveSpeed; + enemy->varTable[2] = 0; + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[1].s = 0x1E; +} + +void N(func_802435D8_C43388)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX = npc->pos.x; + f32 posY = npc->pos.y; + f32 posZ = npc->pos.z; + f32 posW = 1000.0f; + f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; + f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); + f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; + f32 temp_f20 = sin_deg(enemy->varTable[2]); + s32 var; + s32 var2; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f20 * temp_f22); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + func_800494C0(npc, 0x2F4, 0x200000); + npc->moveToPos.y = npc->pos.y; + script->functionTemp[0].s = 12; + return; + } + } + + script->functionTemp[1].s--; + if (npc->unk_8C == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + if (posW <= (2.0f * npc->moveSpeed)) { + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + script->functionTemp[0].s = 2; + } + } +} + +ApiStatus N(func_802438F0_C436A0)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 125.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + N(func_80242948_C426F8)(npc, enemy, script, npcAISettings); + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80241760_C41510)(script, npcAISettings, territoryPtr); + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + case 1: + N(func_80241910_C416C0)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 2: + N(UnkNpcAIFunc1_copy)(script, npcAISettings, territoryPtr); + case 3: + N(func_80241FF8_C41DA8)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 12: + N(func_80242C58_C42A08)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + N(func_80242DB0_C42B60)(script, npcAISettings, territoryPtr); + break; + case 14: + N(func_80242EB4_C42C64)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 15) { + break; + } + case 15: + N(func_80242F94_C42D44)(script, npcAISettings, territoryPtr); + break; + case 16: + N(func_80243230_C42FE0)(script, npcAISettings, territoryPtr); + case 17: + N(func_802432E8_C43098)(script, npcAISettings, territoryPtr); + break; + case 18: + N(func_80243468_C43218)(script, npcAISettings, territoryPtr); + break; + case 20: + N(func_802434B0_C43260)(script, npcAISettings, territoryPtr); + break; + case 30: + N(func_80243530_C432E0)(script, npcAISettings, territoryPtr); + case 31: + N(func_802435D8_C43388)(script, npcAISettings, territoryPtr); + } + + return (script->functionTemp[0].s == 100) * ApiStatus_DONE2; +} #include "world/common/UnkFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243B98_C43948); +ApiStatus N(func_80243B98_C43948)(ScriptInstance* script, s32 isInitialCall) { + if (get_enemy_safe(9) != 0) { + Enemy* enemy = get_enemy(9); + enemy->territory->wander.point.x = 2; + enemy->territory->wander.point.y = -0x1C2; + enemy->territory->wander.point.z = 0; + enemy->territory->wander.wanderSizeX = 0xAF; + enemy->territory->wander.wanderSizeZ = 0x12C; + enemy->territory->wander.moveSpeedOverride = 0; + enemy->territory->wander.wanderShape = 0xAF; + return ApiStatus_DONE2; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243C10_C439C0); + return ApiStatus_DONE2; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243C50_C43A00); +ApiStatus N(func_80243C10_C439C0)(ScriptInstance* script, s32 isInitialCall) { + if (get_enemy_safe(9)) { + Enemy* enemy = get_enemy(9); + enemy->unk_B0 |= 0x80; + return ApiStatus_DONE2; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_80243C50_C43A00)(ScriptInstance *script, s32 isInitialCall) { + func_800494C0(get_npc_unsafe(script->owner1.enemy->npcID), 0x32F, 0); + return ApiStatus_DONE2; +} + +const char N(dgb_00_name_hack)[] = "dgb_00"; +const char N(dgb_01_name_hack)[] = "dgb_01"; diff --git a/src/world/area_dgb/dgb_08/dgb_08.h b/src/world/area_dgb/dgb_08/dgb_08.h index 74a1713f81..6c56a8b482 100644 --- a/src/world/area_dgb/dgb_08/dgb_08.h +++ b/src/world/area_dgb/dgb_08/dgb_08.h @@ -2,3 +2,20 @@ #include "map.h" #define NAMESPACE dgb_08 + +ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024124C_C40FFC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802414AC_C4125C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80243B98_C43948)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80243C10_C439C0)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80243C50_C43A00)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_80246958); +NpcGroupList N(npcGroupList_802469AC); +NpcGroupList N(npcGroupList_802469C4); +Script N(802469E0); +Script N(main); +Script N(npcAI_80244D7C); +Script N(unk_80244100); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index bf8441ad89..bc1b6f951c 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -1,4 +1,602 @@ #include "dgb_09.h" +#include "message_ids.h" +#include "sprite/npc/sentinel.h" +#include "sprite/npc/world_clubba.h" + +extern s16 D_8009A634; +extern Npc* wPartnerNpc; + +enum { + NPC_WORLD_CLUBBA0, + NPC_WORLD_CLUBBA1, + NPC_WORLD_CLUBBA2, + NPC_WORLD_CLUBBA3, + NPC_SENTINEL, +}; + +EntryList N(entryList) = { + { -567.0f, 0.0f, 180.0f, 90.0f }, + { 567.0f, 0.0f, 180.0f, 270.0f }, + { -450.0f, 0.0f, 90.0f, 180.0f }, + { 300.0f, 0.0f, 90.0f, 180.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_09_tattle, +}; + +Script N(80243880) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_3918)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80243920) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 5; + SI_VAR(2) = 10; + SI_VAR(3) = 12; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_03", 4); + sleep 100; +}); + +Script N(exitDoubleDoor_802439D4) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 17; + SI_VAR(2) = 17; + SI_VAR(3) = 15; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 3); + sleep 100; +}); + +Script N(exitSingleDoor_80243A88) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 2; + SI_VAR(1) = 9; + SI_VAR(2) = 20; + SI_VAR(3) = 1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_12", 0); + sleep 100; +}); + +Script N(exitWalk_80243B3C) = EXIT_WALK_SCRIPT(40, 3, "dgb_10", 0); + +Script N(80243B98) = SCRIPT({ + bind N(exitWalk_80243B3C) to TRIGGER_FLOOR_ABOVE 11; +}); + +Script N(enterWalk_80243BC4) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + UseDoorSounds(3); + SI_VAR(2) = 10; + SI_VAR(3) = 12; + await EnterDoubleDoor; + spawn N(80243B98); + } + == 1 { + UseDoorSounds(3); + SI_VAR(2) = 17; + SI_VAR(3) = 15; + await EnterDoubleDoor; + spawn N(80243B98); + } + == 2 { + UseDoorSounds(0); + SI_VAR(2) = 20; + SI_VAR(3) = 1; + await EnterSingleDoor; + spawn N(80243B98); + } + == 3 { + SI_VAR(0) = N(80243B98); + spawn EnterWalk; + sleep 1; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamEnabled(0, 1); + if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) { + MakeNpcs(1, N(npcGroupList_8024533C)); + } + spawn N(80243F6C); + bind N(exitDoubleDoor_80243920) to TRIGGER_WALL_PRESS_A 5; + bind N(exitDoubleDoor_802439D4) to TRIGGER_WALL_PRESS_A 17; + bind N(exitSingleDoor_80243A88) to TRIGGER_WALL_PRESS_A 9; + spawn N(80243880); + spawn N(enterWalk_80243BC4); +}); + +static s32 N(pad_3E4C) = { + 0x00000000, +}; + +s32 N(triggerCoord_80243E50)[] = { + 0x43960000, 0x00000000, 0x42B00000, 0x00000000, +}; + +Script N(80243E60) = SCRIPT({ + sleep 2; + PlayEffect(0x42, 1, 25, 3, 1, 10, 30, 0, 0, 0, 0, 0, 0, 0); + loop 10 { + EnableModel(29, 0); + EnableModel(25, 1); + sleep 1; + EnableModel(29, 1); + EnableModel(25, 0); + sleep 1; + } + ModifyColliderFlags(0, 13, 0x7FFFFE00); + SI_SAVE_FLAG(1051) = 1; + unbind; +}); + +Script N(80243F6C) = SCRIPT({ + if (SI_SAVE_FLAG(1051) == 0) { + bind N(80243E60) to TRIGGER_POINT_BOMB N(triggerCoord_80243E50); + EnableModel(29, 0); + } else { + EnableModel(25, 0); + ModifyColliderFlags(0, 13, 0x7FFFFE00); + } +}); + +static s32 N(pad_3FF8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(80244000) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +NpcAnimID N(extraAnimationList_802440BC)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + ANIM_END, +}; + +NpcAnimID N(extraAnimationList_802440E4)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_802440EC) = { + .moveSpeed = 1.5f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 85.0f, + .unk_10 = { .f = 65.0f }, + .unk_14 = 5, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 12, + .chaseRadius = 110.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 3, +}; + +Script N(npcAI_8024411C) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 5); + SetSelfVar(2, 8); + SetSelfVar(3, 12); + N(func_8024061C_C471FC)(N(npcAISettings_802440EC)); +}); + +NpcSettings N(npcSettings_8024418C) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_8024411C), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcAISettings N(npcAISettings_802441B8) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .unk_10 = { .f = 40.0f }, + .unk_14 = 10, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 15, + .chaseRadius = 200.0f, + .unk_28 = { .f = 160.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_802441E8) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 10); + SetSelfVar(2, 14); + SetSelfVar(3, 18); + N(func_802410D4_C47CB4)(N(npcAISettings_802441B8)); +}); + +NpcSettings N(npcSettings_80244258) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_802441E8), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_80244284) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(update_starpoints_display_C46F9C)(); +}); + +NpcSettings N(npcSettings_8024432C) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_80244284), + .onDefeat = &N(80244000), + .level = 13, + .unk_2A = 8, +}; + +f32 N(D_80244358_C4AF38)[] = { + 4.5f, 3.5f, 2.6f, 2.0f, + 1.5f, 20.0f, +}; + +Script N(80244370) = SCRIPT({ + SetSelfEnemyFlagBits(((0x00100000 | 0x01000000 | 0x02000000 | 0x04000000 | 0x08000000 | 0x10000000 | 0x20000000)), TRUE); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT)), TRUE); +}); + +NpcAISettings N(npcAISettings_802443AC) = { + .moveSpeed = 1.5f, + .moveTime = 90, + .waitTime = 30, + .alertRadius = 240.0f, + .unk_14 = 1, + .chaseSpeed = 5.3f, + .unk_1C = { .s = 180 }, + .unk_20 = 1, + .chaseRadius = 240.0f, + .unk_2C = 1, +}; + +const char N(dgb_00_name_hack)[]; + +Script N(npcAI_802443DC) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(5, -650); + SetSelfVar(6, 30); + SetSelfVar(1, 600); + N(func_80243578_C4A158)(N(npcAISettings_802443AC)); + DisablePlayerInput(TRUE); + sleep 2; +20: + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(4), SI_VAR(2)); + GetPlayerActionState(SI_VAR(0)); + if (SI_VAR(0) != 0) { + sleep 1; + goto 20; + } + DisablePlayerPhysics(TRUE); + func_802D2B6C(); + DisablePartnerAI(0); + group 0; + func_802D5830(1); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + SI_VAR(2) += 2; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_80045838(-1, 759, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(sentinel, Palette_00, Anim_8)); + sleep 10; + SetPlayerAnimation(ANIM_80017); + sleep 10; + func_80045838(-1, 1838, 0); + spawn { + loop 100 { + GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 1; + SetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + } + spawn { + SetNpcAnimation(NPC_PARTNER, 0x108); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + NpcJump0(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + } + sleep 30; + GotoMap(N(dgb_00_name_hack), 2); + sleep 100; +}); + +Script N(80244804) = SCRIPT({ + GetOwnerEncounterTrigger(SI_VAR(0)); + match SI_VAR(0) { + == 1, 2, 4, 6 { + GetSelfAnimationFromTable(7, SI_VAR(0)); + await 0x800936DC; + } + } +}); + +Script N(80244890) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + DoNpcDefeat(); + } + == 1 {} + == 2 { + } + } +}); + +NpcSettings N(npcSettings_802448F4) = { + .height = 38, + .radius = 32, + .otherAI = &N(80244370), + .ai = &N(npcAI_802443DC), + .level = 99, +}; + +StaticNpc N(npcGroup_80244920)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_8024418C), + .pos = { -350.0f, 0.0f, 180.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -350, 0, 180, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_802440BC), + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_8024432C), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802440E4), + }, +}; + +Script N(init_80244D00) = SCRIPT({ + GetEntryID(SI_VAR(0)); + if (SI_VAR(0) == 3) { + SetNpcPos(NPC_SELF, 240, 0, 88); + InterpNpcYaw(NPC_SELF, 270, 0); + } +}); + +StaticNpc N(npcGroup_80244D6C)[] = { + { + .id = NPC_WORLD_CLUBBA2, + .settings = &N(npcSettings_80244258), + .pos = { 310.0f, 0.0f, 88.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_80244D00), + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 310, 0, 88, 40, 0, -32767, 0, 0, 0, 50, 600, 250, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_802440BC), + }, + { + .id = NPC_WORLD_CLUBBA3, + .settings = &N(npcSettings_8024432C), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802440E4), + }, +}; + +StaticNpc N(npcGroup_8024514C) = { + .id = NPC_SENTINEL, + .settings = &N(npcSettings_802448F4), + .pos = { -20.0f, 100.0f, 180.0f }, + .flags = NPC_FLAG_LOCK_ANIMS, + .yaw = 90, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { -20, 100, 180, 40, 0, -32767, 0, -20, 100, 180, 250, 0, 0, 1 }, + .animations = { + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_2), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_3), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_5), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_8), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + NPC_ANIM(sentinel, Palette_00, Anim_1), + }, +}; + +NpcGroupList N(npcGroupList_8024533C) = { + NPC_GROUP(N(npcGroup_80244920), BATTLE_ID(15, 3, 0, 1)), + NPC_GROUP(N(npcGroup_80244D6C), BATTLE_ID(15, 1, 0, 1)), + NPC_GROUP(N(npcGroup_8024514C), BATTLE_ID(0, 0, 0, 0)), + {}, +}; #include "world/common/UnkNpcAIFunc6.inc.c" @@ -8,24 +606,327 @@ #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240208_C46DE8); +s32 N(func_80240208_C46DE8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", update_starpoints_display_C46F9C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024061C_C471FC); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802408D0_C474B0); + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240958_C47538); + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240C10_C477F0); + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240C74_C47854); + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240D1C_C478FC); + return ret; +} + +ApiStatus N(update_starpoints_display_C46F9C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_8024061C_C471FC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C46DE8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +void N(func_802408D0_C474B0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 1; + } +} + +void N(func_80240958_C47538)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 phi_s2 = FALSE; + s32 var; + f32 posX, posZ; + + if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { + if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || + (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || + (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || + (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || + (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { + phi_s2 = TRUE; + } + + if (playerData->currentPartner == 2) { + if (D_8010EBB0.unk_00 == playerData->currentPartner) { + phi_s2 = TRUE; + } + } + } + + if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || + ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + phi_s2 = TRUE; + } + } + + if (phi_s2) { + func_800494C0(npc, 0xB000000E, 0); + npc->currentAnim = enemy->animList[11]; + npc->duration = 10; + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + func_800494C0(npc, 0x2F4, 0x200000); + script->functionTemp[0].s = 2; + } + + npc->duration++; + if (npc->duration == 27) { + func_800494C0(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + func_800494C0(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(func_80240C10_C477F0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + } +} + +void N(func_80240C74_C47854)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim = enemy->animList[0]; + script->functionTemp[1].s = (rand_int(1000) % 2) + 2; + script->functionTemp[0].s = 4; +} + +void N(func_80240D1C_C478FC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + var = enemy->varTable[7]; + if (var == 40) { + npc->duration = 20; + script->functionTemp[0].s = var; + } else if (var == 50) { + npc->duration = 25; + script->functionTemp[0].s = var; + } + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240E54_C47A34); -/* void N(func_80240E54_C47A34)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); @@ -41,16 +942,146 @@ void N(func_80240E54_C47A34)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[0].s = 0x29; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80240F00_C47AE0); +void N(func_80240F00_C47AE0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 var; -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241078_C47C58); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim = enemy->animList[0]; + npc->duration = 15; + enemy->varTable[7] = 50; + script->functionTemp[0].s = 3; + } else if (npc->unk_8C == 0) { + var = npc->yaw; + func_8004A784(npc, 5.0f, &var, 0, 0, 0); + npc->yaw = var; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802410D4_C47CB4); +void N(func_80241078_C47C58)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->functionTemp[0].s = 0; + } + } +} + +ApiStatus N(func_802410D4_C47CB4)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 40.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 30; + npc->currentAnim = enemy->animList[10]; + npc->flags &= ~0x800; + enemy->varTable[0] = 0; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 40; + npc->currentAnim = enemy->animList[0]; + } + enemy->unk_B0 &= ~4; + } + + if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C46DE8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802408D0_C474B0)(script, npcAISettings, territoryPtr); + break; + case 1: + N(func_80240958_C47538)(script, npcAISettings, territoryPtr); + break; + case 2: + N(func_80240C10_C477F0)(script, npcAISettings, territoryPtr); + break; + case 3: + N(func_80240C74_C47854)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240D1C_C478FC)(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + npc->duration = 15; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + break; + case 30: + N(UnkNpcAIFunc6)(script); + if (script->functionTemp[0].s != 31) { + break; + } + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + break; + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 40: + N(func_80240E54_C47A34)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 41) { + break; + } + case 41: + N(func_80240F00_C47AE0)(script, npcAISettings, territoryPtr); + break; + case 50: + N(func_80241078_C47C58)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241424_C48004); -/* void N(func_80241424_C48004)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -74,14 +1105,153 @@ void N(func_80241424_C48004)(ScriptInstance* script, NpcAISettings* aiSettings, enemy->varTable[4] = npc->pos.y * 100.0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802415D4_C481B4); +#ifdef NON_MATCHING +// second func_800DCB7C call +void N(func_802415D4_C481B4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f24; + f32 posX, posY, posZ, posW; + s32 var; + f32 temp_f0; + f32 phi_f4; + s32 phi_v0; + s32 phi_s4 = 0; + + f32 a = enemy->varTable[7]; + f32 temp_f2 = a / 100.0; + f32 b = enemy->varTable[3]; + f32 temp_f26 = b / 100.0; + f32 c = enemy->varTable[4]; + f32 temp_f20 = c / 100.0; + f32 d = enemy->varTable[1]; + f32 temp_f22 = d / 100.0; + + enemy->varTable[4] = npc->pos.y * 100.0; + temp_f24 = temp_f26 + temp_f2; + + if ((enemy->varTable[0] & 0x11) == 1) { + if (npc->flags & 8) { + if (temp_f22 < (temp_f24 - npc->pos.y)) { + enemy->varTable[0] |= 0x10; + } + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (temp_f22 < (temp_f26 - posW)) { + enemy->varTable[0] |= 0x10; + } + } + } + + if ((enemy->varTable[0] & 0x11) == 0x11) { + f64 test; + if (npc->flags & 8) { + phi_f4 = temp_f24; + test = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + npc->pos.y = test; + } else { + posX = npc->pos.x; + posY = temp_f20; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + phi_f4 = posY; + phi_f4 += temp_f26; + d = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + test = d; + npc->pos.y = test; + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + } + //npc->pos.y = temp_f20 + ((phi_f4 - temp_f20) * 0.09); + + if (fabsf(phi_f4 - npc->pos.y) < 1.0) { + npc->pos.y = phi_f4; + enemy->varTable[0] &= ~0x10; + } + } else if (enemy->varTable[1] > 0) { + temp_f0 = sin_deg(enemy->varTable[2]); + if (npc->flags & 8) { + phi_v0 = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + } + if (phi_v0) { + npc->pos.y = posY + temp_f26 + (temp_f0 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f0 * temp_f22); + } + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + + if (enemy->varTable[9] <= 0) { + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && + func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->moveToPos.y = npc->pos.y; + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } + script->functionTemp[1].s--; + } + } else { + enemy->varTable[9]--; + } + + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + posW = dist2D(enemy->territory->wander.point.x, enemy->territory->wander.point.z, npc->pos.x, npc->pos.z); + if (npc->moveSpeed < posW) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + phi_s4 = 1; + } + } + + if (enemy->territory->wander.wanderSizeX | enemy->territory->wander.wanderSizeZ | phi_s4) { + if (npc->unk_8C == 0) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } else { + return; + } + } + + enemy->varTable[4] = npc->pos.y * 100.0; + if (aiSettings->moveTime > 0) { + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + script->functionTemp[0].s = 2; + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_2C <= 0) || (aiSettings->waitTime <= 0) || (script->functionTemp[1].s < 3)) { + script->functionTemp[0].s = 0; + } + } + } +} +#else +INCLUDE_ASM(void, "world/area_dgb/dgb_09/C46BE0", dgb_09_func_802415D4_C481B4, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +#endif #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241CBC_C4889C); -/* void N(func_80241CBC_C4889C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -119,7 +1289,7 @@ void N(func_80241CBC_C4889C)(ScriptInstance* script, NpcAISettings* aiSettings, } if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); npc->moveToPos.y = npc->pos.y; func_800494C0(npc, 0x2F4, 0x200000); @@ -146,29 +1316,23 @@ void N(func_80241CBC_C4889C)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242078_C48C58); -/* void N(func_80242078_C48C58)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; + npc->pos.y += N(D_80244358_C4AF38)[npc->duration++]; if (npc->duration >= 5) { script->functionTemp[0].s = 12; } } -*/ #include "world/common/UnkNpcAIFunc14.inc.c" #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024227C_C48E5C); -/* void N(func_8024227C_C48E5C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -215,12 +1379,12 @@ void N(func_8024227C_C48E5C)(ScriptInstance* script, NpcAISettings* aiSettings, npc->duration = 0; phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { phi_f20 = npc->yaw; if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; + phi_f20 += -aiSettings->unk_1C.s; } else { - phi_f20 += aiSettings->unk_1C; + phi_f20 += aiSettings->unk_1C.s; } } npc->yaw = clamp_angle(phi_f20); @@ -255,10 +1419,7 @@ void N(func_8024227C_C48E5C)(ScriptInstance* script, NpcAISettings* aiSettings, npc->jumpVelocity = 0.0f; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024260C_C491EC); -/* void N(func_8024260C_C491EC)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { f32 posX, posY, posZ, posW; s32 temp_a1; @@ -287,28 +1448,371 @@ void N(func_8024260C_C491EC)(Npc *npc, Enemy *enemy, ScriptInstance *script, Npc script->functionTemp[1].s = aiSettings->unk_14; enemy->unk_B0 |= 0x10; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242730_C49310); +ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024291C_C494FC); + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242A74_C49654); + if (isInitialCall) { + N(func_8024260C_C491EC)(npc, enemy, script, aiSettings); + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242B78_C49758); + npc->unk_AB = -2; -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242C1C_C497FC); + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242EB8_C49A98); + switch (script->functionTemp[0].s) { + case 0: + N(func_80241424_C48004)(script, aiSettings, territoryPtr); + case 1: + N(func_802415D4_C481B4)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80241CBC_C4889C)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80242078_C48C58)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_8024227C_C48E5C)(script, aiSettings, territoryPtr); + break; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242F70_C49B50); + return ApiStatus_BLOCK; +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802430F0_C49CD0); +void N(func_8024291C_C494FC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 temp_f0; + f32 phi_f20; -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243138_C49D18); + npc->duration--; + if (npc->duration <= 0) { + npc->flags &= 0xFFDFFFFF; + npc->duration = aiSettings->unk_20 / 2 + rand_int(aiSettings->unk_20 / 2 + 1); + npc->currentAnim = enemy->animList[8]; + npc->moveSpeed = aiSettings->chaseSpeed; + phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + temp_f0 = get_clamped_angle_diff(npc->yaw, phi_f20); + if (aiSettings->unk_1C.s < fabsf(temp_f0)) { + phi_f20 = npc->yaw; + if (temp_f0 < 0.0f) { + phi_f20 += -aiSettings->unk_1C.s; + } else { + phi_f20 += aiSettings->unk_1C.s; + } + } + npc->yaw = clamp_angle(phi_f20); + script->functionTemp[0].s = 13; + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802431B8_C49D98); +void N(func_80242A74_C49654)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243260_C49E40); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) <= (npc->moveSpeed * 2.5)) { + npc->duration = 0; + script->functionTemp[0].s = 14; + } else { + npc->duration--; + if (npc->duration <= 0) { + npc->flags |= 0x200000; + script->functionTemp[0].s = 12; + } + } + } else { + script->functionTemp[0].s = 16; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243578_C4A158); +} + +void N(func_80242B78_C49758)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + do { enemy->varTable[0] |= 0x100; npc->pos.x = gPlayerStatusPtr->position.x; } while (0); + npc->pos.z = gPlayerStatusPtr->position.z; + if (!(enemy->varTable[0] & 0x1000)) { + enemy->varTable[0] |= 0x1000; + } + sfx_play_sound_at_position(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + npc->duration = 0; + script->functionTemp[0].s = 15; +} + +void N(func_80242C1C_C497FC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + s32 temp_f8_2; + + sfx_adjust_env_sound_pos(0x80000011, 2, npc->pos.x, npc->pos.y, npc->pos.z); + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + enemy->varTable[0] &= ~0x100; + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + script->functionTemp[0].s = 16; + } else { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + + npc->pos.x = (*playerStatus)->position.x; + npc->pos.z = (*playerStatus)->position.z + 2.0f; + npc->rotation.y += 25.0f; + if (npc->rotation.y > 360.0) { + npc->rotation.y -= 360.0; + } + temp_f8_2 = 255.0f - (cosine((s32)npc->rotation.y % 180) * 56.0f); + func_802DE894(npc->unk_24, 6, temp_f8_2, temp_f8_2, temp_f8_2, 255, 0); + + posX = (*playerStatus)->position.x; + posY = (*playerStatus)->position.y; + posZ = (*playerStatus)->position.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (fabsf(npc->pos.y - posY) > 24.0) { + npc->pos.y -= 1.8; + } else { + npc->rotation.y = 0.0f; + npc->flags &= 0xFFDFFFFF; + if (D_8010EBB0.unk_03 != 9) { + disable_player_input(); + func_800EF628(); + npc->duration = 0; + script->functionTemp[0].s = 20; + } else { + script->functionTemp[0].s = 16; + } + } + } +} + +void N(func_80242EB8_C49A98)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + if (enemy->varTable[0] & 0x1000) { + sfx_stop_sound(0x80000011); + enemy->varTable[0] &= ~0x1000; + } + npc->currentAnim = enemy->animList[9]; + npc->duration = 20; + script->functionTemp[0].s = 17; +} + +void N(func_80242F70_C49B50)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 tmp = enemy->varTable[3]; + f32 temp_f20 = tmp / 100.0; + s32 var; + + npc->pos.y += 2.5; + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + if (!(npc->pos.y < (posY + temp_f20))) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc->pos.y = posY + temp_f20; + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &var); + npc->duration = 10; + script->functionTemp[0].s = 18; + } +} + +void N(func_802430F0_C49CD0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[0].s = 30; + } +} + +void N(func_80243138_C49D18)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration++; + if (npc->duration >= 3) { + if (D_8010EBB0.unk_03 != 9) { + npc->duration = 0; + script->functionTemp[0].s = 100; + } else { + enable_player_input(); + func_800EF600(); + script->functionTemp[0].s = 16; + } + } +} + +void N(func_802431B8_C49D98)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + enemy->varTable[0] &= ~0x100; + npc->flags &= 0xFFDFFFFF; + npc->moveSpeed = 2.0 * aiSettings->moveSpeed; + enemy->varTable[2] = 0; + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[1].s = 0x1E; +} + +void N(func_80243260_C49E40)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX = npc->pos.x; + f32 posY = npc->pos.y; + f32 posZ = npc->pos.z; + f32 posW = 1000.0f; + f32 temp_f26 = (f32)enemy->varTable[3] / 100.0; + f32 temp_f24 = temp_f26 + (f32)((f32)enemy->varTable[7] / 100.0); + f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; + f32 temp_f20 = sin_deg(enemy->varTable[2]); + s32 var; + s32 var2; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY + temp_f26 + (temp_f20 * temp_f22); + } else { + npc->pos.y = temp_f24 + (temp_f20 * temp_f22); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 12); + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.5, aiSettings->unk_10.f * 0.5, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + func_800494C0(npc, 0x2F4, 0x200000); + npc->moveToPos.y = npc->pos.y; + script->functionTemp[0].s = 12; + return; + } + } + + script->functionTemp[1].s--; + if (npc->unk_8C == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + posW = dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + if (posW <= (2.0f * npc->moveSpeed)) { + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + script->functionTemp[0].s = 2; + } + } +} + +ApiStatus N(func_80243578_C4A158)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 125.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + N(func_8024260C_C491EC)(npc, enemy, script, aiSettings); + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80241424_C48004)(script, aiSettings, territoryPtr); + func_802DE894(npc->unk_24, 0, 0, 0, 0, 0, 0); + case 1: + N(func_802415D4_C481B4)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80241CBC_C4889C)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s == 12) { + npc->duration = 6; + } + break; + case 12: + N(func_8024291C_C494FC)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + N(func_80242A74_C49654)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80242B78_C49758)(script, aiSettings, territoryPtr); + if (script->functionTemp[0].s != 15) { + break; + } + case 15: + N(func_80242C1C_C497FC)(script, aiSettings, territoryPtr); + break; + case 16: + N(func_80242EB8_C49A98)(script, aiSettings, territoryPtr); + case 17: + N(func_80242F70_C49B50)(script, aiSettings, territoryPtr); + break; + case 18: + N(func_802430F0_C49CD0)(script, aiSettings, territoryPtr); + break; + case 20: + N(func_80243138_C49D18)(script, aiSettings, territoryPtr); + break; + case 30: + N(func_802431B8_C49D98)(script, aiSettings, territoryPtr); + case 31: + N(func_80243260_C49E40)(script, aiSettings, territoryPtr); + } + + return (script->functionTemp[0].s == 100) * ApiStatus_DONE2; +} + +const char N(dgb_00_name_hack)[] = "dgb_00"; diff --git a/src/world/area_dgb/dgb_09/dgb_09.h b/src/world/area_dgb/dgb_09/dgb_09.h index 7962dc9824..cc63dd54f7 100644 --- a/src/world/area_dgb/dgb_09/dgb_09.h +++ b/src/world/area_dgb/dgb_09/dgb_09.h @@ -2,3 +2,12 @@ #include "map.h" #define NAMESPACE dgb_09 + +ApiStatus N(func_8024061C_C471FC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(update_starpoints_display_C46F9C)(ScriptInstance *script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_8024533C); +Script N(80243F6C); +Script N(main); diff --git a/src/world/area_dgb/dgb_10/C4C390.c b/src/world/area_dgb/dgb_10/C4C390.c index f77cd1cbd5..69633bcd46 100644 --- a/src/world/area_dgb/dgb_10/C4C390.c +++ b/src/world/area_dgb/dgb_10/C4C390.c @@ -1,9 +1,354 @@ #include "dgb_10.h" +#include "message_ids.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_10/C4C390", func_80240000_C4C390); +EntryList N(entryList) = { + { 300.0f, 0.0f, -50.0f, 0.0f }, + { 375.0f, 0.0f, -240.0f, 0.0f }, +}; -INCLUDE_ASM(s32, "world/area_dgb/dgb_10/C4C390", func_802400A0_C4C430); +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_10_tattle, +}; -INCLUDE_ASM(s32, "world/area_dgb/dgb_10/C4C390", func_8024013C_C4C4CC); +Script N(80240250) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); -INCLUDE_ASM(s32, "world/area_dgb/dgb_10/C4C390", func_802401C0_C4C550); +static s32 N(pad_2E8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitWalk_802402F0) = EXIT_WALK_SCRIPT(40, 0, "dgb_09", 3); + +Script N(8024034C) = SCRIPT({ + bind N(exitWalk_802402F0) to TRIGGER_FLOOR_ABOVE 8; +}); + +Script N(enterWalk_80240378) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(0) = N(8024034C); + spawn EnterWalk; + sleep 1; + } + == 1 { + UseSettingsFrom(0, 375, 0, -188); + SetPanTarget(0, 375, 0, -188); + SetCamSpeed(0, 90.0); + PanToTarget(0, 0, 1); + DisablePlayerInput(TRUE); + DisablePlayerPhysics(TRUE); + SetPlayerActionState(3); + sleep 1; + SetPlayerJumpscale(0.7001953125); + PlayerJump(375, 0, -188, 20); + PanToTarget(0, 0, 0); + DisablePlayerPhysics(FALSE); + DisablePlayerInput(FALSE); + SetPlayerActionState(0); + spawn N(8024034C); + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + await N(makeEntities); + spawn N(80240E68); + spawn N(80240250); + ModifyColliderFlags(0, 9, 0x7FFFFE00); + EnableModel(6, 0); + EnableModel(12, 0); + EnableModel(18, 0); + ModifyColliderFlags(0, 12, 0x7FFFFE00); + ModifyColliderFlags(0, 13, 0x7FFFFE00); + ModifyColliderFlags(0, 14, 0x7FFFFE00); + spawn N(enterWalk_80240378); +}); + +static s32 N(pad_66C) = { + 0x00000000, +}; + +Script N(80240670) = { + SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(0)), + SI_CMD(ScriptOpcode_NEW_ARRAY, 6, SI_VAR(10)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(0), SI_VAR(0)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(1), SI_VAR(0)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(2), SI_VAR(0)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(3), SI_VAR(0)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), SI_VAR(0)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(5), SI_VAR(0)), + SI_CMD(ScriptOpcode_SET, SI_VAR(0), SI_VAR(10)), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(80240770), TRIGGER_FLOOR_TOUCH, SI_ARRAY(0), 1, 0), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; + +// *INDENT-OFF* +Script N(80240770) = { + SI_CMD(ScriptOpcode_USE_ARRAY, SI_VAR(0)), + SI_CMD(ScriptOpcode_CALL, N(func_80240000_C4C390)), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 0), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_LOOP, 5), + SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 1, SI_ARRAY(0), 2147483136), + SI_CMD(ScriptOpcode_CALL, EnableModel, SI_ARRAY(1), 1), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_CALL, ModifyColliderFlags, 0, SI_ARRAY(0), 2147483136), + SI_CMD(ScriptOpcode_CALL, EnableModel, SI_ARRAY(1), 0), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_END_LOOP), + SI_CMD(ScriptOpcode_IF_NE, SI_ARRAY(5), 0), + SI_CMD(ScriptOpcode_AWAIT_SCRIPT, 0xF4ACD485), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script N(80240860) = { + SI_CMD(ScriptOpcode_USE_BUFFER, SI_VAR(0)), + SI_CMD(ScriptOpcode_NEW_ARRAY, 6, SI_VAR(9)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(1)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(0), SI_VAR(1)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(1)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(1), SI_VAR(1)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(1)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(2), SI_VAR(1)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(1)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(3), SI_VAR(1)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(1)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(4), SI_VAR(1)), + SI_CMD(ScriptOpcode_BUFFER_READ_1, SI_VAR(1)), + SI_CMD(ScriptOpcode_SET, SI_ARRAY(5), SI_VAR(1)), + SI_CMD(ScriptOpcode_CALL, ParentColliderToModel, SI_ARRAY(1), SI_ARRAY(0)), + SI_CMD(ScriptOpcode_LABEL, 0), + SI_CMD(ScriptOpcode_LABEL, 1), + SI_CMD(ScriptOpcode_CALL, GetPlayerActionState, SI_VAR(10)), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(10), 13), + SI_CMD(ScriptOpcode_GOTO, 2), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(10), 15), + SI_CMD(ScriptOpcode_GOTO, 2), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_GOTO, 0), + SI_CMD(ScriptOpcode_LABEL, 2), + SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(1), SI_VAR(2), SI_VAR(3)), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_IF_NE, SI_VAR(2), SI_ARRAY(3)), + SI_CMD(ScriptOpcode_GOTO, 2), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_CALL, N(func_802400A0_C4C430)), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 1), + SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80240AF4)), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 2), + SI_CMD(ScriptOpcode_AWAIT_SCRIPT, N(80240CB8)), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_LABEL, 3), + SI_CMD(ScriptOpcode_CALL, GetPlayerActionState, SI_VAR(0)), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 13), + SI_CMD(ScriptOpcode_GOTO, 3), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(0), 15), + SI_CMD(ScriptOpcode_GOTO, 3), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_GOTO, 0), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script N(80240AF4) = { + SI_CMD(ScriptOpcode_USE_ARRAY, SI_VAR(9)), + SI_CMD(ScriptOpcode_CALL, GetPlayerPos, SI_VAR(2), SI_VAR(3), SI_VAR(4)), + SI_CMD(ScriptOpcode_CALL, MakeLerp, 0, 5, 3, 1), + SI_CMD(ScriptOpcode_LABEL, 2), + SI_CMD(ScriptOpcode_CALL, UpdateLerp), + SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_ARRAY(0), 0, SI_VAR(0), 0), + SI_CMD(ScriptOpcode_SET, SI_VAR(5), SI_VAR(3)), + SI_CMD(ScriptOpcode_ADD, SI_VAR(5), SI_VAR(0)), + SI_CMD(ScriptOpcode_CALL, SetPlayerPos, SI_VAR(2), SI_VAR(5), SI_VAR(4)), + SI_CMD(ScriptOpcode_CALL, UpdateColliderTransform, SI_ARRAY(1)), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 1), + SI_CMD(ScriptOpcode_GOTO, 2), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_CALL, MakeLerp, 5, 0, 3, 1), + SI_CMD(ScriptOpcode_LABEL, 3), + SI_CMD(ScriptOpcode_CALL, UpdateLerp), + SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_ARRAY(0), 0, SI_VAR(0), 0), + SI_CMD(ScriptOpcode_SET, SI_VAR(5), SI_VAR(3)), + SI_CMD(ScriptOpcode_ADD, SI_VAR(5), SI_VAR(0)), + SI_CMD(ScriptOpcode_CALL, SetPlayerPos, SI_VAR(2), SI_VAR(5), SI_VAR(4)), + SI_CMD(ScriptOpcode_CALL, UpdateColliderTransform, SI_ARRAY(1)), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 1), + SI_CMD(ScriptOpcode_GOTO, 3), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script N(80240CB8) = { + SI_CMD(ScriptOpcode_USE_ARRAY, SI_VAR(9)), + SI_CMD(ScriptOpcode_CALL, MakeItemEntity, SI_ARRAY(5), SI_ARRAY(2), SI_ARRAY(3), SI_ARRAY(4), 3, 0), + SI_CMD(ScriptOpcode_SET, SI_VAR(2), 0), + SI_CMD(ScriptOpcode_CALL, MakeLerp, 0, 150, 19, 4), + SI_CMD(ScriptOpcode_LABEL, 2), + SI_CMD(ScriptOpcode_CALL, UpdateLerp), + SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_ARRAY(0), 0, SI_VAR(0), 0), + SI_CMD(ScriptOpcode_ADD, SI_VAR(2), 45), + SI_CMD(ScriptOpcode_CALL, RotateModel, SI_ARRAY(0), SI_VAR(2), 1, 0, 0), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 1), + SI_CMD(ScriptOpcode_GOTO, 2), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_CALL, MakeLerp, 150, 0, 19, 4), + SI_CMD(ScriptOpcode_LABEL, 3), + SI_CMD(ScriptOpcode_CALL, UpdateLerp), + SI_CMD(ScriptOpcode_CALL, TranslateModel, SI_ARRAY(0), 0, SI_VAR(0), 0), + SI_CMD(ScriptOpcode_ADD, SI_VAR(2), 45), + SI_CMD(ScriptOpcode_CALL, RotateModel, SI_ARRAY(0), SI_VAR(2), 1, 0, 0), + SI_CMD(ScriptOpcode_SLEEP_FRAMES, 1), + SI_CMD(ScriptOpcode_IF_EQ, SI_VAR(1), 1), + SI_CMD(ScriptOpcode_GOTO, 3), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +Script N(80240E68) = SCRIPT({ + N(func_8024013C_C4C4CC)(); + func_802CA988(0, SI_VAR(2), SI_VAR(3), SI_VAR(4), SI_VAR(5)); + N(func_802401C0_C4C550)(); + func_802D2B6C(); + GotoMap("dgb_11", SI_VAR(0)); + sleep 100; +}); + +static s32 N(pad_EDC) = { + 0x00000000, +}; + +Script N(80240EE0) = SCRIPT({ + SI_SAVE_FLAG(1052) = 1; +}); + +Script N(80240F00) = SCRIPT({ + SI_SAVE_FLAG(1053) = 1; +}); + +Script N(80240F20) = SCRIPT({ + SI_SAVE_FLAG(1054) = 1; +}); + +Script N(makeEntities) = SCRIPT({ + if (SI_SAVE_FLAG(1052) == 0) { + MakeEntity(0x802BCE84, 500, 0, -100, 0, MAKE_ENTITY_END); + AssignScript(N(80240EE0)); + } + if (SI_SAVE_FLAG(1053) == 0) { + MakeEntity(0x802BCE84, 500, 0, -250, 0, MAKE_ENTITY_END); + AssignScript(N(80240F00)); + } + if (SI_SAVE_FLAG(1054) == 0) { + MakeEntity(0x802BCE84, 375, 0, -250, 0, MAKE_ENTITY_END); + AssignScript(N(80240F20)); + } +}); + +ApiStatus N(func_80240000_C4C390)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 *array = script->array; + f32 distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[3]); + + script->varTable[0] = 1; + if ((playerStatus->actionState != 14) && (playerStatus->actionState != 16)) { + script->varTable[0] = 0; + } + if (script->array[4] <= distance) { + script->varTable[0] = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802400A0_C4C430)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 distance; + s32 *array = script->array; + + distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[4]); + script->varTable[0] = 0; + if (distance < 112.5f) { + script->varTable[0] = 2; + } + if (distance < 37.5f) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_8024013C_C4C4CC)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerStatus* playerStatus2 = playerStatus; + s32 var; + + if (playerStatus->position.y >= 0.0f) { + return 0; + } + + if (playerStatus2->position.x < 440.0f) { + var = 3; + } else if (playerStatus2->position.z < -170.0f) { + var = 2; + } else { + var = 1; + } + script->varTable[0] = var; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802401C0_C4C550)(ScriptInstance *script, s32 isInitialCall) { + if (gPlayerStatus.position.y > -60.0f) { + return ApiStatus_BLOCK; + } + return ApiStatus_DONE2; +} diff --git a/src/world/area_dgb/dgb_10/dgb_10.h b/src/world/area_dgb/dgb_10/dgb_10.h index fd1d26f64a..589b935463 100644 --- a/src/world/area_dgb/dgb_10/dgb_10.h +++ b/src/world/area_dgb/dgb_10/dgb_10.h @@ -2,3 +2,15 @@ #include "map.h" #define NAMESPACE dgb_10 + +ApiStatus N(func_80240000_C4C390)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802400A0_C4C430)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024013C_C4C4CC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802401C0_C4C550)(ScriptInstance* script, s32 isInitialCall); + +Script N(80240770); +Script N(80240AF4); +Script N(80240CB8); +Script N(80240E68); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_11/C4D3E0.c b/src/world/area_dgb/dgb_11/C4D3E0.c index 9f41967edd..cbc8dbb092 100644 --- a/src/world/area_dgb/dgb_11/C4D3E0.c +++ b/src/world/area_dgb/dgb_11/C4D3E0.c @@ -1,3 +1,218 @@ #include "dgb_11.h" +#include "message_ids.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_11/C4D3E0", func_80240000_C4D3E0); +extern s32 D_000001E4; + +EntryList N(entryList) = { + { 450.0f, 0.0f, -40.0f, 0.0f }, + { 500.0f, 180.0f, -100.0f, 180.0f }, + { 500.0f, 180.0f, -250.0f, 180.0f }, + { 375.0f, 180.0f, -250.0f, 180.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_11_tattle, +}; + +Script N(802400D0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_168)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_80240170) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 11; + SI_VAR(2) = 21; + SI_VAR(3) = -1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_02", 3); + sleep 100; +}); + +Script N(enterSingleDoor_80240224) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + UseDoorSounds(0); + SI_VAR(2) = 21; + SI_VAR(3) = -1; + await EnterSingleDoor; + return; + } + == 1 { + UseSettingsFrom(0, 500, 0, -100); + SetPanTarget(0, 500, 0, -100); + SI_VAR(3) = 1; + } + == 2 { + UseSettingsFrom(0, 500, 75, -250); + SetPanTarget(0, 500, 75, -250); + SI_VAR(3) = 75; + } + == 3 { + SetZoneEnabled(5, 0); + UseSettingsFrom(0, 375, 0, -175); + SetPanTarget(0, 375, 0, -175); + SI_AREA_FLAG(2) = 1; + SI_VAR(3) = 1; + } + } + DisablePlayerInput(TRUE); + InterpPlayerYaw(180, 0); + SetCamSpeed(0, 90.0); + PanToTarget(0, 0, 1); + loop { + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(1) <= SI_VAR(3)) { + break loop; + } + sleep 1; + } + PanToTarget(0, 0, 0); + DisablePlayerInput(FALSE); +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + await N(makeEntities); + spawn N(802400D0); + bind N(exitSingleDoor_80240170) to TRIGGER_WALL_PRESS_A 11; + spawn N(enterSingleDoor_80240224); +}); + +static s32 N(pad_56C) = { + 0x00000000, +}; + +Script N(80240570) = SCRIPT({ +0: + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(1) >= SI_VAR(3)) { + SI_VAR(1) = SI_VAR(3); + } + SetCamTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + goto 0; +}); + +Script N(80240600) = SCRIPT({ + PlayerJump(375, 270, -250, 20); +}); + +Script N(8024062C) = SCRIPT({ + if (SI_AREA_FLAG(3) == 1) { + return; + } + SI_AREA_FLAG(3) = 1; + DisablePlayerInput(TRUE); + SetZoneEnabled(5, 0); + if (SI_AREA_FLAG(2) == 0) { + if (SI_SAVE_FLAG(1054) == 0) { + DisablePlayerPhysics(TRUE); + SetPlayerActionState(3); + sleep 1; + SI_VAR(3) = 500; + SI_VAR(10) = spawn N(80240570); + SetPlayerJumpscale(0.7001953125); + SI_VAR(11) = spawn N(80240600); + loop { + sleep 1; + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(1) >= 165) { + break loop; + } + } + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPlayerPos(SI_VAR(0), 165, SI_VAR(2)); + kill SI_VAR(11); + SetPlayerAnimation(0x80015); + ShakeCam(0, 0, 20, 1.0); + sleep 10; + SetPlayerAnimation(ANIM_10002); + SetPlayerJumpscale(0.0); + PlayerJump1(375, 25, -250, 10); + N(func_80240000_C4D3E0)(); + PlaySoundAtPlayer(8326, 0); + SetPlayerJumpscale(0.7001953125); + PlayerJump(375, 0, -175, 15); + kill SI_VAR(10); + SetPlayerActionState(0); + sleep 2; + SetZoneEnabled(5, 1); + DisablePlayerPhysics(FALSE); + DisablePlayerInput(FALSE); + SI_AREA_FLAG(3) = 0; + } else { + DisablePlayerPhysics(TRUE); + SetPlayerActionState(3); + sleep 1; + spawn { + sleep 8; + GotoMap("dgb_10", 1); + sleep 100; + } + SI_VAR(3) = 500; + SI_VAR(10) = spawn N(80240570); + SetPlayerJumpscale(0.7001953125); + PlayerJump(375, 270, -250, 20); + SI_AREA_FLAG(3) = 0; + } + } else { + SetPlayerActionState(3); + sleep 1; + SI_VAR(3) = 25; + SetPlayerJumpscale(0.7001953125); + PlayerJump(375, 0, -175, 15); + SI_AREA_FLAG(2) = 0; + kill SI_VAR(10); + SetPlayerActionState(0); + sleep 2; + SetZoneEnabled(5, 1); + DisablePlayerInput(FALSE); + SI_AREA_FLAG(3) = 0; + } +}); + +Script N(makeEntities) = SCRIPT({ + MakeItemEntity(ITEM_D_DOWN_JUMP, 250, 75, -100, 17, SI_SAVE_FLAG(1055)); + MakeEntity(0x802EAA30, 375, 0, -250, 0, MAKE_ENTITY_END); + AssignScript(N(8024062C)); + SI_MAP_VAR(0) = SI_VAR(0); +}); + +ApiStatus N(func_80240000_C4D3E0)(ScriptInstance* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(get_variable(NULL, 0xFD050F80)); + + if (entity == NULL) { + return ApiStatus_BLOCK; + } + + play_model_animation(entity->virtualModelIndex, &D_000001E4); + + return ApiStatus_DONE2; +} diff --git a/src/world/area_dgb/dgb_11/dgb_11.h b/src/world/area_dgb/dgb_11/dgb_11.h index a76b9f7770..50c401fee4 100644 --- a/src/world/area_dgb/dgb_11/dgb_11.h +++ b/src/world/area_dgb/dgb_11/dgb_11.h @@ -2,3 +2,8 @@ #include "map.h" #define NAMESPACE dgb_11 + +ApiStatus N(func_80240000_C4D3E0)(ScriptInstance* script, s32 isInitialCall); + +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 00ea8dac04..8c37d396c4 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -1,9 +1,177 @@ #include "dgb_12.h" +#include "message_ids.h" + +EntryList N(entryList) = { + { -500.0f, 0.0f, -40.0f, 0.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_12_tattle, +}; + +Script N(80240310) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_3A8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_802403B0) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 8; + SI_VAR(2) = 14; + SI_VAR(3) = -1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_09", 2); + sleep 100; +}); + +Script N(enterSingleDoor_80240464) = SCRIPT({ + UseDoorSounds(0); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 14; + SI_VAR(3) = -1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + await N(makeEntities); + spawn N(802405E0); + spawn N(80240310); + bind N(exitSingleDoor_802403B0) to TRIGGER_WALL_PRESS_A 8; + spawn N(enterSingleDoor_80240464); +}); + +s32 N(lavaResetList_802405C0)[] = { + 0x00000005, 0xC3FB8000, 0x00000000, 0xC27C0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(802405E0) = SCRIPT({ + group 239; + ModifyColliderFlags(3, 12, 0x00000002); + ModifyColliderFlags(3, 0, 0x00000002); + ModifyColliderFlags(3, 14, 0x00000002); + spawn { + ResetFromLava(N(lavaResetList_802405C0)); + } + sleep 50; + TranslateModel(19, 0, 0, 0); + ParentColliderToModel(12, 19); + loop { + spawn { + sleep 2; + ModifyColliderFlags(0, 0, 0x7FFFFE00); + } + MakeLerp(0, -35, 15, 0); + loop { + UpdateLerp(); + TranslateModel(19, 0, SI_VAR(0), 0); + UpdateColliderTransform(12); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + sleep 60; + PlaySoundAtCollider(0, 8339, 0); + spawn { + ModifyColliderFlags(1, 0, 0x7FFFFE00); + } + MakeLerp(-35, 0, 4, 0); + loop { + UpdateLerp(); + TranslateModel(19, 0, SI_VAR(0), 0); + UpdateColliderTransform(12); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + sleep 35; + } +}); + +static s32 N(pad_868)[] = { + 0x00000000, 0x00000000, +}; + +s32 N(D_80240870_C4E760) = { + 0x00000000, +}; + +Script N(80240874) = SCRIPT({ + group 0; + func_802D5830(2); + sleep 40; + ShowGotItem(SI_VAR(0), 0, 0); + func_802D5830(0); + return; +}); + +Script N(802408DC) = SCRIPT({ + DisablePlayerInput(TRUE); + SI_VAR(0) = SI_VAR(10); + if (SI_VAR(10) != 0) { + await N(80240874); + } + match SI_VAR(11) { + == 0 { + AddItem(SI_VAR(10), SI_VAR(0)); + } + == 1 { + AddKeyItem(SI_VAR(10)); + } + == 2 { + AddBadge(SI_VAR(10), SI_VAR(0)); + } + } + sleep 15; + DisablePlayerInput(FALSE); +}); + +Script N(802409BC) = SCRIPT({ + SI_VAR(10) = 19; + SI_VAR(11) = 1; + SI_SAVE_FLAG(1057) = 1; + await N(802408DC); +}); + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802EAE30, -225, 0, -245, 0, ITEM_NONE, MAKE_ENTITY_END); + AssignFlag(SI_SAVE_FLAG(1057)); + AssignScript(N(802409BC)); +}); -INCLUDE_ASM(s32, "world/area_dgb/dgb_12/C4DEF0", func_80240000_C4DEF0); -/* ApiStatus N(func_80240000_C4DEF0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80240870_C4E760); s32 i; s32* test; @@ -17,13 +185,12 @@ ApiStatus N(func_80240000_C4DEF0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80240870_C4E760); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } -*/ #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_dgb/dgb_12/dgb_12.h b/src/world/area_dgb/dgb_12/dgb_12.h index 3b8e3de859..bf7087d715 100644 --- a/src/world/area_dgb/dgb_12/dgb_12.h +++ b/src/world/area_dgb/dgb_12/dgb_12.h @@ -2,3 +2,7 @@ #include "map.h" #define NAMESPACE dgb_12 + +Script N(802405E0); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_13/C4E960.c b/src/world/area_dgb/dgb_13/C4E960.c new file mode 100644 index 0000000000..4bba523434 --- /dev/null +++ b/src/world/area_dgb/dgb_13/C4E960.c @@ -0,0 +1,135 @@ +#include "dgb_13.h" +#include "message_ids.h" + +EntryList N(entryList) = { + { -450.0f, 0.0f, -40.0f, 0.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_13_tattle, +}; + +Script N(80240050) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_E8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitWalk_802400F0) = EXIT_WALK_SCRIPT(26, 0, "dgb_03", 5); + +Script N(8024014C) = SCRIPT({ + bind N(exitWalk_802400F0) to TRIGGER_FLOOR_ABOVE 5; +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + await N(80240270); + ModifyColliderFlags(0, 6, 0x7FFFFE00); + await N(80240680); + spawn N(80240050); + SI_VAR(0) = N(8024014C); + spawn EnterWalk; + sleep 1; +}); + +Script N(80240270) = SCRIPT({ + MakeItemEntity(ITEM_MEGA_RUSH, -910, 50, -206, 17, SI_SAVE_FLAG(1058)); + MakeItemEntity(ITEM_COIN, -530, 55, -190, 17, SI_SAVE_FLAG(1059)); + MakeItemEntity(ITEM_COIN, -510, 55, -175, 17, SI_SAVE_FLAG(1060)); + MakeItemEntity(ITEM_COIN, -510, 55, -205, 17, SI_SAVE_FLAG(1061)); + MakeItemEntity(ITEM_COIN, -490, 55, -160, 17, SI_SAVE_FLAG(1062)); + MakeItemEntity(ITEM_COIN, -490, 55, -190, 17, SI_SAVE_FLAG(1063)); + MakeItemEntity(ITEM_COIN, -490, 55, -220, 17, SI_SAVE_FLAG(1064)); +}); + +static s32 N(pad_37C) = { + 0x00000000, +}; + +Script N(80240380) = SCRIPT({ + MakeLerp(0, 30, 15, 0); + loop { + UpdateLerp(); + TranslateGroup(47, 0, 0, SI_VAR(0)); + UpdateColliderTransform(13); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } +}); + +Script N(80240424) = SCRIPT({ + MakeLerp(30, 0, 15, 0); + loop { + UpdateLerp(); + TranslateGroup(47, 0, 0, SI_VAR(0)); + UpdateColliderTransform(13); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } +}); + +Script N(802404C8) = SCRIPT({ + MakeLerp(0, 30, 15, 0); + loop { + UpdateLerp(); + TranslateGroup(53, 0, 0, SI_VAR(0)); + UpdateColliderTransform(17); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } +}); + +Script N(8024056C) = SCRIPT({ + MakeLerp(30, 0, 15, 0); + loop { + UpdateLerp(); + TranslateGroup(53, 0, 0, SI_VAR(0)); + UpdateColliderTransform(17); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } +}); + +Script N(80240610) = SCRIPT({ + if (SI_MAP_VAR(0) == 0) { + await N(80240380); + SI_MAP_VAR(0) = 1; + } else { + await N(80240424); + SI_MAP_VAR(0) = 0; + } + unbind; +}); + +Script N(80240680) = SCRIPT({ + ParentColliderToModel(13, 44); + bind N(80240610) to TRIGGER_WALL_PRESS_A 13; +}); diff --git a/src/world/area_dgb/dgb_13/dgb_13.h b/src/world/area_dgb/dgb_13/dgb_13.h new file mode 100644 index 0000000000..fa3762d650 --- /dev/null +++ b/src/world/area_dgb/dgb_13/dgb_13.h @@ -0,0 +1,8 @@ +#include "common.h" +#include "map.h" + +#define NAMESPACE dgb_13 + +Script N(80240270); +Script N(80240680); +Script N(main); diff --git a/src/world/area_dgb/dgb_14/C4F030.c b/src/world/area_dgb/dgb_14/C4F030.c new file mode 100644 index 0000000000..a0f752c9cf --- /dev/null +++ b/src/world/area_dgb/dgb_14/C4F030.c @@ -0,0 +1,108 @@ +#include "dgb_14.h" +#include "message_ids.h" + +EntryList N(entryList) = { + { 575.0f, 0.0f, 180.0f, 270.0f }, + { 575.0f, 210.0f, 180.0f, 270.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_14_tattle, +}; + +Script N(80240060) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_F8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80240100) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 14; + SI_VAR(2) = 24; + SI_VAR(3) = 22; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_03", 3); + sleep 100; +}); + +Script N(exitDoubleDoor_802401B4) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 18; + SI_VAR(2) = 19; + SI_VAR(3) = 17; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_15", 0); + sleep 100; +}); + +Script N(enterDoubleDoor_80240268) = SCRIPT({ + UseDoorSounds(3); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 24; + SI_VAR(3) = 22; + await EnterDoubleDoor; + } + == 1 { + DisablePlayerInput(TRUE); + SI_VAR(2) = 19; + SI_VAR(3) = 17; + await EnterDoubleDoor; + if (SI_AREA_FLAG(1) == 1) { + sleep 5; + SetPlayerAnimation(ANIM_8001D); + sleep 20; + SetPlayerAnimation(ANIM_10002); + } + DisablePlayerInput(FALSE); + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + await N(makeEntities); + spawn N(80240060); + bind N(exitDoubleDoor_80240100) to TRIGGER_WALL_PRESS_A 14; + bind N(exitDoubleDoor_802401B4) to TRIGGER_WALL_PRESS_A 18; + spawn N(enterDoubleDoor_80240268); +}); + +static s32 N(pad_47C) = { + 0x00000000, +}; + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802EA564, 500, 60, 75, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END); + AssignBlockFlag(SI_SAVE_FLAG(1065)); +}); diff --git a/src/world/area_dgb/dgb_14/dgb_14.h b/src/world/area_dgb/dgb_14/dgb_14.h new file mode 100644 index 0000000000..17b659d124 --- /dev/null +++ b/src/world/area_dgb/dgb_14/dgb_14.h @@ -0,0 +1,7 @@ +#include "common.h" +#include "map.h" + +#define NAMESPACE dgb_14 + +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index ea0648e1c1..beaf1a7a7d 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -1,4 +1,448 @@ #include "dgb_15.h" +#include "message_ids.h" +#include "sprite/npc/world_tubba.h" + +extern s16 D_8009A634; + +enum { + NPC_WORLD_TUBBA, +}; + +EntryList N(entryList) = { + { -1290.0f, 0.0f, 180.0f, 90.0f }, + { 125.0f, 0.0f, 180.0f, 270.0f }, + { 0.0f, 0.0f, 88.0f, 180.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_15_tattle, +}; + +Script N(802418E0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + if (SI_SAVE_VAR(203) == 15) { + SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8); + } else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_19B4)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +s32 N(itemList_802419C0)[] = { + ITEM_CASTLE_KEY1, + ITEM_NONE, +}; + +Script N(exitDoubleDoor_802419C8) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 19; + SI_VAR(2) = 12; + SI_VAR(3) = 14; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_14", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_80241A7C) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 10; + SI_VAR(2) = 19; + SI_VAR(3) = 17; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_17", 0); + sleep 100; +}); + +Script N(exitSingleDoor_80241B30) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 2; + SI_VAR(1) = 6; + SI_VAR(2) = 22; + SI_VAR(3) = 1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_16", 0); + sleep 100; +}); + +const N(pad_XXXX)[] = { 0, 0 }; + +// *INDENT-OFF* +Script N(80241BE4) = { + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_802419C8), TRIGGER_WALL_PRESS_A, 19, 1, 0), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitSingleDoor_80241B30), TRIGGER_WALL_PRESS_A, 6, 1, 0), + SI_CMD(ScriptOpcode_IF_EQ, SI_SAVE_FLAG(1066), 0), + SI_CMD(ScriptOpcode_BIND_PADLOCK, N(80242AD0), TRIGGER_WALL_PRESS_A, 16384, N(itemList_802419C0), 0, 1), + SI_CMD(ScriptOpcode_ELSE), + SI_CMD(ScriptOpcode_BIND_TRIGGER, N(exitDoubleDoor_80241A7C), TRIGGER_WALL_PRESS_A, 10, 1, 0), + SI_CMD(ScriptOpcode_END_IF), + SI_CMD(ScriptOpcode_RETURN), + SI_CMD(ScriptOpcode_END) +}; +// *INDENT-ON* + +Script N(enterSingleDoor_80241C88) = SCRIPT({ + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + UseDoorSounds(3); + SI_VAR(2) = 12; + SI_VAR(3) = 14; + await EnterDoubleDoor; + } + == 1 { + UseDoorSounds(3); + SI_VAR(2) = 19; + SI_VAR(3) = 17; + await EnterDoubleDoor; + } + == 2 { + UseDoorSounds(0); + SI_VAR(2) = 22; + SI_VAR(3) = 1; + await EnterSingleDoor; + } + } + spawn N(80241BE4); +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SI_AREA_FLAG(1) = 0; + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamEnabled(0, 1); + SetCamLeadPlayer(0, 0); + if (SI_SAVE_FLAG(1068) == 0) { + MakeNpcs(1, N(npcGroupList_80242AB0)); + } + await N(makeEntities); + spawn N(802418E0); + spawn N(enterSingleDoor_80241C88); +}); + +static s32 N(pad_1E94)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(80241EA0) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +s32 N(unk_missing_80241F5C)[] = { + 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, + 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, +}; + +s32 N(D_80241F8C_C5149C)[] = { + 0x3FC00000, 0x00000078, 0x0000001E, 0x42AA0000, 0x42820000, 0x00000005, 0x40600000, 0x0000005A, + 0x0000000C, 0x42DC0000, 0x42B40000, 0x00000003, +}; + +Script N(80241FBC) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 5); + SetSelfVar(2, 8); + SetSelfVar(3, 12); + N(func_8024061C_C4FB2C)(N(D_80241F8C_C5149C)); +}); + +s32 N(unk_missing_8024202C)[] = { + 0x00000000, 0x00240022, 0x00000000, 0x00000000, N(80241FBC), 0x80077F70, 0x00000000, 0x8007809C, + 0x00000000, 0x00000000, 0x000D0000, +}; + +Script N(80242058) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(update_starpoints_display_C4F8CC)(); +}); + +s32 N(unk_missing_80242100)[] = { + 0x00000000, 0x000E0012, 0x00000000, 0x00000000, N(80242058), 0x00000000, 0x00000000, N(80241EA0), + 0x00000000, 0x00000000, 0x000D0008, +}; + +NpcSettings N(npcSettings_8024212C) = { + .height = 90, + .radius = 65, + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +s32 N(unk_missing_80242158)[] = { + 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x000D0000, +}; + +Script N(80242184) = SCRIPT({ + loop { + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_WORLD_TUBBA, SI_VAR(1), SI_VAR(2), SI_VAR(3)); + SI_VAR(1) -= SI_VAR(0); + if (SI_VAR(1) < 150) { + break loop; + } + sleep 1; + } + SI_SAVE_FLAG(1067) = 1; + SI_AREA_FLAG(1) = 1; +}); + +Script N(idle_80242238) = SCRIPT({ + loop { + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(0) >= -1150) { + break loop; + } + sleep 1; + } + DisablePlayerInput(TRUE); + SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8); + sleep 15; + spawn { + UseSettingsFrom(0, -50, 0, 180); + SetCamSpeed(0, 2.0); + SetPanTarget(0, -50, 0, 180); + PanToTarget(0, 0, 1); + } + SI_SAVE_VAR(203) = 15; + SetNpcPos(NPC_SELF, 0, 0, 88); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcYaw(NPC_SELF, 270); + NpcMoveTo(NPC_SELF, -53, 180, 60); + SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + sleep 15; + SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 0, MESSAGE_ID(0x0E, 0x00F3)); + sleep 15; + spawn { + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 2.0); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + WaitForCam(0, 1.0); + PanToTarget(0, 0, 0); + DisablePlayerInput(FALSE); + } + BindNpcAI(NPC_SELF, N(npcAI_8024274C)); +}); + +Script N(802424E8) = SCRIPT({ + GetNpcPos(NPC_SELF, SI_VAR(6), SI_VAR(7), SI_VAR(8)); + loop { + sleep 1; + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + if (SI_VAR(3) != SI_VAR(6)) { + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 65538); + GetDist2D(SI_VAR(10), SI_VAR(0), SI_VAR(2), SI_VAR(3), SI_VAR(5)); + match SI_VAR(10) { + < 200 { + spawn { + ShakeCam(0, 0, 5, 1.6005859375); + sleep 5; + ShakeCam(0, 0, 2, 0.80078125); + } + } + < 300 { + spawn { + ShakeCam(0, 0, 5, 0.6005859375); + sleep 5; + ShakeCam(0, 0, 2, 0.30078125); + } + } + >= 300 { + spawn { + ShakeCam(0, 0, 5, 0.1005859375); + sleep 5; + ShakeCam(0, 0, 2, 0.05078125); + } + } + } + sleep 12; + } else { + } + GetNpcPos(NPC_SELF, SI_VAR(6), SI_VAR(7), SI_VAR(8)); + } +}); + +NpcAISettings N(npcAISettings_8024271C) = { + .moveSpeed = 3.0f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 150.0f, + .unk_10 = { .f = 80.0f }, + .unk_14 = 1, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 180 }, + .unk_20 = 2, + .chaseRadius = 160.0f, + .unk_28 = { .f = 80.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_8024274C) = SCRIPT({ + spawn N(80242184); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_200)), TRUE); + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_C)); + spawn N(802424E8); + N(func_80241464_C50974)(N(npcAISettings_8024271C)); +}); + +const char N(dgb_14_name_hack)[]; + +Script N(defeat_802427B0) = SCRIPT({ + N(UnkFunc1)(); + GotoMap(N(dgb_14_name_hack), 1); + sleep 100; +}); + +Script N(init_802427EC) = SCRIPT({ + if (STORY_PROGRESS != STORY_CH3_ARRIVED_AT_TUBBAS_MANOR) { + RemoveNpc(NPC_SELF); + return; + } + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + if (SI_SAVE_VAR(203) != 15) { + BindNpcIdle(NPC_SELF, N(idle_80242238)); + } else { + SetNpcPos(NPC_SELF, -310, 0, 180); + BindNpcIdle(NPC_SELF, N(npcAI_8024274C)); + } + BindNpcDefeat(NPC_SELF, N(defeat_802427B0)); +}); + +StaticNpc N(npcGroup_802428C0) = { + .id = NPC_WORLD_TUBBA, + .settings = &N(npcSettings_8024212C), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .init = &N(init_802427EC), + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 7, -500, 0, 200, -700, 0, 200, -900, 0, 200, -1000, 0, 200, -800, 0, 200, -600, 0, 200, -400, 0, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -500, 0, 200, 1000, 250, 1, 1 }, + .animations = { + NPC_ANIM(world_tubba, Palette_00, Anim_6), + NPC_ANIM(world_tubba, Palette_00, Anim_9), + NPC_ANIM(world_tubba, Palette_00, Anim_C), + NPC_ANIM(world_tubba, Palette_00, Anim_C), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + NPC_ANIM(world_tubba, Palette_00, Anim_0), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, +}; + +NpcGroupList N(npcGroupList_80242AB0) = { + NPC_GROUP(N(npcGroup_802428C0), BATTLE_ID(15, 4, 0, 1)), + {}, +}; + +static s32 N(pad_2AC8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(80242AD0) = SCRIPT({ + group 0; + suspend group 1; + func_802D6420(); + if (SI_VAR(0) == 0) { + ShowMessageAtScreenPos(MESSAGE_ID(0x1D, 0x00D8), 160, 40); + func_802D6954(); + resume group 1; + return; + } + if (SI_VAR(0) == -1) { + func_802D6954(); + resume group 1; + return; + } + FindKeyItem(19, SI_VAR(0)); + RemoveKeyItemAt(SI_VAR(0)); + func_802D6954(); + SI_SAVE_FLAG(1066) = 1; + N(GetEntityPosition)(SI_MAP_VAR(0), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAt(0x269, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) = SI_MAP_VAR(0); + N(SetEntityFlags100000)(); + resume group 1; + unbind; +}); + +Script N(80242C38) = SCRIPT({ + bind N(exitDoubleDoor_80241A7C) to TRIGGER_WALL_PRESS_A 10; +}); + +Script N(makeEntities) = SCRIPT({ + if (SI_SAVE_FLAG(1066) == 0) { + MakeEntity(0x802BCD68, 130, 8, 175, -80, MAKE_ENTITY_END); + AssignScript(N(80242C38)); + SI_MAP_VAR(0) = SI_VAR(0); + } +}); #include "world/common/UnkNpcAIFunc6.inc.c" @@ -8,15 +452,202 @@ #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240208_C4F718); +s32 N(func_80240208_C4F718)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", update_starpoints_display_C4F8CC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024061C_C4FB2C); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802408D0_C4FDE0); -/* -ApiStatus N(func_802408D0_C4FDE0)(ScriptInstance* script, s32 isInitialCall) { + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(update_starpoints_display_C4F8CC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C4F718)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_802408D0_C4FDE0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -48,12 +679,9 @@ ApiStatus N(func_802408D0_C4FDE0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240A28_C4FF38); -/* void N(func_80240A28_C4FF38)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -63,7 +691,7 @@ void N(func_80240A28_C4FF38)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -101,18 +729,15 @@ void N(func_80240A28_C4FF38)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240D90_C502A0); -/* void N(func_80240D90_C502A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -136,11 +761,8 @@ void N(func_80240D90_C502A0)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240F4C_C5045C); -/* -ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -155,9 +777,8 @@ ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } -*/ #include "world/common/NpcJumpFunc2.inc.c" @@ -165,14 +786,12 @@ ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024121C_C5072C); -/* -ApiStatus N(func_8024121C_C5072C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024121C_C5072C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; @@ -187,12 +806,9 @@ ApiStatus N(func_8024121C_C5072C)(ScriptInstance* script, s32 isInitialCall) { } } } -*/ #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802413A4_C508B4); -/* void N(func_802413A4_C508B4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -210,8 +826,91 @@ void N(func_802413A4_C508B4)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[1].s = 0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241464_C50974); +ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; + + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802408D0_C4FDE0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240A28_C4FF38)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240D90_C502A0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240F4C_C5045C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024121C_C5072C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_802413A4_C508B4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; +} #include "world/common/UnkFunc1.inc.c" + +const char N(dgb_14_name_hack)[] = "dgb_14"; diff --git a/src/world/area_dgb/dgb_15/dgb_15.h b/src/world/area_dgb/dgb_15/dgb_15.h index 115f633fe4..e743e2453c 100644 --- a/src/world/area_dgb/dgb_15/dgb_15.h +++ b/src/world/area_dgb/dgb_15/dgb_15.h @@ -2,3 +2,17 @@ #include "map.h" #define NAMESPACE dgb_15 + +ApiStatus N(GetEntityPosition)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SetEntityFlags100000)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(update_starpoints_display_C4F8CC)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_80242AB0); +Script N(80242AD0); +Script N(main); +Script N(makeEntities); +Script N(npcAI_8024274C); +Script N(unk_80241F8C); diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 591715ec6a..9393ede7ed 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -1,4 +1,618 @@ #include "dgb_16.h" +#include "message_ids.h" +#include "sprite/npc/world_clubba.h" + +extern s16 D_8009A634; +extern Npc* wPartnerNpc; + +enum { + NPC_WORLD_CLUBBA0, + NPC_WORLD_CLUBBA1, + NPC_WORLD_CLUBBA2 = 5, + NPC_WORLD_CLUBBA3, + NPC_WORLD_CLUBBA4 = 10, + NPC_WORLD_CLUBBA5, + NPC_WORLD_CLUBBA6 = 15, + NPC_WORLD_CLUBBA7, + NPC_WORLD_CLUBBA8 = 20, + NPC_WORLD_CLUBBA9, + NPC_WORLD_CLUBBA10 = 25, + NPC_WORLD_CLUBBA11, +}; + +EntryList N(entryList) = { + { 450.0f, 0.0f, -40.0f, 0.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_16_tattle, +}; + +Script N(80241480) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_1518)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitSingleDoor_80241520) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(0); + SI_VAR(0) = 0; + SI_VAR(1) = 6; + SI_VAR(2) = 16; + SI_VAR(3) = -1; + spawn ExitSingleDoor; + sleep 17; + GotoMap("dgb_15", 2); + sleep 100; +}); + +const char N(pad_XXX)[] = { 0, 0 }; + +Script N(enterSingleDoor_802415D4) = SCRIPT({ + UseDoorSounds(0); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + if (SI_SAVE_FLAG(1068) == 0) { + SI_SAVE_FLAG(1068) = 1; + SI_SAVE_VAR(203) = 18; + } + SI_VAR(2) = 16; + SI_VAR(3) = -1; + await EnterSingleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamEnabled(0, 1); + if (STORY_PROGRESS < STORY_CH3_STAR_SPIRIT_RESCUED) { + MakeNpcs(1, N(npcGroupList_8024318C)); + } + await N(80241780); + spawn N(80241480); + bind N(exitSingleDoor_80241520) to TRIGGER_WALL_PRESS_A 6; + spawn N(enterSingleDoor_802415D4); +}); + +static s32 N(pad_1774)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(80241780) = SCRIPT({ + MakeItemEntity(ITEM_CASTLE_KEY1, -235, 25, -165, 17, SI_SAVE_FLAG(1069)); +}); + +static s32 N(pad_17B4)[] = { + 0x00000000, 0x00000000, 0x00000000, +}; + +Script N(802417C0) = SCRIPT({ + GetBattleOutcome(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + RemoveNpc(NPC_SELF); + } + == 2 { + SetNpcPos(NPC_SELF, 0, -1000, 0); + func_80045900(1); + } + == 3 { + SetEnemyFlagBits(-1, 16, 1); + RemoveNpc(NPC_SELF); + } + } +}); + +NpcAnimID N(extraAnimationList_8024187C)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + ANIM_END, +}; + +NpcAnimID N(extraAnimationList_802418A4)[] = { + NPC_ANIM(world_clubba, Palette_00, Anim_0), + ANIM_END, +}; + +NpcAISettings N(npcAISettings_802418AC) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .unk_10 = { .f = 40.0f }, + .unk_14 = 10, + .chaseSpeed = 3.5f, + .unk_1C = { .s = 90 }, + .unk_20 = 15, + .chaseRadius = 200.0f, + .unk_28 = { .f = 160.0f }, + .unk_2C = 1, +}; + +Script N(npcAI_802418DC) = SCRIPT({ + SetSelfVar(0, 0); + SetSelfVar(1, 10); + SetSelfVar(2, 14); + SetSelfVar(3, 18); + N(func_80240E20_C53360)(N(npcAISettings_802418AC)); +}); + +NpcSettings N(npcSettings_8024194C) = { + .height = 36, + .radius = 34, + .ai = &N(npcAI_802418DC), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +Script N(npcAI_80241978) = SCRIPT({ + EnableNpcShadow(NPC_SELF, FALSE); + SetSelfVar(0, 4); + SetSelfVar(1, 32); + SetSelfVar(2, 50); + SetSelfVar(3, 32); + SetSelfVar(4, 3); + SetSelfVar(15, 8389); + N(update_starpoints_display_C528FC)(); +}); + +NpcSettings N(npcSettings_80241A20) = { + .height = 14, + .radius = 18, + .ai = &N(npcAI_80241978), + .onDefeat = &N(802417C0), + .level = 13, + .unk_2A = 8, +}; + +StaticNpc N(npcGroup_80241A4C)[] = { + { + .id = NPC_WORLD_CLUBBA0, + .settings = &N(npcSettings_8024194C), + .pos = { -70.0f, 0.0f, -100.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { -70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + .extraAnimations = &N(extraAnimationList_8024187C), + }, + { + .id = NPC_WORLD_CLUBBA1, + .settings = &N(npcSettings_80241A20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418A4), + }, +}; + +StaticNpc N(npcGroup_80241E2C)[] = { + { + .id = NPC_WORLD_CLUBBA2, + .settings = &N(npcSettings_8024194C), + .pos = { 0.0f, 0.0f, -235.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 90, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 0, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA3, + .settings = &N(npcSettings_80241A20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418A4), + }, +}; + +StaticNpc N(npcGroup_8024220C)[] = { + { + .id = NPC_WORLD_CLUBBA4, + .settings = &N(npcSettings_8024194C), + .pos = { 70.0f, 0.0f, -100.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 90, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 70, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA5, + .settings = &N(npcSettings_80241A20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418A4), + }, +}; + +StaticNpc N(npcGroup_802425EC)[] = { + { + .id = NPC_WORLD_CLUBBA6, + .settings = &N(npcSettings_8024194C), + .pos = { 140.0f, 0.0f, -235.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 140, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA7, + .settings = &N(npcSettings_80241A20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418A4), + }, +}; + +StaticNpc N(npcGroup_802429CC)[] = { + { + .id = NPC_WORLD_CLUBBA8, + .settings = &N(npcSettings_8024194C), + .pos = { 210.0f, 0.0f, -100.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 270, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 210, 0, -100, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA9, + .settings = &N(npcSettings_80241A20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418A4), + }, +}; + +StaticNpc N(npcGroup_80242DAC)[] = { + { + .id = NPC_WORLD_CLUBBA10, + .settings = &N(npcSettings_8024194C), + .pos = { 280.0f, 0.0f, -235.0f }, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT, + .yaw = 90, + .dropFlags = 0x80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_SUPER_SHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(3), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 2, + .maxCoinBonus = 3, + .movement = { 280, 0, -235, 40, 0, -32767, 0, 150, 0, -175, 430, 92, 1, 1 }, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .unk_1E0 = { 00, 00, 00, 02, 00, 00, 00, 00}, + }, + { + .id = NPC_WORLD_CLUBBA11, + .settings = &N(npcSettings_80241A20), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_NO_DROPS, + .yaw = 0, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_3), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_4), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_C), + NPC_ANIM(world_clubba, Palette_00, Anim_11), + NPC_ANIM(world_clubba, Palette_00, Anim_12), + NPC_ANIM(world_clubba, Palette_00, Anim_7), + NPC_ANIM(world_clubba, Palette_00, Anim_8), + NPC_ANIM(world_clubba, Palette_00, Anim_1), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + NPC_ANIM(world_clubba, Palette_00, Anim_2), + }, + .extraAnimations = &N(extraAnimationList_802418A4), + }, +}; + +NpcGroupList N(npcGroupList_8024318C) = { + NPC_GROUP(N(npcGroup_80241A4C), BATTLE_ID(15, 3, 0, 3)), + NPC_GROUP(N(npcGroup_80241E2C), BATTLE_ID(15, 0, 0, 3)), + NPC_GROUP(N(npcGroup_8024220C), BATTLE_ID(15, 0, 0, 3)), + NPC_GROUP(N(npcGroup_802425EC), BATTLE_ID(15, 0, 0, 3)), + NPC_GROUP(N(npcGroup_802429CC), BATTLE_ID(15, 1, 0, 3)), + NPC_GROUP(N(npcGroup_80242DAC), BATTLE_ID(15, 1, 0, 3)), + {}, +}; #include "world/common/UnkNpcAIFunc6.inc.c" @@ -8,22 +622,242 @@ #include "world/common/UnkNpcAIFunc5.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240208_C52748); +s32 N(func_80240208_C52748)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", update_starpoints_display_C528FC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024061C_C52B5C); + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802406A4_C52BE4); + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_8024095C_C52E9C); + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_802409C0_C52F00); + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240A68_C52FA8); + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} + +ApiStatus N(update_starpoints_display_C528FC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} + +void N(func_8024061C_C52B5C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } + + if (npc->duration == 1) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration <= 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0].s = 1; + } +} + +void N(func_802406A4_C52BE4)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerData* playerData = get_player_data(); + s32 phi_s2 = FALSE; + s32 var; + f32 posX, posZ; + + if (func_800490B4(territory, enemy, 80.0f, 0.0f, 0)) { + if ((gPlayerStatusPtr->actionState == 2) || (gPlayerStatusPtr->actionState == 26) || + (gPlayerStatusPtr->actionState == 3) || (gPlayerStatusPtr->actionState == 14) || + (gPlayerStatusPtr->actionState == 16) || (gPlayerStatusPtr->actionState == 11) || + (gPlayerStatusPtr->actionState == 10) || (gPlayerStatusPtr->actionState == 18) || + (gPlayerStatusPtr->actionState == 19) || (gPlayerStatusPtr->actionState == 37)) { + phi_s2 = TRUE; + } + + if (playerData->currentPartner == 2) { + if (D_8010EBB0.unk_00 == playerData->currentPartner) { + phi_s2 = TRUE; + } + } + } + + if (((playerData->currentPartner == 1) && (D_8010EBB0.unk_00 != 0)) || + ((playerData->currentPartner == 3) && (D_8010EBB0.unk_00 == 2))) { + posX = npc->pos.x; + posZ = npc->pos.z; + add_vec2D_polar(&posX, &posZ, 0.0f, npc->yaw); + if (dist2D(posX, posZ, wPartnerNpc->pos.x, wPartnerNpc->pos.z) <= 80.0f) { + phi_s2 = TRUE; + } + } + + if (phi_s2) { + func_800494C0(npc, 0xB000000E, 0); + npc->currentAnim = enemy->animList[11]; + npc->duration = 10; + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + func_800494C0(npc, 0x2F4, 0x200000); + script->functionTemp[0].s = 2; + } + + npc->duration++; + if (npc->duration == 27) { + func_800494C0(npc, 0xB000000C, 0); + } else if (npc->duration == 57) { + func_800494C0(npc, 0xB000000D, 0); + } else if (npc->duration == 59) { + npc->currentAnim = enemy->animList[12]; + } else if (npc->duration == 60) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + } +} + +void N(func_8024095C_C52E9C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 1; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + } +} + +void N(func_802409C0_C52F00)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + + npc->yaw = clamp_angle((npc->yaw + rand_int(180)) - 90.0f); + npc->currentAnim = enemy->animList[0]; + script->functionTemp[1].s = (rand_int(1000) % 2) + 2; + script->functionTemp[0].s = 4; +} + +void N(func_80240A68_C52FA8)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + return; + } + + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + return; + } + + var = enemy->varTable[7]; + if (var == 40) { + npc->duration = 20; + script->functionTemp[0].s = var; + } else if (var == 50) { + npc->duration = 25; + script->functionTemp[0].s = var; + } + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240BA0_C530E0); -/* void N(func_80240BA0_C530E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); @@ -39,12 +873,227 @@ void N(func_80240BA0_C530E0)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[0].s = 0x29; } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240C4C_C5318C); +void N(func_80240C4C_C5318C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 var; -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240DC4_C53304); + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->currentAnim = enemy->animList[0]; + npc->duration = 15; + enemy->varTable[7] = 50; + script->functionTemp[0].s = 3; + } else if (npc->unk_8C == 0) { + var = npc->yaw; + func_8004A784(npc, 5.0f, &var, 0, 0, 0); + npc->yaw = var; + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80240E20_C53360); +void N(func_80240DC4_C53304)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); -INCLUDE_ASM(s32, "world/area_dgb/dgb_16/C52540", func_80241170_C536B0); + if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration <= 0) { + npc->duration = 0; + script->functionTemp[0].s = 0; + } + } +} + +ApiStatus N(func_80240E20_C53360)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 40.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 30; + npc->currentAnim = enemy->animList[10]; + npc->flags &= ~0x800; + enemy->varTable[0] = 0; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 40; + npc->currentAnim = enemy->animList[0]; + } + enemy->unk_B0 &= ~4; + } + + if (((u32)script->functionTemp[0].s - 10 < 20) && (enemy->varTable[0] == 0) && N(func_80240208_C52748)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_8024061C_C52B5C)(script, npcAISettings, territoryPtr); + break; + case 1: + N(func_802406A4_C52BE4)(script, npcAISettings, territoryPtr); + break; + case 2: + N(func_8024095C_C52E9C)(script, npcAISettings, territoryPtr); + break; + case 3: + N(func_802409C0_C52F00)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240A68_C52FA8)(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 13) { + break; + } + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + npc->duration = 15; + enemy->varTable[7] = 40; + script->functionTemp[0].s = 3; + break; + case 30: + N(UnkNpcAIFunc6)(script); + if (script->functionTemp[0].s != 31) { + break; + } + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + break; + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 40: + N(func_80240BA0_C530E0)(script, npcAISettings, territoryPtr); + if (script->functionTemp[0].s != 41) { + break; + } + case 41: + N(func_80240C4C_C5318C)(script, npcAISettings, territoryPtr); + break; + case 50: + N(func_80240DC4_C53304)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_80241170_C536B0)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_C52748)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} diff --git a/src/world/area_dgb/dgb_16/dgb_16.h b/src/world/area_dgb/dgb_16/dgb_16.h index ffbe5ee054..be1e8ec21f 100644 --- a/src/world/area_dgb/dgb_16/dgb_16.h +++ b/src/world/area_dgb/dgb_16/dgb_16.h @@ -2,3 +2,10 @@ #include "map.h" #define NAMESPACE dgb_16 + +ApiStatus N(func_80240E20_C53360)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(update_starpoints_display_C528FC)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_8024318C); +Script N(80241780); +Script N(main); diff --git a/src/world/area_dgb/dgb_17/C55A60.c b/src/world/area_dgb/dgb_17/C55A60.c new file mode 100644 index 0000000000..426d260b05 --- /dev/null +++ b/src/world/area_dgb/dgb_17/C55A60.c @@ -0,0 +1,106 @@ +#include "dgb_17.h" +#include "message_ids.h" + +EntryList N(entryList) = { + { -570.0f, 0.0f, 180.0f, 90.0f }, + { -180.0f, 0.0f, 180.0f, 270.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = MSG_dgb_17_tattle, +}; + +Script N(80240060) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_F8)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80240100) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 7; + SI_VAR(2) = 14; + SI_VAR(3) = 16; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_15", 1); + sleep 100; +}); + +Script N(exitDoubleDoor_802401B4) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 1; + SI_VAR(1) = 11; + SI_VAR(2) = 21; + SI_VAR(3) = 19; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 5); + sleep 100; +}); + +Script N(80240268) = SCRIPT({ + bind N(exitDoubleDoor_80240100) to TRIGGER_WALL_PRESS_A 7; + bind N(exitDoubleDoor_802401B4) to TRIGGER_WALL_PRESS_A 11; +}); + +Script N(enterDoubleDoor_802402B0) = SCRIPT({ + GetLoadType(SI_VAR(1)); + if (SI_VAR(1) == 1) { + spawn EnterSavePoint; + spawn N(80240268); + return; + } + UseDoorSounds(3); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 14; + SI_VAR(3) = 16; + await EnterDoubleDoor; + } + == 1 { + SI_VAR(2) = 21; + SI_VAR(3) = 19; + await EnterDoubleDoor; + } + } + spawn N(80240268); +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamLeadPlayer(0, 0); + SetCamEnabled(0, 1); + await N(makeEntities); + spawn N(80240060); + spawn N(enterDoubleDoor_802402B0); +}); + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802E9A18, -300, 60, 75, 0, MAKE_ENTITY_END); + MakeEntity(0x802EA7E0, -450, 60, 75, 0, MAKE_ENTITY_END); +}); diff --git a/src/world/area_dgb/dgb_17/dgb_17.h b/src/world/area_dgb/dgb_17/dgb_17.h new file mode 100644 index 0000000000..03825770c4 --- /dev/null +++ b/src/world/area_dgb/dgb_17/dgb_17.h @@ -0,0 +1,7 @@ +#include "common.h" +#include "map.h" + +#define NAMESPACE dgb_17 + +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index d01eadbbbe..8944f79dca 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -1,8 +1,690 @@ #include "dgb_18.h" +#include "message_ids.h" +#include "sprite/npc/world_bombette.h" +#include "sprite/npc/world_bow.h" +#include "sprite/npc/world_goombario.h" +#include "sprite/npc/world_kooper.h" +#include "sprite/npc/world_parakarry.h" +#include "sprite/npc/world_tubba.h" +#include "sprite/npc/yakkey.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240000_C55F40); -/* -ApiStatus N(func_80240000_C55F40)(ScriptInstance* script, s32 isInitialCall) { +enum { + NPC_WORLD_TUBBA, + NPC_YAKKEY, +}; + +EntryList N(entryList) = { + { -120.0f, 0.0f, 180.0f, 90.0f }, +}; + +MapConfig N(config) = { + .main = N(main), + .entryList = N(entryList), + .entryCount = ENTRY_COUNT(N(entryList)), + .tattle = 0x1900D2, +}; + +Script N(802412C0) = SCRIPT({ + match STORY_PROGRESS { + < STORY_CH3_TUBBA_WOKE_UP { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + < STORY_CH3_DEFEATED_TUBBA_BLUBBA { + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + } + else { + SetMusicTrack(0, SONG_TUBBAS_MANOR, 0, 8); + } + } +}); + +static s32 N(pad_1358)[] = { + 0x00000000, 0x00000000, +}; + +Script N(exitDoubleDoor_80241360) = SCRIPT({ + group 27; + DisablePlayerInput(TRUE); + UseDoorSounds(3); + SI_VAR(0) = 0; + SI_VAR(1) = 17; + SI_VAR(2) = 8; + SI_VAR(3) = 10; + spawn ExitDoubleDoor; + sleep 17; + GotoMap("dgb_01", 6); + sleep 100; +}); + +Script N(enterDoubleDoor_80241414) = SCRIPT({ + UseDoorSounds(3); + GetEntryID(SI_VAR(0)); + match SI_VAR(0) { + == 0 { + SI_VAR(2) = 8; + SI_VAR(3) = 10; + await EnterDoubleDoor; + } + } +}); + +Script N(main) = SCRIPT({ + WORLD_LOCATION = LOCATION_TUBBAS_MANOR; + SetSpriteShading(-1); + SetCamPerspective(0, 3, 25, 16, 4096); + SetCamBGColor(0, 0, 0, 0); + SetCamEnabled(0, 1); + SetCamLeadPlayer(0, 0); + MakeNpcs(1, N(npcGroupList_802436B4)); + await N(makeEntities); + spawn N(802412C0); + bind N(exitDoubleDoor_80241360) to TRIGGER_WALL_PRESS_A 17; + spawn N(enterDoubleDoor_80241414); +}); + +static s32 N(pad_1578)[] = { + 0x00000000, 0x00000000, +}; + +NpcAISettings N(npcAISettings_80241580) = { + .moveSpeed = 4.5f, + .alertRadius = 170.0f, + .unk_10 = { .f = 90.0f }, + .unk_14 = 1, + .chaseSpeed = 3.9f, + .unk_1C = { .s = 180 }, + .unk_20 = 2, + .chaseRadius = 170.0f, + .unk_28 = { .f = 90.0f }, + .unk_2C = 1, +}; + +Script N(802415B0) = SCRIPT({ + N(func_80240B94_C56AD4)(N(npcAISettings_80241580)); +}); + +NpcSettings N(npcSettings_802415D0) = { + .height = 90, + .radius = 65, + .ai = &N(802415B0), + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcSettings N(npcSettings_802415FC) = { + .height = 90, + .radius = 65, + .onHit = EnemyNpcHit, + .onDefeat = EnemyNpcDefeat, + .level = 13, +}; + +NpcSettings N(npcSettings_80241628) = { + .height = 24, + .radius = 24, + .level = 13, +}; + +Script N(idle_80241654) = SCRIPT({ +10: + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + if (SI_VAR(0) < 700) { + goto 10; + } + if (SI_VAR(2) > 185) { + goto 10; + } + DisablePlayerInput(TRUE); + sleep 10; + spawn { + sleep 10; + InterpPlayerYaw(270, 0); + } + FadeOutMusic(0, 500); + loop 3 { + SetPlayerAnimation(ANIM_8001E); + PlaySoundAt(SOUND_UNKNOWN_20F6, 0, 382, 0, 218); + ShakeCam(0, 0, 5, 1.0); + sleep 20; + SetPlayerAnimation(ANIM_10002); + sleep 10; + } + loop 2 { + InterpPlayerYaw(270, 0); + sleep 10; + InterpPlayerYaw(90, 0); + sleep 10; + } + UseSettingsFrom(0, -40, 0, 180); + SetCamSpeed(0, 90.0); + SetPanTarget(0, -40, 0, 180); + PanToTarget(0, 0, 1); + WaitForCam(0, 1.0); + SetPlayerPos(740, 0, 180); + SetNpcPos(NPC_PARTNER, 765, 0, 180); + InterpPlayerYaw(270, 0); + InterpNpcYaw(NPC_PARTNER, 270, 0); + SetPlayerAnimation(ANIM_8000C); + PlaySoundAtCollider(17, 455, 0); + MakeLerp(0, 80, 10, 0); + loop { + UpdateLerp(); + RotateModel(8, SI_VAR(0), 0, -1, 0); + RotateModel(10, SI_VAR(0), 0, 1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + spawn { + loop 3 { + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 5, 0.30078125); + sleep 5; + } + } + SetMusicTrack(0, SONG_TUBBA_BLUBBA_THEME, 0, 8); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetNpcPos(NPC_SELF, -210, 0, 180); + NpcMoveTo(NPC_SELF, -60, 180, 30); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + spawn { + MakeLerp(80, 0, 10, 0); + loop { + UpdateLerp(); + RotateModel(8, SI_VAR(0), 0, -1, 0); + RotateModel(10, SI_VAR(0), 0, 1, 0); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + PlaySoundAtCollider(17, 456, 0); + } + sleep 20; + SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00F4)); + sleep 20; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_9)); + SetSelfVar(0, 0); + spawn { + loop { + GetSelfVar(0, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 5, 0.30078125); + sleep 9; + GetSelfVar(0, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_20F6, 0); + ShakeCam(0, 0, 2, 0.150390625); + sleep 12; + } + } + spawn { + loop { + GetNpcPos(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + GetSelfVar(0, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + } + } + SetNpcSpeed(NPC_SELF, 4.0); + NpcMoveTo(NPC_SELF, 45, 215, 0); + NpcMoveTo(NPC_SELF, 140, 245, 0); + NpcMoveTo(NPC_SELF, 615, 245, 0); + SetSelfVar(0, 1); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_6)); + sleep 15; + sleep 20; + SpeakToPlayer(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_10), NPC_ANIM(world_tubba, Palette_00, Anim_6), 5, MESSAGE_ID(0x0E, 0x00F5)); + sleep 20; + spawn { + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_14)); + sleep 5; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_15)); + sleep 5; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_16)); + sleep 5; + } + sleep 5; + SetNpcJumpscale(NPC_SELF, 0.7001953125); + NpcJump0(NPC_SELF, 600, 50, 115, 20); + spawn { + ShakeCam(0, 0, 5, 0.30078125); + } + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_5)); + SetNpcScale(NPC_SELF, 1.25, 1.2001953125, 1.25); + sleep 1; + SetNpcScale(NPC_SELF, 1.3505859375, 1.150390625, 1.25); + sleep 1; + SetNpcScale(NPC_SELF, 1.4501953125, 1.05078125, 1.25); + sleep 1; + SetNpcScale(NPC_SELF, 1.3505859375, 1.150390625, 1.25); + sleep 1; + SetNpcScale(NPC_SELF, 1.25, 1.2001953125, 1.25); + sleep 1; + GetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + spawn { + SetNpcJumpscale(NPC_SELF, 0.5); + NpcJump0(NPC_SELF, SI_VAR(3), 30, SI_VAR(5), 23); + } + sleep 2; + spawn { + MakeLerp(0, 50, 18, 1); + loop { + UpdateLerp(); + func_802CDE68(-1, SI_VAR(0)); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + } + MakeLerp(0, -90, 18, 1); + loop { + UpdateLerp(); + SetNpcRotation(NPC_SELF, 0, 0, SI_VAR(0)); + sleep 1; + if (SI_VAR(1) == 0) { + break loop; + } + } + spawn { + ShakeCam(0, 0, 10, 0.400390625); + } + sleep 5; + FadeOutMusic(0, 1000); + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + SetNpcPos(NPC_SELF, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + func_802CDE68(-1, 0); + SetNpcRotation(NPC_SELF, 0, 0, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_2)); + sleep 15; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_24)); + sleep 30; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + sleep 30; + spawn { + SetSelfVar(1, 0); + loop { + GetSelfVar(1, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2039, 0); + RandInt(10, SI_VAR(1)); + SI_VAR(1) += 15; + ShowSleepBubble(0, 0, 0, 2, 628, 121, 127, SI_VAR(1), SI_VAR(0)); + sleep 48; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + RandInt(10, SI_VAR(1)); + SI_VAR(1) += 10; + func_802D8248(SI_VAR(0), SI_VAR(1)); + sleep 30; + } + } + sleep 30; + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 2.0); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + WaitForCam(0, 1.0); + PanToTarget(0, 0, 0); + STORY_PROGRESS = STORY_CH3_TUBBA_BEGAN_NAPPING; + DisablePlayerInput(FALSE); +}); + +Script N(idle_80242494) = SCRIPT({ + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + SetNpcPos(NPC_SELF, 600, 50, 115); + func_802CDE68(-1, 0); + SetNpcRotation(NPC_SELF, 0, 0, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_2)); + sleep 15; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_24)); + sleep 30; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + sleep 30; + spawn { + SetSelfVar(1, 0); + loop { + GetSelfVar(1, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2039, 0); + RandInt(10, SI_VAR(1)); + SI_VAR(1) += 15; + ShowSleepBubble(0, 0, 0, 2, 628, 121, 127, SI_VAR(1), SI_VAR(0)); + sleep 48; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2038, 0); + RandInt(10, SI_VAR(1)); + SI_VAR(1) += 10; + func_802D8248(SI_VAR(0), SI_VAR(1)); + sleep 30; + } + } +}); + +Script N(npcAI_802426B0) = SCRIPT({ + group 11; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2039, 0); + ShowSleepBubble(0, 0, 50, 2, 552, 111, 128, 30, SI_VAR(0)); + sleep 360; + func_802D8248(SI_VAR(0), 20); + SetNpcVar(-1, 1, 2); + sleep 20; + PlaySoundAtNpc(NPC_SELF, SOUND_UNKNOWN_2F1, 0); + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_19)); + sleep 30; + spawn { + NpcJump0(NPC_SELF, 650, 0, 250, 25); + } + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_1A)); + sleep 10; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_1B)); + sleep 12; + SetNpcAnimation(NPC_SELF, NPC_ANIM(world_tubba, Palette_00, Anim_1C)); + sleep 5; + BindNpcAI(NPC_WORLD_TUBBA, N(npcAI_80242834)); +}); + +Script N(npcAI_80242834) = SCRIPT({ + group 11; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_D)); + spawn { + loop { + ShakeCam(0, 0, 5, 2.0); + sleep 5; + ShakeCam(0, 0, 2, 1.0); + sleep 8; + } + } + N(func_80240B94_C56AD4)(N(npcAISettings_80241580)); +}); + +const char N(dgb_01_name_hack)[]; + +Script N(defeat_802428E8) = SCRIPT({ + N(UnkFunc1)(); + GotoMap(N(dgb_01_name_hack), 6); + sleep 100; +}); + +const char N(pad_XXX)[] = { 0, 0 }; + +Script N(init_80242924) = SCRIPT({ + SetNpcScale(NPC_SELF, 1.25, 1.25, 1.25); + BindNpcDefeat(NPC_SELF, N(defeat_802428E8)); + match STORY_PROGRESS { + < STORY_CH3_TUBBA_BEGAN_NAPPING { + BindNpcIdle(NPC_SELF, N(idle_80241654)); + } + < STORY_CH3_TUBBA_WOKE_UP { + BindNpcIdle(NPC_SELF, N(idle_80242494)); + } + < STORY_CH3_TUBBA_SMASHED_THE_BRIDGES { + SetNpcPos(NPC_SELF, 245, 0, 250); + SetNpcYaw(NPC_SELF, 270); + BindNpcIdle(NPC_SELF, N(npcAI_80242834)); + } + < STORY_CH3_TUBBA_CHASED_MARIO_IN_FOYER { + RemoveNpc(NPC_SELF); + } + } +}); + +Script N(idle_80242A24) = SCRIPT({ + loop { + GetSelfVar(0, SI_VAR(0)); + if (SI_VAR(0) == 1) { + break loop; + } + sleep 1; + } + DisablePlayerInput(TRUE); + sleep 40; + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE); + SetNpcPos(NPC_SELF, 845, 0, 140); + SetNpcJumpscale(NPC_SELF, 0.80078125); + NpcJump1(NPC_SELF, 845, 35, 145, 15); + PlayerFaceNpc(-1, 0); + sleep 15; + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 90.0); + SetCamDistance(0, 300); + SetCamPosB(0, 800, 245); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PanToTarget(0, 0, 1); + SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00F6)); + sleep 15; + SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 5, MESSAGE_ID(0x0E, 0x00F7)); + ShowChoice(1966093); + if (SI_VAR(0) == 0) { + ContinueSpeech(-1, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00F8)); + } else { + ContinueSpeech(-1, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00F9)); + } + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 4.0); + UseSettingsFrom(0, 740, SI_VAR(1), SI_VAR(2)); + SetCamDistance(0, 600); + SetCamPosB(0, 800, 245); + SetPanTarget(0, 740, SI_VAR(1), SI_VAR(2)); + WaitForCam(0, 1.0); + spawn { + SI_MAP_FLAG(0) = 0; + SpeakToPlayer(NPC_SELF, NPC_ANIM(yakkey, Palette_00, Anim_2), NPC_ANIM(yakkey, Palette_00, Anim_1), 517, MESSAGE_ID(0x0E, 0x00FA)); + SI_MAP_FLAG(0) = 1; + } + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + loop { + SetCamDistance(0, 550.0); + SetCamSpeed(0, 90.0); + SetPanTarget(0, 740, SI_VAR(1), SI_VAR(2)); + sleep 1; + SetCamDistance(0, 600.0); + SetCamSpeed(0, 90.0); + SetPanTarget(0, 740, SI_VAR(1), SI_VAR(2)); + sleep 1; + if (SI_MAP_FLAG(0) == 1) { + break loop; + } + } + SetMusicTrack(0, SONG_TUBBA_ESCAPE, 0, 8); + SetNpcVar(0, 1, 1); + sleep 15; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_25)); + spawn { + loop { + GetNpcVar(0, 1, SI_VAR(0)); + if (SI_VAR(0) == 2) { + break loop; + } + RandInt(40, SI_VAR(0)); + RandInt(40, SI_VAR(1)); + SI_VAR(0) += 537; + SI_VAR(1) += 110; + PlayEffect(0x27, 2, SI_VAR(0), SI_VAR(1), 128, 0.30078125, 24, 0, 0, 0, 0, 0, 0, 0); + sleep 5; + } + } + sleep 15; + SetNpcAnimation(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_5)); + SpeakToPlayer(NPC_WORLD_TUBBA, NPC_ANIM(world_tubba, Palette_00, Anim_13), NPC_ANIM(world_tubba, Palette_00, Anim_5), 5, MESSAGE_ID(0x0E, 0x00FB)); + sleep 15; + DisablePartnerAI(0); + GetCurrentPartnerID(SI_VAR(0)); + match SI_VAR(0) { + == 1 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_goombario, normal, talk), NPC_ANIM(world_goombario, normal, idle), 0, MESSAGE_ID(0x0E, 0x00FC)); + } + == 2 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_kooper, normal, talk), NPC_ANIM(world_kooper, normal, idle), 0, MESSAGE_ID(0x0E, 0x00FD)); + } + == 3 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bombette, normal, idle_fast), NPC_ANIM(world_bombette, normal, idle), 0, MESSAGE_ID(0x0E, 0x00FE)); + } + == 4 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_parakarry, Palette_00, Anim_6), NPC_ANIM(world_parakarry, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x00FF)); + } + == 9 { + SpeakToPlayer(NPC_PARTNER, NPC_ANIM(world_bow, Palette_00, Anim_4), NPC_ANIM(world_bow, Palette_00, Anim_1), 0, MESSAGE_ID(0x0E, 0x0100)); + } + } + EnablePartnerAI(); + sleep 15; + BindNpcAI(NPC_WORLD_TUBBA, N(npcAI_802426B0)); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + UseSettingsFrom(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetCamSpeed(0, 4.0); + SetPanTarget(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + WaitForCam(0, 1.0); + PanToTarget(0, 0, 0); + GetPlayerPos(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetNpcJumpscale(NPC_SELF, 1.0); + SetNpcFlagBits(NPC_SELF, ((NPC_FLAG_100)), TRUE); + SI_VAR(1) -= 10; + NpcJump0(NPC_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + SetNpcPos(NPC_SELF, 0, -1000, 0); + STORY_PROGRESS = STORY_CH3_TUBBA_WOKE_UP; + DisablePlayerInput(FALSE); +}); + +Script N(init_8024329C) = SCRIPT({ + SetSelfVar(0, 0); + BindNpcIdle(NPC_SELF, N(idle_80242A24)); +}); + +StaticNpc N(npcGroup_802432D4) = { + .id = NPC_WORLD_TUBBA, + .settings = &N(npcSettings_802415FC), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_IGNORE_HEIGHT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .init = &N(init_80242924), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .movement = { 5, 0, 0, 240, 175, 0, 240, 350, 0, 240, 525, 0, 240, 700, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 300, 0, 240, 1000, 250, 1, 1 }, + .animations = { + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_A), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_D), + NPC_ANIM(world_tubba, Palette_00, Anim_19), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + NPC_ANIM(world_tubba, Palette_00, Anim_7), + }, +}; + +StaticNpc N(npcGroup_802434C4) = { + .id = NPC_YAKKEY, + .settings = &N(npcSettings_80241628), + .pos = { 0.0f, -1000.0f, 0.0f }, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_IGNORE_HEIGHT, + .init = &N(init_8024329C), + .yaw = 270, + .dropFlags = 0x80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + .animations = { + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + NPC_ANIM(yakkey, Palette_00, Anim_1), + }, +}; + +NpcGroupList N(npcGroupList_802436B4) = { + NPC_GROUP(N(npcGroup_802432D4), BATTLE_ID(15, 4, 0, 0)), + NPC_GROUP(N(npcGroup_802434C4), BATTLE_ID(0, 0, 0, 0)), + {}, +}; + +static s32 N(pad_36D8)[] = { + 0x00000000, 0x00000000, +}; + +s32 N(D_802436E0_C59620) = { + 0x00000000, +}; + +Script N(802436E4) = SCRIPT({ + group 0; + func_802D5830(2); + sleep 40; + ShowGotItem(SI_VAR(0), 0, 0); + func_802D5830(0); + return; +}); + +Script N(8024374C) = SCRIPT({ + DisablePlayerInput(TRUE); + SI_VAR(0) = SI_VAR(10); + if (SI_VAR(10) != 0) { + await N(802436E4); + } + match SI_VAR(11) { + == 0 { + AddItem(SI_VAR(10), SI_VAR(0)); + } + == 1 { + AddKeyItem(SI_VAR(10)); + } + == 2 { + AddBadge(SI_VAR(10), SI_VAR(0)); + } + } + sleep 15; + DisablePlayerInput(FALSE); +}); + +Script N(8024382C) = SCRIPT({ + SI_SAVE_FLAG(1071) = 1; + AddKeyItem(ITEM_MYSTICAL_KEY); + SetNpcVar(1, 0, 1); +}); + +Script N(makeEntities) = SCRIPT({ + MakeEntity(0x802EAE30, 845, 0, 145, -35, ITEM_NONE, MAKE_ENTITY_END); + AssignFlag(SI_SAVE_FLAG(1071)); + AssignScript(N(8024382C)); +}); + +ApiStatus N(func_80240000_C55F40)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,12 +716,9 @@ ApiStatus N(func_80240000_C55F40)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240158_C56098); -/* void N(func_80240158_C56098)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -49,7 +728,7 @@ void N(func_80240158_C56098)(ScriptInstance* script, NpcAISettings* aiSettings, if (aiSettings->unk_14 >= 0) { if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); func_800494C0(npc, 0x2F4, 0x200000); if (enemy->npcSettings->unk_2A & 1) { @@ -87,18 +766,15 @@ void N(func_80240158_C56098)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_802404C0_C56400); -/* void N(func_802404C0_C56400)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); func_800494C0(npc, 0x2F4, 0x200000); @@ -122,11 +798,8 @@ void N(func_802404C0_C56400)(ScriptInstance* script, NpcAISettings* aiSettings, } } } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024067C_C565BC); -/* -ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,9 +814,8 @@ ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } -*/ #include "world/common/NpcJumpFunc2.inc.c" @@ -151,14 +823,12 @@ ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_8024094C_C5688C); -/* -ApiStatus N(func_8024094C_C5688C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024094C_C5688C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); s32 var; - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); npc->currentAnim = enemy->animList[0]; npc->duration = 25; @@ -173,12 +843,9 @@ ApiStatus N(func_8024094C_C5688C)(ScriptInstance* script, s32 isInitialCall) { } } } -*/ #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240AD4_C56A14); -/* void N(func_80240AD4_C56A14)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -196,10 +863,119 @@ void N(func_80240AD4_C56A14)(ScriptInstance* script, NpcAISettings* aiSettings, script->functionTemp[1].s = 0; script->functionTemp[0].s = 1; } -*/ -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240B94_C56AD4); +ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; + + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; + } + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_C55F40)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240158_C56098)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802404C0_C56400)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024067C_C565BC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024094C_C5688C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240AD4_C56A14)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; +} #include "world/common/UnkFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240EBC_C56DFC); +ApiStatus N(func_80240EBC_C56DFC)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerStatus* playerStatus2 = playerStatus; + Npc *npc = get_npc_unsafe(0); + f32 posX, posZ; + + if (isInitialCall) { + posX = npc->pos.x; + posZ = npc->pos.z; + npc->moveSpeed = 3.7f; + npc->yaw = atan2(posX, posZ, playerStatus->position.x, playerStatus->position.z); + script->functionTemp[1].s = 0; + npc->duration = 15; + } + + if (script->functionTemp[1].s == 0) { + if (npc->duration == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus2->position.x, playerStatus2->position.z); + npc->duration = 15; + } + npc->duration--; + } + + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + + return ApiStatus_BLOCK; +} + +const char N(dgb_01_name_hack)[] = "dgb_01"; diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index da4514a0bc..130dfeb201 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -1,9 +1,7 @@ #include "dgb_18.h" -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C56EF0", func_80240FB0_C56EF0); -/* ApiStatus N(func_80240FB0_C56EF0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_802436E0_C59620); s32 i; s32* test; @@ -17,13 +15,12 @@ ApiStatus N(func_80240FB0_C56EF0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_802436E0_C59620); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } -*/ #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_dgb/dgb_18/dgb_18.h b/src/world/area_dgb/dgb_18/dgb_18.h index 504fd6be47..088b2e3454 100644 --- a/src/world/area_dgb/dgb_18/dgb_18.h +++ b/src/world/area_dgb/dgb_18/dgb_18.h @@ -2,3 +2,13 @@ #include "map.h" #define NAMESPACE dgb_18 + +ApiStatus N(UnkFunc1)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_802436B4); +Script N(main); +Script N(makeEntities); +Script N(npcAI_80242834); + +s32 N(D_802436E0_C59620); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index e4e9750795..dea37dbe7f 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0_95B7E0); /* -ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -36,99 +36,19 @@ ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240738_95B938); -/* -void N(func_80240738_95B938)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240AA0_95BCA0); -/* -void N(func_80240AA0_95BCA0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240C5C_95BE5C); /* -ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -143,7 +63,7 @@ ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -153,59 +73,103 @@ ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240F2C_95C12C); -/* -ApiStatus N(func_80240F2C_95C12C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802410B4_95C2B4); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241174_95C374); /* -void N(func_802410B4_95C2B4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_802405E0_95B7E0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240738_95B938)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240AA0_95BCA0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240C5C_95BE5C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240F2C_95C12C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_802410B4_95C2B4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241174_95C374); - INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670); /* ApiStatus N(func_80241470_95C670)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -219,11 +183,11 @@ ApiStatus N(func_80241470_95C670)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -295,10 +259,10 @@ ApiStatus N(func_80242730_95D930)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -309,7 +273,7 @@ ApiStatus N(func_80242784_95D984)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index ec17084c30..53f91693cc 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243460_95E660); /* ApiStatus N(func_80243460_95E660)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80243460_95E660)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 47e7e5b3f0..0b3982dbee 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0); /* ApiStatus N(func_80240300_9694C0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_80240300_9694C0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -117,10 +117,10 @@ ApiStatus N(func_802432C0_96C480)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -131,7 +131,7 @@ ApiStatus N(func_80243314_96C4D4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 01292d7543..f4995c6f21 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240040_C9DF60); /* -ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240198_C9E0B8); -/* -void N(func_80240198_C9E0B8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240500_C9E420); -/* -void N(func_80240500_C9E420)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802406BC_C9E5DC); /* -ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,55 +71,99 @@ ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024098C_C9E8AC); -/* -ApiStatus N(func_8024098C_C9E8AC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240B14_C9EA34); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240BD4_C9EAF4); /* -void N(func_80240B14_C9EA34)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240040_C9DF60)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240198_C9E0B8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240500_C9E420)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_802406BC_C9E5DC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024098C_C9E8AC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240B14_C9EA34)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240BD4_C9EAF4); - ApiStatus PostChapter6StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index a04e970439..2a315abd7a 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240040_CA72E0); /* ApiStatus N(func_80240040_CA72E0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240040_CA72E0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index fd67412ced..d1b6ac980f 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_8024061C_CAC80C); /* ApiStatus N(func_8024061C_CAC80C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_8024061C_CAC80C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 18ea2ce34e..3469955f4f 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_8024001C_CAED5C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_8024003C_CAED7C); /* -s) { +ApiStatus N(func_8024003C_CAED7C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240068_CAEDA8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_802400D4_CAEE14); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240120_CAEE60); +/* +ApiStatus N(func_80240120_CAEE60)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_802401CC_CAEF0C); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_8024041C_CAF15C); /* -s) { +ApiStatus N(func_8024041C_CAF15C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240448_CAF188); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240480_CAF1C0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240510_CAF250); +/* +ApiStatus N(func_80240510_CAF250)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240544_CAF284); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_802405A8_CAF2E8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240600_CAF340); +/* +ApiStatus N(func_80240600_CAF340)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240B38_CAF878); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240D08_CAFA48); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_flo/flo_08/CAED40", func_80240D08_CAFA48); diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 674ea644fa..cb7da93950 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -28,10 +28,10 @@ ApiStatus N(func_80241970_CB06B0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -42,7 +42,7 @@ ApiStatus N(func_802419C4_CB0704)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 7b9c42f4ee..bd1e63308c 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_802404D0_CB54D0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240BB8_CB5BB8); -/* -void N(func_80240BB8_CB5BB8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,126 +52,8 @@ void N(func_80240F74_CB5F74)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241178_CB6178); -/* -void N(func_80241178_CB6178)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241508_CB6508); -/* -void N(func_80241508_CB6508)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_8024162C_CB662C); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index ddfc022a91..10885ee98b 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_10/CB9280", func_80240080_CB9280); /* ApiStatus N(func_80240080_CB9280)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240080_CB9280)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 9ebefdf977..23f9f3093e 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC); /* ApiStatus N(func_8024027C_CC10AC)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -20,11 +20,11 @@ ApiStatus N(func_8024027C_CC10AC)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -50,10 +50,10 @@ ApiStatus N(func_802405C0_CC13F0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -64,7 +64,7 @@ ApiStatus N(func_80240614_CC1444)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 3eddce6794..9515408a6c 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -33,73 +33,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240A5C_CC426C); -/* -void N(func_80240A5C_CC426C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -120,129 +54,72 @@ void N(func_80240E18_CC4628)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024101C_CC482C); -/* -void N(func_8024101C_CC482C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802413AC_CC4BBC); -/* -void N(func_802413AC_CC4BBC)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802414D0_CC4CE0); +/* +ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_802413AC_CC4BBC)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802401C4_CC39D4)(script, aiSettings, territoryPtr); + case 1: + N(func_80240374_CC3B84)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240A5C_CC426C)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240E18_CC4628)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_8024101C_CC482C)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802416BC_CC4ECC); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index b61e30de5a..38eb86ae55 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8_CCC6B8); -/* -void N(func_802413A8_CCC6B8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80241764_CCCA74)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241968_CCCC78); -/* -void N(func_80241968_CCCC78)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241CF8_CCD008); -/* -void N(func_80241CF8_CCD008)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241E1C_CCD12C); +/* +ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241CF8_CCD008)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240B10_CCBE20)(script, aiSettings, territoryPtr); + case 1: + N(func_80240CC0_CCBFD0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802413A8_CCC6B8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241764_CCCA74)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241968_CCCC78)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/GetNpcCollisionHeight.inc.c" @@ -262,10 +139,10 @@ ApiStatus N(func_80242234_CCD544)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -276,7 +153,7 @@ ApiStatus N(func_80242288_CCD598)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 6f31f05432..4d69205ea1 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -2,48 +2,203 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802400FC_CD1F2C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_8024011C_CD1F4C); /* -s) { +ApiStatus N(func_8024011C_CD1F4C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240148_CD1F78); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802401B4_CD1FE4); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240200_CD2030); +/* +ApiStatus N(func_80240200_CD2030)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802402AC_CD20DC); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802404FC_CD232C); /* -s) { +ApiStatus N(func_802404FC_CD232C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240528_CD2358); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240560_CD2390); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802405F0_CD2420); +/* +ApiStatus N(func_802405F0_CD2420)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240624_CD2454); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240688_CD24B8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802406E0_CD2510); +/* +ApiStatus N(func_802406E0_CD2510)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240C18_CD2A48); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240DE8_CD2C18); +#include "world/common/UnkFunc24.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240E18_CD2C48); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240E18_CD2C48); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index c0e0fc0dff..45aed5d233 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241000_CD2E30); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802416E8_CD3518); -/* -void N(func_802416E8_CD3518)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80241AA4_CD38D4)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241CA8_CD3AD8); -/* -void N(func_80241CA8_CD3AD8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242038_CD3E68); -/* -void N(func_80242038_CD3E68)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_8024215C_CD3F8C); +/* +ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80242038_CD3E68)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240E50_CD2C80)(script, aiSettings, territoryPtr); + case 1: + N(func_80241000_CD2E30)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802416E8_CD3518)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241AA4_CD38D4)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241CA8_CD3AD8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 7200527d3a..dac12b7548 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240908_CD7BE8); -/* -void N(func_80240908_CD7BE8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80240CC4_CD7FA4)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240EC8_CD81A8); -/* -void N(func_80240EC8_CD81A8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241258_CD8538); -/* -void N(func_80241258_CD8538)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_8024137C_CD865C); +/* +ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241258_CD8538)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240070_CD7350)(script, aiSettings, territoryPtr); + case 1: + N(func_80240220_CD7500)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240908_CD7BE8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240CC4_CD7FA4)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80240EC8_CD81A8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241568_CD8848); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index dc2c11f454..1a0f7c6655 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -93,7 +93,7 @@ ApiStatus N(func_80240708_CE6E08)(ScriptInstance* script, s32 isInitialCall) { ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - return 0; + return ApiStatus_BLOCK; } */ diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index a184d61456..b964f350f9 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024026C_CEE4CC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_802402C0_CEE520)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index bb36d577e0..52cc2a550e 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8_CF34A8); -/* -void N(func_802408D8_CF34A8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80240C94_CF3864)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240E98_CF3A68); -/* -void N(func_80240E98_CF3A68)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241228_CF3DF8); -/* -void N(func_80241228_CF3DF8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_8024134C_CF3F1C); +/* +ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241228_CF3DF8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240040_CF2C10)(script, aiSettings, territoryPtr); + case 1: + N(func_802401F0_CF2DC0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802408D8_CF34A8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240C94_CF3864)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80240E98_CF3A68)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" @@ -249,6 +126,67 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241668_CF4238); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802418E8_CF44B8); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241944_CF4514); +/* +ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241228_CF3DF8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240040_CF2C10)(script, aiSettings, territoryPtr); + case 1: + N(func_802401F0_CF2DC0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802408D8_CF34A8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240C94_CF3864)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); + break; + case 13: + N(func_80241668_CF4238)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802418E8_CF44B8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/GetNpcCollisionHeight.inc.c" @@ -270,10 +208,10 @@ ApiStatus N(func_80241D58_CF4928)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -284,7 +222,7 @@ ApiStatus N(func_80241DAC_CF497C)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_00/A0C4E0.c b/src/world/area_hos/hos_00/A0C4E0.c index 1e00f29871..8868296687 100644 --- a/src/world/area_hos/hos_00/A0C4E0.c +++ b/src/world/area_hos/hos_00/A0C4E0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_802407F0_A0C4E0); /* ApiStatus N(func_802407F0_A0C4E0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_802407F0_A0C4E0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index 84e6f5aff2..aa570890a8 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -31,10 +31,10 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C84_A11504); INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CB0_A11530); /* -s) { +ApiStatus N(func_80240CB0_A11530)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CDC_A1155C); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CDC_A1155C); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 5e77330df1..ee8f9e1761 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888_A17AA8); -/* -void N(func_80241888_A17AA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80241C44_A17E64)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241E48_A18068); -/* -void N(func_80241E48_A18068)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802421D8_A183F8); -/* -void N(func_802421D8_A183F8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802422FC_A1851C); +/* +ApiStatus N(func_802422FC_A1851C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_802421D8_A183F8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240FF0_A17210)(script, aiSettings, territoryPtr); + case 1: + N(func_802411A0_A173C0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80241888_A17AA8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241C44_A17E64)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241E48_A18068)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index c6574c7492..7a5e8f017a 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -33,73 +33,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548_A1C648); -/* -void N(func_80241548_A1C648)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -120,129 +54,72 @@ void N(func_80241904_A1CA04)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241B08_A1CC08); -/* -void N(func_80241B08_A1CC08)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241E98_A1CF98); -/* -void N(func_80241E98_A1CF98)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); +/* +ApiStatus N(func_80241FBC_A1D0BC)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241E98_A1CF98)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240CB0_A1BDB0)(script, aiSettings, territoryPtr); + case 1: + N(func_80240E60_A1BF60)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80241548_A1C648)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241904_A1CA04)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241B08_A1CC08)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/Call800E9894.inc.c" @@ -267,7 +144,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4); /* ApiStatus N(func_802424A4_A1D5A4)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -281,11 +158,11 @@ ApiStatus N(func_802424A4_A1D5A4)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_04/A27AA0.c b/src/world/area_hos/hos_04/A27AA0.c index 1d69251723..bab8f922d2 100644 --- a/src/world/area_hos/hos_04/A27AA0.c +++ b/src/world/area_hos/hos_04/A27AA0.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240BD0_A27AA0); INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E40_A27D10); /* -s) { +ApiStatus N(func_80240E40_A27D10)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E6C_A27D3C); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E6C_A27D3C); diff --git a/src/world/area_hos/hos_05/A2EC30.c b/src/world/area_hos/hos_05/A2EC30.c index 4f9ff1caf8..0ca8396e10 100644 --- a/src/world/area_hos/hos_05/A2EC30.c +++ b/src/world/area_hos/hos_05/A2EC30.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_802449F0_A2EC30); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C60_A2EEA0); /* -s) { +ApiStatus N(func_80244C60_A2EEA0)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C8C_A2EECC); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C8C_A2EECC); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index a0e31353db..fc27fa49ed 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); /* ApiStatus N(func_80240310_A397F0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240310_A397F0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -51,10 +51,10 @@ ApiStatus N(func_80240654_A39B34)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -65,7 +65,7 @@ ApiStatus N(func_802406A8_A39B88)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index e0ce968148..493c306efd 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -20,10 +20,10 @@ ApiStatus N(func_80240F7C_A3A45C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_80240FD0_A3A4B0)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -43,7 +43,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802410A4_A3A584); /* ApiStatus N(func_802410A4_A3A584)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -57,11 +57,11 @@ ApiStatus N(func_802410A4_A3A584)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index cd41935adc..ddf36a5768 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); /* ApiStatus N(func_80241FD0_A3B4B0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80241FD0_A3B4B0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_isk/isk_04/97BF60.c b/src/world/area_isk/isk_04/97BF60.c index 5d50a98cf9..fd6c5ffcb5 100644 --- a/src/world/area_isk/isk_04/97BF60.c +++ b/src/world/area_isk/isk_04/97BF60.c @@ -2,10 +2,10 @@ INCLUDE_ASM(s32, "world/area_isk/isk_04/97BF60", func_80240930_97BF60); /* -s) { +ApiStatus N(func_80240930_97BF60)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_isk/isk_04/97BF60", func_8024095C_97BF8C); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_isk/isk_04/97BF60", func_8024095C_97BF8C); diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 07be3ad32c..b2f568f4db 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_09/9864E0", func_80240000_9864E0); /* ApiStatus N(func_80240000_9864E0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_9864E0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 29246fbb56..415ed05fd5 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -2,48 +2,203 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024001C_988B7C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024003C_988B9C); /* -s) { +ApiStatus N(func_8024003C_988B9C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240068_988BC8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802400D4_988C34); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240120_988C80); +/* +ApiStatus N(func_80240120_988C80)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC_988D2C); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024041C_988F7C); /* -s) { +ApiStatus N(func_8024041C_988F7C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240448_988FA8); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240480_988FE0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240510_989070); +/* +ApiStatus N(func_80240510_989070)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240544_9890A4); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802405A8_989108); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240600_989160); +/* +ApiStatus N(func_80240600_989160)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240B38_989698); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D08_989868); +#include "world/common/UnkFunc24.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D38_989898); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D38_989898); diff --git a/src/world/area_iwa/iwa_00/90CC40.c b/src/world/area_iwa/iwa_00/90CC40.c index c365435293..113137c909 100644 --- a/src/world/area_iwa/iwa_00/90CC40.c +++ b/src/world/area_iwa/iwa_00/90CC40.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CC40", func_80240000_90CC40); /* ApiStatus N(func_80240000_90CC40)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_90CC40)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index a26aae30c3..7ddc280041 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -53,7 +53,7 @@ void N(func_80242498_911B48)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim = enemy->animList[9]; fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); @@ -72,34 +72,7 @@ void N(func_80242498_911B48)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242794_911E44); -/* -void N(func_80242794_911E44)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - PlayerStatus** playerStatus; - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - playerStatus = &gPlayerStatusPtr; - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else { - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->duration = 15; - script->functionTemp[0].s = 0x28; - } - } - } -} -*/ +#include "world/common/UnkFunc8.inc.c" #include "world/common/UnkNpcAIFunc16.inc.c" @@ -133,44 +106,7 @@ void N(func_80242958_912008)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242AF8_9121A8); -/* -void N(func_80242AF8_9121A8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ; - s32 phi_s1; - - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - phi_s1 = 0; - if (is_point_within_region(enemy->territory->wander.detectShape, - enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, - npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, - enemy->territory->wander.detectSizeZ)) { - phi_s1 = 1; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - - if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ, - 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { - phi_s1 = 1; - } - - npc->duration--; - if (npc->duration <= 0) { - phi_s1 = 1; - } - if (phi_s1) { - script->functionTemp[0].s = 4; - enemy->unk_07 = 0; - } -} -*/ +#include "world/common/UnkFunc10.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242C48_9122F8); /* @@ -191,25 +127,7 @@ void N(func_80242C48_9122F8)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242CF4_9123A4); -/* -void N(func_80242CF4_9123A4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - PlayerStatus** playerStatus = &gPlayerStatusPtr; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->duration = 10; - script->functionTemp[0].s = 50; - } else if (npc->unk_8C == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} -*/ +#include "world/common/UnkFunc9.inc.c" #include "world/common/UnkNpcAIFunc19.inc.c" diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c index b5f5243343..0a3800fe7a 100644 --- a/src/world/area_iwa/iwa_02/915D70.c +++ b/src/world/area_iwa/iwa_02/915D70.c @@ -13,7 +13,7 @@ void N(func_802401D4_915F44)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim = enemy->animList[9]; fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); @@ -32,34 +32,7 @@ void N(func_802401D4_915F44)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_802404D0_916240); -/* -void N(func_802404D0_916240)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - PlayerStatus** playerStatus; - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - playerStatus = &gPlayerStatusPtr; - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else { - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->duration = 15; - script->functionTemp[0].s = 0x28; - } - } - } -} -*/ +#include "world/common/UnkFunc8.inc.c" #include "world/common/UnkNpcAIFunc16.inc.c" @@ -93,44 +66,7 @@ void N(func_80240694_916404)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240834_9165A4); -/* -void N(func_80240834_9165A4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ; - s32 phi_s1; - - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - phi_s1 = 0; - if (is_point_within_region(enemy->territory->wander.detectShape, - enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, - npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, - enemy->territory->wander.detectSizeZ)) { - phi_s1 = 1; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - - if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ, - 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { - phi_s1 = 1; - } - - npc->duration--; - if (npc->duration <= 0) { - phi_s1 = 1; - } - if (phi_s1) { - script->functionTemp[0].s = 4; - enemy->unk_07 = 0; - } -} -*/ +#include "world/common/UnkFunc10.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240984_9166F4); /* @@ -151,25 +87,7 @@ void N(func_80240984_9166F4)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240A30_9167A0); -/* -void N(func_80240A30_9167A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - PlayerStatus** playerStatus = &gPlayerStatusPtr; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->duration = 10; - script->functionTemp[0].s = 50; - } else if (npc->unk_8C == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} -*/ +#include "world/common/UnkFunc9.inc.c" #include "world/common/UnkNpcAIFunc19.inc.c" @@ -182,7 +100,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240FE0_916D50); /* ApiStatus N(func_80240FE0_916D50)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -196,11 +114,11 @@ ApiStatus N(func_80240FE0_916D50)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index fd724416ad..75b34a3239 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918BB0", func_80240000_918BB0); /* ApiStatus N(func_80240000_918BB0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_918BB0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_iwa/iwa_03/918EF0.c b/src/world/area_iwa/iwa_03/918EF0.c index 3ddc538ff9..532089a956 100644 --- a/src/world/area_iwa/iwa_03/918EF0.c +++ b/src/world/area_iwa/iwa_03/918EF0.c @@ -13,7 +13,7 @@ void N(func_80240514_9190C4)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim = enemy->animList[9]; fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); @@ -32,34 +32,7 @@ void N(func_80240514_9190C4)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240810_9193C0); -/* -void N(func_80240810_9193C0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - PlayerStatus** playerStatus; - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - playerStatus = &gPlayerStatusPtr; - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else { - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->duration = 15; - script->functionTemp[0].s = 0x28; - } - } - } -} -*/ +#include "world/common/UnkFunc8.inc.c" #include "world/common/UnkNpcAIFunc16.inc.c" @@ -93,44 +66,7 @@ void N(func_802409D4_919584)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240B74_919724); -/* -void N(func_80240B74_919724)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ; - s32 phi_s1; - - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - phi_s1 = 0; - if (is_point_within_region(enemy->territory->wander.detectShape, - enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, - npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, - enemy->territory->wander.detectSizeZ)) { - phi_s1 = 1; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - - if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ, - 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { - phi_s1 = 1; - } - - npc->duration--; - if (npc->duration <= 0) { - phi_s1 = 1; - } - if (phi_s1) { - script->functionTemp[0].s = 4; - enemy->unk_07 = 0; - } -} -*/ +#include "world/common/UnkFunc10.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240CC4_919874); /* @@ -151,25 +87,7 @@ void N(func_80240CC4_919874)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240D70_919920); -/* -void N(func_80240D70_919920)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - PlayerStatus** playerStatus = &gPlayerStatusPtr; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->duration = 10; - script->functionTemp[0].s = 50; - } else if (npc->unk_8C == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} -*/ +#include "world/common/UnkFunc9.inc.c" #include "world/common/UnkNpcAIFunc19.inc.c" diff --git a/src/world/area_iwa/iwa_04/91B8E0.c b/src/world/area_iwa/iwa_04/91B8E0.c index 52f5af99f4..a4ede32dbe 100644 --- a/src/world/area_iwa/iwa_04/91B8E0.c +++ b/src/world/area_iwa/iwa_04/91B8E0.c @@ -15,7 +15,7 @@ void N(func_80240254_91BB34)(ScriptInstance* script, NpcAISettings* aiSettings, if (script->functionTemp[1].s <= 0) { script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.s, 0)) { + if (func_800490B4(territory, enemy, aiSettings->alertRadius * 0.85, aiSettings->unk_10.f, 0)) { npc->currentAnim = enemy->animList[9]; fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); func_800494C0(npc, 0x2F4, 0x200000); @@ -34,34 +34,7 @@ void N(func_80240254_91BB34)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc22.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240550_91BE30); -/* -void N(func_80240550_91BE30)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - PlayerStatus** playerStatus; - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - playerStatus = &gPlayerStatusPtr; - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else { - npc->duration--; - if (npc->duration <= 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->duration = 15; - script->functionTemp[0].s = 0x28; - } - } - } -} -*/ +#include "world/common/UnkFunc8.inc.c" #include "world/common/UnkNpcAIFunc16.inc.c" @@ -95,44 +68,7 @@ void N(func_80240714_91BFF4)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_802408B4_91C194); -/* -void N(func_802408B4_91C194)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ; - s32 phi_s1; - - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - phi_s1 = 0; - if (is_point_within_region(enemy->territory->wander.detectShape, - enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, - npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, - enemy->territory->wander.detectSizeZ)) { - phi_s1 = 1; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - - if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ, - 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { - phi_s1 = 1; - } - - npc->duration--; - if (npc->duration <= 0) { - phi_s1 = 1; - } - if (phi_s1) { - script->functionTemp[0].s = 4; - enemy->unk_07 = 0; - } -} -*/ +#include "world/common/UnkFunc10.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240A04_91C2E4); /* @@ -153,25 +89,7 @@ void N(func_80240A04_91C2E4)(ScriptInstance* script, NpcAISettings* aiSettings, } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240AB0_91C390); -/* -void N(func_80240AB0_91C390)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - PlayerStatus** playerStatus = &gPlayerStatusPtr; - - if (func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); - script->functionTemp[0].s = 12; - } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { - npc->duration = 10; - script->functionTemp[0].s = 50; - } else if (npc->unk_8C == 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - } -} -*/ +#include "world/common/UnkFunc9.inc.c" #include "world/common/UnkNpcAIFunc19.inc.c" diff --git a/src/world/area_iwa/iwa_10/91E5B0.c b/src/world/area_iwa/iwa_10/91E5B0.c index e55f47f916..dc527199d5 100644 --- a/src/world/area_iwa/iwa_10/91E5B0.c +++ b/src/world/area_iwa/iwa_10/91E5B0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_80240040_91E5B0); /* ApiStatus N(func_80240040_91E5B0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240040_91E5B0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 4f6e5e6cbd..68a51781a0 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -4,46 +4,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024030C_91E87C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024032C_91E89C); /* -s) { +ApiStatus N(func_8024032C_91E89C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240358_91E8C8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802403C4_91E934); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240410_91E980); +/* +ApiStatus N(func_80240410_91E980)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802404BC_91EA2C); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024070C_91EC7C); /* -s) { +ApiStatus N(func_8024070C_91EC7C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240738_91ECA8); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240770_91ECE0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240800_91ED70); +/* +ApiStatus N(func_80240800_91ED70)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240834_91EDA4); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240898_91EE08); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802408F0_91EE60); +/* +ApiStatus N(func_802408F0_91EE60)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240E28_91F398); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FF8_91F568); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FF8_91F568); diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c index 55882e5920..ac533579e3 100644 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -22,10 +22,10 @@ ApiStatus N(func_802413E0_91F950)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -36,7 +36,7 @@ ApiStatus N(func_80241434_91F9A4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 61d65cbdcc..8be41eea55 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -11,7 +11,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240340_B20880); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934); /* ApiStatus N(func_802403F4_B20934)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -25,11 +25,11 @@ ApiStatus N(func_802403F4_B20934)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -55,10 +55,10 @@ ApiStatus N(func_80240738_B20C78)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -69,7 +69,7 @@ ApiStatus N(func_8024078C_B20CCC)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 2708d51ac9..cc35ec5ffe 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430_B2C8A0); /* -ApiStatus N(func_80240430_B2C8A0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240430_B2C8A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -36,99 +36,19 @@ ApiStatus N(func_80240430_B2C8A0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240588_B2C9F8); -/* -void N(func_80240588_B2C9F8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802408F0_B2CD60); -/* -void N(func_802408F0_B2CD60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240AAC_B2CF1C); /* -ApiStatus N(func_80240AAC_B2CF1C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240AAC_B2CF1C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -143,7 +63,7 @@ ApiStatus N(func_80240AAC_B2CF1C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -153,55 +73,99 @@ ApiStatus N(func_80240AAC_B2CF1C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240D7C_B2D1EC); -/* -ApiStatus N(func_80240D7C_B2D1EC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240F04_B2D374); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4_B2D434); /* -void N(func_80240F04_B2D374)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240430_B2C8A0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240588_B2C9F8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802408F0_B2CD60)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240AAC_B2CF1C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240D7C_B2D1EC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240F04_B2D374)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4_B2D434); - #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" @@ -222,10 +186,10 @@ ApiStatus N(func_802414EC_B2D95C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -236,7 +200,7 @@ ApiStatus N(func_80241540_B2D9B0)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -245,7 +209,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84); /* ApiStatus N(func_80241614_B2DA84)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -259,11 +223,11 @@ ApiStatus N(func_80241614_B2DA84)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 2e415a5a88..bd27605320 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240620_B351F0); /* -ApiStatus N(func_80240620_B351F0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240620_B351F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -54,99 +54,19 @@ ApiStatus N(func_80240620_B351F0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240778_B35348); -/* -void N(func_80240778_B35348)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240AE0_B356B0); -/* -void N(func_80240AE0_B356B0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240C9C_B3586C); /* -ApiStatus N(func_80240C9C_B3586C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240C9C_B3586C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -161,7 +81,7 @@ ApiStatus N(func_80240C9C_B3586C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -171,55 +91,99 @@ ApiStatus N(func_80240C9C_B3586C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240F6C_B35B3C); -/* -ApiStatus N(func_80240F6C_B35B3C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4_B35CC4); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); /* -void N(func_802410F4_B35CC4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240620_B351F0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240778_B35348)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240AE0_B356B0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240C9C_B3586C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240F6C_B35B3C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_802410F4_B35CC4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); - #include "world/common/Call800E9894.inc.c" #include "world/common/Call800E98C4SyncStatusMenu.inc.c" @@ -260,10 +224,10 @@ ApiStatus N(func_802419D8_B365A8)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -274,7 +238,7 @@ ApiStatus N(func_80241A2C_B365FC)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -285,7 +249,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C); /* ApiStatus N(func_80241B9C_B3676C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -299,11 +263,11 @@ ApiStatus N(func_80241B9C_B3676C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index be06836d03..c26d882827 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); /* ApiStatus N(func_80240350_B44AC0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240350_B44AC0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index f7743fc55a..d127a003b6 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -31,12 +31,223 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241AD4_B4C544); +/* +s32 N(func_80241AD4_B4C544)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241C88_B4C6F8); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241EE8_B4C958); +/* +ApiStatus N(func_80241EE8_B4C958)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241AD4_B4C544)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C_B4CC0C); +/* +ApiStatus N(func_8024219C_B4CC0C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241AD4_B4C544)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); + case 3: + N(func_80241708_B4C178)(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ #define NAMESPACE dup_jan_05 #include "world/common/SomeMatrixOperations.inc.c" diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index cb277c99c8..62036b4c85 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -31,15 +31,224 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241658_B53E88); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241A24_B54254); +/* +s32 N(func_80241A24_B54254)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241BD8_B54408); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241E38_B54668); +/* +ApiStatus N(func_80241E38_B54668)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241A24_B54254)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802420EC_B5491C); +/* +ApiStatus N(func_802420EC_B5491C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241A24_B54254)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); + case 3: + N(func_80241658_B53E88)(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ #define NAMESPACE dup_jan_06 #include "world/common/SomeMatrixOperations.inc.c" #define NAMESPACE jan_06 - - diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index e9d7b81929..cac62f8093 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -13,9 +13,220 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_8024041C_B59C8C); +/* +s32 N(func_8024041C_B59C8C)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802405D0_B59E40); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240830_B5A0A0); +/* +ApiStatus N(func_80240830_B5A0A0)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_8024041C_B59C8C)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240AE4_B5A354); +/* +ApiStatus N(func_80240AE4_B5A354)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_8024041C_B59C8C)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240050_B598C0)(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index f5a9044402..97fd099846 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024067C_B5E92C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024069C_B5E94C); /* -s) { +ApiStatus N(func_8024069C_B5E94C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_802406C8_B5E978); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240734_B5E9E4); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240780_B5EA30); +/* +ApiStatus N(func_80240780_B5EA30)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024082C_B5EADC); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240A7C_B5ED2C); /* -s) { +ApiStatus N(func_80240A7C_B5ED2C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240AA8_B5ED58); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240AE0_B5ED90); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240B70_B5EE20); +/* +ApiStatus N(func_80240B70_B5EE20)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240BA4_B5EE54); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240C08_B5EEB8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240C60_B5EF10); +/* +ApiStatus N(func_80240C60_B5EF10)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241198_B5F448); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241368_B5F618); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241368_B5F618); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 6694f19904..ddf08d566c 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -15,9 +15,220 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241870_B5FB20); +/* +s32 N(func_80241870_B5FB20)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241A24_B5FCD4); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241C84_B5FF34); +/* +ApiStatus N(func_80241C84_B5FF34)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241870_B5FB20)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241F38_B601E8); +/* +ApiStatus N(func_80241F38_B601E8)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241870_B5FB20)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); + case 3: + N(func_802414A4_B5F754)(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index e32bb74b08..f3de172c2e 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -13,9 +13,220 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240990_B66440); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240D5C_B6680C); +/* +s32 N(func_80240D5C_B6680C)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240F10_B669C0); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80241170_B66C20); +/* +ApiStatus N(func_80241170_B66C20)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240D5C_B6680C)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80241424_B66ED4); +/* +ApiStatus N(func_80241424_B66ED4)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240D5C_B6680C)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240990_B66440)(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index 40567e195b..a45861784f 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -13,9 +13,220 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240510_B735C0); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802408DC_B7398C); +/* +s32 N(func_802408DC_B7398C)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240A90_B73B40); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240CF0_B73DA0); +/* +ApiStatus N(func_80240CF0_B73DA0)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_802408DC_B7398C)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240FA4_B74054); +/* +ApiStatus N(func_80240FA4_B74054)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_802408DC_B7398C)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc4)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240510_B735C0)(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index ec40c1b299..45a2d82020 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240000_B84180); /* -ApiStatus N(func_80240000_B84180)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240000_B84180)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_80240000_B84180)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240158_B842D8); -/* -void N(func_80240158_B842D8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_802404C0_B84640); -/* -void N(func_802404C0_B84640)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024067C_B847FC); /* -ApiStatus N(func_8024067C_B847FC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024067C_B847FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_8024067C_B847FC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,59 +71,103 @@ ApiStatus N(func_8024067C_B847FC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024094C_B84ACC); -/* -ApiStatus N(func_8024094C_B84ACC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240AD4_B84C54); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240B94_B84D14); /* -void N(func_80240AD4_B84C54)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_B84180)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240158_B842D8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802404C0_B84640)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024067C_B847FC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024094C_B84ACC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240AD4_B84C54)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240B94_B84D14); - INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240E90_B85010); /* ApiStatus N(func_80240E90_B85010)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -217,11 +181,11 @@ ApiStatus N(func_80240E90_B85010)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index c63cefd8b9..941e0e6403 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802400B0_ABB340); /* -ApiStatus N(func_802400B0_ABB340)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802400B0_ABB340)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_802400B0_ABB340)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240208_ABB498); -/* -void N(func_80240208_ABB498)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240570_ABB800); -/* -void N(func_80240570_ABB800)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_8024072C_ABB9BC); /* -ApiStatus N(func_8024072C_ABB9BC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024072C_ABB9BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_8024072C_ABB9BC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,53 +71,97 @@ ApiStatus N(func_8024072C_ABB9BC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802409FC_ABBC8C); -/* -ApiStatus N(func_802409FC_ABBC8C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B84_ABBE14); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240C44_ABBED4); /* -void N(func_80240B84_ABBE14)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_802400B0_ABB340)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240208_ABB498)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240570_ABB800)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024072C_ABB9BC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_802409FC_ABBC8C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240B84_ABBE14)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240C44_ABBED4); - INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240F40_ABC1D0); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 2622b2254a..ce5379fa4e 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240000_AC5170); /* -ApiStatus N(func_80240000_AC5170)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240000_AC5170)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_80240000_AC5170)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240158_AC52C8); -/* -void N(func_80240158_AC52C8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_802404C0_AC5630); -/* -void N(func_802404C0_AC5630)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024067C_AC57EC); /* -ApiStatus N(func_8024067C_AC57EC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024067C_AC57EC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_8024067C_AC57EC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,51 +71,95 @@ ApiStatus N(func_8024067C_AC57EC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024094C_AC5ABC); -/* -ApiStatus N(func_8024094C_AC5ABC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240AD4_AC5C44); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240B94_AC5D04); /* -void N(func_80240AD4_AC5C44)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_AC5170)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240158_AC52C8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802404C0_AC5630)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024067C_AC57EC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024094C_AC5ABC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240AD4_AC5C44)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ - -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240B94_AC5D04); diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index 6fa9987d3b..781d16a9da 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_17/AF1C60", func_80240000_AF1C60); /* ApiStatus N(func_80240000_AF1C60)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_AF1C60)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index f990dc8ef1..8606b1f12e 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024056C_AF320C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_802405C0_AF3260)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 8a0e976bf0..81ea41c674 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -20,10 +20,10 @@ ApiStatus N(func_802404DC_AF7E2C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_80240530_AF7E80)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index 4cc9f2c9cf..8d884b2265 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDB40", func_80240000_AFDB40); /* ApiStatus N(func_80240000_AFDB40)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_AFDB40)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index c030594482..7d4cdb65d6 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -21,7 +21,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400); /* ApiStatus N(func_80240390_8B0400)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -35,11 +35,11 @@ ApiStatus N(func_80240390_8B0400)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -135,10 +135,10 @@ ApiStatus N(func_8024226C_8B22DC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -149,7 +149,7 @@ ApiStatus N(func_802422C0_8B2330)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index c14523a482..46b66aa2a9 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -2,8 +2,6 @@ #include "message_ids.h" #include "../../partners.h" -Script N(main); - ApiStatus N(func_80240000_8C7F90)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerData* playerData = &gPlayerData; diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index 100fc034a0..f8e1a0782f 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -1,10 +1,9 @@ #include "kmr_03.h" #include "sprite/npc/goompa.h" -NpcGroupList N(npcGroupList_80241450); -Script N(makeEntities); -Script N(802422B8); -Script N(80242340); +enum { + NPC_GOOMPA, +}; ApiStatus N(func_802401B0_8C8140)(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(0); @@ -66,14 +65,14 @@ Script N(8024097C) = SCRIPT({ AwaitPlayerLeave(294, 123, 170); EnableNpcAI(0, 0); DisablePlayerInput(TRUE); - SetNpcSpeed(NPC_PLAYER, 4.0); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(goompa, Palette_00, Anim_3)); + SetNpcSpeed(NPC_GOOMPA, 4.0); + SetNpcAnimation(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_3)); N(func_802401B0_8C8140)(); GetAngleToPlayer(0, SI_VAR(2)); loop SI_VAR(1) { - GetNpcPos(NPC_PLAYER, SI_VAR(7), SI_VAR(8), SI_VAR(9)); + GetNpcPos(NPC_GOOMPA, SI_VAR(7), SI_VAR(8), SI_VAR(9)); AddVectorPolar(SI_VAR(7), SI_VAR(9), 4.0, SI_VAR(2)); - SetNpcPos(NPC_PLAYER, SI_VAR(7), SI_VAR(8), SI_VAR(9)); + SetNpcPos(NPC_GOOMPA, SI_VAR(7), SI_VAR(8), SI_VAR(9)); sleep 1; } PlayerFaceNpc(0, 3); @@ -99,13 +98,13 @@ Script N(npcAI_80240B50) = SCRIPT({ goto 89; } DisablePlayerInput(TRUE); - SetNpcAux(NPC_PLAYER, 0); - PlaySoundAtNpc(NPC_PLAYER, 0x262, 0); + SetNpcAux(NPC_GOOMPA, 0); + PlaySoundAtNpc(NPC_GOOMPA, SOUND_UNKNOWN_262, 0); ShowEmote(0, EMOTE_EXCLAMATION, 45, 15, 1, 0, 0, 0, 0); sleep 15; NpcFacePlayer(NPC_SELF, 5); sleep 10; - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A6)); + SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A6)); UseSettingsFrom(0, -220, 20, -72); SetPanTarget(0, -20, 0, 68); SetCamPitch(0, 15.0, -8.5); @@ -117,18 +116,18 @@ Script N(npcAI_80240B50) = SCRIPT({ SetPlayerSpeed(2.0); PlayerMoveTo(-38, 68, 0); } - GetNpcPos(NPC_PLAYER, SI_VAR(7), SI_VAR(8), SI_VAR(9)); - SetNpcSpeed(NPC_PLAYER, 4.0); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(goompa, Palette_00, Anim_3)); - NpcMoveTo(NPC_PLAYER, 0, 70, 0); - SetNpcAnimation(NPC_PLAYER, NPC_ANIM(goompa, Palette_00, Anim_1)); - InterpNpcYaw(NPC_PLAYER, 276, 20); + GetNpcPos(NPC_GOOMPA, SI_VAR(7), SI_VAR(8), SI_VAR(9)); + SetNpcSpeed(NPC_GOOMPA, 4.0); + SetNpcAnimation(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_3)); + NpcMoveTo(NPC_GOOMPA, 0, 70, 0); + SetNpcAnimation(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_1)); + InterpNpcYaw(NPC_GOOMPA, 276, 20); sleep 30; - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A7)); + SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A7)); sleep 5; - SetPlayerAnimation(0x80007); + SetPlayerAnimation(ANIM_80007); sleep 30; - SpeakToPlayer(NPC_PLAYER, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A8)); + SpeakToPlayer(NPC_GOOMPA, NPC_ANIM(goompa, Palette_00, Anim_8), NPC_ANIM(goompa, Palette_00, Anim_1), 0, MESSAGE_ID(0x0B, 0x00A8)); N(func_80240000_8C7F90)(0, 5); STORY_PROGRESS = STORY_CH0_GOOMPA_JOINED_PARTY; UseSettingsFrom(0, -220, 20, -72); @@ -174,11 +173,11 @@ Script N(hit_80240F64) = SCRIPT({ SetNpcAnimation(NPC_SELF, NPC_ANIM(goompa, Palette_00, Anim_3)); } else { sleep 10; - GetNpcPos(NPC_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetNpcPos(NPC_GOOMPA, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetNpcPos(NPC_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); - SetNpcFlagBits(NPC_PARTNER, 0x00000200, TRUE); - SetNpcPos(NPC_PLAYER, 0, -1000, 0); - SetNpcFlagBits(NPC_PLAYER, 0x00000100, FALSE); + SetNpcFlagBits(NPC_PARTNER, NPC_FLAG_200, TRUE); + SetNpcPos(NPC_GOOMPA, 0, -1000, 0); + SetNpcFlagBits(NPC_GOOMPA, NPC_FLAG_100, FALSE); EnablePartnerAI(); SetNpcAux(NPC_SELF, N(8024097C)); BindNpcAI(NPC_SELF, N(npcAI_80240B50)); @@ -191,15 +190,15 @@ Script N(init_802411A8) = SCRIPT({ BindNpcHit(-1, N(hit_80240F64)); match STORY_PROGRESS { >= STORY_CH0_GOOMPA_JOINED_PARTY { - SetNpcFlagBits(NPC_SELF, 0x00000200, FALSE); - SetNpcFlagBits(NPC_SELF, 0x00000008, TRUE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_200, FALSE); + SetNpcFlagBits(NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE); SetNpcPos(NPC_SELF, 0, -1000, 0); } } }); StaticNpc N(npcGroup_80241260) = { - .id = 0, + .id = NPC_GOOMPA, .settings = &N(npcSettings_80240950), .pos = { -50.0f, 0.0f, 80.0f }, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_400000, @@ -282,4 +281,3 @@ Script N(makeEntities) = SCRIPT({ AssignPanelFlag(SI_SAVE_FLAG(88)); MakeEntity(0x802EA7E0, 130, 60, 0, 0, MAKE_ENTITY_END); }); - diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 9da2c645df..ff64062f77 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -4,8 +4,16 @@ #define NAMESPACE kmr_03 -ApiStatus N(func_80240000_8C7F90)(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D2520(ScriptInstance* script, s32 isInitialCall); -Script N(main); + +ApiStatus N(UnkPositionFunc)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_80240000_8C7F90)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802401B0_8C8140)(ScriptInstance* script, s32 isInitialCall); + +NpcGroupList N(npcGroupList_80241450); +Script N(802422B8); +Script N(80242340); Script N(802406C0); +Script N(main); +Script N(makeEntities); diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index 47965e9012..53aee2d43b 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -9,7 +9,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); /* ApiStatus N(func_802402C8_8CABC8)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -23,11 +23,11 @@ ApiStatus N(func_802402C8_8CABC8)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index a4c6333e3b..bd50e711ba 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898_8CE908); -/* -void N(func_80240898_8CE908)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,126 +52,8 @@ void N(func_80240C54_8CECC4)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240E58_8CEEC8); -/* -void N(func_80240E58_8CEEC8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802411E8_8CF258); -/* -void N(func_802411E8_8CF258)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_8024130C_8CF37C); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index e5f8332da6..72d405088d 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802401B0_8D16C0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240898_8D1DA8); -/* -void N(func_80240898_8D1DA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,126 +52,8 @@ void N(func_80240C54_8D2164)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240E58_8D2368); -/* -void N(func_80240E58_8D2368)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802411E8_8D26F8); -/* -void N(func_802411E8_8D26F8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_8024130C_8D281C); diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index 07f63150af..9b01b16015 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -34,4 +34,17 @@ ApiStatus func_80240A6C_8D482C(ScriptInstance* script, s32 isInitialCall) { } #else INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240A6C_8D482C); +/* +ApiStatus N(func_80240A6C_8D482C)(void) { + Entity* entity = get_entity_by_index(get_variable(NULL, 0xFD050F80)); + + if (entity == NULL) { + return ApiStatus_BLOCK; + } + + play_model_animation(entity->virtualModelIndex, &D_000001E4); + + return ApiStatus_DONE2; +} +*/ #endif diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 747e8bf3e2..b7af7e9ce0 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802401B0_8D5FB0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240898_8D6698); -/* -void N(func_80240898_8D6698)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80240C54_8D6A54)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240E58_8D6C58); -/* -void N(func_80240E58_8D6C58)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802411E8_8D6FE8); -/* -void N(func_802411E8_8D6FE8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_8024130C_8D710C); +/* +ApiStatus N(func_8024130C_8D710C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_802411E8_8D6FE8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_8D5E00)(script, aiSettings, territoryPtr); + case 1: + N(func_802401B0_8D5FB0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240898_8D6698)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240C54_8D6A54)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80240E58_8D6C58)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ ApiStatus func_802414F8_8D72F8(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = get_enemy_safe(2); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 30384af4c0..ad148b900e 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); /* ApiStatus N(func_80240000_8D84D0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_8D84D0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index 223084c72b..166395f3ca 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -33,7 +33,7 @@ NpcAISettings N(goombaAISettings) = { .unk_10 = { .f = 0.0f }, .unk_14 = 1, .chaseSpeed = 2.5f, - .unk_1C = 180, + .unk_1C = { .s = 180 }, .unk_20 = 3, .chaseRadius = 150.0f, .unk_28 = { .f = 0.0f }, @@ -89,7 +89,7 @@ Script N(GoombaIdle) = SCRIPT({ SetSelfVar(0, FALSE); SetNpcAnimation(NPC_SELF, NPC_ANIM(goomba, normal, fake_mushroom)); // TODO: work out why palette 0 is used here EnableNpcShadow(NPC_SELF, FALSE); - SetSelfEnemyFlagBits(0x00000020, TRUE); + SetSelfEnemyFlagBits(NPC_FLAG_NO_AI, TRUE); // Wait until read_sign sets NPC var 0 loop { @@ -98,7 +98,7 @@ Script N(GoombaIdle) = SCRIPT({ } until(SI_VAR(0) == FALSE) // Peel and jump off the sign - SetNpcFlagBits(NPC_SELF, 0x00240000, TRUE); + SetNpcFlagBits(NPC_SELF, 0x240000, TRUE); sleep 3; SI_VAR(0) = 0.0; loop 9 { @@ -126,9 +126,9 @@ Script N(GoombaIdle) = SCRIPT({ NpcJump0(NPC_SELF, -35, 0, 30, 23); func_802CFD30(NPC_SELF, 0, 0, 0, 0, 0); InterpNpcYaw(NPC_SELF, 90, 0); - SetNpcFlagBits(NPC_SELF, 0x00240000, FALSE); - SetSelfEnemyFlagBits(0x00000020, FALSE); - SetSelfEnemyFlagBits(0x40000000, TRUE); + SetNpcFlagBits(NPC_SELF, 0x240000, FALSE); + SetSelfEnemyFlagBits(NPC_FLAG_NO_AI, FALSE); + SetSelfEnemyFlagBits(NPC_FLAG_40000000, TRUE); // We're done jumping off; the player can read the sign again bind N(ReadWestSign) to TRIGGER_WALL_PRESS_A 10; diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c index 49ad544edc..b1eec279c5 100644 --- a/src/world/area_kmr/kmr_20/8ED440.c +++ b/src/world/area_kmr/kmr_20/8ED440.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241620_8ED440); /* ApiStatus N(func_80241620_8ED440)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80241620_8ED440)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kpa/kpa_04/A4BF60.c b/src/world/area_kpa/kpa_04/A4BF60.c index 21d2f7b09f..823d4d8f98 100644 --- a/src/world/area_kpa/kpa_04/A4BF60.c +++ b/src/world/area_kpa/kpa_04/A4BF60.c @@ -1,5 +1,5 @@ #include "kpa_04.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_04/A4BF60", func_80240000_A4BF60); +#include "world/common/UnkFunc11.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_04/A4BF60", func_802400BC_A4C01C); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index ab9c96f8c8..8d370e0f7d 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -1,8 +1,8 @@ #include "kpa_111.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240000_A99590); +#include "world/common/UnkFunc11.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802400BC_A9964C); +#include "world/common/UnkFunc12.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240170_A99700); diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index c0236267dd..98bc4bdea0 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -1,8 +1,8 @@ #include "kpa_113.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240040_A9CC70); +#include "world/common/UnkFunc11.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802400FC_A9CD2C); +#include "world/common/UnkFunc12.inc.c" #include "world/common/set_script_owner_npc_anim.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index f0118eaaeb..c6d47d7326 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -1,8 +1,8 @@ #include "kpa_115.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240000_A9ED40); +#include "world/common/UnkFunc11.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802400BC_A9EDFC); +#include "world/common/UnkFunc12.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240170_A9EEB0); diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 56e95fb42b..8427c92e7c 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); /* ApiStatus N(func_80240380_A57830)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240380_A57830)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index e20a2ac2b1..8bfbcf6861 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_15/A596A0", func_80240310_A596A0); /* ApiStatus N(func_80240310_A596A0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240310_A596A0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index 091feed5c3..8086141ef0 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024027C_A7873C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_802402D0_A78790)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c index 53d0d29cea..99be3c189d 100644 --- a/src/world/area_kpa/kpa_82/A7A550.c +++ b/src/world/area_kpa/kpa_82/A7A550.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024027C_A7A77C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_802402D0_A7A7D0)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 7963f268a3..4ae8bb55e4 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240000_A86A50); /* -ApiStatus N(func_80240000_A86A50)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240000_A86A50)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_80240000_A86A50)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240158_A86BA8); -/* -void N(func_80240158_A86BA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802404C0_A86F10); -/* -void N(func_802404C0_A86F10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024067C_A870CC); /* -ApiStatus N(func_8024067C_A870CC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024067C_A870CC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_8024067C_A870CC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,55 +71,99 @@ ApiStatus N(func_8024067C_A870CC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024094C_A8739C); -/* -ApiStatus N(func_8024094C_A8739C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240AD4_A87524); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240B94_A875E4); /* -void N(func_80240AD4_A87524)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240000_A86A50)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240158_A86BA8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802404C0_A86F10)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024067C_A870CC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024094C_A8739C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240AD4_A87524)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240B94_A875E4); - #include "world/common/set_script_owner_npc_anim.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240F0C_A8795C); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 44de64ea55..d87a9e7a41 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802400E0_A8CB60); /* -ApiStatus N(func_802400E0_A8CB60)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802400E0_A8CB60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_802400E0_A8CB60)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240238_A8CCB8); -/* -void N(func_80240238_A8CCB8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802405A0_A8D020); -/* -void N(func_802405A0_A8D020)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024075C_A8D1DC); /* -ApiStatus N(func_8024075C_A8D1DC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024075C_A8D1DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_8024075C_A8D1DC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,55 +71,99 @@ ApiStatus N(func_8024075C_A8D1DC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240A2C_A8D4AC); -/* -ApiStatus N(func_80240A2C_A8D4AC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240BB4_A8D634); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240C74_A8D6F4); /* -void N(func_80240BB4_A8D634)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_802400E0_A8CB60)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240238_A8CCB8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802405A0_A8D020)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024075C_A8D1DC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240A2C_A8D4AC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240BB4_A8D634)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240C74_A8D6F4); - #include "world/common/set_script_owner_npc_anim.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240FEC_A8DA6C); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 35fa36b3a3..ada4e7d827 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78_C5B4B8); -/* -void N(func_80240D78_C5B4B8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_80241134_C5B874)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241338_C5BA78); -/* -void N(func_80241338_C5BA78)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802416C8_C5BE08); -/* -void N(func_802416C8_C5BE08)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802417EC_C5BF2C); +/* +ApiStatus N(func_802417EC_C5BF2C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_802416C8_C5BE08)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802404E0_C5AC20)(script, aiSettings, territoryPtr); + case 1: + N(func_80240690_C5ADD0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240D78_C5B4B8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241134_C5B874)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241338_C5BA78)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" @@ -249,11 +126,72 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241B08_C5C248); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241D88_C5C4C8); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241DE4_C5C524); +/* +ApiStatus N(func_80241DE4_C5C524)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_802416C8_C5BE08)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802404E0_C5AC20)(script, aiSettings, territoryPtr); + case 1: + N(func_80240690_C5ADD0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240D78_C5B4B8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241134_C5B874)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); + break; + case 13: + N(func_80241B08_C5C248)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241D88_C5C4C8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); /* ApiStatus N(func_80241FCC_C5C70C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -267,11 +205,11 @@ ApiStatus N(func_80241FCC_C5C70C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -297,10 +235,10 @@ ApiStatus N(func_80242310_C5CA50)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -311,7 +249,7 @@ ApiStatus N(func_80242364_C5CAA4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index db64a7912b..5800a7909c 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -21,10 +21,135 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802406A4_C613B4); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240E00_C61B10); +/* +s32 N(func_80240E00_C61B10)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240FB4_C61CC4); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241214_C61F24); +/* +ApiStatus N(func_80241214_C61F24)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240E00_C61B10)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802414C8_C621D8); @@ -45,7 +170,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024234C_C6305C); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC); /* ApiStatus N(func_8024259C_C632AC)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -59,11 +184,11 @@ ApiStatus N(func_8024259C_C632AC)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -89,10 +214,10 @@ ApiStatus N(func_802428E0_C635F0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -103,7 +228,7 @@ ApiStatus N(func_80242934_C63644)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index 2b9d78823e..c963b033c0 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024032C_C6845C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024034C_C6847C); /* -s) { +ApiStatus N(func_8024034C_C6847C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240378_C684A8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802403E4_C68514); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240430_C68560); +/* +ApiStatus N(func_80240430_C68560)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802404DC_C6860C); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024072C_C6885C); /* -s) { +ApiStatus N(func_8024072C_C6885C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240758_C68888); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240790_C688C0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240820_C68950); +/* +ApiStatus N(func_80240820_C68950)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240854_C68984); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802408B8_C689E8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240910_C68A40); +/* +ApiStatus N(func_80240910_C68A40)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240E48_C68F78); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80241018_C69148); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80241018_C69148); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 2997de9c70..472c8fcd98 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -35,73 +35,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8_C6F3E8); -/* -void N(func_802410B8_C6F3E8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -122,129 +56,72 @@ void N(func_80241474_C6F7A4)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241678_C6F9A8); -/* -void N(func_80241678_C6F9A8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241A08_C6FD38); -/* -void N(func_80241A08_C6FD38)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241B2C_C6FE5C); +/* +ApiStatus N(func_80241B2C_C6FE5C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241A08_C6FD38)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240820_C6EB50)(script, aiSettings, territoryPtr); + case 1: + N(func_802409D0_C6ED00)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802410B8_C6F3E8)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241474_C6F7A4)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241678_C6F9A8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71C10.c b/src/world/area_kzn/kzn_08/C71C10.c index 89ed25f8f5..34e4c3bb1c 100644 --- a/src/world/area_kzn/kzn_08/C71C10.c +++ b/src/world/area_kzn/kzn_08/C71C10.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71C10", func_80240790_C71C10); /* ApiStatus N(func_80240790_C71C10)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240790_C71C10)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 08cc2d1848..86828e7ec3 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802412E8_C72768); -/* -void N(func_802412E8_C72768)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_802416A4_C72B24)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802418A8_C72D28); -/* -void N(func_802418A8_C72D28)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241C38_C730B8); -/* -void N(func_80241C38_C730B8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241D5C_C731DC); +/* +ApiStatus N(func_80241D5C_C731DC)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241C38_C730B8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240A50_C71ED0)(script, aiSettings, territoryPtr); + case 1: + N(func_80240C00_C72080)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802412E8_C72768)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802416A4_C72B24)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802418A8_C72D28)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" @@ -249,6 +126,67 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242078_C734F8); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802422F8_C73778); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); +/* +ApiStatus N(func_80242354_C737D4)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241C38_C730B8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240A50_C71ED0)(script, aiSettings, territoryPtr); + case 1: + N(func_80240C00_C72080)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802412E8_C72768)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802416A4_C72B24)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); + break; + case 13: + N(func_80242078_C734F8)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802422F8_C73778)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc6.inc.c" @@ -259,10 +197,135 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242744_C73BC4); +/* +s32 N(func_80242744_C73BC4)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802428F8_C73D78); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242B58_C73FD8); +/* +ApiStatus N(func_80242B58_C73FD8)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80242744_C73BC4)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E0C_C7428C); diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index 0918139bd1..a218741291 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024001C_C76CFC); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024003C_C76D1C); /* -s) { +ApiStatus N(func_8024003C_C76D1C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240068_C76D48); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802400D4_C76DB4); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240120_C76E00); +/* +ApiStatus N(func_80240120_C76E00)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802401CC_C76EAC); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024041C_C770FC); /* -s) { +ApiStatus N(func_8024041C_C770FC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240448_C77128); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240480_C77160); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240510_C771F0); +/* +ApiStatus N(func_80240510_C771F0)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240544_C77224); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802405A8_C77288); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240600_C772E0); +/* +ApiStatus N(func_80240600_C772E0)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240B38_C77818); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240D08_C779E8); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_80240D08_C779E8); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index b51646a881..545824cf62 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241228_C77F08); +/* +s32 N(func_80241228_C77F08)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802413DC_C780BC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024163C_C7831C); +/* +ApiStatus N(func_8024163C_C7831C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241228_C77F08)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802418F0_C785D0); @@ -45,7 +170,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242D58_C79A38); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC_C79F8C); /* ApiStatus N(func_802432AC_C79F8C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -59,11 +184,11 @@ ApiStatus N(func_802432AC_C79F8C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -89,10 +214,10 @@ ApiStatus N(func_802435F0_C7A2D0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -103,7 +228,7 @@ ApiStatus N(func_80243644_C7A324)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 54af25a357..df1ff44334 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240610_C807B0); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240CF8_C80E98); -/* -void N(func_80240CF8_C80E98)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,129 +52,72 @@ void N(func_802410B4_C81254)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802412B8_C81458); -/* -void N(func_802412B8_C81458)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241648_C817E8); -/* -void N(func_80241648_C817E8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024176C_C8190C); +/* +ApiStatus N(func_8024176C_C8190C)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241648_C817E8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240460_C80600)(script, aiSettings, territoryPtr); + case 1: + N(func_80240610_C807B0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240CF8_C80E98)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802410B4_C81254)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802412B8_C81458)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc13.inc.c" @@ -249,6 +126,67 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241A88_C81C28); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D08_C81EA8); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D64_C81F04); +/* +ApiStatus N(func_80241D64_C81F04)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241648_C817E8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240460_C80600)(script, aiSettings, territoryPtr); + case 1: + N(func_80240610_C807B0)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240CF8_C80E98)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802410B4_C81254)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, aiSettings, territoryPtr); + break; + case 13: + N(func_80241A88_C81C28)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241D08_C81EA8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241F4C_C820EC); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index e8bc81262e..b4fa3d9d4e 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240518_C85FC8); +/* +s32 N(func_80240518_C85FC8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802406CC_C8617C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024092C_C863DC); +/* +ApiStatus N(func_8024092C_C863DC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240518_C85FC8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240BE0_C86690); @@ -45,7 +170,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242048_C87AF8); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024259C_C8804C); /* ApiStatus N(func_8024259C_C8804C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -59,11 +184,11 @@ ApiStatus N(func_8024259C_C8804C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -89,10 +214,10 @@ ApiStatus N(func_802428E0_C88390)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -103,7 +228,7 @@ ApiStatus N(func_80242934_C883E4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index 44d3dce900..37378e03e8 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -97,7 +97,7 @@ ApiStatus N(func_80240A14_C8E5C4)(ScriptInstance* script, s32 isInitialCall) { ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - return 0; + return ApiStatus_BLOCK; } */ @@ -120,7 +120,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024140C_C8EFBC); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468_C8F018); /* ApiStatus N(func_80241468_C8F018)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -134,11 +134,11 @@ ApiStatus N(func_80241468_C8F018)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -164,10 +164,10 @@ ApiStatus N(func_802417AC_C8F35C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -178,7 +178,7 @@ ApiStatus N(func_80241800_C8F3B0)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_kzn/kzn_20/C96240.c b/src/world/area_kzn/kzn_20/C96240.c index 757e467596..5702f753dd 100644 --- a/src/world/area_kzn/kzn_20/C96240.c +++ b/src/world/area_kzn/kzn_20/C96240.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_20/C96240", func_80240310_C96240); /* ApiStatus N(func_80240310_C96240)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240310_C96240)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -47,10 +47,10 @@ ApiStatus N(func_80240654_C96584)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_802406A8_C965D8)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 435f9cc020..4475441f49 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); /* ApiStatus N(func_80240630_7EB340)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_80240630_7EB340)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -95,10 +95,10 @@ ApiStatus N(func_802418F0_7EC600)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -109,7 +109,7 @@ ApiStatus N(func_80241944_7EC654)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 7f47d8bfd8..f43a9fb6f5 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242570_7ED280); /* -ApiStatus N(func_80242570_7ED280)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80242570_7ED280)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_80242570_7ED280)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802426C8_7ED3D8); -/* -void N(func_802426C8_7ED3D8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242A30_7ED740); -/* -void N(func_80242A30_7ED740)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242BEC_7ED8FC); /* -ApiStatus N(func_80242BEC_7ED8FC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80242BEC_7ED8FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_80242BEC_7ED8FC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,59 +71,103 @@ ApiStatus N(func_80242BEC_7ED8FC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242EBC_7EDBCC); -/* -ApiStatus N(func_80242EBC_7EDBCC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243044_7EDD54); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243104_7EDE14); /* -void N(func_80243044_7EDD54)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80243104_7EDE14)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80242570_7ED280)(script, npcAISettings, territoryPtr); + case 1: + N(func_802426C8_7ED3D8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80242A30_7ED740)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80242BEC_7ED8FC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80242EBC_7EDBCC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80243044_7EDD54)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243104_7EDE14); - INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400_7EE110); /* ApiStatus N(func_80243400_7EE110)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -217,11 +181,11 @@ ApiStatus N(func_80243400_7EE110)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -253,10 +217,10 @@ ApiStatus N(func_80243744_7EE454)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -267,7 +231,7 @@ ApiStatus N(func_80243798_7EE4A8)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 4beb806a66..a77b872b77 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -8,7 +8,7 @@ extern u8 D_80258407_818C87; INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); /* -ApiStatus N(func_80241080_801900)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80241080_801900)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -40,101 +40,21 @@ ApiStatus N(func_80241080_801900)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802411D8_801A58); -/* -void N(func_802411D8_801A58)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #define NAMESPACE dup_mac_01 #include "world/common/UnkNpcAIFunc1.inc.c" #define NAMESPACE mac_01 -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241540_801DC0); -/* -void N(func_80241540_801DC0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC_801F7C); /* -ApiStatus N(func_802416FC_801F7C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802416FC_801F7C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -149,7 +69,7 @@ ApiStatus N(func_802416FC_801F7C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -165,61 +85,105 @@ ApiStatus N(func_802416FC_801F7C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" #define NAMESPACE mac_01 -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802419CC_80224C); -/* -ApiStatus N(func_802419CC_80224C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #define NAMESPACE dup_mac_01 #include "world/common/UnkNpcDurationFlagFunc.inc.c" #define NAMESPACE mac_01 -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241B54_8023D4); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14_802494); /* -void N(func_80241B54_8023D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241C14_802494)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80241080_801900)(script, npcAISettings, territoryPtr); + case 1: + N(func_802411D8_801A58)(script, npcAISettings, territoryPtr); + break; + case 2: + dup_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + N(func_80241540_801DC0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_802416FC_801F7C)(script, npcAISettings, territoryPtr); + break; + case 10: + dup_NpcJumpFunc2(script, npcAISettings, territoryPtr); + case 11: + dup_NpcJumpFunc(script, npcAISettings, territoryPtr); + break; + case 12: + dup_UnkNpcAIFunc13(script, npcAISettings, territoryPtr); + case 13: + N(func_802419CC_80224C)(script, npcAISettings, territoryPtr); + break; + case 14: + dup_UnkNpcDurationFlagFunc(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241B54_8023D4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14_802494); - INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790); /* ApiStatus N(func_80241F10_802790)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -233,11 +197,11 @@ ApiStatus N(func_80241F10_802790)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -345,10 +309,10 @@ ApiStatus N(func_80243CD4_804554)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -359,7 +323,7 @@ ApiStatus N(func_80243D28_8045A8)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 318e677410..0cdcfbd53e 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245550_805DD0); /* -ApiStatus N(func_80245550_805DD0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80245550_805DD0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -34,99 +34,19 @@ ApiStatus N(func_80245550_805DD0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802456A8_805F28); -/* -void N(func_802456A8_805F28)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13_copy.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245A10_806290); -/* -void N(func_80245A10_806290)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14_copy.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245BCC_80644C); /* -ApiStatus N(func_80245BCC_80644C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80245BCC_80644C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -141,7 +61,7 @@ ApiStatus N(func_80245BCC_80644C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -151,53 +71,97 @@ ApiStatus N(func_80245BCC_80644C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245E9C_80671C); -/* -ApiStatus N(func_80245E9C_80671C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15_copy.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80246024_8068A4); +#include "world/common/UnkFunc16_copy.inc.c" + +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802460E4_806964); /* -void N(func_80246024_8068A4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_802460E4_806964)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80245550_805DD0)(script, npcAISettings, territoryPtr); + case 1: + N(func_802456A8_805F28)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80245A10_806290)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80245BCC_80644C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80245E9C_80671C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80246024_8068A4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802460E4_806964); - INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802463E0_806C60); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index f7ce884d1e..cc37e0d29a 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930_823BF0); /* -ApiStatus N(func_80240930_823BF0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240930_823BF0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -36,99 +36,19 @@ ApiStatus N(func_80240930_823BF0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240A88_823D48); -/* -void N(func_80240A88_823D48)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240DF0_8240B0); -/* -void N(func_80240DF0_8240B0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240FAC_82426C); /* -ApiStatus N(func_80240FAC_82426C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240FAC_82426C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -143,7 +63,7 @@ ApiStatus N(func_80240FAC_82426C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -153,59 +73,103 @@ ApiStatus N(func_80240FAC_82426C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024127C_82453C); -/* -ApiStatus N(func_8024127C_82453C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241404_8246C4); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802414C4_824784); /* -void N(func_80241404_8246C4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_802414C4_824784)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240930_823BF0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240A88_823D48)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240DF0_8240B0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240FAC_82426C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024127C_82453C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241404_8246C4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802414C4_824784); - INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80); /* ApiStatus N(func_802417C0_824A80)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -219,11 +183,11 @@ ApiStatus N(func_802417C0_824A80)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -295,10 +259,10 @@ ApiStatus N(func_80242A80_825D40)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -309,7 +273,7 @@ ApiStatus N(func_80242AD4_825D94)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 04d83e15a8..c3d1f6d460 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); /* ApiStatus N(func_802404B0_831CB0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -21,11 +21,11 @@ ApiStatus N(func_802404B0_831CB0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -97,10 +97,10 @@ ApiStatus N(func_80241770_832F70)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -111,7 +111,7 @@ ApiStatus N(func_802417C4_832FC4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index e88bdb37e2..1044361d13 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030); /* ApiStatus N(func_80240460_843030)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_80240460_843030)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -95,10 +95,10 @@ ApiStatus N(func_80241720_8442F0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -109,7 +109,7 @@ ApiStatus N(func_80241774_844344)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 379ba77360..7a05fc3f7a 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240490_852600); /* -ApiStatus N(func_80240490_852600)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240490_852600)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -44,99 +44,19 @@ ApiStatus N(func_80240490_852600)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802405E8_852758); -/* -void N(func_802405E8_852758)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240950_852AC0); -/* -void N(func_80240950_852AC0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240B0C_852C7C); /* -ApiStatus N(func_80240B0C_852C7C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240B0C_852C7C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -151,7 +71,7 @@ ApiStatus N(func_80240B0C_852C7C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -161,59 +81,103 @@ ApiStatus N(func_80240B0C_852C7C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240DDC_852F4C); -/* -ApiStatus N(func_80240DDC_852F4C)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240F64_8530D4); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241024_853194); /* -void N(func_80240F64_8530D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241024_853194)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240490_852600)(script, npcAISettings, territoryPtr); + case 1: + N(func_802405E8_852758)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240950_852AC0)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240B0C_852C7C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240DDC_852F4C)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240F64_8530D4)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241024_853194); - INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490); /* ApiStatus N(func_80241320_853490)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -227,11 +191,11 @@ ApiStatus N(func_80241320_853490)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -303,10 +267,10 @@ ApiStatus N(func_802425E0_854750)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -317,7 +281,7 @@ ApiStatus N(func_80242634_8547A4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 935209d1a0..9e63333c5b 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802402E0_E0EA80); /* -ApiStatus N(func_802402E0_E0EA80)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802402E0_E0EA80)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -46,99 +46,19 @@ ApiStatus N(func_802402E0_E0EA80)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240438_E0EBD8); -/* -void N(func_80240438_E0EBD8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802407A0_E0EF40); -/* -void N(func_802407A0_E0EF40)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_8024095C_E0F0FC); /* -ApiStatus N(func_8024095C_E0F0FC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024095C_E0F0FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -153,7 +73,7 @@ ApiStatus N(func_8024095C_E0F0FC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -163,53 +83,97 @@ ApiStatus N(func_8024095C_E0F0FC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240C2C_E0F3CC); -/* -ApiStatus N(func_80240C2C_E0F3CC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240DB4_E0F554); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240E74_E0F614); /* -void N(func_80240DB4_E0F554)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80240E74_E0F614)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_802402E0_E0EA80)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240438_E0EBD8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802407A0_E0EF40)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024095C_E0F0FC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240C2C_E0F3CC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80240DB4_E0F554)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240E74_E0F614); - INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80241170_E0F910); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 1dbaffe4cc..a7dc4d9da9 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240708_B93B48); +/* +s32 N(func_80240708_B93B48)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802408BC_B93CFC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240B1C_B93F5C); +/* +ApiStatus N(func_80240B1C_B93F5C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240708_B93B48)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240DD0_B94210); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index f6b8fb3f7b..73e4990784 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -36,10 +36,10 @@ ApiStatus N(func_802410B0_B98CB0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -50,7 +50,7 @@ ApiStatus N(func_80241104_B98D04)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index f0060a107f..25e6c9f523 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -19,7 +19,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DF0_B9E750); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80241014_B9E974); /* ApiStatus N(func_80241014_B9E974)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -33,11 +33,11 @@ ApiStatus N(func_80241014_B9E974)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index ff6eff63a5..7d01dbe4de 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240278_BA09A8); +/* +s32 N(func_80240278_BA09A8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024042C_BA0B5C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024068C_BA0DBC); +/* +ApiStatus N(func_8024068C_BA0DBC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240278_BA09A8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240940_BA1070); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 5b1b02b984..f0b7c08812 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240778_BA4EF8); +/* +s32 N(func_80240778_BA4EF8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024092C_BA50AC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240B8C_BA530C); +/* +ApiStatus N(func_80240B8C_BA530C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240778_BA4EF8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240E40_BA55C0); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 47325f8b40..43aa493b60 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -35,73 +35,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240250_BADB90); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240938_BAE278); -/* -void N(func_80240938_BAE278)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -122,129 +56,72 @@ void N(func_80240CF4_BAE634)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240EF8_BAE838); -/* -void N(func_80240EF8_BAE838)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241288_BAEBC8); -/* -void N(func_80241288_BAEBC8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); +/* +ApiStatus N(func_802413AC_BAECEC)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241288_BAEBC8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802400A0_BAD9E0)(script, aiSettings, territoryPtr); + case 1: + N(func_80240250_BADB90)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240938_BAE278)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240CF4_BAE634)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80240EF8_BAE838)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/UnkNpcAIFunc6.inc.c" @@ -255,10 +132,135 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802417A0_BAF0E0); +/* +s32 N(func_802417A0_BAF0E0)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241954_BAF294); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241BB4_BAF4F4); +/* +ApiStatus N(func_80241BB4_BAF4F4)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_802417A0_BAF0E0)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241E68_BAF7A8); diff --git a/src/world/area_mim/mim_10/BB59E0.c b/src/world/area_mim/mim_10/BB59E0.c index 036513c9ff..7ba04fca1f 100644 --- a/src/world/area_mim/mim_10/BB59E0.c +++ b/src/world/area_mim/mim_10/BB59E0.c @@ -1,6 +1,14 @@ #include "mim_10.h" INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240000_BB59E0); +/* +ApiStatus N(func_80240000_BB59E0)(ScriptInstance *script, s32 isInitialCall) { + if (gPlayerStatus.position.y >= -210.0f) { + return ApiStatus_BLOCK; + } + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240030_BB5A10); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 341f9fb27d..2c86918c5c 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -45,7 +45,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D68_9C6148); /* ApiStatus N(func_80240D68_9C6148)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -59,11 +59,11 @@ ApiStatus N(func_80240D68_9C6148)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -135,10 +135,10 @@ ApiStatus N(func_80242028_9C7408)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -149,7 +149,7 @@ ApiStatus N(func_8024207C_9C745C)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index f867655703..4c7d43faa0 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -15,7 +15,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); /* ApiStatus N(func_802402E0_9D7300)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -29,11 +29,11 @@ ApiStatus N(func_802402E0_9D7300)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -65,10 +65,10 @@ ApiStatus N(func_80240624_9D7644)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -79,7 +79,7 @@ ApiStatus N(func_80240678_9D7698)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 1e9ee94651..ea43d866ce 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80_9D7AA0); /* -ApiStatus N(func_80240A80_9D7AA0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240A80_9D7AA0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -36,99 +36,19 @@ ApiStatus N(func_80240A80_9D7AA0)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240BD8_9D7BF8); -/* -void N(func_80240BD8_9D7BF8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240F40_9D7F60); -/* -void N(func_80240F40_9D7F60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802410FC_9D811C); /* -ApiStatus N(func_802410FC_9D811C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802410FC_9D811C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -143,7 +63,7 @@ ApiStatus N(func_802410FC_9D811C)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -153,59 +73,103 @@ ApiStatus N(func_802410FC_9D811C)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802413CC_9D83EC); -/* -ApiStatus N(func_802413CC_9D83EC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241554_9D8574); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241614_9D8634); /* -void N(func_80241554_9D8574)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241614_9D8634)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240A80_9D7AA0)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240BD8_9D7BF8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240F40_9D7F60)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_802410FC_9D811C)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_802413CC_9D83EC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241554_9D8574)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241614_9D8634); - INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930); /* ApiStatus N(func_80241910_9D8930)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -219,11 +183,11 @@ ApiStatus N(func_80241910_9D8930)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -295,10 +259,10 @@ ApiStatus N(func_80242BD0_9D9BF0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -309,7 +273,7 @@ ApiStatus N(func_80242C24_9D9C44)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -325,9 +289,9 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FB8_9D9FD8); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FE4_9DA004); /* -s) { +ApiStatus N(func_80242FE4_9DA004)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index e2a1143491..b9c15d162c 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -26,10 +26,10 @@ ApiStatus N(func_80243BEC_9DAC0C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -40,7 +40,7 @@ ApiStatus N(func_80243C40_9DAC60)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -51,7 +51,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243DB0_9DADD0); /* ApiStatus N(func_80243DB0_9DADD0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -65,11 +65,11 @@ ApiStatus N(func_80243DB0_9DADD0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 4f5b3ce5cb..25be028398 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -41,73 +41,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240984_9F53C4); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024106C_9F5AAC); -/* -void N(func_8024106C_9F5AAC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -128,129 +62,72 @@ void N(func_80241428_9F5E68)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024162C_9F606C); -/* -void N(func_8024162C_9F606C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802419BC_9F63FC); -/* -void N(func_802419BC_9F63FC)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241AE0_9F6520); +/* +ApiStatus N(func_80241AE0_9F6520)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_802419BC_9F63FC)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802407D4_9F5214)(script, aiSettings, territoryPtr); + case 1: + N(func_80240984_9F53C4)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_8024106C_9F5AAC)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241428_9F5E68)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_8024162C_9F606C)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/SomeMatrixOperations.inc.c" diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 47f1323907..34f855a957 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240904_9FB0F4); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240D44_9FB534); /* -ApiStatus N(func_80240D44_9FB534)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240D44_9FB534)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -44,99 +44,19 @@ ApiStatus N(func_80240D44_9FB534)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240E9C_9FB68C); -/* -void N(func_80240E9C_9FB68C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241204_9FB9F4); -/* -void N(func_80241204_9FB9F4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802413C0_9FBBB0); /* -ApiStatus N(func_802413C0_9FBBB0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802413C0_9FBBB0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -151,7 +71,7 @@ ApiStatus N(func_802413C0_9FBBB0)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -161,53 +81,97 @@ ApiStatus N(func_802413C0_9FBBB0)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241690_9FBE80); -/* -ApiStatus N(func_80241690_9FBE80)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241818_9FC008); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802418D8_9FC0C8); /* -void N(func_80241818_9FC008)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_802418D8_9FC0C8)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240D44_9FB534)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240E9C_9FB68C)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80241204_9FB9F4)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_802413C0_9FBBB0)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80241690_9FBE80)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241818_9FC008)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802418D8_9FC0C8); - INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241BD4_9FC3C4); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index bb47bb0c54..c0105b6d17 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -41,73 +41,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C_A03A6C); -/* -void N(func_8024122C_A03A6C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -128,129 +62,72 @@ void N(func_802415E8_A03E28)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802417EC_A0402C); -/* -void N(func_802417EC_A0402C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241B7C_A043BC); -/* -void N(func_80241B7C_A043BC)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241CA0_A044E0); +/* +ApiStatus N(func_80241CA0_A044E0)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241B7C_A043BC)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240994_A031D4)(script, aiSettings, territoryPtr); + case 1: + N(func_80240B44_A03384)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_8024122C_A03A6C)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802415E8_A03E28)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802417EC_A0402C)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241E8C_A046CC); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 35582a5357..165eac508c 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -53,73 +53,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C_A0824C); -/* -void N(func_8024134C_A0824C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -140,129 +74,72 @@ void N(func_80241708_A08608)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024190C_A0880C); -/* -void N(func_8024190C_A0880C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241C9C_A08B9C); -/* -void N(func_80241C9C_A08B9C)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241DC0_A08CC0); +/* +ApiStatus N(func_80241DC0_A08CC0)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241C9C_A08B9C)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240AB4_A079B4)(script, aiSettings, territoryPtr); + case 1: + N(func_80240C64_A07B64)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_8024134C_A0824C)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241708_A08608)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_8024190C_A0880C)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241FAC_A08EAC); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index 3de24bfbd5..141375b7ee 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980); /* ApiStatus N(func_802407E0_BBD980)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_802407E0_BBD980)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -47,10 +47,10 @@ ApiStatus N(func_80240B24_BBDCC4)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_80240B78_BBDD18)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 3f555fe674..7ffea3b2e1 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0); /* ApiStatus N(func_80240170_BC43F0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240170_BC43F0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -47,10 +47,10 @@ ApiStatus N(func_802404B4_BC4734)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_80240508_BC4788)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c index ee07a3fdc6..d3d077e9e1 100644 --- a/src/world/area_obk/obk_04/BC7EB0.c +++ b/src/world/area_obk/obk_04/BC7EB0.c @@ -21,7 +21,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240910_BC8770); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240940_BC87A0); /* ApiStatus N(func_80240940_BC87A0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -35,11 +35,11 @@ ApiStatus N(func_80240940_BC87A0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index 6664d239d3..acec6f02ef 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEBF0", func_80240000_BCEBF0); /* ApiStatus N(func_80240000_BCEBF0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_BCEBF0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 8386e0b65b..52d92926fa 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); /* ApiStatus N(func_80240000_DAD400)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_DAD400)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -68,73 +68,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240550_DAD950); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240C38_DAE038); -/* -void N(func_80240C38_DAE038)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -155,129 +89,72 @@ void N(func_80240FF4_DAE3F4)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802411F8_DAE5F8); -/* -void N(func_802411F8_DAE5F8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241588_DAE988); -/* -void N(func_80241588_DAE988)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802416AC_DAEAAC); +/* +ApiStatus N(func_802416AC_DAEAAC)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241588_DAE988)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_802403A0_DAD7A0)(script, aiSettings, territoryPtr); + case 1: + N(func_80240550_DAD950)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240C38_DAE038)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80240FF4_DAE3F4)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802411F8_DAE5F8)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241898_DAEC98); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 000b3c5a5c..1225225410 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -47,73 +47,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802412EC_DB35AC); -/* -void N(func_802412EC_DB35AC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -134,129 +68,72 @@ void N(func_802416A8_DB3968)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802418AC_DB3B6C); -/* -void N(func_802418AC_DB3B6C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241C3C_DB3EFC); -/* -void N(func_80241C3C_DB3EFC)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241D60_DB4020); +/* +ApiStatus N(func_80241D60_DB4020)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241C3C_DB3EFC)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240A54_DB2D14)(script, aiSettings, territoryPtr); + case 1: + N(func_80240C04_DB2EC4)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_802412EC_DB35AC)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802416A8_DB3968)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802418AC_DB3B6C)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ #include "world/common/GetNpcCollisionHeight.inc.c" @@ -278,10 +155,10 @@ ApiStatus N(func_80242178_DB4438)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -292,7 +169,7 @@ ApiStatus N(func_802421CC_DB448C)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index df0927858e..81bc7d5756 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); /* ApiStatus N(func_80240870_DB8180)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240870_DB8180)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 42a0ecba56..797b419f0e 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240238_DBD4E8); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024056C_DBD81C); /* -ApiStatus N(func_8024056C_DBD81C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024056C_DBD81C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -44,99 +44,19 @@ ApiStatus N(func_8024056C_DBD81C)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802406C4_DBD974); -/* -void N(func_802406C4_DBD974)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240A2C_DBDCDC); -/* -void N(func_80240A2C_DBDCDC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240BE8_DBDE98); /* -ApiStatus N(func_80240BE8_DBDE98)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240BE8_DBDE98)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -151,7 +71,7 @@ ApiStatus N(func_80240BE8_DBDE98)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -161,55 +81,99 @@ ApiStatus N(func_80240BE8_DBDE98)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240EB8_DBE168); -/* -ApiStatus N(func_80240EB8_DBE168)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241040_DBE2F0); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241100_DBE3B0); /* -void N(func_80241040_DBE2F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241100_DBE3B0)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_8024056C_DBD81C)(script, npcAISettings, territoryPtr); + case 1: + N(func_802406C4_DBD974)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240A2C_DBDCDC)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240BE8_DBDE98)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80240EB8_DBE168)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241040_DBE2F0)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241100_DBE3B0); - INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802413FC_DBE6AC); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024146C_DBE71C); @@ -253,73 +217,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); #include "world/common/UnkNpcAIFunc1.inc.c" #define NAMESPACE omo_07 -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); -/* -void N(func_80242210_DBF4C0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -340,129 +238,72 @@ void N(func_802425CC_DBF87C)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802427D0_DBFA80); -/* -void N(func_802427D0_DBFA80)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242B60_DBFE10); -/* -void N(func_80242B60_DBFE10)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242C84_DBFF34); +/* +ApiStatus N(func_80242C84_DBFF34)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80242B60_DBFE10)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80241978_DBEC28)(script, aiSettings, territoryPtr); + case 1: + N(func_80241B28_DBEDD8)(script, aiSettings, territoryPtr); + break; + case 2: + dup_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + case 3: + N(func_80242210_DBF4C0)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802425CC_DBF87C)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802427D0_DBFA80)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E70_DC0120); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 396b4dd65b..620afd964d 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); /* ApiStatus N(func_80242F20_DC01D0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80242F20_DC01D0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index c69297163a..5c7bbf6acc 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); /* ApiStatus N(func_80240720_DCD3F0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240720_DCD3F0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 9336529ce0..8b57c85ca4 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240C18_DCD8E8); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240F4C_DCDC1C); /* -ApiStatus N(func_80240F4C_DCDC1C)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240F4C_DCDC1C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -44,99 +44,19 @@ ApiStatus N(func_80240F4C_DCDC1C)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802410A4_DCDD74); -/* -void N(func_802410A4_DCDD74)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024140C_DCE0DC); -/* -void N(func_8024140C_DCE0DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802415C8_DCE298); /* -ApiStatus N(func_802415C8_DCE298)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802415C8_DCE298)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -151,7 +71,7 @@ ApiStatus N(func_802415C8_DCE298)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -161,55 +81,99 @@ ApiStatus N(func_802415C8_DCE298)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241898_DCE568); -/* -ApiStatus N(func_80241898_DCE568)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241A20_DCE6F0); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241AE0_DCE7B0); /* -void N(func_80241A20_DCE6F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241AE0_DCE7B0)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240F4C_DCDC1C)(script, npcAISettings, territoryPtr); + case 1: + N(func_802410A4_DCDD74)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_8024140C_DCE0DC)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_802415C8_DCE298)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80241898_DCE568)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241A20_DCE6F0)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241AE0_DCE7B0); - INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241DDC_DCEAAC); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241E4C_DCEB1C); diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index 07f1cab3d5..c476c8c030 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407AC_DDCFDC); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407CC_DDCFFC); /* -s) { +ApiStatus N(func_802407CC_DDCFFC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407F8_DDD028); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240864_DDD094); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802408B0_DDD0E0); +/* +ApiStatus N(func_802408B0_DDD0E0)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_8024095C_DDD18C); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240BAC_DDD3DC); /* -s) { +ApiStatus N(func_80240BAC_DDD3DC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240BD8_DDD408); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240C10_DDD440); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240CA0_DDD4D0); +/* +ApiStatus N(func_80240CA0_DDD4D0)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240CD4_DDD504); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240D38_DDD568); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240D90_DDD5C0); +/* +ApiStatus N(func_80240D90_DDD5C0)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802412C8_DDDAF8); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241498_DDDCC8); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241498_DDDCC8); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 02574e5eb6..53abc1e24b 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -36,10 +36,10 @@ ApiStatus N(func_80240F00_DE3390)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -50,7 +50,7 @@ ApiStatus N(func_80240F54_DE33E4)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index ec6f12965f..f43d968ec9 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); /* ApiStatus N(func_80241230_DE36C0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80241230_DE36C0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 5ff0bb3ec5..e0a4cbc71c 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -47,73 +47,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C_DF06EC); -/* -void N(func_8024184C_DF06EC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -134,129 +68,72 @@ void N(func_80241C08_DF0AA8)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241E0C_DF0CAC); -/* -void N(func_80241E0C_DF0CAC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024219C_DF103C); -/* -void N(func_8024219C_DF103C)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802422C0_DF1160); +/* +ApiStatus N(func_802422C0_DF1160)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_8024219C_DF103C)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240FB4_DEFE54)(script, aiSettings, territoryPtr); + case 1: + N(func_80241164_DF0004)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_8024184C_DF06EC)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241C08_DF0AA8)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80241E0C_DF0CAC)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802424AC_DF134C); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index bdb6016451..a8710bd8c8 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350); /* ApiStatus N(func_80240360_AB0350)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240360_AB0350)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -47,10 +47,10 @@ ApiStatus N(func_802406A4_AB0694)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_802406F8_AB06E8)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 4ba10f6c5e..13a52da4a8 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -53,10 +53,10 @@ ApiStatus N(func_802411AC_D4E1EC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -67,7 +67,7 @@ ApiStatus N(func_80241200_D4E240)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 508d02bc59..ceda79166d 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -46,10 +46,10 @@ ApiStatus N(func_8024114C_D5113C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -60,7 +60,7 @@ ApiStatus N(func_802411A0_D51190)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 8b8457e608..2ce16c4b64 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC); INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); /* ApiStatus N(func_80240F20_D56AD0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -43,11 +43,11 @@ ApiStatus N(func_80240F20_D56AD0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 90df43bb69..be236d7318 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -46,10 +46,10 @@ ApiStatus N(func_8024114C_D599DC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -60,7 +60,7 @@ ApiStatus N(func_802411A0_D59A30)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 26f97a3b3f..d15d79cdf5 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C); INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420); /* ApiStatus N(func_80240F20_D62420)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -43,11 +43,11 @@ ApiStatus N(func_80240F20_D62420)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 5e3dc0806f..a1ffdd694a 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C); INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60); /* ApiStatus N(func_80240F50_D63C60)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -45,11 +45,11 @@ ApiStatus N(func_80240F50_D63C60)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 9da02c702e..4401433bd8 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -46,10 +46,10 @@ ApiStatus N(func_8024114C_D6572C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -60,7 +60,7 @@ ApiStatus N(func_802411A0_D65780)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -72,9 +72,9 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241310_D658F0); INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802413A4_D65984); /* -s) { +ApiStatus N(func_802413A4_D65984)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index de8f2046a6..d03ade469f 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C); INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20); /* ApiStatus N(func_80240F20_D68C20)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -43,11 +43,11 @@ ApiStatus N(func_80240F20_D68C20)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 7b3f682510..49ef77464d 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -46,10 +46,10 @@ ApiStatus N(func_8024114C_D6FAFC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -60,7 +60,7 @@ ApiStatus N(func_802411A0_D6FB50)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_22/D788A0.c b/src/world/area_pra/pra_22/D788A0.c index 5e524fa883..f1b5869f1c 100644 --- a/src/world/area_pra/pra_22/D788A0.c +++ b/src/world/area_pra/pra_22/D788A0.c @@ -1,6 +1,6 @@ #include "pra_22.h" -INCLUDE_ASM(s32, "world/area_pra/pra_22/D788A0", func_80240020_D788A0); +#include "world/common/UnkFunc11.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_22/D788A0", func_802400DC_D7895C); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index a0a4681c90..e339a347aa 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C); INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940); /* ApiStatus N(func_80240F50_D7A940)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -45,11 +45,11 @@ ApiStatus N(func_80240F50_D7A940)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index 6fb13920d2..11f577d7a7 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C); INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0); /* ApiStatus N(func_80240F50_D7C1F0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -45,11 +45,11 @@ ApiStatus N(func_80240F50_D7C1F0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index 39bf4a9c81..90c860f351 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024024C_D7EFAC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_802402A0_D7F000)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_31/D7F270.c b/src/world/area_pra/pra_31/D7F270.c index a7df1b1c2a..a8d7de99e1 100644 --- a/src/world/area_pra/pra_31/D7F270.c +++ b/src/world/area_pra/pra_31/D7F270.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", delete_actor_D7F91C); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240C70_D7F9D0); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240DBC_D7FB1C); +#include "world/common/UnkFunc12.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240E70_D7FBD0); diff --git a/src/world/area_pra/pra_32/D86A20.c b/src/world/area_pra/pra_32/D86A20.c index 8ff1a8113b..1e15965688 100644 --- a/src/world/area_pra/pra_32/D86A20.c +++ b/src/world/area_pra/pra_32/D86A20.c @@ -93,7 +93,7 @@ ApiStatus N(func_80240728_D87128)(ScriptInstance* script, s32 isInitialCall) { ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - return 0; + return ApiStatus_BLOCK; } */ diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index e5b7030141..601660bbdd 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240F20_D8E170); /* -ApiStatus N(func_80240F20_D8E170)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240F20_D8E170)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -60,99 +60,19 @@ ApiStatus N(func_80240F20_D8E170)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241078_D8E2C8); -/* -void N(func_80241078_D8E2C8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802413E0_D8E630); -/* -void N(func_802413E0_D8E630)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024159C_D8E7EC); /* -ApiStatus N(func_8024159C_D8E7EC)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_8024159C_D8E7EC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -167,7 +87,7 @@ ApiStatus N(func_8024159C_D8E7EC)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -177,55 +97,99 @@ ApiStatus N(func_8024159C_D8E7EC)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024186C_D8EABC); -/* -ApiStatus N(func_8024186C_D8EABC)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802419F4_D8EC44); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); /* -void N(func_802419F4_D8EC44)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241AB4_D8ED04)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240F20_D8E170)(script, npcAISettings, territoryPtr); + case 1: + N(func_80241078_D8E2C8)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_802413E0_D8E630)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_8024159C_D8E7EC)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_8024186C_D8EABC)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_802419F4_D8EC44)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); - #include "world/common/UnkNpcAIFunc6.inc.c" #include "world/common/UnkNpcAIFunc7.inc.c" @@ -235,9 +199,134 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241FB8_D8F208); +/* +s32 N(func_80241FB8_D8F208)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024216C_D8F3BC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802423CC_D8F61C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80242698_D8F8E8); +/* +ApiStatus N(func_80242698_D8F8E8)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241FB8_D8F208)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index d714c2a86a..5a1f81147a 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); /* ApiStatus N(func_80242950_D8FBA0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80242950_D8FBA0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index 56973647c8..751e4efa98 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -37,7 +37,132 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240D6C_D93CAC); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241158_D94098); +/* +s32 N(func_80241158_D94098)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024130C_D9424C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024156C_D944AC); +/* +ApiStatus N(func_8024156C_D944AC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80241158_D94098)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 467095c907..53041738d2 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -22,10 +22,10 @@ ApiStatus N(func_8024053C_CF80AC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -36,7 +36,7 @@ ApiStatus N(func_80240590_CF8100)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -47,7 +47,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270); /* ApiStatus N(func_80240700_CF8270)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -61,11 +61,11 @@ ApiStatus N(func_80240700_CF8270)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -132,7 +132,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800); /* ApiStatus N(func_80241C90_CF9800)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -146,11 +146,11 @@ ApiStatus N(func_80241C90_CF9800)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index f87e7dbb5e..740bedb187 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -25,7 +25,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C); /* ApiStatus N(func_80240B2C_D0625C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -39,11 +39,11 @@ ApiStatus N(func_80240B2C_D0625C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 55f5c0839c..022426431d 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -11,7 +11,132 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240000_D110C0); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240258_D11318); +/* +s32 N(func_80240258_D11318)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024040C_D114CC); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024066C_D1172C); +/* +ApiStatus N(func_8024066C_D1172C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240258_D11318)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c index 1df2b9025f..e412c05f80 100644 --- a/src/world/area_sam/sam_04/D138E0.c +++ b/src/world/area_sam/sam_04/D138E0.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024053C_D13B0C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_80240590_D13B60)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index abf49d8273..59273729dd 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240208_D189E8); +/* +s32 N(func_80240208_D189E8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", update_starpoints_display_D18B9C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024061C_D18DFC); +/* +ApiStatus N(func_8024061C_D18DFC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240208_D189E8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802408D0_D190B0); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 1bf2586376..a74312e035 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -31,73 +31,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240DE8_D20C78); -/* -void N(func_80240DE8_D20C78)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -118,134 +52,77 @@ void N(func_802411A4_D21034)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802413A8_D21238); -/* -void N(func_802413A8_D21238)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241738_D215C8); -/* -void N(func_80241738_D215C8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024185C_D216EC); +/* +ApiStatus N(func_8024185C_D216EC)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241738_D215C8)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240550_D203E0)(script, aiSettings, territoryPtr); + case 1: + N(func_80240700_D20590)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_80240DE8_D20C78)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_802411A4_D21034)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_802413A8_D21238)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48_D218D8); /* ApiStatus N(func_80241A48_D218D8)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -259,11 +136,11 @@ ApiStatus N(func_80241A48_D218D8)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -289,10 +166,10 @@ ApiStatus N(func_80241D8C_D21C1C)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -303,7 +180,7 @@ ApiStatus N(func_80241DE0_D21C70)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 18a97fdb71..9020478daa 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -19,10 +19,135 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240858_D2C588); +/* +s32 N(func_80240858_D2C588)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240A0C_D2C73C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240C6C_D2C99C); +/* +ApiStatus N(func_80240C6C_D2C99C)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240858_D2C588)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240F20_D2CC50); diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index 81e49c645d..a92de76640 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024001C_D2FC9C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024003C_D2FCBC); /* -s) { +ApiStatus N(func_8024003C_D2FCBC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240068_D2FCE8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802400D4_D2FD54); INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240120_D2FDA0); +/* +ApiStatus N(func_80240120_D2FDA0)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802401CC_D2FE4C); INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024041C_D3009C); /* -s) { +ApiStatus N(func_8024041C_D3009C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240448_D300C8); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240480_D30100); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240510_D30190); +/* +ApiStatus N(func_80240510_D30190)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240544_D301C4); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802405A8_D30228); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240600_D30280); +/* +ApiStatus N(func_80240600_D30280)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240B38_D307B8); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240D08_D30988); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_80240D08_D30988); diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index 9b1b6566a5..44c35d18ac 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -9,10 +9,135 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240F48_D30BC8); +/* +s32 N(func_80240F48_D30BC8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_802410FC_D30D7C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_8024135C_D30FDC); +/* +ApiStatus N(func_8024135C_D30FDC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_80240F48_D30BC8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80241610_D31290); diff --git a/src/world/area_sam/sam_09/D362F0.c b/src/world/area_sam/sam_09/D362F0.c index 8da1ccdc1b..de9c26d3d3 100644 --- a/src/world/area_sam/sam_09/D362F0.c +++ b/src/world/area_sam/sam_09/D362F0.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_09/D362F0", func_80240000_D362F0); /* ApiStatus N(func_80240000_D362F0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_D362F0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index 89c8bcd59e..035b10c77d 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_80240000_D37800); /* ApiStatus N(func_80240000_D37800)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240000_D37800)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sam/sam_10/D37BD0.c b/src/world/area_sam/sam_10/D37BD0.c index f8582e2238..b9d69ec183 100644 --- a/src/world/area_sam/sam_10/D37BD0.c +++ b/src/world/area_sam/sam_10/D37BD0.c @@ -9,7 +9,132 @@ #include "world/common/UnkNpcAIFunc5.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802405D8_D37DD8); +/* +s32 N(func_802405D8_D37DD8)(ScriptInstance *script) { + PlayerStatus** playerStatus = &gPlayerStatusPtr; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Camera* camera = CAM2(D_8009A634); + Enemy* enemy2 = get_enemy(enemy->npcID + 1); + f32 phi_f20; + s32 ret = TRUE; -INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_8024078C_D37F8C); + if (dist2D(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z) > enemy2->varTable[2]) { + ret = FALSE; + } + + if (clamp_angle(get_clamped_angle_diff(camera->currentYaw, npc->yaw)) < 180.0) { + phi_f20 = 90.0f; + } else { + phi_f20 = 270.0f; + } + + if (fabsf(get_clamped_angle_diff(phi_f20, atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z))) > enemy2->varTable[3]) { + ret = FALSE; + } + + if ((2.0 * npc->collisionHeight) <= fabsf(npc->pos.y - (*playerStatus)->position.y)) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 9) { + ret = FALSE; + } + + if (D_8010EBB0.unk_03 == 7) { + ret = FALSE; + } + + return ret; +} +*/ + +#include "world/common/UnkFunc7.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37BD0", func_802409EC_D381EC); +/* +ApiStatus N(func_802409EC_D381EC)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->wander.isFlying) { + npc->flags = (npc->flags | 0x200) & ~0x8; + } else { + npc->flags = (npc->flags & ~0x200) | 0x8; + } + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } + enemy->varTable[0] = 0; + } + + if ((script->functionTemp[0].s < 30) && (enemy->varTable[0] == 0) && N(func_802405D8_D37DD8)(script)) { + script->functionTemp[0].s = 30; + } + + switch (script->functionTemp[0].s) { + case 0: + func_800495A0(script, npcAISettings, territoryPtr); + case 1: + func_800496B8(script, npcAISettings, territoryPtr); + break; + case 2: + base_UnkNpcAIFunc1(script, npcAISettings, territoryPtr); + case 3: + func_80049C04(script, npcAISettings, territoryPtr); + break; + case 10: + func_80049E3C(script, npcAISettings, territoryPtr); + case 11: + func_80049ECC(script, npcAISettings, territoryPtr); + break; + case 12: + func_80049F7C(script, npcAISettings, territoryPtr); + case 13: + func_8004A124(script, npcAISettings, territoryPtr); + break; + case 14: + func_8004A3E8(script, npcAISettings, territoryPtr); + break; + case 30: + N(UnkNpcAIFunc6)(script); + case 31: + N(UnkNpcAIFunc7)(script); + if (script->functionTemp[0].s != 32) { + break; + } + case 32: + N(UnkNpcAIFunc8)(script); + if (script->functionTemp[0].s != 33) { + break; + } + case 33: + N(UnkNpcAIFunc5)(script); + break; + case 99: + func_8004A73C(script); + } + + return ApiStatus_BLOCK; +} +*/ diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index b94dfcd84d..9c845baeda 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); /* ApiStatus N(func_802407D0_D3ADA0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_802407D0_D3ADA0)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index 6df54ca577..2a4684a356 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -10,7 +10,7 @@ NpcAISettings N(npcAISettings_80240300) = { .alertRadius = 250.0f, .unk_14 = 2, .chaseSpeed = 3.5f, - .unk_1C = 45, + .unk_1C = { .s = 45 }, .unk_20 = 6, .chaseRadius = 300.0f, .unk_2C = 1, diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c index 6134fa28ba..061cc319b6 100644 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ b/src/world/area_sbk/sbk_01/929AD0.c @@ -10,7 +10,7 @@ NpcAISettings N(npcAISettings_80240370) = { .alertRadius = 250.0f, .unk_14 = 2, .chaseSpeed = 3.5f, - .unk_1C = 45, + .unk_1C = { .s = 45 }, .unk_20 = 6, .chaseRadius = 300.0f, .unk_2C = 1, diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index 73626516c3..b901e7908e 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -20,10 +20,10 @@ ApiStatus N(func_8024091C_92ABCC)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -34,7 +34,7 @@ ApiStatus N(func_80240970_92AC20)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ @@ -43,7 +43,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8_92AC58); INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44_92ACF4); /* ApiStatus N(func_80240A44_92ACF4)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -57,11 +57,11 @@ ApiStatus N(func_80240A44_92ACF4)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 340d91c09d..f5061120d4 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240B64_940114); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80240DDC_94038C); /* ApiStatus N(func_80240DDC_94038C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -45,11 +45,11 @@ ApiStatus N(func_80240DDC_94038C)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -75,10 +75,10 @@ ApiStatus N(func_80241120_9406D0)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -89,7 +89,7 @@ ApiStatus N(func_80241174_940724)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index e306f14a73..7a24a48c35 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10); /* ApiStatus N(func_80240040_945F10)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240040_945F10)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -47,10 +47,10 @@ ApiStatus N(func_80240384_946254)(ScriptInstance* script, s32 isInitialCall) { ptr = &D_80241CCC_BE0A5C; *ptr = 0; set_variable(script, *args, D_80241CD0_BE0A60); - return 2; + return ApiStatus_DONE2; } - return 0; + return ApiStatus_BLOCK; } */ @@ -61,7 +61,7 @@ ApiStatus N(func_802403D8_9462A8)(ScriptInstance* script, s32 isInitialCall) { D_80241CD0_BE0A60 = get_variable(script, *args); D_80241CCC_BE0A5C = 1; - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index 854b886560..56b117e3e7 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -8,46 +8,201 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024005C_95401C); #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024009C_95405C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400BC_95407C); /* -s) { +ApiStatus N(func_802400BC_95407C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400E8_9540A8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240154_954114); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802401A0_954160); +/* +ApiStatus N(func_802401A0_954160)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C_95420C); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024049C_95445C); /* -s) { +ApiStatus N(func_8024049C_95445C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802404C8_954488); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240500_9544C0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240590_954550); +/* +ApiStatus N(func_80240590_954550)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802405C4_954584); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240628_9545E8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240680_954640); +/* +ApiStatus N(func_80240680_954640)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240BB8_954B78); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D88_954D48); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D88_954D48); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index 6ace843749..222d359786 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); /* ApiStatus N(func_80240310_86CA50)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240310_86CA50)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 940b4aa787..174a7d691c 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240310_8750D0); INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); /* ApiStatus N(func_80240680_875440)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_80240680_875440)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 46b0641946..c64e6d4f67 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -14,46 +14,201 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14); #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802402FC_879EDC); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024031C_879EFC); /* -s) { +ApiStatus N(func_8024031C_879EFC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240348_879F28); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802403B4_879F94); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240400_879FE0); +/* +ApiStatus N(func_80240400_879FE0)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC_87A08C); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802406FC_87A2DC); /* -s) { +ApiStatus N(func_802406FC_87A2DC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240728_87A308); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240760_87A340); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802407F0_87A3D0); +/* +ApiStatus N(func_802407F0_87A3D0)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240824_87A404); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240888_87A468); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802408E0_87A4C0); +/* +ApiStatus N(func_802408E0_87A4C0)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240E18_87A9F8); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FE8_87ABC8); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FE8_87ABC8); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 87972bca7a..bd8327e219 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -35,73 +35,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88_87B868); -/* -void N(func_80241C88_87B868)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -122,126 +56,8 @@ void N(func_80242044_87BC24)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242248_87BE28); -/* -void N(func_80242248_87BE28)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802425D8_87C1B8); -/* -void N(func_802425D8_87C1B8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802426FC_87C2DC); diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index 0d32a0281a..4d4b7ee58e 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -4,46 +4,201 @@ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240310_8866D0); #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024069C_886A5C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406BC_886A7C); /* -s) { +ApiStatus N(func_802406BC_886A7C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406E8_886AA8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240754_886B14); INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802407A0_886B60); +/* +ApiStatus N(func_802407A0_886B60)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C_886C0C); INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240A9C_886E5C); /* -s) { +ApiStatus N(func_80240A9C_886E5C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240AC8_886E88); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B00_886EC0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B90_886F50); +/* +ApiStatus N(func_80240B90_886F50)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240BC4_886F84); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C28_886FE8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C80_887040); +/* +ApiStatus N(func_80240C80_887040)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802411B8_887578); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241388_887748); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241388_887748); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index a9f1f67218..9603df52ed 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802405F0_8891C0); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); /* ApiStatus N(func_80240960_889530)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_80240960_889530)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ @@ -35,45 +35,200 @@ ApiStatus N(func_80240960_889530)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C38_889808); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C58_889828); /* -s) { +ApiStatus N(func_80240C58_889828)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C84_889854); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240CF0_8898C0); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240D3C_88990C); +/* +ApiStatus N(func_80240D3C_88990C)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240DE8_8899B8); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241038_889C08); /* -s) { +ApiStatus N(func_80241038_889C08)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241064_889C34); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024109C_889C6C); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024112C_889CFC); +/* +ApiStatus N(func_8024112C_889CFC)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241160_889D30); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802411C4_889D94); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024121C_889DEC); +/* +ApiStatus N(func_8024121C_889DEC)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241754_88A324); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c index b70b12e0db..a42e1d4e91 100644 --- a/src/world/area_tik/tik_15/890190.c +++ b/src/world/area_tik/tik_15/890190.c @@ -5,7 +5,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_802405F0_890190); INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240960_890500); /* ApiStatus N(func_80240960_890500)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -19,11 +19,11 @@ ApiStatus N(func_80240960_890500)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index 1a84b3da41..af1a9528f1 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024004C_892A6C); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024006C_892A8C); /* -s) { +ApiStatus N(func_8024006C_892A8C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240098_892AB8); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240104_892B24); INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240150_892B70); +/* +ApiStatus N(func_80240150_892B70)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC_892C1C); INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024044C_892E6C); /* -s) { +ApiStatus N(func_8024044C_892E6C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240478_892E98); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802404B0_892ED0); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240540_892F60); +/* +ApiStatus N(func_80240540_892F60)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240574_892F94); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802405D8_892FF8); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240630_893050); +/* +ApiStatus N(func_80240630_893050)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240B68_893588); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240D38_893758); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240D38_893758); diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index 2f30b317b0..8b7dfd65cd 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -2,46 +2,201 @@ #include "world/common/SetOverrideFlags_40.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024060C_897BEC); +#include "world/common/UnkFunc17.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024062C_897C0C); /* -s) { +ApiStatus N(func_8024062C_897C0C)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240658_897C38); +#include "world/common/UnkFunc18.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802406C4_897CA4); INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240710_897CF0); +/* +ApiStatus N(func_80240710_897CF0)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + s32 i; + s16 var = script->varTable[12] >= 0; + + script->varTable[0] = -1; + + for (i = 1; i < 12; i++) { + if (playerData->partners[i].enabled && N(func_802424A4_C389D4)(i, var) != -1) { + script->varTable[0] = 1; + break; + } + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC_897D9C); INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A0C_897FEC); /* -s) { +ApiStatus N(func_80240A0C_897FEC)(ScriptInstance* script, s32 isInitialCall) { func_800EB168(get_variable(script, *script->ptrReadPos)); - return 2; + return ApiStatus_DONE2; } */ -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A38_898018); +#include "world/common/UnkFunc19.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A70_898050); +#include "world/common/UnkFunc20.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B00_8980E0); +/* +ApiStatus N(func_80240B00_8980E0)(ScriptInstance *script, s32 isInitialCall) { + Effect* effect = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B34_898114); + effect->flags |= 0x10; -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B98_898178); + return ApiStatus_DONE2; +} +*/ + +#include "world/common/UnkFunc21.inc.c" + +#include "world/common/UnkFunc22.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240BF0_8981D0); +/* +ApiStatus N(func_80240BF0_8981D0)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + Npc* npc = get_npc_safe(-4); + f32 sinTheta, cosTheta; + s32 i; + f32 var; + UserData* userDataPtr; + UserData* scriptPtr; + f32 save, save2; -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241128_898708); + sin_cos_deg(gCameras[gCurrentCameraID].currentYaw, &sinTheta, &cosTheta); + + if (isInitialCall) { + script->userData = (UserData*)general_heap_malloc(0x68); + scriptPtr = (UserData*)script->userData; + + scriptPtr->unk_5C = get_entity_by_index(get_variable(script, *args)); + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i] = func_800716F0(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f, scriptPtr->unk_5C->position.z, 1.0f, -1); + save = 0.0f; + userDataPtr->unk_2C[i] = save; + userDataPtr->unk_20[i] = save; + userDataPtr->unk_14[i] = save; + userDataPtr->unk_50[i] = save; + userDataPtr->unk_44[i] = save; + userDataPtr->unk_38[i] = save; + } + + scriptPtr->unk_00 = 0; + scriptPtr->unk_04 = 0; + scriptPtr->unk_60 = 0; + scriptPtr->unk_64 = 0; + + userDataPtr = scriptPtr; + for (i = 0, save = 50.0f; i < 3; i++) { + var = 0; + add_vec2D_polar(&var, &scriptPtr->unk_44[i], save, *(N(D_80243D88_C3A2B8) + i)); //*(dataPtr++)); + userDataPtr->unk_38[i] = cosTheta * var; + userDataPtr->unk_50[i] = sinTheta * var; + userDataPtr->unk_38[i] = npc->pos.x - (scriptPtr->unk_5C->position.x + userDataPtr->unk_38[i]); + userDataPtr->unk_44[i] = npc->pos.y - (scriptPtr->unk_5C->position.y + userDataPtr->unk_44[i]); + userDataPtr->unk_50[i] = npc->pos.z - (scriptPtr->unk_5C->position.z + userDataPtr->unk_50[i]); + } + } + + scriptPtr = (UserData*)script->userData; + switch (scriptPtr->unk_00) { + case 0: + save = update_lerp(5, 0.0f, 50.0f, scriptPtr->unk_60, 0x14); + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x15) { + scriptPtr->unk_00 = 1; + scriptPtr->unk_60 = 0; + } + break; + + case 1: + save = 50.0f; + save2 = 0.0f; + for (i = 0; i < 3; i++) { + scriptPtr->unk_20[i] = save2; + var = save2; + add_vec2D_polar(&var, &scriptPtr->unk_20[i], save, *(N(D_80243D88_C3A2B8) + i)); + scriptPtr->unk_14[i] = cosTheta * var; + scriptPtr->unk_2C[i] = sinTheta * var; + } + + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x10) { + scriptPtr->unk_60 = 0xF; + scriptPtr->unk_00 = 2; + } + break; + + case 2: + scriptPtr->unk_60++; + if (scriptPtr->unk_60 >= 0x1F) { + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_08[i]->flags |= 0x10; + } + return ApiStatus_DONE2; + } + } + + switch (scriptPtr->unk_04) { + case 0: + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x10) { + scriptPtr->unk_04 = 1; + scriptPtr->unk_64 = 0; + } + break; + + case 1: + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + userDataPtr->unk_14[i] = userDataPtr->unk_14[i] + update_lerp(1, 0.0f, userDataPtr->unk_38[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_20[i] = userDataPtr->unk_20[i] + update_lerp(1, 0.0f, userDataPtr->unk_44[i], scriptPtr->unk_64, 0x14); + userDataPtr->unk_2C[i] = userDataPtr->unk_2C[i] + update_lerp(1, 0.0f, userDataPtr->unk_50[i], scriptPtr->unk_64, 0x14); + } + + scriptPtr->unk_64++; + if (scriptPtr->unk_64 >= 0x15) { + scriptPtr->unk_04 = 2; + scriptPtr->unk_64 = 0; + } + break; + } + + for (i = 0, userDataPtr = scriptPtr; i < 3; i++) { + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.x = userDataPtr->unk_14[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.y = userDataPtr->unk_20[i]; + ((EffectInstanceData*)userDataPtr->unk_08[i]->unk_0C)->rotation.z = userDataPtr->unk_2C[i]; + } + + return ApiStatus_BLOCK; +} +*/ + +#include "world/common/UnkFunc23.inc.c" #include "world/common/UnkPartnerPosFuncs.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802412F8_8988D8); \ No newline at end of file +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802412F8_8988D8); diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c index 66560b7dfd..c7b3ac011c 100644 --- a/src/world/area_trd/trd_00/999F80.c +++ b/src/world/area_trd/trd_00/999F80.c @@ -3,7 +3,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_00/999F80", func_80240310_999F80); /* ApiStatus N(func_80240310_999F80)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &D_80241C68_BE09F8; + s32** ptr = &N(D_80241C68_BE09F8); s32 i; s32* test; @@ -17,11 +17,11 @@ ApiStatus N(func_80240310_999F80)(ScriptInstance* script, s32 isInitialCall) { for (i = 0, test = *ptr; i < 16; i++) { script->varTable[i] = *test++; } - ptr = &D_80241C68_BE09F8; + ptr = &N(D_80241C68_BE09F8); heap_free(*ptr); *ptr = NULL; } - return 2; + return ApiStatus_DONE2; } */ diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 39b68ae9d5..753a9647b0 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240474_9A1454); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802408B4_9A1894); /* -ApiStatus N(func_802408B4_9A1894)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_802408B4_9A1894)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -44,99 +44,19 @@ ApiStatus N(func_802408B4_9A1894)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240A0C_9A19EC); -/* -void N(func_80240A0C_9A19EC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240D74_9A1D54); -/* -void N(func_80240D74_9A1D54)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240F30_9A1F10); /* -ApiStatus N(func_80240F30_9A1F10)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240F30_9A1F10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -151,7 +71,7 @@ ApiStatus N(func_80240F30_9A1F10)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -161,53 +81,97 @@ ApiStatus N(func_80240F30_9A1F10)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241200_9A21E0); -/* -ApiStatus N(func_80241200_9A21E0)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241388_9A2368); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241448_9A2428); /* -void N(func_80241388_9A2368)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241448_9A2428)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_802408B4_9A1894)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240A0C_9A19EC)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80240D74_9A1D54)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80240F30_9A1F10)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_80241200_9A21E0)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241388_9A2368)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241448_9A2428); - INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241744_9A2724); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 10dbcb10e8..c0ad02a43f 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240844_9A8C34); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240C84_9A9074); /* -ApiStatus N(func_80240C84_9A9074)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80240C84_9A9074)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc *npc = get_npc_unsafe(enemy->npcID); f32 ret; @@ -44,99 +44,19 @@ ApiStatus N(func_80240C84_9A9074)(ScriptInstance* script, s32 isInitialCall) { } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240DDC_9A91CC); -/* -void N(func_80240DDC_9A91CC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(shape, enemy, aiSettings->alertRadius, aiSettings->unk_10.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241144_9A9534); -/* -void N(func_80241144_9A9534)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ +#include "world/common/UnkFunc14.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241300_9A96F0); /* -ApiStatus N(func_80241300_9A96F0)(ScriptInstance* script, s32 isInitialCall) { +ApiStatus N(func_80241300_9A96F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); @@ -151,7 +71,7 @@ ApiStatus N(func_80241300_9A96F0)(ScriptInstance* script, s32 isInitialCall) { npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; } script->functionTemp[0].s = 1; - return 1; + return ApiStatus_DONE1; } */ @@ -161,55 +81,99 @@ ApiStatus N(func_80241300_9A96F0)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/UnkNpcAIFunc13.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802415D0_9A99C0); -/* -ApiStatus N(func_802415D0_9A99C0)(ScriptInstance* script, s32 isInitialCall) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ +#include "world/common/UnkFunc15.inc.c" #include "world/common/UnkNpcDurationFlagFunc.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241758_9A9B48); +#include "world/common/UnkFunc16.inc.c" + +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241818_9A9C08); /* -void N(func_80241758_9A9B48)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { +ApiStatus N(func_80241818_9A9C08)(ScriptInstance* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; + Bytecode* args = script->ptrReadPos; + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* npcAISettings = (NpcAISettings*)get_variable(script, *args++); + f32 posX, posY, posZ, posW; - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; + territory.unk_00 = 0; + territory.shape = enemy->territory->patrol.detectShape; + territory.pointX = enemy->territory->patrol.detect.x; + territory.pointZ = enemy->territory->patrol.detect.z; + territory.sizeX = enemy->territory->patrol.detectSizeX; + territory.sizeZ = enemy->territory->patrol.detectSizeZ; + territory.unk_34 = 65.0f; + territory.unk_1C = 0; + + if (isInitialCall || enemy->unk_B0 & 4) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->currentAnim = enemy->animList[0]; + npc->flags &= ~0x800; + if (!enemy->territory->patrol.isFlying) { + npc->flags = (npc->flags | 0x200) & ~8; + } else { + npc->flags = (npc->flags & ~0x200) | 8; + } + + if (enemy->unk_B0 & 4) { + script->functionTemp[0].s = 99; + script->functionTemp[1].s = 0; + enemy->unk_B0 &= ~4; + } else if (enemy->flags & 0x40000000) { + script->functionTemp[0].s = 12; + enemy->flags &= 0xBFFFFFFF; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = 100.0f; + + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + npc->pos.y = posY; } } - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; + switch (script->functionTemp[0].s) { + case 0: + N(func_80240C84_9A9074)(script, npcAISettings, territoryPtr); + case 1: + N(func_80240DDC_9A91CC)(script, npcAISettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); + case 3: + N(func_80241144_9A9534)(script, npcAISettings, territoryPtr); + break; + case 4: + N(func_80241300_9A96F0)(script, npcAISettings, territoryPtr); + break; + case 10: + N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); + case 11: + N(NpcJumpFunc)(script, npcAISettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc13)(script, npcAISettings, territoryPtr); + case 13: + N(func_802415D0_9A99C0)(script, npcAISettings, territoryPtr); + break; + case 14: + N(UnkNpcDurationFlagFunc)(script, npcAISettings, territoryPtr); + break; + case 15: + N(func_80241758_9A9B48)(script, npcAISettings, territoryPtr); + break; + case 99: + func_8004A73C(script); + } + return ApiStatus_BLOCK; } */ -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241818_9A9C08); - INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241B14_9A9F04); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18_9AA208); @@ -245,73 +209,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); #include "world/common/UnkNpcAIFunc1.inc.c" #define NAMESPACE trd_04 -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); -/* -void N(func_802426B0_9AAAA0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -332,129 +230,72 @@ void N(func_80242A6C_9AAE5C)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C70_9AB060); -/* -void N(func_80242C70_9AB060)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243000_9AB3F0); -/* -void N(func_80243000_9AB3F0)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243124_9AB514); +/* +ApiStatus N(func_80243124_9AB514)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80243000_9AB3F0)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80241E18_9AA208)(script, aiSettings, territoryPtr); + case 1: + N(func_80241FC8_9AA3B8)(script, aiSettings, territoryPtr); + break; + case 2: + dup_UnkNpcAIFunc1(script, aiSettings, territoryPtr); + case 3: + N(func_802426B0_9AAAA0)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80242A6C_9AAE5C)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_80242C70_9AB060)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243310_9AB700); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 0dbc7ab715..b093dd7909 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -41,73 +41,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C_9B7CFC); -/* -void N(func_8024137C_9B7CFC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(shape, enemy, aiSettings->chaseRadius, aiSettings->unk_28.s, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ +#include "world/common/UnkFunc4.inc.c" #include "world/common/UnkNpcAIFunc2.inc.c" @@ -128,129 +62,72 @@ void N(func_80241738_9B80B8)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc3.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024193C_9B82BC); -/* -void N(func_8024193C_9B82BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; +#include "world/common/UnkFunc6.inc.c" - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C; - } else { - phi_f20 += aiSettings->unk_1C; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241CCC_9B864C); -/* -void N(func_80241CCC_9B864C)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ +#include "world/common/UnkFunc5.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241DF0_9B8770); +/* +ApiStatus N(func_80241DF0_9B8770)(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Bytecode* args = script->ptrReadPos; + Npc* npc = get_npc_unsafe(enemy->npcID); + EnemyTerritoryThing territory; + EnemyTerritoryThing* territoryPtr = &territory; + NpcAISettings* aiSettings = get_variable(script, *args); + + territory.unk_00 = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detect.x; + territory.pointZ = enemy->territory->wander.detect.z; + territory.sizeX = enemy->territory->wander.detectSizeX; + territory.sizeZ = enemy->territory->wander.detectSizeZ; + territory.unk_34 = 120.0f; + territory.unk_1C = 0; + + if (isInitialCall) { + N(func_80241CCC_9B864C)(npc, enemy, script, aiSettings); + } + + npc->unk_AB = -2; + + if (enemy->unk_B0 & 4) { + if (enemy->unk_B4 != 0) { + return ApiStatus_BLOCK; + } + enemy->unk_B0 &= ~4; + } + + switch (script->functionTemp[0].s) { + case 0: + N(func_80240AE4_9B7464)(script, aiSettings, territoryPtr); + case 1: + N(func_80240C94_9B7614)(script, aiSettings, territoryPtr); + break; + case 2: + N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); + case 3: + N(func_8024137C_9B7CFC)(script, aiSettings, territoryPtr); + break; + case 10: + N(UnkNpcAIFunc2)(script, aiSettings, territoryPtr); + case 11: + N(func_80241738_9B80B8)(script, aiSettings, territoryPtr); + break; + case 12: + N(UnkNpcAIFunc14)(script, aiSettings, territoryPtr); + break; + case 13: + N(UnkNpcAIFunc3)(script, aiSettings, territoryPtr); + break; + case 14: + N(func_8024193C_9B82BC)(script, aiSettings, territoryPtr); + break; + } + + return ApiStatus_BLOCK; +} +*/ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241FDC_9B895C); diff --git a/src/world/area_trd/trd_10/9C2910.c b/src/world/area_trd/trd_10/9C2910.c index 5a7ff91397..03e21765f2 100644 --- a/src/world/area_trd/trd_10/9C2910.c +++ b/src/world/area_trd/trd_10/9C2910.c @@ -93,7 +93,7 @@ ApiStatus N(func_80240708_9C3018)(ScriptInstance* script, s32 isInitialCall) { ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; - return 0; + return ApiStatus_BLOCK; } */ diff --git a/src/world/area_tst/tst_13/B1D760.c b/src/world/area_tst/tst_13/B1D760.c index bacd1e5e81..ee14ec42e1 100644 --- a/src/world/area_tst/tst_13/B1D760.c +++ b/src/world/area_tst/tst_13/B1D760.c @@ -1,7 +1,42 @@ #include "tst_13.h" INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_80240000_B1D760); +/* +ApiStatus N(func_80240000_B1D760)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 *array = script->array; + f32 distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[3]); + + script->varTable[0] = 1; + if ((playerStatus->actionState != 14) && (playerStatus->actionState != 16)) { + script->varTable[0] = 0; + } + if (script->array[4] <= distance) { + script->varTable[0] = 0; + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_802400A0_B1D800); +/* +ApiStatus N(func_802400A0_B1D800)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 distance; + s32 *array = script->array; + + distance = dist2D(playerStatus->position.x, playerStatus->position.z, array[2], array[4]); + script->varTable[0] = 0; + if (distance < 112.5f) { + script->varTable[0] = 2; + } + if (distance < 37.5f) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} +*/ INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_8024013C_B1D89C); diff --git a/src/world/common/UnkFunc10.inc.c b/src/world/common/UnkFunc10.inc.c new file mode 100644 index 0000000000..4fdb87f1fe --- /dev/null +++ b/src/world/common/UnkFunc10.inc.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ; + s32 phi_s1; + + func_8003D660(npc, 1); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + + phi_s1 = 0; + if (is_point_within_region(enemy->territory->wander.detectShape, + enemy->territory->wander.detect.x, enemy->territory->wander.detect.z, + npc->pos.x, npc->pos.z, enemy->territory->wander.detectSizeX, + enemy->territory->wander.detectSizeZ)) { + phi_s1 = 1; + } + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + + if (func_800DDC44(npc->unk_80, &posX, &posY, &posZ, + 1.0f, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { + phi_s1 = 1; + } + + npc->duration--; + if (npc->duration <= 0) { + phi_s1 = 1; + } + if (phi_s1) { + script->functionTemp[0].s = 4; + enemy->unk_07 = 0; + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc11.inc.c b/src/world/common/UnkFunc11.inc.c new file mode 100644 index 0000000000..6305ca82ea --- /dev/null +++ b/src/world/common/UnkFunc11.inc.c @@ -0,0 +1,28 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc11)(ScriptInstance *script, s32 isInitialCall) { + s32 var = get_variable(script, *script->ptrReadPos); + PlayerStatus* playerStatus = &gPlayerStatus; + CollisionStatus* collisionStatus = &gCollisionStatus; + + if (((collisionStatus->pushingAgainstWall != var) && (playerStatus->actionState == 20)) || + playerStatus->enableCollisionOverlapsCheck || playerStatus->statusMenuCounterinputEnabledCounter) { + set_action_state(0); + script->varTable[0] = 0; + return ApiStatus_DONE2; + } + + if (collisionStatus->pushingAgainstWall != var) { + script->varTable[0] = 0; + } else if ((playerStatus->actionState != 20) && (playerStatus->actionState != 1) && + (playerStatus->actionState != 2)) { + script->varTable[0] = 0; + } else if (playerStatus->animFlags & 1) { + script->varTable[0] = 0; + } else { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc12.inc.c b/src/world/common/UnkFunc12.inc.c new file mode 100644 index 0000000000..63135332f3 --- /dev/null +++ b/src/world/common/UnkFunc12.inc.c @@ -0,0 +1,24 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc12)(ScriptInstance *script, s32 isInitialCall) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 posX, posY, posZ, posW; + + if (script->varTable[5] == 0) { + playerStatus->position.x = script->varTable[0]; + } else { + playerStatus->position.z = script->varTable[0]; + } + + posX = playerStatus->position.x; + posY = playerStatus->position.y + 10.0f; + posZ = playerStatus->position.z; + posW = 40.0f; + func_800DCB7C(0, &posX, &posY, &posZ, &posW); + playerStatus->position.x = posX; + playerStatus->position.y = posY; + playerStatus->position.z = posZ; + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc13.inc.c b/src/world/common/UnkFunc13.inc.c new file mode 100644 index 0000000000..48fe029399 --- /dev/null +++ b/src/world/common/UnkFunc13.inc.c @@ -0,0 +1,50 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc13)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, z; + s32 var; + + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } + script->functionTemp[1].s--; + } + + if (npc->unk_8C == 0) { + if (npc->moveSpeed < 4.0) { + func_8003D660(npc, 0); + } else { + func_8003D660(npc, 1); + } + + x = script->functionTemp[2].s[enemy->territory->patrol.points].x; + z = script->functionTemp[2].s[enemy->territory->patrol.points].z; + npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { + script->functionTemp[0].s = 2; + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || + (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { + script->functionTemp[0].s = 4; + } + if (rand_int(10000) % 100 < aiSettings->moveTime) { + script->functionTemp[0].s = 4; + } + } + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc13_copy.inc.c b/src/world/common/UnkFunc13_copy.inc.c new file mode 100644 index 0000000000..47fd291c54 --- /dev/null +++ b/src/world/common/UnkFunc13_copy.inc.c @@ -0,0 +1,50 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc13_copy)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 x, z; + s32 var; + + if (aiSettings->unk_14 >= 0) { + if (script->functionTemp[1].s <= 0) { + script->functionTemp[1].s = aiSettings->unk_14; + if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } + script->functionTemp[1].s--; + } + + if (npc->unk_8C == 0) { + if (npc->moveSpeed < 4.0) { + func_8003D660(npc, 0); + } else { + func_8003D660(npc, 1); + } + + x = script->functionTemp[2].s[enemy->territory->patrol.points].x; + z = script->functionTemp[2].s[enemy->territory->patrol.points].z; + npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { + script->functionTemp[0].s = 2; + script->functionTemp[1].s = (rand_int(1000) % 3) + 2; + if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || + (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { + script->functionTemp[0].s = 4; + } + if (rand_int(10000) % 100 < aiSettings->moveTime) { + script->functionTemp[0].s = 4; + } + } + } +} diff --git a/src/world/common/UnkFunc14.inc.c b/src/world/common/UnkFunc14.inc.c new file mode 100644 index 0000000000..b41b2e3eb2 --- /dev/null +++ b/src/world/common/UnkFunc14.inc.c @@ -0,0 +1,32 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc14)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + func_800494C0(npc, 0x2F4, 0x200000); + if (!(enemy->npcSettings->unk_2A & 1)) { + script->functionTemp[0].s = 12; + } else { + script->functionTemp[0].s = 10; + } + } else if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s != 0) { + if (!(enemy->npcSettings->unk_2A & 0x10)) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + } + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + } else { + script->functionTemp[0].s = 4; + } + } + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc14_copy.inc.c b/src/world/common/UnkFunc14_copy.inc.c new file mode 100644 index 0000000000..b08a81001b --- /dev/null +++ b/src/world/common/UnkFunc14_copy.inc.c @@ -0,0 +1,32 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc14_copy)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + func_800494C0(npc, 0x2F4, 0x200000); + if (!(enemy->npcSettings->unk_2A & 1)) { + script->functionTemp[0].s = 12; + } else { + script->functionTemp[0].s = 10; + } + } else if (npc->unk_8C == 0) { + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s != 0) { + if (!(enemy->npcSettings->unk_2A & 0x10)) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + } + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + } else { + script->functionTemp[0].s = 4; + } + } + } +} diff --git a/src/world/common/UnkFunc15.inc.c b/src/world/common/UnkFunc15.inc.c new file mode 100644 index 0000000000..8b456f9573 --- /dev/null +++ b/src/world/common/UnkFunc15.inc.c @@ -0,0 +1,23 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc15)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + npc->currentAnim = enemy->animList[0]; + npc->duration = 25; + script->functionTemp[0].s = 14; + } else { + func_8003D660(npc, 1); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->duration > 0) { + npc->duration--; + } else { + script->functionTemp[0].s = 12; + } + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc15_copy.inc.c b/src/world/common/UnkFunc15_copy.inc.c new file mode 100644 index 0000000000..286d8c55b5 --- /dev/null +++ b/src/world/common/UnkFunc15_copy.inc.c @@ -0,0 +1,23 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc15_copy)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); + npc->currentAnim = enemy->animList[0]; + npc->duration = 25; + script->functionTemp[0].s = 14; + } else { + func_8003D660(npc, 1); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->duration > 0) { + npc->duration--; + } else { + script->functionTemp[0].s = 12; + } + } +} diff --git a/src/world/common/UnkFunc16.inc.c b/src/world/common/UnkFunc16.inc.c new file mode 100644 index 0000000000..37963c0bfa --- /dev/null +++ b/src/world/common/UnkFunc16.inc.c @@ -0,0 +1,20 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc16)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 i; + + for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { + if (i[enemy->territory->patrol.points].y <= npc->pos.y) { + script->functionTemp[2].s = i; + break; + } + } + + npc->moveSpeed = aiSettings->moveSpeed; + npc->currentAnim = enemy->animList[1]; + script->functionTemp[1].s = 0; + script->functionTemp[0].s = 1; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc16_copy.inc.c b/src/world/common/UnkFunc16_copy.inc.c new file mode 100644 index 0000000000..e408a081c8 --- /dev/null +++ b/src/world/common/UnkFunc16_copy.inc.c @@ -0,0 +1,20 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc16_copy)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 i; + + for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { + if (i[enemy->territory->patrol.points].y <= npc->pos.y) { + script->functionTemp[2].s = i; + break; + } + } + + npc->moveSpeed = aiSettings->moveSpeed; + npc->currentAnim = enemy->animList[1]; + script->functionTemp[1].s = 0; + script->functionTemp[0].s = 1; +} diff --git a/src/world/common/UnkFunc17.inc.c b/src/world/common/UnkFunc17.inc.c new file mode 100644 index 0000000000..a62fbbeb30 --- /dev/null +++ b/src/world/common/UnkFunc17.inc.c @@ -0,0 +1,7 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc17)(ScriptInstance *script, s32 isInitialCall) { + OVERRIDE_FLAG_UNSET(0x40) + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc18.inc.c b/src/world/common/UnkFunc18.inc.c new file mode 100644 index 0000000000..ed5e5f8ed9 --- /dev/null +++ b/src/world/common/UnkFunc18.inc.c @@ -0,0 +1,14 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc18)(ScriptInstance *script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + s32 partnerIdx = get_variable(script, *args++); + s32 si_var = *args++; + + playerData->partners[partnerIdx].level++; + set_variable(script, si_var, playerData->partners[partnerIdx].level); + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc19.inc.c b/src/world/common/UnkFunc19.inc.c new file mode 100644 index 0000000000..2a45a27d6c --- /dev/null +++ b/src/world/common/UnkFunc19.inc.c @@ -0,0 +1,10 @@ +#include "common.h" +#include "map.h" + +extern s32 D_8008EF20[11][4]; + +ApiStatus N(UnkFunc19)(ScriptInstance *script, s32 isInitialCall) { + set_message_string(D_8008EF20[gPlayerData.currentPartner][0], 0); + + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFunc20.inc.c b/src/world/common/UnkFunc20.inc.c new file mode 100644 index 0000000000..b747a88050 --- /dev/null +++ b/src/world/common/UnkFunc20.inc.c @@ -0,0 +1,14 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc20)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + s32 entityIdx = get_variable(script, *args++); + Entity* entity = get_entity_by_index(entityIdx); + s32 si_var = *args++; + Effect* effect = func_80071750(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f, 0); + + set_variable(script, si_var, effect); + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc21.inc.c b/src/world/common/UnkFunc21.inc.c new file mode 100644 index 0000000000..af5794ae45 --- /dev/null +++ b/src/world/common/UnkFunc21.inc.c @@ -0,0 +1,10 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc21)(ScriptInstance *script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(get_variable(script, *script->ptrReadPos)); + + func_80070BB0(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B); + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc22.inc.c b/src/world/common/UnkFunc22.inc.c new file mode 100644 index 0000000000..cf5992c83e --- /dev/null +++ b/src/world/common/UnkFunc22.inc.c @@ -0,0 +1,10 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc22)(ScriptInstance *script, s32 isInitialCall) { + Npc *npc = get_npc_safe(-4); + + func_80070BB0(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E); + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc23.inc.c b/src/world/common/UnkFunc23.inc.c new file mode 100644 index 0000000000..5c9b6088dc --- /dev/null +++ b/src/world/common/UnkFunc23.inc.c @@ -0,0 +1,49 @@ +#include "common.h" +#include "map.h" + +s32 N(UnkFunc23)(ScriptInstance *script, s32 isInitialCall) { + Bytecode *args = script->ptrReadPos; + s32 ret = 0; + + if (isInitialCall) { + script->varTable[0] = get_variable(script, *args++); + script->varTable[1] = get_variable(script, *args++); + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 0; + set_transition_stencil_color(0, 0xD0, 0xD0, 0xD0); + } + + switch (script->functionTemp[0].s) { + case 0: + if (script->functionTemp[1].s == 0xFF) { + script->functionTemp[0].s = 1; + script->functionTemp[2].s = 0; + } + script->functionTemp[1].s += script->varTable[0]; + if (script->functionTemp[1].s >= 0x100) { + script->functionTemp[1].s = 0xFF; + } + break; + + case 1: + script->functionTemp[2].s++; + if (script->functionTemp[2].s >= 2) { + script->functionTemp[0].s = 2; + } + break; + + case 2: + if (script->functionTemp[1].s == 0) { + ret = 1; + } + script->functionTemp[1].s -= script->varTable[1]; + if (script->functionTemp[1].s < 0) { + script->functionTemp[1].s = 0; + } + break; + } + + set_transition_stencil_zoom_0(1, script->functionTemp[1].s); + + return ret; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc24.inc.c b/src/world/common/UnkFunc24.inc.c new file mode 100644 index 0000000000..ffe172966a --- /dev/null +++ b/src/world/common/UnkFunc24.inc.c @@ -0,0 +1,11 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc24)(ScriptInstance *script, s32 isInitialCall) { + script->varTable[0] = 0; + if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc4.inc.c b/src/world/common/UnkFunc4.inc.c new file mode 100644 index 0000000000..5f4a0a3e1c --- /dev/null +++ b/src/world/common/UnkFunc4.inc.c @@ -0,0 +1,67 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; + f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); + s32 var; + + if (npc->duration > 0) { + npc->duration--; + } + + if (enemy->varTable[1] > 0) { + f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; + f32 sin_degrees = sin_deg(enemy->varTable[2]); + s32 phi_v0; + + if (npc->flags & 8) { + phi_v0 = FALSE; + } else { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + } + + if (phi_v0) { + npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); + } else { + npc->pos.y = temp_f26 + (sin_degrees * temp_f22); + } + + enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); + } + + if (enemy->varTable[9] <= 0) { + if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { + fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->moveToPos.y = npc->pos.y; + func_800494C0(npc, 0x2F4, 0x200000); + if (enemy->npcSettings->unk_2A & 1) { + script->functionTemp[0].s = 10; + } else { + script->functionTemp[0].s = 12; + } + return; + } + } else { + enemy->varTable[9]--; + } + + if ((npc->unk_8C == 0) && (npc->duration <= 0)) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + if (!(enemy->npcSettings->unk_2A & 0x10)) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + } + npc->duration = (rand_int(1000) % 11) + 5; + } else { + script->functionTemp[0].s = 0; + } + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc5.inc.c b/src/world/common/UnkFunc5.inc.c new file mode 100644 index 0000000000..87e025b9ba --- /dev/null +++ b/src/world/common/UnkFunc5.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc5)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { + f32 posX, posY, posZ, posW; + s32 temp_a1; + s32 temp_v1; + s32 phi_v0; + + script->functionTemp[0].s = 0; + npc->duration = 0; + temp_v1 = npc->flags & ~0x200; + npc->flags = (npc->flags & ~0x200) | 0x800; + if (enemy->territory->wander.isFlying) { + npc->flags = temp_v1 | 0x808; + } else { + npc->flags = npc->flags & ~8; + } + + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + enemy->varTable[2] = 0; + enemy->varTable[9] = 0; + enemy->varTable[3] = ((posW * 100.0) + 0.5); + enemy->varTable[7] = ((posY * 100.0) + 0.5); + script->functionTemp[1].s = aiSettings->unk_14; + enemy->unk_B0 |= 0x10; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc6.inc.c b/src/world/common/UnkFunc6.inc.c new file mode 100644 index 0000000000..9e03be12ef --- /dev/null +++ b/src/world/common/UnkFunc6.inc.c @@ -0,0 +1,89 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc6)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 posX, posY, posZ, posW; + f32 temp_f0_2; + f32 temp_f20; + f32 temp_f22; + f32 temp_f2; + s32 phi_v0; + f32 phi_f20; + f32 a = enemy->varTable[3]; + f32 b = enemy->varTable[7]; + + npc->jumpVelocity += npc->jumpScale; + temp_f20 = a / 100.0; + temp_f22 = b / 100.0; + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + + if (npc->jumpVelocity >= 0.0) { + npc->pos.y += npc->jumpVelocity; + npc->currentAnim = enemy->animList[9]; + enemy->unk_07 = 0; + if (!(npc->flags & 8)) { + posX = npc->pos.x; + posY = npc->pos.y; + posZ = npc->pos.z; + posW = 1000.0f; + phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); + } else { + phi_v0 = FALSE; + } + if (phi_v0) { + temp_f2 = posY + temp_f20; + if (temp_f2 <= npc->pos.y) { + npc->pos.y = temp_f2; + script->functionTemp[0].s = 0; + } + } else if (npc->pos.y >= npc->moveToPos.y) { + script->functionTemp[0].s = 0; + } + } else if (npc->jumpVelocity < 0.0) { + npc->duration++; + if (npc->duration >= aiSettings->unk_20) { + npc->duration = 0; + phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); + if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { + phi_f20 = npc->yaw; + if (temp_f0_2 < 0.0f) { + phi_f20 += -aiSettings->unk_1C.s; + } else { + phi_f20 += aiSettings->unk_1C.s; + } + } + npc->yaw = clamp_angle(phi_f20); + } + + if (npc->flags & 8) { + if (npc->pos.y + npc->jumpVelocity < temp_f22) { + npc->pos.y = temp_f22; + npc->jumpVelocity = 0.0f; + } else { + npc->pos.y += npc->jumpVelocity; + } + return; + } + + posX = npc->pos.x; + posY = npc->pos.y + npc->collisionHeight; + posZ = npc->pos.z; + posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; + if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { + if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { + npc->jumpVelocity = 0.0f; + npc->pos.y = posY; + } else { + npc->pos.y += npc->jumpVelocity; + } + return; + } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { + npc->pos.y = npc->pos.y + npc->jumpVelocity; + return; + } + npc->jumpVelocity = 0.0f; + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc7.inc.c b/src/world/common/UnkFunc7.inc.c new file mode 100644 index 0000000000..c71657d13e --- /dev/null +++ b/src/world/common/UnkFunc7.inc.c @@ -0,0 +1,74 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkFunc7)(ScriptInstance *script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + Enemy* enemy2; + Npc* npc2; + f32 posX, posZ; + s32 func; + + if (isInitialCall || (enemy->unk_B0 & 4)) { + script->functionTemp[0].s = 0; + npc->duration = 0; + npc->flags |= 0x102; + enemy->flags |= 0x1F300000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + if (enemy->unk_B0 & 4) { + enemy->unk_B0 &= ~4; + } + } + + func = script->functionTemp[0].s; + switch (func) { + case 0: + enemy2 = get_enemy(enemy->npcID - 1); + npc2 = get_npc_unsafe(enemy2->npcID); + enemy->unk_07 = 1; + if (enemy2->varTable[0] == 3) { + if (enemy->varTable[15] != 0) { + func_800494C0(npc2, enemy->varTable[15], 0); + } + posX = npc2->pos.x; + posZ = npc2->pos.z; + add_vec2D_polar(&posX, &posZ, enemy->varTable[1], 270.0f - npc2->unk_34); + + npc->pos.x = posX; + enemy->unk_10.x = npc->pos.x; + + npc->pos.y = npc2->pos.y + enemy->varTable[0]; + enemy->unk_10.y = npc->pos.y; + + npc->pos.z = posZ; + enemy->unk_10.z = npc->pos.z; + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + enemy->flags &= 0xE0EFFFFF; + npc->duration = 0; + script->functionTemp[0].s = 1; + } + break; + + case 1: + enemy2 = get_enemy(enemy->npcID - 1); + get_npc_unsafe(enemy2->npcID); + npc->duration++; + if (npc->duration >= enemy->varTable[4]) { + enemy->unk_07 = 0; + } + if (enemy2->varTable[0] == 4) { + enemy->flags |= 0x1F100000; + npc->pos.x = 0.0f; + npc->pos.y = -1000.0f; + npc->pos.z = 0.0f; + enemy->unk_07 = func; + script->functionTemp[0].s = 0; + } + break; + } + + return ApiStatus_BLOCK; +} \ No newline at end of file diff --git a/src/world/common/UnkFunc8.inc.c b/src/world/common/UnkFunc8.inc.c new file mode 100644 index 0000000000..58e8aea56b --- /dev/null +++ b/src/world/common/UnkFunc8.inc.c @@ -0,0 +1,28 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + PlayerStatus** playerStatus; + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + s32 var; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + playerStatus = &gPlayerStatusPtr; + npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); + script->functionTemp[0].s = 12; + } else { + npc->duration--; + if (npc->duration <= 0) { + script->functionTemp[1].s--; + if (script->functionTemp[1].s > 0) { + npc->yaw = clamp_angle(npc->yaw + 180.0f); + npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); + } else { + fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); + npc->duration = 15; + script->functionTemp[0].s = 0x28; + } + } + } +} \ No newline at end of file diff --git a/src/world/common/UnkFunc9.inc.c b/src/world/common/UnkFunc9.inc.c new file mode 100644 index 0000000000..e4b884cffa --- /dev/null +++ b/src/world/common/UnkFunc9.inc.c @@ -0,0 +1,19 @@ +#include "common.h" +#include "map.h" + +void N(UnkFunc9)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc *npc = get_npc_unsafe(enemy->npcID); + PlayerStatus** playerStatus = &gPlayerStatusPtr; + + if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, (*playerStatus)->position.x, (*playerStatus)->position.z); + script->functionTemp[0].s = 12; + } else if (dist2D(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z) <= npc->moveSpeed) { + npc->duration = 10; + script->functionTemp[0].s = 50; + } else if (npc->unk_8C == 0) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + } +} \ No newline at end of file diff --git a/src/world/common/UnkNpcAIFunc11.inc.c b/src/world/common/UnkNpcAIFunc11.inc.c index f269fe6180..87af37e793 100644 --- a/src/world/common/UnkNpcAIFunc11.inc.c +++ b/src/world/common/UnkNpcAIFunc11.inc.c @@ -5,7 +5,7 @@ void N(UnkNpcAIFunc11)(ScriptInstance* script, NpcAISettings* aiSettings, s32 ar Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - if (func_800490B4(arg2, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C, 1) == 0) { + if (func_800490B4(arg2, enemy, aiSettings->chaseSpeed, aiSettings->unk_1C.f, 1) == 0) { s32* something; fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &something); diff --git a/src/world/common/UnkNpcAIFunc13.inc.c b/src/world/common/UnkNpcAIFunc13.inc.c index b4605cbda7..778a0b9dfd 100644 --- a/src/world/common/UnkNpcAIFunc13.inc.c +++ b/src/world/common/UnkNpcAIFunc13.inc.c @@ -14,13 +14,13 @@ void N(UnkNpcAIFunc13)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyT tempAngle = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); angleDiff = get_clamped_angle_diff(npc->yaw, tempAngle); - if (aiSettings->unk_1C < fabsf(angleDiff)) { + if (aiSettings->unk_1C.s < fabsf(angleDiff)) { tempAngle = npc->yaw; if (angleDiff < 0.0f) { - tempAngle += -aiSettings->unk_1C; + tempAngle += -aiSettings->unk_1C.s; } else { - tempAngle += aiSettings->unk_1C; + tempAngle += aiSettings->unk_1C.s; } } diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 42a0ad8eed..bc4a16fb2e 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -55,7 +55,7 @@ INCLUDE_ASM(s32, "world/script_api/7E0E80", func_802814D0); INCLUDE_ASM(s32, "world/script_api/7E0E80", draw_shop_items); -INCLUDE_ASM(s32, "world/script_api/7E0E80", MakeShop); +INCLUDE_ASM(ApiStatus, "world/script_api/7E0E80", MakeShop, ScriptInstance* script, s32 isInitialCall); ApiStatus MakeShopOwner(ScriptInstance* script, s32 isInitialCall) { Shop* mapShop = gGameStatusPtr->mapShop; diff --git a/src/world/script_api/7E2AA0.c b/src/world/script_api/7E2AA0.c index f841d34e9a..186149630e 100644 --- a/src/world/script_api/7E2AA0.c +++ b/src/world/script_api/7E2AA0.c @@ -36,7 +36,7 @@ ApiStatus func_80281C84(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/script_api/7E2AA0", MakeDoorAdvanced); +INCLUDE_ASM(ApiStatus, "world/script_api/7E2AA0", MakeDoorAdvanced, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "world/script_api/7E2AA0", func_802822A8); diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index f36b637e3c..6c727ba40c 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -30,12 +30,12 @@ ApiStatus CheckActionState(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/script_api/7E3700", func_80283240); -INCLUDE_ASM(s32, "world/script_api/7E3700", CreatePushBlockGrid); +INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", CreatePushBlockGrid, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlock); +INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", SetPushBlock, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "world/script_api/7E3700", GetPushBlock); +INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", GetPushBlock, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "world/script_api/7E3700", GetGridIndexFromPos); +INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", GetGridIndexFromPos, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "world/script_api/7E3700", SetPushBlockFallEffect); +INCLUDE_ASM(ApiStatus, "world/script_api/7E3700", SetPushBlockFallEffect, ScriptInstance* script, s32 isInitialCall); diff --git a/tools/compile_dsl_macros.py b/tools/compile_dsl_macros.py index 44b24fb158..a2c4a413a1 100755 --- a/tools/compile_dsl_macros.py +++ b/tools/compile_dsl_macros.py @@ -8,6 +8,7 @@ import traceback DEBUG_OUTPUT = None # "debug.i" + def eprint(*args, **kwargs): print(*args, file=stderr, **kwargs) diff --git a/tools/disasm_script.py b/tools/disasm_script.py index ea9babcf55..09b9a84e93 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -80,6 +80,7 @@ def get_constants(): for enum in valid_enums: CONSTANTS[enum] = {} CONSTANTS["NPC_SPRITE"] = {} + CONSTANTS["MAP_NPCS"] = {} [SAVE_VARS.add(x) for x in ["WORLD_LOCATION", "STORY_PROGRESS"]] @@ -135,6 +136,7 @@ def get_constants(): i += 1 last_num = val + #exit() # sprites sprite_path = Path(Path(__file__).resolve().parent.parent / "ver" / "current" / "build" / "include" / "sprite" / "npc") for file in sprite_path.iterdir(): @@ -171,11 +173,30 @@ def get_constants(): return +def make_anim_macro(self, sprite, palette, anim): + call = "NPC_ANIM(" + if sprite in CONSTANTS["NPC_SPRITE"]: + call += f"{CONSTANTS['NPC_SPRITE'][sprite]['name']}, " + if palette in CONSTANTS["NPC_SPRITE"][sprite]["palettes"]: + call += f"{CONSTANTS['NPC_SPRITE'][sprite]['palettes'][palette]}, " + else: + call += f"0x{palette:02X}, " + if anim in CONSTANTS["NPC_SPRITE"][sprite]["anims"]: + call += f"{CONSTANTS['NPC_SPRITE'][sprite]['anims'][anim]}" + else: + call += f"0x{anim:02X}" + call += ")" + self.INCLUDES_NEEDED["sprites"].add(CONSTANTS['NPC_SPRITE'][sprite]['name']) + else: + call += f"0x{sprite:02X}, 0x{palette:02X}, 0x{anim:02X})" + return call + def fix_args(self, func, args, info): global CONSTANTS new_args = [] - for i,arg in enumerate(args.split(", ")): + args = args.split(", ") + for i,arg in enumerate(args): if ((arg == "D_80000000") or (arg.startswith("D_B")) or (i == 0 and func == "MakeEntity" and arg.startswith("D_"))): arg = "0x" + arg[2:] @@ -195,41 +216,54 @@ def fix_args(self, func, args, info): sprite = (argNum & 0xFF0000) >> 16 palette = (argNum & 0xFF00) >> 8 anim = (argNum & 0xFF) >> 0 - - if argNum in CONSTANTS["PlayerAnims"]: + + if func == "SetAnimation" and int(new_args[1], 10) == 0: call = f"{CONSTANTS['PlayerAnims'][argNum]}" + elif "SI_" not in args[0] and CONSTANTS["MAP_NPCS"][int(args[0])] == "NPC_PLAYER": + if sprite == 0: + print(f"Func {func} arg {i} ({CONSTANTS['MAP_NPCS'][int(args[0])]}) -- sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") + call = f"0x{argNum:X}" + else: + call = f"{CONSTANTS['PlayerAnims'][argNum]}" else: if sprite == 0: - print(f"Sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") - call = "NPC_ANIM(" - if sprite in CONSTANTS["NPC_SPRITE"]: - call += f"{CONSTANTS['NPC_SPRITE'][sprite]['name']}, " - if palette in CONSTANTS["NPC_SPRITE"][sprite]["palettes"]: - call += f"{CONSTANTS['NPC_SPRITE'][sprite]['palettes'][palette]}, " - else: - call += f"0x{palette:02X}, " - if anim in CONSTANTS["NPC_SPRITE"][sprite]["anims"]: - call += f"{CONSTANTS['NPC_SPRITE'][sprite]['anims'][anim]}" - else: - call += f"0x{anim:02X}" - call += ")" - self.INCLUDES_NEEDED["npcs"].add(CONSTANTS['NPC_SPRITE'][sprite]['name']) + print(f"Func {func} arg {i} ({CONSTANTS['MAP_NPCS'][int(args[0])]}) -- sprite was 0, is this really valid? Arg 0x{argNum:X} -- sprite: {sprite}, palette: {palette}, anim: {anim}") + call = f"0x{argNum:X}" else: - call += f"0x{sprite:02X}, 0x{palette:02X}, 0x{anim:02X})" - + call = make_anim_macro(self, sprite, palette, anim) new_args.append(call) elif info[i] == "CustomMsg": type_ = (argNum & 0xFF0000) >> 16 num_ = (argNum & 0xFFFF) >> 0 new_args.append(f"MESSAGE_ID(0x{type_:02X}, 0x{num_:04X})") - + elif info[i] == "NpcFlags": + enabled = [] + for x in range(32): + flag = argNum & (1 << x) + if flag: + if flag in CONSTANTS["NpcFlags"]: + enabled.append(CONSTANTS["NpcFlags"][flag]) + else: + enabled.append(f"0x{flag:08X}") + if not enabled: + enabled.append(f"0") + new_args.append("((" + " | ".join(enabled) + "))") + elif info[i] == "NpcIDs": + if argNum >= 0: + new_args.append(CONSTANTS["MAP_NPCS"][argNum]) + else: + new_args.append(CONSTANTS["NpcIDs"][argNum]) elif argNum in CONSTANTS[info[i]]: new_args.append(f"{CONSTANTS[info[i]][argNum]}") else: if not (info[i] == "NpcIDs" and argNum > 0): - print(f"0x{argNum:X} was not found within {info[i]} constants, add it.") - #Print the unknowns in hex - new_args.append(f"0x{int(argNum):X}") + print(f"0x{argNum:X} was not found within {info[i]} constants for function {func} arg {i}, add it.") + + if (info[i] == "ItemIDs" and argNum < 0): + new_args.append(f"{int(argNum)}") + else: + #Print the unknowns in hex + new_args.append(f"0x{int(argNum):X}") else: new_args.append(f"{arg}") return ", ".join(new_args) @@ -311,7 +345,7 @@ replace_funcs = { "SetMusicTrack" :{1:"SongIDs"}, "SetNpcAnimation" :{0:"NpcIDs", 1:"CustomAnim"}, "SetNpcAux" :{0:"NpcIDs"}, - "SetNpcFlagBits" :{0:"NpcIDs", 1:"Hex", 2:"Bool"}, + "SetNpcFlagBits" :{0:"NpcIDs", 1:"NpcFlags", 2:"Bool"}, "SetNpcJumpscale" :{0:"NpcIDs"}, "SetNpcPos" :{0:"NpcIDs"}, "SetNpcRotation" :{0:"NpcIDs"}, @@ -319,7 +353,7 @@ replace_funcs = { "SetNpcSpeed" :{0:"NpcIDs"}, "SetNpcYaw" :{0:"NpcIDs"}, "SetPlayerAnimation" :{0:"PlayerAnims"}, - "SetSelfEnemyFlagBits" :{0:"Hex", 1:"Bool"}, + "SetSelfEnemyFlagBits" :{0:"NpcFlags", 1:"Bool"}, #"SetSelfVar" :{1:"Bool"}, # apparently this was a bool in some scripts but it passes non-0/1 values, including negatives "SetTargetActor" :{0:"ActorIDs"}, "ShowEmote" :{1:"Emotes"}, @@ -431,7 +465,7 @@ class ScriptDisassembler: def replace_star_rod_function_name(self, name): vram = int(name.split("_",1)[1], 16) - name = name.replace("function", "func") + f"_{(vram - 0x80240000)+self.romstart:X}" + name = "N(" + name.replace("function", "func") + f"_{(vram - 0x80240000)+self.romstart:X}" + ")" return name def replace_star_rod_prefix(self, addr): @@ -443,25 +477,28 @@ class ScriptDisassembler: prefix = "ApiStatus " name = self.replace_star_rod_function_name(name[2:-1]) suffix = "(ScriptInstance* script, s32 isInitialCall)" - elif name.startswith("802"): - prefix = "Script " - elif name.startswith("npcAISettings_"): + elif name[2:-1] in self.INCLUDED["includes"]: + prefix = "ApiStatus " + suffix = "(ScriptInstance* script, s32 isInitialCall)" + elif name.startswith("N(npcAISettings_"): prefix = "NpcAISettings " - elif name.startswith("npcSettings_"): + elif name.startswith("N(npcSettings_"): prefix = "NpcSettings " - elif name.startswith("npcGroup_"): + elif name.startswith("N(npcGroup_"): prefix = "StaticNpc " - elif name.startswith("entryList_"): - prefix = "Vec4f " - elif name.startswith("npcGroupList_"): + elif name.startswith("N(entryList_"): + prefix = "EntryList " + elif name.startswith("N(npcGroupList_"): prefix = "NpcGroupList " + elif name.startswith("N("): + prefix = "Script " else: toReplace = False if toReplace: - name = "N(" + name + ")" if name not in self.INCLUDED["functions"]: self.INCLUDES_NEEDED["forward"].append(prefix + name + suffix + ";") + self.INCLUDED["functions"].add(name) return name return addr @@ -649,8 +686,8 @@ class ScriptDisassembler: args = ["ScriptOpcode_BUFFER_PEEK_F",*map(self.var, argv)] self.write_line(f"SI_CMD({', '.join(args)}),") elif opcode == 0x3C: self.write_line(f"SI_CMD(ScriptOpcode_USE_ARRAY, {self.var(argv[0])}),") - elif opcode == 0x3D: self.write_line(f"SI_CMD(ScriptOpcode_NEW_ARRAY, {self.var(argv[0])}, {self.var(argv[1])}),") - elif opcode == 0x3E: self.write_line(f"SI_CMD(ScriptOpcode_USE_FLAGS, {self.var(argv[0])}),") + elif opcode == 0x3D: self.write_line(f"SI_CMD(ScriptOpcode_USE_FLAGS, {self.var(argv[0])}),") + elif opcode == 0x3E: self.write_line(f"SI_CMD(ScriptOpcode_NEW_ARRAY, {self.var(argv[0])}, {self.var(argv[1])}),") elif opcode == 0x3F: self.write_line(f"SI_CMD(ScriptOpcode_AND, {self.var(argv[0])}, {self.var(argv[1])}),") elif opcode == 0x40: self.write_line(f"SI_CMD(ScriptOpcode_OR, {self.var(argv[0])}, {self.var(argv[1])}),") elif opcode == 0x41: self.write_line(f"SI_CMD(ScriptOpcode_AND_CONST, {self.var(argv[0])}, 0x{argv[1]:X})") @@ -1033,9 +1070,6 @@ class ScriptDSLDisassembler(ScriptDisassembler): addr = argv[0] if addr in self.symbol_map: func_name = self.addr_ref(addr) - if func_name.startswith("N("): - self.INCLUDED["functions"].add(func_name) - for i,arg in enumerate(argv): argv[i] = self.replace_star_rod_prefix(arg) argv_str = ", ".join(self.var(arg) for arg in argv[1:]) @@ -1045,9 +1079,17 @@ class ScriptDSLDisassembler(ScriptDisassembler): else: print(f"script API function {addr:X} is not present in symbol_addrs.txt, please add it") exit(1) - elif opcode == 0x44: self.write_line(f"spawn {self.addr_ref(argv[0])};") + elif opcode == 0x44: + name = self.addr_ref(argv[0]) + if name.startswith("N("): + self.INCLUDED["functions"].add(name) + self.write_line(f"spawn {name};") elif opcode == 0x45: self.write_line(f"{self.var(argv[1])} = spawn {self.addr_ref(argv[0])};") - elif opcode == 0x46: self.write_line(f"await {self.addr_ref(argv[0])};") + elif opcode == 0x46: + name = self.addr_ref(argv[0]) + if name.startswith("N("): + self.INCLUDED["functions"].add(name) + self.write_line(f"await {name};") elif opcode == 0x47: assert argv[3] == 1 if argv[4] != 0: diff --git a/tools/gfxdis_loop.py b/tools/gfxdis_loop.py new file mode 100644 index 0000000000..a713d40bfd --- /dev/null +++ b/tools/gfxdis_loop.py @@ -0,0 +1,52 @@ +import os, sys +import subprocess +import argparse +from struct import unpack_from +from pathlib import Path + +parser = argparse.ArgumentParser() +parser.add_argument("baserom") +parser.add_argument("start", type=lambda x:int(x, 0)) +parser.add_argument("end", type=lambda x:int(x, 0)) +args = parser.parse_args() + +baserom_path = Path(__file__).parent.parent / "baserom.z64" +baserom = baserom_path.read_bytes() +gfxdis_path = Path(__file__).parent / "gfxdis.f3dex2" + +rom_start = 0xBFD880 + +i = args.start +while i < args.end: + dis_start = i + while unpack_from(">2I", baserom, i) != (0xDF000000, 0x0): + i += 4 + i += 8 + while unpack_from("B", baserom, i)[0] == 0: + i += 1 + + #print(f"Start {hex(dis_start)} end {hex(i)}") + gfxdis = subprocess.run(f"{gfxdis_path.resolve()} " + f"-x " + f"-dc " + f"-d {baserom[dis_start:i].hex()}", + capture_output=True, shell=True, text=True) + + commands = gfxdis.stdout.splitlines()[1:-1] + new_commands = [] + for command in commands: + if "unk_" in command: + nn = [] + for s in command.split(","): + if "unk_" in s: + vram = int(s.split("unk_")[1].split(")")[0], 16) + rom = rom_start + (vram - 0x80240000) + name = f"D_{vram:X}_{rom:X}" + nn.append(name) + else: + nn.append(s) + new_commands.append(", ".join(nn)) + else: + new_commands.append(command) + + vram = 0x80240000 + (dis_start - rom_start) + print(f"Gfx D_{vram:X}[] = {{") + print("\n".join(new_commands)) + print(f"}};\n") diff --git a/tools/new_lines.py b/tools/new_lines.py new file mode 100644 index 0000000000..e669d0555f --- /dev/null +++ b/tools/new_lines.py @@ -0,0 +1,13 @@ +from pathlib import Path + +def parse_folder(path): + for entry in path.iterdir(): + if entry.is_dir(): + parse_folder(entry) + else: + fd = entry.read_text().splitlines() + if fd[-1] != "": + fd.append("") + entry.write_text("\n".join(fd)) + +parse_folder(Path("src")) diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index f8ff73d814..95dcbb4ac5 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -5,7 +5,9 @@ import os import yaml import json from struct import unpack, unpack_from +from copy import deepcopy import argparse +from pathlib import Path import disasm_script @@ -13,10 +15,49 @@ DIR = os.path.dirname(__file__) INCLUDED = {} INCLUDED["functions"] = set() +INCLUDED["includes"] = set() INCLUDES_NEEDED = {} INCLUDES_NEEDED["include"] = [] INCLUDES_NEEDED["forward"] = [] -INCLUDES_NEEDED["npcs"] = set() +INCLUDES_NEEDED["npcs"] = {} +INCLUDES_NEEDED["sprites"] = set() + +def get_function_list(area_name, map_name, rom_offset): + map_file = (Path(__file__).parent.parent / "ver" / "current" / "build" / "papermario.map").read_text().splitlines() + i = 0 + firstFind = False + functions = {} + while i < len(map_file): + if map_file[i].startswith(f" ver/us/build/src/world/area_{area_name}/{map_name}/"): + firstFind = True + i += 1 + while not map_file[i].startswith(" .data"): + if map_file[i].startswith(" ") and " = ." not in map_file[i]: + line = map_file[i].strip() + vram, *_, func = line.split() + vram = int(vram, 16) + func = func.replace(f"{map_name}_", "") + if func.count("_") == 2: + func = func.rsplit("_",1)[0] + functions[vram] = func + i += 1 + if firstFind: + break + i += 1 + + return functions + +def get_include_list(area_name, map_name): + include_path = Path(__file__).parent.parent / "src" / "world" / "common" + includes = set() + for file in include_path.iterdir(): + if file.is_file() and ".inc.c" in file.parts[-1]: + with open(file, "r", encoding="utf8") as f: + for line in f: + if (line.startswith("void N(") or line.startswith("ApiStatus N(")) and "{" in line: + func_name = line.split("N(",1)[1].split(")",1)[0] + includes.add(func_name) + return includes def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): global INCLUDES_NEEDED, INCLUDED @@ -26,13 +67,14 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): main_script_name = None INDENT = f" " + afterHeader = False while len(midx) > 0: struct = midx.pop(0) name = struct["name"] - INCLUDED["functions"].add(name) + #INCLUDED["functions"].add(name) if comments: out += f"// {romstart+struct['start']:X}-{romstart+struct['end']:X} (VRAM: {struct['vaddr']:X})\n" @@ -41,8 +83,14 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): if struct["type"].startswith("Script"): if struct["type"] == "Script_Main": name = "N(main)" + INCLUDES_NEEDED["forward"].append(f"Script " + name + ";") main_script_name = name + # For PlayMusic script if using a separate header file + #if afterHeader: + # INCLUDES_NEEDED["forward"].append(f"Script " + name + ";") + # afterHeader = False + pos = bytes.tell() try_replace = False try: @@ -125,10 +173,9 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): tmp_out += INDENT + f".{var_names[x]} = {var_f:.01f}f,\n" if not var_i1 == 0: # account for X32 - if var_names[x + 1] == "unk_10" or var_names[x + 1] == "unk_28": - ftest = float(unpack_from(">f", npcAISettings, i+4)[0]) - if ftest >= -1000.0 and ftest <= 1000: - tmp_out += INDENT + f".{var_names[x + 1]} = {{ .f = {ftest:.01f}f }},\n" + if var_names[x + 1] in ["unk_10", "unk_1C", "unk_28"]: + if var_i1 < -100000 or var_i1 > 100000: + tmp_out += INDENT + f".{var_names[x + 1]} = {{ .f = {unpack_from('>f', npcAISettings, i+4)[0]:.01f}f }},\n" else: tmp_out += INDENT + f".{var_names[x + 1]} = {{ .s = {var_i1} }},\n" else: @@ -146,7 +193,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): numNpcs = struct['length'] // 0x1F0 tmp_out = f"StaticNpc {name}" + ("[]" if numNpcs > 1 else "") + f" = {{\n" - for z in range(struct['length'] // 0x1F0): + for z in range(numNpcs): i = 0 var_names = ["id", "settings", "pos", "flags", "init", "unk_1C", "yaw", "dropFlags", @@ -162,7 +209,10 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): if i == 0x0 or i == 0x24: var_name = var_names[0] if i == 0x0 else var_names[6] var = unpack_from(f">i", staticNpc, curr_base+i)[0] - tmp_out += INDENT + f".{var_name} = {var},\n" + if var_name == "id": + tmp_out += INDENT + f".{var_name} = {disasm_script.CONSTANTS['MAP_NPCS'][var]},\n" + else: + tmp_out += INDENT + f".{var_name} = {var},\n" elif i == 0x4 or i == 0x14 or i == 0x18 or i == 0x1E8: var_name = var_names[1] if i == 0x4 else var_names[3] if i == 0x14 else var_names[4] if i == 0x18 else var_names[17] addr = unpack_from(f">I", staticNpc, curr_base+i)[0] @@ -282,7 +332,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): tmp_out += INDENT + " " + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" else: tmp_out += INDENT*2 + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" - INCLUDES_NEEDED["npcs"].add(sprite) + INCLUDES_NEEDED["sprites"].add(sprite) i += 4 tmp_out += INDENT + f"}},\n" i -= 1 @@ -318,7 +368,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): palette = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["palettes"][palette_id] anim = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["anims"][anim_id] tmp_out += INDENT + f"NPC_ANIM({sprite}, {palette}, {anim}),\n" - INCLUDES_NEEDED["npcs"].add(sprite) + INCLUDES_NEEDED["sprites"].add(sprite) i += 4 tmp_out += f"}};\n" out += tmp_out @@ -369,6 +419,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): out += f" .tattle = 0x{tattle:X},\n" out += f"}};\n" + afterHeader = True elif struct["type"] == "ASCII" or struct["type"] == "SJIS": # rodata string hopefully inlined elsewhere bytes.read(struct["length"]) @@ -429,6 +480,8 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0): out += f"\n}};\n" out += "\n" + if not struct["type"] == "Function": + INCLUDED["functions"].add(name) # end of data return out @@ -540,22 +593,31 @@ if __name__ == "__main__": print(f"can't find segment with name '{segment_name}' in splat.yaml") exit(1) + function_replacements = get_function_list(area_name, map_name, rom_offset) + INCLUDED["includes"] = get_include_list(area_name, map_name) + with open(args.idxfile, "r") as f: midx = parse_midx(f, vram=vram) with open(os.path.join(DIR, "../ver/current/baserom.z64"), "rb") as romfile: - name_fixes = { "script_NpcAI": "npcAI", + name_fixes = { + "script_NpcAI": "npcAI", "aISettings": "npcAISettings", "script_ExitWalk": "exitWalk", "script_MakeEntities": "makeEntities", - } - + } + total_npc_counts = {} for struct in midx: romfile.seek(struct["start"] + rom_offset) name = struct["name"] + if name.startswith("N("): name = name[2:-1] + + if struct['vaddr'] in function_replacements: + name = function_replacements[struct['vaddr']] + if name.split("_",1)[0] in name_fixes: name = name_fixes[name.split("_",1)[0]] + "_" + name.rsplit("_",1)[1] elif name.startswith("script_"): @@ -564,7 +626,10 @@ if __name__ == "__main__": name = "main" elif "ASCII" in name: name = name.replace("ASCII", "ascii") - name = name[0].lower() + name[1:] + + if name not in INCLUDED["includes"]: + name = name[0].lower() + name[1:] + name = "N(" + name + ")" struct["name"] = name @@ -583,24 +648,64 @@ if __name__ == "__main__": string_literal = '"' + string_data + '"' symbol_map[struct["vaddr"]] = [[struct["vaddr"], string_literal]] + elif struct["type"] == "NpcGroup": + for z in range(struct["length"]//0x1F0): + npc = romfile.read(0x1F0) + npc_id = unpack_from(">I", npc, 0)[0] + if npc_id >= 0: + anim = unpack_from(">I", npc, 0x1A0)[0] + if not anim == 0: + sprite_id = (anim & 0x00FF0000) >> 16 + sprite = disasm_script.CONSTANTS["NPC_SPRITE"][sprite_id]["name"].upper() + if npc_id not in total_npc_counts: + total_npc_counts[npc_id] = sprite + symbol_map[struct["vaddr"]] = [[struct["vaddr"], struct["name"]]] else: symbol_map[struct["vaddr"]] = [[struct["vaddr"], struct["name"]]] - romfile.seek(rom_offset) + # fix NPC names + curr_counts = {} + for id_, name in total_npc_counts.items(): + if sum(x == name for x in total_npc_counts.values()) > 1: + if name not in curr_counts: + curr_counts[name] = 0 + nname = name + name = name + f"{curr_counts[name]}" + curr_counts[nname] += 1 + name = f"NPC_{name}" + disasm_script.CONSTANTS["MAP_NPCS"][id_] = name + INCLUDES_NEEDED["npcs"][id_] = name + + for id_, name in disasm_script.CONSTANTS["NpcIDs"].items(): + disasm_script.CONSTANTS["MAP_NPCS"][id_] = name + + romfile.seek(rom_offset, 0) + disasm = disassemble(romfile, midx, symbol_map, args.comments, rom_offset) + print("========== Includes needed: ===========\n") + print(f"#include \"map.h\"") + print(f"#include \"message_ids.h\"") + if INCLUDES_NEEDED["sprites"]: + for npc in sorted(INCLUDES_NEEDED["sprites"]): + print(f"#include \"sprite/npc/{npc}.h\"") + print() + if INCLUDES_NEEDED["forward"]: print() print("========== Forward declares: ==========\n") - for forward in INCLUDES_NEEDED["forward"]: + for forward in sorted(INCLUDES_NEEDED["forward"]): print(forward) print() if INCLUDES_NEEDED["npcs"]: - print("========== Includes needed: ===========\n") - print(f"#include \"map.h\"") - for npc in INCLUDES_NEEDED["npcs"]: - print(f"#include \"sprite/npc/{npc}.h\"") + print("========== NPCs needed: ===========\n") + print(f"enum {{") + lastnum = -1 + for i, (k, v) in enumerate(sorted(INCLUDES_NEEDED["npcs"].items())): + print(f" {v}" + (f" = {k}" if ((k > 0 and i == 0) or (k != lastnum+1)) else "") + ",") + lastnum = k + print(f"}};") print() print("=======================================\n") diff --git a/tools/substitute2.py b/tools/substitute2.py new file mode 100644 index 0000000000..2821eecc1d --- /dev/null +++ b/tools/substitute2.py @@ -0,0 +1,81 @@ +from pathlib import Path + +FUNC=""" script->varTable[0] = 0; + if ((D_8010EBB0.unk_00 != 0) && (D_8010EBB0.unk_03 == 3)) { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +}""".splitlines() + +NEW_FUNC_NAME = f"UnkFunc24" +NEW_INCLUDE = f"#include \"world/common/{NEW_FUNC_NAME}.inc.c\"" + +RENAMED = [] +def parse_folder(path): + for entry in path.iterdir(): + if entry.is_dir(): + parse_folder(entry) + continue + + if not "area" in str(entry): + continue + + area_name = entry.parts[3] + fd = entry.read_text().splitlines() + + i = 0 + while i < len(fd): + if (i+2 < len(fd) and + fd[i].startswith("INCLUDE_ASM") and + fd[i+1] == "/*"): + + for func, test in zip(fd[i+3:], FUNC): + if func != test: + break + else: + print(f"Found a match in {entry}: {fd[i]}") + #print("\n".join(fd[i:i+3+len(FUNC)+1])) + #print("\n".join(fd)) + + include_path = Path("src/world/common/") / (NEW_FUNC_NAME + ".inc.c") + if not include_path.is_file(): + name_start = fd[i+2].find("N(") + name_end = fd[i+2].find("(",name_start+2) + new_file_name = fd[i+2][:name_start] + "N(" + NEW_FUNC_NAME + ")" + fd[i+2][name_end:] + + new_fd = ["#include \"common.h\"", + "#include \"map.h\"", + "", + new_file_name, + ] + new_fd.extend(FUNC) + include_path.write_text("\n".join(new_fd)) + + old_func_name = fd[i].split(",")[2].strip().replace(");", "") + RENAMED.append({"name":old_func_name, "area":area_name}) + + fd = fd[:i] + [NEW_INCLUDE] + fd[i+3+len(FUNC)+1:] + + if fd[-1] != "": + fd.append("") + + entry.write_text("\n".join(fd)) + break + + i += 1 + +parse_folder(Path("src/world")) + +def do_renames(path): + for entry in path.iterdir(): + if entry.is_dir(): + do_renames(entry) + continue + + fd = entry.read_text() + for rename in RENAMED: + if rename["name"] in fd: + fd = fd.replace(rename["name"], f"{rename['area']}_{NEW_FUNC_NAME}") + entry.write_text(fd) +do_renames(Path("ver/us/asm")) diff --git a/ver/us/asm/data/code_1422A0.data.s b/ver/us/asm/data/code_1422A0.data.s index 46af0c45ab..50cc15dec4 100644 --- a/ver/us/asm/data/code_1422A0.data.s +++ b/ver/us/asm/data/code_1422A0.data.s @@ -180,13 +180,13 @@ glabel D_8024F488 .word 0x1F000003, 0x00100121, 0x009A0000, pause_stats_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FBA0, 0x00000000, 0x00020700, 0x8024F3A0, pause_stats_init, pause_stats_handle_input, 0x00000000, pause_stats_cleanup, 0x00000000, 0x00000000 glabel D_8024F4D0 -.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, D_802427A8_C31348, jan_02_SomeMatrixOperation2, D_801083D8 +.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, jan_02_SomeMatrixOperation2, D_801083D8 glabel D_8024F528 .word 0x20000003, 0x00100121, 0x009A0100, pause_badges_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FC80, 0x00000000, 0x00000000, 0x00000000, pause_badges_init, pause_badges_handle_input, pause_badges_update, pause_badges_cleanup, 0x00000000, 0x00000000 glabel D_8024F570 -.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, D_802427A8_C31348, D_801083D8 +.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, D_801083D8 glabel D_8024F5C0 .word 0x21000003, 0x00100121, 0x009A0100, pause_items_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FD28, 0x00000000, 0x00000000, 0x00000000, pause_items_init, pause_items_handle_input, pause_items_update, pause_items_cleanup diff --git a/ver/us/asm/data/world/area_dgb/dgb_01/C20C70.rodata.s b/ver/us/asm/data/world/area_dgb/dgb_01/C20C70.rodata.s index 049306b1ae..ab3fb3b4a9 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_01/C20C70.rodata.s +++ b/ver/us/asm/data/world/area_dgb/dgb_01/C20C70.rodata.s @@ -8,11 +8,9 @@ glabel D_802633F0_C20C70 glabel D_80263420_C20CA0 .double 32767.0 -glabel D_80263428_C20CA8 -.double 0.09 -glabel D_80263430_C20CB0 -.double 0.09 + + glabel jtbl_80263438_C20CB8 .word L80241538_BFEDB8, L80241548_BFEDC8, L80241560_BFEDE0, L80241570_BFEDF0, L802415F0_BFEE70, L802415F0_BFEE70, L802415F0_BFEE70, L802415F0_BFEE70, L802415F0_BFEE70, L802415F0_BFEE70, L80241588_BFEE08, L80241598_BFEE18, L802415B0_BFEE30, L802415C8_BFEE48, L802415E0_BFEE60, 0 diff --git a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s index adb0ae7eb5..34898f930e 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s +++ b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s @@ -15,4 +15,7 @@ glabel D_80243D48_C3A278 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243D88_C3A2B8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80242914_C38E44, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024240C_C3893C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80242978_C38EA8, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802429D0_C38F00, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F96, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802430D8_C39608, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dgb_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80242850_C38D80, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802424F0_C38A20, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024259C_C38ACC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802427EC_C38D1C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D94, 0x00000043, 0x00000003, func_80242438_C38968, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F96, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000001, func_80242818_C38D48, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000001F4, 0xFFFFFE98, 0x0000006E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F96, 0x00000043, 0x00000002, AssignScript, 0x80243EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, + + +0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80242914_C38E44, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024240C_C3893C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80242978_C38EA8, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802429D0_C38F00, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F96, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802430D8_C39608, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dgb_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80242850_C38D80, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802424F0_C38A20, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024259C_C38ACC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802427EC_C38D1C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D94, 0x00000043, 0x00000003, func_80242438_C38968, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F96, 0x00000001, 0x00000043, 0x00000002, func_802428E0_C38E10, 0xFE363C89, 0x00000043, 0x00000001, func_80242818_C38D48, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802423EC_C3891C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000001F4, 0xFFFFFE98, 0x0000006E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F96, 0x00000043, 0x00000002, AssignScript, 0x80243EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_04/C3A910.rodata.s b/ver/us/asm/data/world/area_dgb/dgb_04/C3A910.rodata.s index 1387d152a5..50e6ee8826 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_04/C3A910.rodata.s +++ b/ver/us/asm/data/world/area_dgb/dgb_04/C3A910.rodata.s @@ -8,11 +8,7 @@ glabel D_802443E0_C3A910 glabel D_802443F0_C3A920 .double 32767.0 -glabel D_802443F8_C3A928 -.double 0.09 -glabel D_80244400_C3A930 -.double 0.09 glabel jtbl_80244408_C3A938 .word L80241418_C37948, L80241428_C37958, L80241440_C37970, L80241450_C37980, L802414D0_C37A00, L802414D0_C37A00, L802414D0_C37A00, L802414D0_C37A00, L802414D0_C37A00, L802414D0_C37A00, L80241468_C37998, L80241478_C379A8, L80241490_C379C0, L802414A8_C379D8, L802414C0_C379F0, 0 diff --git a/ver/us/asm/data/world/area_dgb/dgb_08/C467B0.rodata.s b/ver/us/asm/data/world/area_dgb/dgb_08/C467B0.rodata.s index bbf99db7ba..4f4b99b196 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_08/C467B0.rodata.s +++ b/ver/us/asm/data/world/area_dgb/dgb_08/C467B0.rodata.s @@ -20,11 +20,5 @@ glabel jtbl_80246BA8_C46958 glabel D_80246D38_C46AE8 .double 32767.0 -glabel D_80246D40_C46AF0 -.double 0.09 - -glabel D_80246D48_C46AF8 -.double 0.09 - glabel jtbl_80246D50_C46B00 .word L80242B78_C42928, L80242B88_C42938, L80242BA0_C42950, L80242BB0_C42960, L80242C30_C429E0, L80242C30_C429E0, L80242C30_C429E0, L80242C30_C429E0, L80242C30_C429E0, L80242C30_C429E0, L80242BC8_C42978, L80242BD8_C42988, L80242BF0_C429A0, L80242C08_C429B8, L80242C20_C429D0, 0 diff --git a/ver/us/asm/data/world/area_dgb/dgb_09/C4BF50.rodata.s b/ver/us/asm/data/world/area_dgb/dgb_09/C4BF50.rodata.s index a767524e2e..b8c3737377 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_09/C4BF50.rodata.s +++ b/ver/us/asm/data/world/area_dgb/dgb_09/C4BF50.rodata.s @@ -20,11 +20,5 @@ glabel jtbl_80245530_C4C110 glabel D_802456C0_C4C2A0 .double 32767.0 -glabel D_802456C8_C4C2A8 -.double 0.09 - -glabel D_802456D0_C4C2B0 -.double 0.09 - glabel jtbl_802456D8_C4C2B8 .word L8024283C_C4941C, L8024284C_C4942C, L80242864_C49444, L80242874_C49454, L802428F4_C494D4, L802428F4_C494D4, L802428F4_C494D4, L802428F4_C494D4, L802428F4_C494D4, L802428F4_C494D4, L8024288C_C4946C, L8024289C_C4947C, L802428B4_C49494, L802428CC_C494AC, L802428E4_C494C4, 0 diff --git a/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s b/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s index 96d00f4fc3..a1fc70f278 100644 --- a/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s +++ b/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s @@ -15,4 +15,4 @@ glabel D_80241FC8_CB0D08 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80242008_CB0D48 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240544_CAF284, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_CAF878, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_CAF878, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_CAED7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_CAF2E8, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_CAF340, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_CAFA48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_CAF1C0, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_CAEE60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_CAED5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_CAEF0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_CAED5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_CAF15C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_CAED5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242014, 0x00000043, 0x00000003, func_80240068_CAEDA8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_CAF188, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_CAED5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FA, 0x00000043, 0x00000002, AssignScript, 0x80242178, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246120, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246128, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024292C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242988, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244EC4, 0x00000046, 0x00000001, 0x802425F8, 0x00000044, 0x00000001, 0x80245F5C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, 0x80242A2C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000018, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80242680, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80242680, 0x00000044, 0x00000001, 0x80245914, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x802429E4, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, 0x80241F40, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240D40_CAFA80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, flo_08_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, flo_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, flo_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_CAED7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, flo_08_UnkFunc22, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_CAF340, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_CAFA48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_08_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_CAEE60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_CAEF0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_CAF15C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242014, 0x00000043, 0x00000003, flo_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000001, flo_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FA, 0x00000043, 0x00000002, AssignScript, 0x80242178, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, RandInt, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, PlayEffect, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246120, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246128, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024292C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242988, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244EC4, 0x00000046, 0x00000001, 0x802425F8, 0x00000044, 0x00000001, 0x80245F5C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, 0x80242A2C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000018, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80242680, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80242680, 0x00000044, 0x00000001, 0x80245914, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x802429E4, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, 0x80241F40, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_80240D40_CAFA80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s b/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s index dac61f1c9a..d8320e5e77 100644 --- a/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s +++ b/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s @@ -12,4 +12,4 @@ glabel D_80243718_CD5548 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243758_CD5588 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240624_CD2454, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240C18_CD2A48, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240C18_CD2A48, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_CD1F4C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240688_CD24B8, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_CD2510, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_CD2C18, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_16_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240560_CD2390, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_CD2030, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_CD1F2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_CD20DC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_CD1F2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802404FC_CD232C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_CD1F2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243764, 0x00000043, 0x00000003, func_80240148_CD1F78, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000001, func_80240528_CD2358, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_CD1F2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, 0x80243D48, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, func_80240E18_CD2C48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, 0x80243E80, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FB, 0x00000043, 0x00000002, AssignScript, 0x802438C8, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x80243DB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, flo_16_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, flo_16_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, flo_16_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_CD1F4C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, flo_16_UnkFunc22, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_CD2510, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_16_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_16_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_16_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_CD2030, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_CD20DC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802404FC_CD232C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243764, 0x00000043, 0x00000003, flo_16_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000001, flo_16_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, 0x80243D48, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, func_80240E18_CD2C48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, 0x80243E80, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FB, 0x00000043, 0x00000002, AssignScript, 0x802438C8, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x80243DB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s index e0dd96daf4..3249924b47 100644 --- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s +++ b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s @@ -15,4 +15,4 @@ glabel D_80241118_989C78 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80241158_989CB8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240544_9890A4, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_989698, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_989698, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_989108, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_989160, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_989868, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_988FE0, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_988C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_988B7C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_988B7C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_988F7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_988B7C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241164, 0x00000043, 0x00000003, func_80240068_988BC8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_988FA8, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_988B7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFDDA, 0xFFFFFD30, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F07, 0x00000043, 0x00000002, AssignScript, 0x802412C8, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D38_989898, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDFC, 0xFFFFFCF4, 0xFFFFFFB9, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x80241748, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFE3B, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFD37, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_UnkFunc22, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_989160, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_988C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_988F7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241164, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, func_80240510_989070, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFDDA, 0xFFFFFD30, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F07, 0x00000043, 0x00000002, AssignScript, 0x802412C8, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D38_989898, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDFC, 0xFFFFFCF4, 0xFFFFFFB9, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x80241748, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFE3B, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFD37, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s index 7c9d0de898..ff3d3f872f 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s @@ -12,4 +12,4 @@ glabel D_80245A78_923FE8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80245AB8_924028 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240834_91EDA4, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240E28_91F398, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240E28_91F398, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240898_91EE08, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408F0_91EE60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240FF8_91F568, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240770_91ECE0, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240410_91E980, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024030C_91E87C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024030C_91E87C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024070C_91EC7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024030C_91E87C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80245AC4, 0x00000043, 0x00000003, func_80240358_91E8C8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000001, func_80240738_91ECA8, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024030C_91E87C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x802460A8, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, 0x80245C28, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, D_80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_UnkFunc21, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_UnkFunc22, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408F0_91EE60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240FF8_91F568, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240410_91E980, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024070C_91EC7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80245AC4, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, func_80240800_91ED70, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x802460A8, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, 0x80245C28, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, D_80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s index 4d46b889c7..46d6e456ff 100644 --- a/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s +++ b/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80244700_B4F170 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244700_B4F170, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x80244A8C, D_80244700_B4F170, 0x00000000, 0x00000000, 0x80244AB0, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80244CD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802407F0_B4B260, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, 0x80244CA4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x80244C58, 0x80244CD4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244E0C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x80244F88, 0x80244E0C, 0x00000000, 0x00000000, 0x80244FAC, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, func_80241494_B4BF04, 0x8024508C, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x802450BC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_8024219C_B4CC0C, 0x80245210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80245240, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_80241C88_B4C6F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x802452DC, 0x00000000, 0x00000000, 0x80245154, 0x00000000, 0x00000000, 0x00100008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000007, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002B0309, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000007D, 0x00000064, 0xFFFFFE78, 0x00000043, 0x00000003, func_802D617C, 0x00000331, 0x0000006E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802450BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802453B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFECC, 0xFFFFFEF2, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFECC, 0xFFFFFEF2, 0x00000032, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000301, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFECC, 0x00000000, 0xFFFFFF08, 0x0000001E, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x00000018, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000334, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000009, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x80245754, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000009, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00970206, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, 0x80245670, 0x00001000, 0x0000002E, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x8024556C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEBC, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE9D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF28, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970202, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEF2, 0xFFFFFF08, 0x0000001E, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFFFFFF06, 0x0000001E, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFFFFFF08, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFF08, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFF08, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097020B, 0x0097020A, 0x00000000, 0x001000B9, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097020B, 0x0097020A, 0x00000000, 0x001000BA, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970204, 0x00970201, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970203, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC5, 0xFFFFFF79, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFEBB, 0x00000000, 0x000000D7, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF840604E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80242750, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFECC, 0x0000006E, 0xFFFFFED4, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970207, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802458C8, 0x00000044, 0x00000001, 0x802457F8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x80244C2C, 0xC3A00000, 0x00000000, 0x42A00000, 0x00400D09, 0x80245EC8, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00970201, 0x00970202, 0x00970203, 0x00970203, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00000000, 0x00000000, 0x00000000, 0x001A00C5, 0x002B0301, 0x002B0302, 0x002B0303, 0x002B0308, 0xFFFFFFFF, 0x00000000, 0x802450F8, 0x00000000, 0x00000000, 0x00000000, 0x00400400, 0x802454F0, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000003F, 0x00000000, 0xFFFFFE92, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003F, 0x00000000, 0xFFFFFE92, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, 0x80246174, 0x00000000, 0x00000001, 0x802452B0, 0x00000000, 0x00000000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x80245124, 0x00000000, 0x00000002, 0x80245384, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x8024514C, 0x00000000, 0x00000004, 0x80244DE0, 0x43D70000, 0x00000000, 0x434D0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000005, 0x8024504C, 0x43BB8000, 0x00000000, 0x43820000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x80245078, 0x001A00D3, 0x00000006, 0x80244C00, 0x43C80000, 0x00000000, 0xC2960000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000001, 0x80246188, 0x140A0002, 0x00000002, 0x80246378, 0x14000002, 0x00000001, 0x80246758, 0x00000000, 0x00000001, 0x80246948, 0x14080002, 0x00000001, 0x80246B38, 0x140E0002, 0x00000001, 0x80245F84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244700_B4F170, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x80244A8C, D_80244700_B4F170, 0x00000000, 0x00000000, 0x80244AB0, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80244CD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802407F0_B4B260, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, 0x80244CA4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x80244C58, 0x80244CD4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244E0C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x80244F88, 0x80244E0C, 0x00000000, 0x00000000, 0x80244FAC, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, func_80241494_B4BF04, 0x8024508C, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x802450BC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_8024219C_B4CC0C, 0x80245210, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80245240, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x802452DC, 0x00000000, 0x00000000, 0x80245154, 0x00000000, 0x00000000, 0x00100008, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000007, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002B0309, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000007D, 0x00000064, 0xFFFFFE78, 0x00000043, 0x00000003, func_802D617C, 0x00000331, 0x0000006E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802450BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802453B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFECC, 0xFFFFFEF2, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFECC, 0xFFFFFEF2, 0x00000032, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000301, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFECC, 0x00000000, 0xFFFFFF08, 0x0000001E, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x00000018, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000334, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000009, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x80245754, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000009, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00970206, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, 0x80245670, 0x00001000, 0x0000002E, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x8024556C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEBC, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE9D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF28, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970202, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEF2, 0xFFFFFF08, 0x0000001E, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFFFFFF06, 0x0000001E, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFFFFFF08, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFF08, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFF08, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097020B, 0x0097020A, 0x00000000, 0x001000B9, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097020B, 0x0097020A, 0x00000000, 0x001000BA, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970204, 0x00970201, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970203, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC5, 0xFFFFFF79, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFEBB, 0x00000000, 0x000000D7, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF840604E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80242750, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFECC, 0x0000006E, 0xFFFFFED4, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970207, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802458C8, 0x00000044, 0x00000001, 0x802457F8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x80244C2C, 0xC3A00000, 0x00000000, 0x42A00000, 0x00400D09, 0x80245EC8, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00970201, 0x00970202, 0x00970203, 0x00970203, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00000000, 0x00000000, 0x00000000, 0x001A00C5, 0x002B0301, 0x002B0302, 0x002B0303, 0x002B0308, 0xFFFFFFFF, 0x00000000, 0x802450F8, 0x00000000, 0x00000000, 0x00000000, 0x00400400, 0x802454F0, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000003F, 0x00000000, 0xFFFFFE92, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003F, 0x00000000, 0xFFFFFE92, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, 0x80246174, 0x00000000, 0x00000001, 0x802452B0, 0x00000000, 0x00000000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x80245124, 0x00000000, 0x00000002, 0x80245384, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x8024514C, 0x00000000, 0x00000004, 0x80244DE0, 0x43D70000, 0x00000000, 0x434D0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000005, 0x8024504C, 0x43BB8000, 0x00000000, 0x43820000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x80245078, 0x001A00D3, 0x00000006, 0x80244C00, 0x43C80000, 0x00000000, 0xC2960000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000001, 0x80246188, 0x140A0002, 0x00000002, 0x80246378, 0x14000002, 0x00000001, 0x80246758, 0x00000000, 0x00000001, 0x80246948, 0x14080002, 0x00000001, 0x80246B38, 0x140E0002, 0x00000001, 0x80245F84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s b/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s index 2366753167..d03047bb5e 100644 --- a/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s +++ b/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80244AF0_B57320 -.word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, func_80241330_B53B60, D_80244AF0_B57320, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244B20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80244C04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241554_B53D84, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, 0x80244BD4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x80244B88, 0x80244C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244D3C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x80244EB8, 0x80244D3C, 0x00000000, 0x00000000, 0x80244EDC, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_802420EC_B5491C, 0x802450A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x802450D8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_80241BD8_B54408, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80245174, 0x00000000, 0x00000000, 0x80244FEC, 0x00000000, 0x00000000, 0x00100008, 0x002B0201, 0x002B0202, 0x002B0203, 0x002B0208, 0xFFFFFFFF, 0x00000000, 0x80244B5C, 0x439B0000, 0x41C00000, 0x420C0000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000136, 0x00000018, 0x00000023, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000136, 0x00000018, 0x00000023, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, 0x80245248, 0x00000000, 0x00420003, 0x00420004, 0x00420005, 0x00420006, 0x0042000F, 0x00420010, 0x00420007, 0x00420008, 0x00420009, 0x0042000D, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00000001, 0x80245148, 0xC3950000, 0x420C0000, 0x42140000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFED6, 0x00000000, 0x00000025, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED6, 0x00000000, 0x00000025, 0x00000096, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x8024544C, 0x00000000, 0x00000002, 0x8024521C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80244FE4, 0x00000000, 0x00000003, 0x80244D10, 0x43CD0000, 0x00000000, 0xC1F00000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000004, 0x80244F7C, 0x42DC0000, 0x00000000, 0x425C0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000005, 0x80244F7C, 0xC3D70000, 0x00000000, 0xC2A00000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000001, 0x8024525C, 0x140D0002, 0x00000002, 0x80245480, 0x14020002, 0x00000001, 0x80245860, 0x00000000, 0x00000001, 0x80245A50, 0x14080002, 0x00000001, 0x80245C40, 0x14080002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, func_80241330_B53B60, D_80244AF0_B57320, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244B20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80244C04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241554_B53D84, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, 0x80244BD4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x80244B88, 0x80244C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244D3C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x80244EB8, 0x80244D3C, 0x00000000, 0x00000000, 0x80244EDC, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_802420EC_B5491C, 0x802450A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x802450D8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_06_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80245174, 0x00000000, 0x00000000, 0x80244FEC, 0x00000000, 0x00000000, 0x00100008, 0x002B0201, 0x002B0202, 0x002B0203, 0x002B0208, 0xFFFFFFFF, 0x00000000, 0x80244B5C, 0x439B0000, 0x41C00000, 0x420C0000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000136, 0x00000018, 0x00000023, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000136, 0x00000018, 0x00000023, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, 0x80245248, 0x00000000, 0x00420003, 0x00420004, 0x00420005, 0x00420006, 0x0042000F, 0x00420010, 0x00420007, 0x00420008, 0x00420009, 0x0042000D, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00000001, 0x80245148, 0xC3950000, 0x420C0000, 0x42140000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFED6, 0x00000000, 0x00000025, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED6, 0x00000000, 0x00000025, 0x00000096, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x8024544C, 0x00000000, 0x00000002, 0x8024521C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80244FE4, 0x00000000, 0x00000003, 0x80244D10, 0x43CD0000, 0x00000000, 0xC1F00000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000004, 0x80244F7C, 0x42DC0000, 0x00000000, 0x425C0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000005, 0x80244F7C, 0xC3D70000, 0x00000000, 0xC2A00000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000001, 0x8024525C, 0x140D0002, 0x00000002, 0x80245480, 0x14020002, 0x00000001, 0x80245860, 0x00000000, 0x00000001, 0x80245A50, 0x14080002, 0x00000001, 0x80245C40, 0x14080002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s index 856a88cb29..4ea8d90f19 100644 --- a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80241430_B5ACA0 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80240AE4_B5A354, 0x80241574, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x802415A4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_802405D0_B59E40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80241640, 0x00000000, 0x00000000, 0x802414B8, 0x00000000, 0x00000000, 0x00100008, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406078, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B4, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF49, 0x00000032, 0xFFFFFFF5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00970306, 0x00970306, 0x00000005, 0x001000B5, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, 0x80241714, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8406078, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC9, 0x00000005, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFEC, 0x0000000A, 0x00000019, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0097030A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097030B, 0x0097030A, 0x00000000, 0x001000B6, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097030B, 0x0097030A, 0x00000000, 0x001000B7, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970304, 0x00970301, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970303, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF6A, 0x0000000F, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF840604F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80241270, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970306, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024178C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF42, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x00000030, 0x00000028, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000002, 0x00000030, 0x00000028, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000003C, 0x00000014, 0x0000008C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B3, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000003B2, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241F48, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x8024263C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveEncounter, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x0000000B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80241614, 0xC1E00000, 0x00000000, 0x41500000, 0x00000D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFFE4, 0x00000000, 0x0000000D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFE4, 0x00000000, 0x0000000D, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, 0x802416E8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D00, 0x802427B0, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x8024145C, 0xC1A00000, 0x00000000, 0x41A00000, 0x00C40900, 0x80242730, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x8024145C, 0x42A00000, 0x00000000, 0x41A00000, 0x00C40900, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241430_B5ACA0, 0x41F00000, 0x00000000, 0x41A00000, 0x0040090D, 0x80241EC8, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00970301, 0x00970302, 0x00970303, 0x00970303, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00000000, 0x00000000, 0x00000000, 0x001A00C6, 0x00000002, 0x802427F8, 0x14010004, 0x00000002, 0x80242BD8, 0x15010004, 0x00000001, 0x80242FB8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80240AE4_B5A354, 0x80241574, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x802415A4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80241640, 0x00000000, 0x00000000, 0x802414B8, 0x00000000, 0x00000000, 0x00100008, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406078, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B4, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF49, 0x00000032, 0xFFFFFFF5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00970306, 0x00970306, 0x00000005, 0x001000B5, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, 0x80241714, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8406078, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC9, 0x00000005, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFEC, 0x0000000A, 0x00000019, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0097030A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097030B, 0x0097030A, 0x00000000, 0x001000B6, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097030B, 0x0097030A, 0x00000000, 0x001000B7, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970304, 0x00970301, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970303, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF6A, 0x0000000F, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF840604F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80241270, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970306, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024178C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF42, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x00000030, 0x00000028, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000002, 0x00000030, 0x00000028, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000003C, 0x00000014, 0x0000008C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B3, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000003B2, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241F48, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x8024263C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveEncounter, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x0000000B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80241614, 0xC1E00000, 0x00000000, 0x41500000, 0x00000D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFFE4, 0x00000000, 0x0000000D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFE4, 0x00000000, 0x0000000D, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, 0x802416E8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D00, 0x802427B0, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x8024145C, 0xC1A00000, 0x00000000, 0x41A00000, 0x00C40900, 0x80242730, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x8024145C, 0x42A00000, 0x00000000, 0x41A00000, 0x00C40900, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241430_B5ACA0, 0x41F00000, 0x00000000, 0x41A00000, 0x0040090D, 0x80241EC8, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00970301, 0x00970302, 0x00970303, 0x00970303, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00000000, 0x00000000, 0x00000000, 0x001A00C6, 0x00000002, 0x802427F8, 0x14010004, 0x00000002, 0x80242BD8, 0x15010004, 0x00000001, 0x80242FB8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s index b009e94d9a..012dea8520 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s @@ -12,4 +12,4 @@ glabel D_80243E18_B620C8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243E58_B62108 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240BA4_B5EE54, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80241198_B5F448, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80241198_B5F448, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240C08_B5EEB8, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C60_B5EF10, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241368_B5F618, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240AE0_B5ED90, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240780_B5EA30, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024067C_B5E92C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024067C_B5E92C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A7C_B5ED2C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024067C_B5E92C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243E64, 0x00000043, 0x00000003, func_802406C8_B5E978, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000001, func_80240AA8_B5ED58, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024067C_B5E92C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, 0x80243FC8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_UnkFunc21, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_UnkFunc22, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C60_B5EF10, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241368_B5F618, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240780_B5EA30, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A7C_B5ED2C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243E64, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, func_80240B70_B5EE20, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, 0x80243FC8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s b/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s index 75ad0e20e8..bad19b1f81 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802445A0_B62850 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802445CC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x80244958, 0x802445CC, 0x00000000, 0x00000000, 0x8024497C, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80244B74, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802413A0_B5F650, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, 0x80244B44, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x80244AF8, 0x80244B74, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244CAC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x80244E28, 0x80244CAC, 0x00000000, 0x00000000, 0x80244E4C, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80241F38_B601E8, 0x80245018, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80245048, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_80241A24_B5FCD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x802450E4, 0x00000000, 0x00000000, 0x80244F5C, 0x00000000, 0x00000000, 0x00100008, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000118, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000AF, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802451B8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFFFFFFE9, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097040B, 0x0097040A, 0x00000000, 0x001000B0, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097040B, 0x0097040A, 0x00000000, 0x001000B1, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970404, 0x00970401, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970403, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE5E, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFED4, 0x00000050, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC0, 0x00000073, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406050, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x802424A0, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406050, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000102, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970406, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE79, 0x00000000, 0xFFFFFF5C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80245230, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802445CC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000003C, 0x0000001E, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80245770, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x802450B8, 0x437F0000, 0x41700000, 0xC2820000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000FF, 0x00000000, 0xFFFFFFBF, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FF, 0x00000000, 0xFFFFFFBF, 0x00000096, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x80244F2C, 0x00000000, 0x00000001, 0x8024518C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80244F54, 0x00000000, 0x00000002, 0x80244EEC, 0x43C80000, 0x00000000, 0x436B0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x80244F18, 0x001A00D3, 0x00000003, 0x80244ACC, 0xC3CB8000, 0x00000000, 0xC2280000, 0x00408D01, 0x802458C0, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000004, 0x80244ACC, 0xC2F00000, 0x00000000, 0xC3C58000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000005, 0x80244C80, 0xC35B0000, 0x00000000, 0x43D20000, 0x00408D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000006, 0x80244C80, 0xC31D0000, 0x00000000, 0x43E20000, 0x00408D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000007, D_802445A0_B62850, 0xC3E10000, 0x00000000, 0xC3910000, 0x00400D0D, 0x80245694, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00970401, 0x00970402, 0x00970403, 0x00970403, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00000000, 0x00000000, 0x00000000, 0x001A00C7, 0x00000002, 0x802458FC, 0x14010002, 0x00000001, 0x80245CDC, 0x14080002, 0x00000001, 0x80245ECC, 0x14100002, 0x00000001, 0x802460BC, 0x140E0002, 0x00000001, 0x802462AC, 0x00000000, 0x00000001, 0x8024649C, 0x00000000, 0x00000001, 0x8024668C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802445CC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x80244958, 0x802445CC, 0x00000000, 0x00000000, 0x8024497C, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80244B74, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_802413A0_B5F650, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, 0x80244B44, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x80244AF8, 0x80244B74, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244CAC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x80244E28, 0x80244CAC, 0x00000000, 0x00000000, 0x80244E4C, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80241F38_B601E8, 0x80245018, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80245048, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x802450E4, 0x00000000, 0x00000000, 0x80244F5C, 0x00000000, 0x00000000, 0x00100008, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000118, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000AF, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802451B8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFFFFFFE9, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097040B, 0x0097040A, 0x00000000, 0x001000B0, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097040B, 0x0097040A, 0x00000000, 0x001000B1, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970404, 0x00970401, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970403, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE5E, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFED4, 0x00000050, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC0, 0x00000073, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406050, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x802424A0, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406050, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000102, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970406, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE79, 0x00000000, 0xFFFFFF5C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80245230, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802445CC, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000003C, 0x0000001E, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80245770, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x802450B8, 0x437F0000, 0x41700000, 0xC2820000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000FF, 0x00000000, 0xFFFFFFBF, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FF, 0x00000000, 0xFFFFFFBF, 0x00000096, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x80244F2C, 0x00000000, 0x00000001, 0x8024518C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80244F54, 0x00000000, 0x00000002, 0x80244EEC, 0x43C80000, 0x00000000, 0x436B0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x80244F18, 0x001A00D3, 0x00000003, 0x80244ACC, 0xC3CB8000, 0x00000000, 0xC2280000, 0x00408D01, 0x802458C0, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000004, 0x80244ACC, 0xC2F00000, 0x00000000, 0xC3C58000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000005, 0x80244C80, 0xC35B0000, 0x00000000, 0x43D20000, 0x00408D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000006, 0x80244C80, 0xC31D0000, 0x00000000, 0x43E20000, 0x00408D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000007, D_802445A0_B62850, 0xC3E10000, 0x00000000, 0xC3910000, 0x00400D0D, 0x80245694, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00970401, 0x00970402, 0x00970403, 0x00970403, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00000000, 0x00000000, 0x00000000, 0x001A00C7, 0x00000002, 0x802458FC, 0x14010002, 0x00000001, 0x80245CDC, 0x14080002, 0x00000001, 0x80245ECC, 0x14100002, 0x00000001, 0x802460BC, 0x140E0002, 0x00000001, 0x802462AC, 0x00000000, 0x00000001, 0x8024649C, 0x00000000, 0x00000001, 0x8024668C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s index c663493018..b272e0b4e0 100644 --- a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80242D20_B687D0 -.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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000046, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x0000005F, 0xFE363C86, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000061, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000047, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F82, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xFD050F82, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000063, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F84, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F83, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F84, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F84, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000046, 0x7FFFFE00, 0x00000044, 0x00000001, 0x80243684, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000044, 0x00000001, 0x8024384C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, 0x80243954, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, 0x8024384C, 0x00000044, 0x00000001, 0x80243954, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C81, 0x00000043, 0x00000007, DropItemEntity, 0x00000157, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFD050F85, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFD050F85, 0x00000078, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C83, 0x00000028, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000E10, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFD050F85, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A9280, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8680, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A0680, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A7EE0, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7BB0, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x0000003C, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x0000005D, 0x00000001, 0x00000157, 0x00000192, 0x00000014, 0x000000A1, 0x00000007, 0xF8406073, 0x00000000, 0x00000001, 0x00000192, 0x00000014, 0x000000A1, 0x802442D4, 0x802442DC, 0x802442FC, 0x00000000, 0x00000001, 0x0000003E, 0x00000001, 0xFFFFFF67, 0x00000014, 0x000001DB, 0x8024431C, 0x00000000, 0x80244324, 0x00000000, 0x00000001, 0x00000040, 0x00000001, 0x00000093, 0x00000014, 0x000001E9, 0x80244344, 0x00000000, 0x8024434C, 0x00000000, 0x00000001, 0x00000042, 0x00000001, 0x000000C1, 0x00000014, 0x000001D9, 0x8024436C, 0x00000000, 0x80244374, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0xFFFFFFA3, 0x00000014, 0x00000121, 0x80244394, 0x00000000, 0x8024439C, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x00000157, 0xFFFFFFDE, 0x00000016, 0x0000013D, 0x00000007, 0xF8406074, 0x00000000, 0x00000001, 0xFFFFFFDE, 0x00000016, 0x0000013D, 0x802443BC, 0x802443C4, 0x802443E4, 0x00000000, 0x00000001, 0x00000048, 0x00000001, 0x00000022, 0x00000014, 0x000000A7, 0x80244404, 0x00000000, 0x8024440C, 0x00000000, 0x00000001, 0x0000004A, 0x00000001, 0x0000005F, 0x00000014, 0x000000B8, 0x8024442C, 0x00000000, 0x80244434, 0x00000000, 0x00000001, 0x0000004C, 0x00000001, 0x0000014E, 0x00000014, 0x0000011F, 0x80244454, 0x00000000, 0x8024445C, 0x00000000, 0x00000001, 0x0000004E, 0x00000001, 0x00000184, 0x00000014, 0x00000117, 0x8024447C, 0x00000000, 0x80244484, 0x00000000, 0x00000001, 0x00000050, 0x00000001, 0x000001C6, 0x00000014, 0x00000094, 0x802444A4, 0x00000000, 0x802444AC, 0x00000000, 0x00000001, 0x00000052, 0x00000001, 0x00000167, 0x00000014, 0xFFFFFF81, 0x802444CC, 0x00000000, 0x802444D4, 0x00000000, 0x00000001, 0x00000054, 0x00000001, 0xFFFFFEA9, 0x0000006E, 0xFFFFFEC1, 0x802444F4, 0x00000000, 0x802444FC, 0x00000000, 0x00000001, 0x00000055, 0x00000001, 0xFFFFFEE2, 0x00000070, 0xFFFFFE83, 0x8024451C, 0x00000000, 0x80244524, 0x00000000, 0x00000001, 0x00000056, 0x00000001, 0xFFFFFF16, 0x0000006E, 0xFFFFFE88, 0x80244544, 0x00000000, 0x8024454C, 0x00000000, 0x00000001, 0x00000057, 0x00000001, 0xFFFFFFC7, 0x0000006E, 0xFFFFFE4A, 0x8024456C, 0x00000000, 0x80244574, 0x00000000, 0x00000001, 0x00000058, 0x00000001, 0x0000006D, 0x00000014, 0xFFFFFE3C, 0x80244594, 0x00000000, 0x8024459C, 0x00000000, 0x00000001, 0x0000005A, 0x00000001, 0x0000009F, 0x00000014, 0xFFFFFE1B, 0x802445BC, 0x00000000, 0x802445C4, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, 0x80243DC0, 0x00000013, 0x00000000, 0x00000047, 0x00000005, 0x80243B1C, 0x00000100, 0x00000046, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243C08, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243CD4, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80243FC4, 0x00000024, 0x00000002, 0xFE363C80, 0x8024430C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000045, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244334, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024435C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244384, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000028, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802443AC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802443F4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002A, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024441C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244444, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024446C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244494, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802444BC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802444E4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000030, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024450C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000031, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244534, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000032, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024455C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244584, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000034, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802445AC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000035, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802445D4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000036, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802449A0, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x80244D2C, 0x802449A0, 0x00000000, 0x00000000, 0x80244D50, 0x00000000, 0x00000000, 0x00100000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80241424_B66ED4, 0x80244FB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80244FE8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_80240F10_B669C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80245084, 0x00000000, 0x00000000, 0x80244EFC, 0x00000000, 0x00000000, 0x00100008, 0x0000001E, 0x80245058, 0xC3480000, 0x42B40000, 0xC3A50000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF38, 0x0000005A, 0xFFFFFEB6, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF4A, 0x0000005A, 0xFFFFFED2, 0x000000D4, 0x00000064, 0x00000001, 0x00000001, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x8024512C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80244EF4, 0x00000000, 0x00000046, 0x80244EA0, 0x43A78000, 0x00000000, 0xC2200000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000050, 0x80244EA0, 0x43CF8000, 0x00000000, 0xC2820000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000002, 0x80245158, 0x14030003, 0x00000001, 0x80245538, 0x140E0003, 0x00000001, 0x80245728, 0x140E0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, jan_09_SomeMatrixOperation2, 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, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000046, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x0000005F, 0xFE363C86, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000061, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000047, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F82, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xFD050F82, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000063, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F84, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F83, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F84, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F84, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, func_80240888_B66338, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000046, 0x7FFFFE00, 0x00000044, 0x00000001, 0x80243684, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000044, 0x00000001, 0x8024384C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, 0x80243954, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, 0x8024384C, 0x00000044, 0x00000001, 0x80243954, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80240888_B66338, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C81, 0x00000043, 0x00000007, DropItemEntity, 0x00000157, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFD050F85, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFD050F85, 0x00000078, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C83, 0x00000028, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000E10, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFD050F85, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A9280, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8680, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A0680, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A7EE0, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7BB0, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x0000003C, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x0000005D, 0x00000001, 0x00000157, 0x00000192, 0x00000014, 0x000000A1, 0x00000007, 0xF8406073, 0x00000000, 0x00000001, 0x00000192, 0x00000014, 0x000000A1, 0x802442D4, 0x802442DC, 0x802442FC, 0x00000000, 0x00000001, 0x0000003E, 0x00000001, 0xFFFFFF67, 0x00000014, 0x000001DB, 0x8024431C, 0x00000000, 0x80244324, 0x00000000, 0x00000001, 0x00000040, 0x00000001, 0x00000093, 0x00000014, 0x000001E9, 0x80244344, 0x00000000, 0x8024434C, 0x00000000, 0x00000001, 0x00000042, 0x00000001, 0x000000C1, 0x00000014, 0x000001D9, 0x8024436C, 0x00000000, 0x80244374, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0xFFFFFFA3, 0x00000014, 0x00000121, 0x80244394, 0x00000000, 0x8024439C, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x00000157, 0xFFFFFFDE, 0x00000016, 0x0000013D, 0x00000007, 0xF8406074, 0x00000000, 0x00000001, 0xFFFFFFDE, 0x00000016, 0x0000013D, 0x802443BC, 0x802443C4, 0x802443E4, 0x00000000, 0x00000001, 0x00000048, 0x00000001, 0x00000022, 0x00000014, 0x000000A7, 0x80244404, 0x00000000, 0x8024440C, 0x00000000, 0x00000001, 0x0000004A, 0x00000001, 0x0000005F, 0x00000014, 0x000000B8, 0x8024442C, 0x00000000, 0x80244434, 0x00000000, 0x00000001, 0x0000004C, 0x00000001, 0x0000014E, 0x00000014, 0x0000011F, 0x80244454, 0x00000000, 0x8024445C, 0x00000000, 0x00000001, 0x0000004E, 0x00000001, 0x00000184, 0x00000014, 0x00000117, 0x8024447C, 0x00000000, 0x80244484, 0x00000000, 0x00000001, 0x00000050, 0x00000001, 0x000001C6, 0x00000014, 0x00000094, 0x802444A4, 0x00000000, 0x802444AC, 0x00000000, 0x00000001, 0x00000052, 0x00000001, 0x00000167, 0x00000014, 0xFFFFFF81, 0x802444CC, 0x00000000, 0x802444D4, 0x00000000, 0x00000001, 0x00000054, 0x00000001, 0xFFFFFEA9, 0x0000006E, 0xFFFFFEC1, 0x802444F4, 0x00000000, 0x802444FC, 0x00000000, 0x00000001, 0x00000055, 0x00000001, 0xFFFFFEE2, 0x00000070, 0xFFFFFE83, 0x8024451C, 0x00000000, 0x80244524, 0x00000000, 0x00000001, 0x00000056, 0x00000001, 0xFFFFFF16, 0x0000006E, 0xFFFFFE88, 0x80244544, 0x00000000, 0x8024454C, 0x00000000, 0x00000001, 0x00000057, 0x00000001, 0xFFFFFFC7, 0x0000006E, 0xFFFFFE4A, 0x8024456C, 0x00000000, 0x80244574, 0x00000000, 0x00000001, 0x00000058, 0x00000001, 0x0000006D, 0x00000014, 0xFFFFFE3C, 0x80244594, 0x00000000, 0x8024459C, 0x00000000, 0x00000001, 0x0000005A, 0x00000001, 0x0000009F, 0x00000014, 0xFFFFFE1B, 0x802445BC, 0x00000000, 0x802445C4, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, 0x80243DC0, 0x00000013, 0x00000000, 0x00000047, 0x00000005, 0x80243B1C, 0x00000100, 0x00000046, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243C08, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243CD4, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80243FC4, 0x00000024, 0x00000002, 0xFE363C80, 0x8024430C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000045, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244334, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024435C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244384, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000028, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802443AC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802443F4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002A, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024441C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244444, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024446C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244494, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802444BC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802444E4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000030, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024450C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000031, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244534, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000032, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024455C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244584, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000034, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802445AC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000035, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802445D4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000036, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x802449A0, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x80244D2C, 0x802449A0, 0x00000000, 0x00000000, 0x80244D50, 0x00000000, 0x00000000, 0x00100000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80241424_B66ED4, 0x80244FB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80244FE8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_09_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80245084, 0x00000000, 0x00000000, 0x80244EFC, 0x00000000, 0x00000000, 0x00100008, 0x0000001E, 0x80245058, 0xC3480000, 0x42B40000, 0xC3A50000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF38, 0x0000005A, 0xFFFFFEB6, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF4A, 0x0000005A, 0xFFFFFED2, 0x000000D4, 0x00000064, 0x00000001, 0x00000001, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x8024512C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80244EF4, 0x00000000, 0x00000046, 0x80244EA0, 0x43A78000, 0x00000000, 0xC2200000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000050, 0x80244EA0, 0x43CF8000, 0x00000000, 0xC2820000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 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, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000002, 0x80245158, 0x14030003, 0x00000001, 0x80245538, 0x140E0003, 0x00000001, 0x80245728, 0x140E0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s index 6cd2a25af5..dfe0ef9ffa 100644 --- a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s +++ b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80242C80_B75D30 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0x00000082, 0x00000000, 0xFFFFFF92, 0x000000AA, D_80000000, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0xFFFFFEA2, 0x0000001E, 0xFFFFFFC9, 0x00000019, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFECA, 0x0000005A, 0xFFFFFFE7, 0x00000000, 0x00000088, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406062, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80240FA4_B74054, 0x80242DFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80242E2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_80240A90_B73B40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80242EC8, 0x00000000, 0x00000000, 0x80242D40, 0x00000000, 0x00000000, 0x00100008, 0x00000000, 0x80242E9C, 0x43250000, 0x00000000, 0x41700000, 0x00400D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000A5, 0x00000000, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000A5, 0x00000000, 0x0000000F, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80242F70, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80242D38, 0x00000000, 0x00000002, 0x80242F9C, 0x14060007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0x00000082, 0x00000000, 0xFFFFFF92, 0x000000AA, D_80000000, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0xFFFFFEA2, 0x0000001E, 0xFFFFFFC9, 0x00000019, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFECA, 0x0000005A, 0xFFFFFFE7, 0x00000000, 0x00000088, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406062, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, func_80240FA4_B74054, 0x80242DFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x80242E2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_12_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00080014, 0x00000000, 0x00000000, 0x80242EC8, 0x00000000, 0x00000000, 0x80242D40, 0x00000000, 0x00000000, 0x00100008, 0x00000000, 0x80242E9C, 0x43250000, 0x00000000, 0x41700000, 0x00400D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000A5, 0x00000000, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000A5, 0x00000000, 0x0000000F, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80242F70, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x80242D38, 0x00000000, 0x00000002, 0x80242F9C, 0x14060007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s b/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s index 1695a66794..c29b8390b2 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80240240_A4C1A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240AB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240AB8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240240_A4C1A0, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024029C, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802402F8, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240990, 0x00000044, 0x00000001, 0x80240340, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802401D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240000_A4BF60, 0x00000019, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000019, 0x80000010, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000006, 0x00000064, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleGroup, 0x00000025, 0xFE363C8A, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400BC_A4C01C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C8B, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE02B0, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000082, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0x000000AA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0xFFFFFFCE, 0x00000046, 0x00000001, 0x80240430, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000032, 0x00000046, 0x00000001, 0x80240430, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE02B0, 0xFE363C89, 0x0000000B, 0x00000002, 0xF5DE02B0, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000019, 0x00000014, 0x00000001, 0xF5DE02B0, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240808, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240AB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240AB8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240240_A4C1A0, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024029C, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802402F8, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240990, 0x00000044, 0x00000001, 0x80240340, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802401D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_04_UnkFunc11, 0x00000019, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000019, 0x80000010, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000006, 0x00000064, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleGroup, 0x00000025, 0xFE363C8A, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400BC_A4C01C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C8B, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE02B0, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000082, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0x000000AA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0xFFFFFFCE, 0x00000046, 0x00000001, 0x80240430, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000032, 0x00000046, 0x00000001, 0x80240430, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE02B0, 0xFE363C89, 0x0000000B, 0x00000002, 0xF5DE02B0, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000019, 0x00000014, 0x00000001, 0xF5DE02B0, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240808, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s index 8bacb9551c..70a6090e1a 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80241760_A9ACF0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240000_A99590, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400BC_A9964C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000019, 0x00000046, 0x00000001, D_80241760_A9ACF0, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AD, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001A, 0x00000046, 0x00000001, D_80241760_A9ACF0, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AD, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AD, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000026, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000026, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000026, 0x00000047, 0x00000005, 0x80241AF0, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241BE4, 0x00000040, 0x0000001A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, func_80241064_A9A5F4, 0x80241E90, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x80241EC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001E0000, 0x40F00000, 0x00000000, 0x00000000, 0x3F8CCCCD, 0x3E3851EC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, func_802406CC_A99C5C, 0x80241F5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_111_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80241FFC, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, func_80240C08_A9A198, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80241F8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000C000C, 0x00000000, 0x00000000, 0x80241F8C, 0x8024200C, 0x00000000, 0x80241DC0, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x80241F30, 0xC1200000, 0x00000000, 0x42C80000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0xFFFFFFF6, 0x00000000, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000064, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 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, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80241F30, 0x43480000, 0x00000000, 0x430C0000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000C8, 0x00000000, 0x0000008C, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x0000008C, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 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, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80242200, 0x2207000D, 0x00000004, 0x802429C0, 0x220C000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_111_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kpa_111_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000019, 0x00000046, 0x00000001, D_80241760_A9ACF0, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AD, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001A, 0x00000046, 0x00000001, D_80241760_A9ACF0, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AD, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AD, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000026, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000026, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000026, 0x00000047, 0x00000005, 0x80241AF0, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241BE4, 0x00000040, 0x0000001A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, func_80241064_A9A5F4, 0x80241E90, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x80241EC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001E0000, 0x40F00000, 0x00000000, 0x00000000, 0x3F8CCCCD, 0x3E3851EC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, func_802406CC_A99C5C, 0x80241F5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_111_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80241FFC, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, func_80240C08_A9A198, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80241F8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000C000C, 0x00000000, 0x00000000, 0x80241F8C, 0x8024200C, 0x00000000, 0x80241DC0, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x80241F30, 0xC1200000, 0x00000000, 0x42C80000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0xFFFFFFF6, 0x00000000, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000064, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 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, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80241F30, 0x43480000, 0x00000000, 0x430C0000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000C8, 0x00000000, 0x0000008C, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x0000008C, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 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, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x802421D4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 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, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80242200, 0x2207000D, 0x00000004, 0x802429C0, 0x220C000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s index 693ffc8778..5cde38ebcf 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802410D0_A9DD00 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240040_A9CC70, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400FC_A9CD2C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000013, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000046, 0x00000001, D_802410D0_A9DD00, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AE, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000046, 0x00000001, D_802410D0_A9DD00, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AE, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AE, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000013, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000012, 0x00000022, 0x00000047, 0x00000005, 0x80241470, 0x00000040, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241564, 0x00000040, 0x00000012, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240544_A9D174, 0x80241740, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80240544_A9D174, 0x802417E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80240544_A9D174, 0x80241880, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240544_A9D174, 0x80241740, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80241770, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80241920, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80241810, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x802418B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000000, 0x80241A98, 0x42C80000, 0x00000000, 0x42A60000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00000064, 0x00000000, 0x00000053, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000041, 0x00000000, 0x00000064, 0x00000104, 0x00000064, 0x00000001, 0x00000001, 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, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80241AC4, 0x2206000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_113_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kpa_113_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000013, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000046, 0x00000001, D_802410D0_A9DD00, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AE, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000046, 0x00000001, D_802410D0_A9DD00, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AE, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AE, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000013, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000012, 0x00000022, 0x00000047, 0x00000005, 0x80241470, 0x00000040, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241564, 0x00000040, 0x00000012, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240544_A9D174, 0x80241740, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80240544_A9D174, 0x802417E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80240544_A9D174, 0x80241880, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80240544_A9D174, 0x80241740, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80241770, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80241920, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80241810, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x802418B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000000, 0x80241A98, 0x42C80000, 0x00000000, 0x42A60000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00000064, 0x00000000, 0x00000053, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000041, 0x00000000, 0x00000064, 0x00000104, 0x00000064, 0x00000001, 0x00000001, 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, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80241AC4, 0x2206000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s index e79e4f0b66..fb3d954040 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802416F0_AA0430 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240000_A9ED40, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400BC_A9EDFC, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000016, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000064, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000046, 0x00000001, D_802416F0_AA0430, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AF, 0xFE363C88, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000017, 0x00000046, 0x00000001, D_802416F0_AA0430, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AF, 0xFE363C88, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AF, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0x00000064, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000016, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x00000027, 0x00000047, 0x00000005, 0x80241A80, 0x00000040, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241BA4, 0x00000040, 0x00000017, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_115_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kpa_115_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000016, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000064, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000046, 0x00000001, D_802416F0_AA0430, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AF, 0xFE363C88, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000017, 0x00000046, 0x00000001, D_802416F0_AA0430, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AF, 0xFE363C88, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AF, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0x00000064, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000016, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x00000027, 0x00000047, 0x00000005, 0x80241A80, 0x00000040, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241BA4, 0x00000040, 0x00000017, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s index 51f25d2398..2e39523d32 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C647B0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80243AA0_C647B0 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802406A4_C613B4, 0x80243B40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802406A4_C613B4, 0x80243BE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kzn_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243AD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243C80, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243B70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80243C10, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_8024234C_C6305C, 0x80243EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80243F10, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_80240FB4_C61CC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80244010, 0x00000000, 0x00000000, 0x80243E24, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802406A4_C613B4, 0x80243B40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802406A4_C613B4, 0x80243BE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kzn_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802406A4_C613B4, D_80243AA0_C647B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243AD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243C80, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243B70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80243C10, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_8024234C_C6305C, 0x80243EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80243F10, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_03_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80244010, 0x00000000, 0x00000000, 0x80243E24, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 glabel D_802441A0_C64EB0 .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s index 5620b2c953..3635eea843 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s @@ -12,4 +12,4 @@ glabel D_80241C58_C69D88 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80241C98_C69DC8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240854_C68984, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240E48_C68F78, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240E48_C68F78, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802408B8_C689E8, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240910_C68A40, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241018_C69148, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240790_C688C0, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240430_C68560, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024032C_C6845C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024032C_C6845C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024072C_C6885C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024032C_C6845C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241CA4, 0x00000043, 0x00000003, func_80240378_C684A8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000001, func_80240758_C68888, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024032C_C6845C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, 0x80241E08, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_UnkFunc22, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240910_C68A40, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241018_C69148, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240430_C68560, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024072C_C6885C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241CA4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, func_80240820_C68950, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, 0x80241E08, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s index d1a04426a6..e0106e0fc6 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s @@ -6,4 +6,4 @@ glabel D_80244BB0_C76030 .word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, 0x80244BB4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF84060AC, 0x00000001, 0x00000046, 0x00000001, 0x80244C1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000078, 0x00000064, 0xFFFFFFC9, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignFlag, 0xF84060AC, 0x00000043, 0x00000002, AssignScript, 0x80244CFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244DA0_C76220 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x404CCCCD, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, func_80242354_C737D4, 0x80244DB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244DE8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80243C90_C75110, 0x80244F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80244F70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802428F8_C73D78, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80245070, 0x00000000, 0x00000000, 0x80244E84, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x80245044, 0x42A00000, 0x00000000, 0x43070000, 0x00000500, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000050, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000005A, 0x00000000, 0x00000082, 0x00000082, 0x0000003C, 0x00000001, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x8024517C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802451A8, 0x16110005, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80243EE0_C75360, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F4CCCCD, 0x00000064, 0x00000000, 0x42B40000, 0x00000000, 0x00000004, 0x404CCCCD, 0x0000000A, 0x00000001, 0x42C80000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000096, 0x00000043, 0x00000002, func_80242354_C737D4, 0x80244DB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244DE8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80243C90_C75110, 0x80244F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80244F70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80245070, 0x00000000, 0x00000000, 0x80244E84, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x80245044, 0x42A00000, 0x00000000, 0x43070000, 0x00000500, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000050, 0x00000000, 0x00000087, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000005A, 0x00000000, 0x00000082, 0x00000082, 0x0000003C, 0x00000001, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x8024517C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802451A8, 0x16110005, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80243EE0_C75360, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s index bd93923cee..77bd6a16b0 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s @@ -12,4 +12,4 @@ glabel D_80243D18_C7A9F8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243D58_C7AA38 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240544_C77224, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_C77818, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_C77818, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_C77288, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_C772E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_C779E8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_C77160, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_C76E00, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_C76CFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_C76CFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_C770FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_C76CFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D64, 0x00000043, 0x00000003, func_80240068_C76D48, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_C77128, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_C76CFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, 0x80243EC8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, D_80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_UnkFunc22, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_C772E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_C779E8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_C76E00, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_C770FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D64, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, func_80240510_C771F0, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, 0x80243EC8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, D_80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s index 83117ca16e..f8332599ef 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7B0D0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802443F0_C7B0D0 -.word 0xC3A64000, 0x447C3000, 0xC25C0000, 0x43B3D99A, 0x445D8000, 0xC25C0000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, 0x80244408, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD484, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xF4ACD483, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7B4D, 0x00000043, 0x00000005, PlayerJump, 0xF4ACD483, 0xF4ACD484, 0xF4ACD485, 0x00000005, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x80000019, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E80, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80240D40_C77A20, 0xFAA2B58A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E80, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80240E88_C77B68, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241000_C77CE0, 0x0000000A, 0x00000002, 0xFE363C88, 0x00008000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002087, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00800000, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000019, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000001A, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E81, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80240DE4_C77AC4, 0xFAA2B58B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E81, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80240E88_C77B68, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000007, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_802443F0_C7B0D0, 0x00000024, 0x00000002, 0xF4ACD481, 0x0000000C, 0x00000024, 0x00000002, 0xF4ACD482, 0x0000000E, 0x00000024, 0x00000002, 0xF4ACD483, 0xFFFFFEB4, 0x00000024, 0x00000002, 0xF4ACD484, 0x0000037F, 0x00000024, 0x00000002, 0xF4ACD485, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000001, 0x00000047, 0x00000005, 0x80244470, 0x00000800, 0x00000007, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802467DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80242774_C79454, 0x80244C38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80244C68, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802413DC_C780BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80244D68, 0x00000000, 0x00000000, 0x80244B7C, 0x00000000, 0x00000000, 0x00110000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kzn_09_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_09_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_09_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244ED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80245080, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244F70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80245010, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0xC3A64000, 0x447C3000, 0xC25C0000, 0x43B3D99A, 0x445D8000, 0xC25C0000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, 0x80244408, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD484, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xF4ACD483, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7B4D, 0x00000043, 0x00000005, PlayerJump, 0xF4ACD483, 0xF4ACD484, 0xF4ACD485, 0x00000005, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x80000019, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E80, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80240D40_C77A20, 0xFAA2B58A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E80, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80240E88_C77B68, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241000_C77CE0, 0x0000000A, 0x00000002, 0xFE363C88, 0x00008000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002087, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00800000, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000019, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000001A, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E81, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80240DE4_C77AC4, 0xFAA2B58B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E81, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80240E88_C77B68, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000007, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_802443F0_C7B0D0, 0x00000024, 0x00000002, 0xF4ACD481, 0x0000000C, 0x00000024, 0x00000002, 0xF4ACD482, 0x0000000E, 0x00000024, 0x00000002, 0xF4ACD483, 0xFFFFFEB4, 0x00000024, 0x00000002, 0xF4ACD484, 0x0000037F, 0x00000024, 0x00000002, 0xF4ACD485, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000001, 0x00000047, 0x00000005, 0x80244470, 0x00000800, 0x00000007, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802467DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80242774_C79454, 0x80244C38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80244C68, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_09_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80244D68, 0x00000000, 0x00000000, 0x80244B7C, 0x00000000, 0x00000000, 0x00110000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244FE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kzn_09_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_09_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_09_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242D58_C79A38, 0x80244EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244ED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80245080, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244F70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80245010, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 glabel D_80245250_C7BF30 .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s index 9f093fceb4..7dc32b2800 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C89450.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802439A0_C89450 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241A64_C87514, 0x80243A88, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80243AB8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802406CC_C8617C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80243BB8, 0x00000000, 0x00000000, 0x802439CC, 0x00000000, 0x00000000, 0x00110000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243D90, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243D20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243ED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243DC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80243E60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 +.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241A64_C87514, 0x80243A88, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80243AB8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, kzn_17_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80243BB8, 0x00000000, 0x00000000, 0x802439CC, 0x00000000, 0x00000000, 0x00110000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243D90, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kzn_17_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kzn_17_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kzn_17_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80242048_C87AF8, 0x80243CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243D20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243ED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243DC0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80243E60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 glabel D_80244074_C89B24 .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s index 54dfcec60d..6b677ae18a 100644 --- a/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80242CA0_B960E0 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000099, 0x00000043, 0x00000006, RotateGroup, 0x0000009B, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x0000009F, 0x00000043, 0x00000006, RotateGroup, 0x000000A1, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000009C, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x000000A2, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009B, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000006, RotateGroup, 0x000000A1, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80243124, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243054, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243054, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009B, 0x00000046, 0x00000001, 0x80243170, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A1, 0x00000046, 0x00000001, 0x80243170, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009E, 0x00000046, 0x00000001, 0x80243170, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000044, 0x00000001, 0x80243124, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000B, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243054, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0x0000000A, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242CA0_B960E0, 0x00000044, 0x00000001, 0x80242F34, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, 0x8024375C, 0x00000100, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802437D8, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802438D0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243854, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241C54_B95094, 0x80243F6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x80243F9C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802408BC_B93CFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x8024409C, 0x00000000, 0x00000000, 0x80243EB0, 0x00000000, 0x00000000, 0x000B0008, 0x00000001, 0x80244070, 0x43070000, 0x00000000, 0xC3960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000087, 0x00000000, 0xFFFFFED4, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802441A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802441D4, 0x0D090001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000099, 0x00000043, 0x00000006, RotateGroup, 0x0000009B, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x0000009F, 0x00000043, 0x00000006, RotateGroup, 0x000000A1, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000009C, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x000000A2, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000009B, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000006, RotateGroup, 0x000000A1, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80243124, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243054, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243054, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009B, 0x00000046, 0x00000001, 0x80243170, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A1, 0x00000046, 0x00000001, 0x80243170, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009E, 0x00000046, 0x00000001, 0x80243170, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000044, 0x00000001, 0x80243124, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000B, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80243054, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0x0000000A, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242CA0_B960E0, 0x00000044, 0x00000001, 0x80242F34, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, 0x8024375C, 0x00000100, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802437D8, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802438D0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243854, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241C54_B95094, 0x80243F6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x80243F9C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_01_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x8024409C, 0x00000000, 0x00000000, 0x80243EB0, 0x00000000, 0x00000000, 0x000B0008, 0x00000001, 0x80244070, 0x43070000, 0x00000000, 0xC3960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000087, 0x00000000, 0xFFFFFED4, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802441A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802441D4, 0x0D090001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s b/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s index c719fc2bf9..15c7a2d8b2 100644 --- a/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s +++ b/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80243350_BA3A80 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_802417C4_BA1EF4, 0x8024340C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x8024343C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_8024042C_BA0B5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x8024353C, 0x00000000, 0x00000000, D_80243350_BA3A80, 0x00000000, 0x00000000, 0x000B0008, 0x00000000, 0x80243510, 0xC3700000, 0x00000000, 0x43700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243648, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243510, 0x43700000, 0x00000000, 0xC3700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243648, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243674, 0x0D0B0001, 0x00000002, 0x80243A54, 0x0D0A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_802417C4_BA1EF4, 0x8024340C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x8024343C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x8024353C, 0x00000000, 0x00000000, D_80243350_BA3A80, 0x00000000, 0x00000000, 0x000B0008, 0x00000000, 0x80243510, 0xC3700000, 0x00000000, 0x43700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243648, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243510, 0x43700000, 0x00000000, 0xC3700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243648, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243674, 0x0D0B0001, 0x00000002, 0x80243A54, 0x0D0A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s index 6ddbabd1ac..a603c28875 100644 --- a/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s +++ b/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802449F0_BA9170 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241CC4_BA6444, 0x80244AAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x80244ADC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_8024092C_BA50AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x80244BDC, 0x00000000, 0x00000000, D_802449F0_BA9170, 0x00000000, 0x00000000, 0x000B0008, 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, func_80242B04_BA7284, 0x80244D14, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244D44, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000000, 0x80244BB0, 0xC3700000, 0x00000000, 0xC3700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244CE8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80244BB0, 0x43700000, 0x00000000, 0xC3700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80244CE8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80244D80, 0xC30C0000, 0x00000000, 0x43960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80244DAC, 0x0D0D0001, 0x00000002, 0x8024518C, 0x0D0E0001, 0x00000001, 0x8024556C, 0x0D070001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241CC4_BA6444, 0x80244AAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x80244ADC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_06_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x80244BDC, 0x00000000, 0x00000000, D_802449F0_BA9170, 0x00000000, 0x00000000, 0x000B0008, 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, func_80242B04_BA7284, 0x80244D14, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244D44, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000000, 0x80244BB0, 0xC3700000, 0x00000000, 0xC3700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244CE8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80244BB0, 0x43700000, 0x00000000, 0xC3700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80244CE8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80244D80, 0xC30C0000, 0x00000000, 0x43960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80244DAC, 0x0D0D0001, 0x00000002, 0x8024518C, 0x0D0E0001, 0x00000001, 0x8024556C, 0x0D070001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s index f7a59d6320..c29bb8fca7 100644 --- a/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s +++ b/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802443C0_BB1D00 -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_802413AC_BAECEC, 0x802443D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x80244408, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80242CEC_BB062C, 0x80244560, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x80244590, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_80241954_BAF294, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x80244690, 0x00000000, 0x00000000, 0x802444A4, 0x00000000, 0x00000000, 0x000B0008, 0x00000003, 0x00000001, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEE8, 0x0000006C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFFFFFEE8, 0x00000032, 0x0000000A, 0x00000005, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244408, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802447C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80244478, 0x00000000, 0xC47A0000, 0x00000000, 0x00202D00, 0x80244884, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x0000003C, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244664, 0xC3700000, 0x00000000, 0xC3700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x8024479C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80244664, 0x43700000, 0x00000000, 0x43700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x8024479C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802448A8, 0x0D100001, 0x00000002, 0x80244A98, 0x0D0F0001, 0x00000002, 0x80244E78, 0x0D090001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_802413AC_BAECEC, 0x802443D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x80244408, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80242CEC_BB062C, 0x80244560, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0020001A, 0x00000000, 0x00000000, 0x80244590, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00120012, 0x00000000, 0x00000000, 0x80244690, 0x00000000, 0x00000000, 0x802444A4, 0x00000000, 0x00000000, 0x000B0008, 0x00000003, 0x00000001, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEE8, 0x0000006C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFFFFFEE8, 0x00000032, 0x0000000A, 0x00000005, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80244408, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802447C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80244478, 0x00000000, 0xC47A0000, 0x00000000, 0x00202D00, 0x80244884, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x0000003C, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244664, 0xC3700000, 0x00000000, 0xC3700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x8024479C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80244664, 0x43700000, 0x00000000, 0x43700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x8024479C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802448A8, 0x0D100001, 0x00000002, 0x80244A98, 0x0D0F0001, 0x00000002, 0x80244E78, 0x0D090001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s index b79d588ad4..568870f336 100644 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s +++ b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s @@ -24,4 +24,4 @@ glabel D_80241E58_DDE688 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80241E98_DDE6C8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240CD4_DDD504, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_802412C8_DDDAF8, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_802412C8_DDDAF8, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240D38_DDD568, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240D90_DDD5C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241498_DDDCC8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240C10_DDD440, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802408B0_DDD0E0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802407AC_DDCFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802407AC_DDCFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240BAC_DDD3DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802407AC_DDCFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241EA4, 0x00000043, 0x00000003, func_802407F8_DDD028, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000001, func_80240BD8_DDD408, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802407AC_DDCFDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, 0x80242008, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, 0x802EA5D0, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_UnkFunc22, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240D90_DDD5C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241498_DDDCC8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802408B0_DDD0E0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240BAC_DDD3DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241EA4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, func_80240CA0_DDD4D0, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, 0x80242008, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, 0x802EA5D0, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s index 41635661c9..48b6050717 100644 --- a/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_22/D78BF0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80240370_D78BF0 -.word 0x0000002D, 0xFFFFFFFF, 0x0000002F, 0xFFFFFFFF, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241160, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, 0x80240378, 0x00000044, 0x00000001, 0x80285EEC, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241168, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240380, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240424, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, 0x802404C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, 0x80240378, 0x00000046, 0x00000001, 0x802861B0, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x802404C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240020_D788A0, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000151, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000019D, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, 0x80240608, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xF5DE029E, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241088, 0x00000044, 0x00000001, 0x80240330, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000047, 0x00000005, 0x80240AB0, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000021, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000044, 0x00000001, 0x80240510, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000002D, 0xFFFFFFFF, 0x0000002F, 0xFFFFFFFF, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241160, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, 0x80240378, 0x00000044, 0x00000001, 0x80285EEC, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241168, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240380, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240424, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, 0x802404C8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, D_80240370_D78BF0, 0x00000024, 0x00000002, 0xFE363C83, 0x80240378, 0x00000046, 0x00000001, 0x802861B0, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x802404C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_22_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400DC_D7895C, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000008, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000151, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x0000019D, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000046, 0x00000001, 0x80240608, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000024, 0x00000002, 0xF5DE029E, 0xFE363C88, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241088, 0x00000044, 0x00000001, 0x80240330, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000054, 0x00000047, 0x00000005, 0x80240AB0, 0x00000040, 0x0000001C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE029E, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000021, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000044, 0x00000001, 0x80240510, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s b/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s index 4f90b4caff..738e970d65 100644 --- a/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s +++ b/ver/us/asm/data/world/area_pra/pra_31/D81250.data.s @@ -9,4 +9,4 @@ glabel D_80242514_D81274 .word 0x00000001, 0x00000001, 0x0000010E, 0x00000004, 0x00000001, 0x0000010E, 0x00000007, 0x00000001, 0x0000010E glabel D_80242538_D81298 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x0000FFFF, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24F87B4, 0xF2497080, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24F1DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000021, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000023, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000030, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000032, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000018, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000056, 0x00000030, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000057, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000051, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000008, 0x00000001, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80246558, 0x00000008, 0x00000001, 0x000000C8, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C82, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000001, 0x00000024, 0x00000002, 0xFD050F87, 0xFE363C82, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000002, 0x00000024, 0x00000002, 0xFD050F88, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003B, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000038, 0xFD050F86, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0xFD050F87, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000004B, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFD050F88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, delete_actor_D7F91C, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240C70_D7F9D0, 0xFE363C8A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_80240DBC_D7FB1C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000028, 0xF24A7BB4, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x0000002D, 0x00000000, 0x00000043, 0x00000002, func_80240A3C_D7F79C, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000043, 0x00000001, func_80240FD0_D7FD30, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001B, 0x00000046, 0x00000001, 0x80242E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000046, 0x00000001, 0x80242E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000046, 0x00000001, 0x80242E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802CCCB0, 0x00000043, 0x00000003, LoadModelAnimation, 0x00000000, 0x80246094, 0x00000043, 0x00000005, SetAnimModelPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802CD348, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240510_D7F270, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000022, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000044, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000044, 0x00000001, 0x80242B40, 0x00000047, 0x00000005, 0x80243078, 0x00000040, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243104, 0x00000040, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243190, 0x00000040, 0x00000025, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x802471E4, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005B, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80246130, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000021, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000030, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000055, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005B, 0x00000000, 0x00000044, 0x00000001, 0x80242570, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x2BC17217, 0x2DD00000, 0x00000000, 0x00000000, 0x00000111, 0x11111111, 0x10C3CDD2, 0x712ABC18, 0x81C1F817, 0x8DD03300, 0x11000000, 0x00000000, 0x00000111, 0x11111111, 0x11330DD2, 0x712ABC18, 0x81C1F817, 0x2DD13000, 0x00000000, 0x00000000, 0x000B1011, 0x11111111, 0x11031332, 0x8B2A1C18, 0x80C17817, 0x2DD13004, 0x00000000, 0x00000000, 0x000B7B00, 0x11111111, 0x1100F332, 0xAB2A1C08, 0x80C17217, 0x8DD10400, 0x00000000, 0x00000000, 0x00BBBBB0, 0x01111111, 0x11007332, 0xAB2A1C08, 0x80C17817, 0x8DD03304, 0x00000111, 0x00000000, 0x0B0BB77B, 0xB1111111, 0x1100F332, 0xAB271C08, 0x80C1F817, 0x2D3B0000, 0x00000111, 0x00000000, 0x0B0B7777, 0x7F111111, 0x1110B332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000011, 0x00000B00, 0x00BB7777, 0x7777B110, 0x0010F332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000001, 0x0001B000, 0x11117777, 0x77777703, 0x3400F332, 0xA12F0C08, 0x80C072B8, 0x63370011, 0x00000000, 0x00000000, 0xBF777777, 0x7777B000, 0x30330DD2, 0x71271C18, 0x80C0F2B8, 0x633A0001, 0x11000000, 0x10330001, 0xB777B777, 0x777B3DDD, 0xD3330DD2, 0x712F1C18, 0x80C0F21A, 0x233A0001, 0x11000000, 0x03DD001B, 0x777B7BBB, 0xBB0DDDDD, 0xDD3DDDD8, 0x2F2ABC12, 0x80C0F8BA, 0x23370000, 0x11100000, 0x4DD3400B, 0x777B7000, 0x003DDDDD, 0xDDDDDDD7, 0xAB2A1C12, 0x80C0F2B8, 0x63370000, 0x01110000, 0x3DDDD30B, 0x777B1100, 0x043DDDDD, 0xDDDDDDDB, 0x7F271C08, 0x80C0F2B2, 0x93370000, 0x00011103, 0xDD33330B, 0x77B11110, 0x003DDDDD, 0xDDDDDDD1, 0xFF68BC1A, 0x80C0721A, 0x63370000, 0x0000003D, 0xD3333330, 0xBB711111, 0x0043DDD3, 0xDDDDDDD1, 0x00871C0B, 0x80C17218, 0x63370000, 0x000003DD, 0x3333403D, 0x4BB11111, 0x100043DD, 0xDDDDDDD1, 0x0CF103C1, 0x80C172B2, 0x63377700, 0x00003D33, 0x33334003, 0x33B11111, 0x10000033, 0x3DDDDDDF, 0x1010333F, 0x80C0F2B8, 0x63370000, 0x00043DD3, 0x33340000, 0x43B11110, 0x000000B3, 0x3DDDDDDA, 0xF171C33F, 0x80C072B8, 0x63370000, 0x00333333, 0x33300000, 0x03111110, 0x00000000, 0x33DD3D36, 0x2B27030F, 0x80C1A2B2, 0x63370700, 0x33333333, 0x33300001, 0x03111100, 0x00000000, 0x00330336, 0x8B2703C7, 0x81C1A2F2, 0x63370870, 0x33333333, 0x3333C400, 0x33010000, 0x00000000, 0x00047339, 0x2F2A1307, 0x80C172B2, 0x63370080, 0x3333333C, 0x33334040, 0x3D0100BB, D_B0000000, 0x0000A339, 0x2F2A13CF, 0x80C172F2, 0x63370000, 0x43333000, 0x00433333, 0x3D000BBB, D_B0000000, 0x0000A339, 0x2F68B3C1, 0x80C172B8, 0x63370008, 0x03333000, 0xE0003333, 0x3300B77B, 0x00000000, 0x0008A339, 0x2F68B3C1, 0x80C0F81A, 0x63370007, 0x04333030, 0x00043333, 0xD3400BBB, 0x00000111, 0x0078A336, 0x2F2A1331, 0x80C0F817, 0x233F0770, 0x00433003, 0x00E4333D, 0xD340BB00, 0x00011111, 0x5178A336, 0x2F270331, 0x80C172BA, 0x633BB444, 0x440033C0, 0x000C3DDD, 0x0000B000, 0x00100111, 0x17887336, 0x2B270330, 0x80C172B8, 0x633B0044, 0x4440033C, 0xCC33DDD0, 0x0000B000, 0x00110011, 0x11157332, 0xA08F030A, 0x81C1F81A, 0x2D3B4040, 0x0000000C, 0x333DDD30, 0x00000000, 0x01110000, 0x01117336, 0x70FF130A, 0x81C172BA, 0x23310444, 0x44440000, 0xCDDD3330, 0x000B0000, 0x01100000, 0x0400B332, 0x70FF0C0A, 0x81CBA2F2, 0x63377000, 0x00000000, 0x04333344, 0x00010000, 0x01100000, 0x00C3F332, 0xA1F1030A, 0x81C172B2, 0x63370000, 0x00000000, 0x00043304, 0x40000000, 0x00000000, 0x0C30B332, 0xAB210307, 0x81CBA2BA, 0x233F0000, 0x00000000, 0x00000C04, 0x4C000000, 0x0000004C, 0x333C0DD2, 0x718F0307, 0x80C1A2BA, 0x63370000, 0x00000000, 0x00000000, 0xCCCC4440, 0x3400400C, 0x3C041DD2, 0x70AB03CB, 0x80C1A2BA, 0x23370000, 0x00000000, 0x00000000, 0x00000000, 0x043CCC33, 0x34041332, 0xA1AF030A, 0x80C1A2B2, 0x63370000, 0x000000B0, 0x00000000, 0x00000000, 0x04433C33, 0x444C13D2, 0x71AF030A, 0x80C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x04444444, 0x4444B3D2, 0xF0AB030A, 0x81C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x00444444, 0x4444F332, 0x70AB030A, 0x81CB86F2, 0x933A0110, 0x11111100, 0x00000000, 0x00000000, 0x00000444, 0x4444B332, 0xA1AB030A, 0x80CB86F2, 0x933A1111, 0x11111110, 0x00000000, 0x000000C0, 0x00000000, 0x0444B336, 0x8BAB030A, 0x80C1A2F2, 0x933A1111, 0x11100111, 0x00000000, 0x00000400, 0x00000000, 0x0004F332, 0x8BAF1C0A, 0x80C1A2F2, 0x933A0111, 0x10000011, 0x1100000B, 0x77504000, 0x00000000, 0x0000F336, 0x8B8F1C0A, 0x81C172B8, 0x633A1111, 0x00000011, 0x11111850, 0x0007B000, 0x00000000, 0x0000F332, 0xA127030A, 0x81C1A2F2, 0x9331CC55, 0x87000111, 0x11118111, 0x00000070, 0x05700777, 0xBBB7F332, 0x812F030A, 0x81C172B2, 0x63303330, 0x78787111, 0x11108111, 0x00000000, 0x0000B077, 0x77777336, 0x812F030A, 0x81C1F2F2, 0x933C33DD, 0x07588111, 0x11115511, 0x0000000B, 0x0000700B, 0x0E077336, 0x8127030A, 0x81C172B8, 0x633C3DDD, 0x34580581, 0x11110501, 0x00000000, 0x00007000, 0x00077336, 0xA1871C0A, 0x81CBA2F2, 0x63333DDD, 0x33005850, 0x11111500, 0x00000000, 0x00000700, 0x00077332, 0x718F030A, 0x81CB8672, 0x9333DD33, 0xD3333070, 0x11110700, 0x00000000, 0x00000B00, 0x000E7336, 0x2B2F030A, 0x80C172F8, 0x633CDD3D, 0x33DDD370, 0x11110500, 0x00000000, 0x00000750, 0x00EE7336, 0x8B2F030A, 0x21C1A2B2, 0x6330DD33, 0xDDDDD301, 0x11115000, 0x000000BE, 0x00000070, 0x0000F332, 0x718F030A, 0x21CBA2F2, 0x63310DDD, 0xDDD33D40, 0x11108100, 0x040000BE, 0xE0000770, 0x00007332, 0x718F030A, 0x81C1F217, 0x23300DDD, 0xDDD3330C, 0x01118100, 0x040000EE, 0xE0000070, 0x00007336, 0xA18F030A, 0x81C17217, 0x2D3003DD, 0xDDD33403, 0x01118000, 0x044000EE, 0xE0000700, 0x000BF336, 0xAB2F030A, 0x80C0F21A, 0x2330103D, 0xDDD40403, 0x00110570, 0x00400E0E, 0x00000700, 0x777BB3D2, 0xF0AF030A, 0x80C0F81A, 0x23300033, 0xDD3C0040, 0x00110075, 0x00000EE0, 0x00000770, 0x0007BDD2, 0x70AF030A, 0x80C0F81A, 0x233C333C, 0xDD340010, 0x01000004, 0x17100B08, 0x71100F00, 0x00001DD2, 0xF0AF030A, 0x80C172BA, 0x633C3103, 0x3D301075, 0x10000443, 0xD4717777, 0x88F100B0, 0x04CC0DDA, 0xF08F030A, 0x80C1A2BA, 0x63300700, 0x33D005B7, 0x70004043, 0xD400B001, 0x78A55770, 0x000B0DD8, 0xF18F130A, 0x80C1A2BA, 0x233B0070, 0x30040100, 0x4004444D, 0x3000E011, 0x11AA7710, 0x00100DD2, 0x718F0C0A, 0x81C1A2B8, 0x23310070, 0x000533C0, 0x4040443D, 0x40000111, 0x115A7510, 0x04010DD2, 0x718F0C0A, 0x81CBA217, 0x2DD04400, 0x50053330, 0x33444433, 0x04000111, 0x1117F101, 0x00400DD8, 0xF08F0C0A, 0x81CBA217, 0x2DDC0C40, 0xCC033300, 0x03444330, 0x04000111, 0x111A7111, 0x10000DD2, 0xF1871CB2, 0xD675C637, 0x8C63EF7B, 0xCEB9B5F5, 0x739DAD6B, 0x9CE76319, 0xA529BDEF, 0xDEF7F7BD, 0xCE31B5AD, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x80243510, 0xF5500000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5400800, 0x00018060, 0xF2000000, 0x000FC0FC, 0xE3000C00, 0x00080000, 0xE3001001, 0x00008000, 0xFD100000, 0x80243D10, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0x55E45545, 0x5445E4E4, 0x44444444, 0x4C111111, 0x1111111C, 0x44C44CCC, 0xCD445EE5, 0x5E545E54, 0x65555555, 0x5E444E4E, 0x4E44444C, 0x11111111, 0x11111111, 0xC44C4C11, 0xCD445445, 0x55555E45, 0x65555555, 0x64E544E4, 0x444444C4, 0xC1111111, 0x11111111, 0xCDD4C111, 0xD44464E5, 0x5455E455, 0x86555558, 0x6E454E44, 0x4444C44C, 0xC1111111, 0x11111111, 0x9CCC111C, 0xD44D8545, 0x55545456, 0x86565658, 0xA545E4E4, 0x44C4CCCC, 0x11111111, 0x11111111, 0x1C911199, 0xDDDD3655, 0x5E555558, 0x36556658, 0x3D44444C, 0xC444CCCC, 0x11111111, 0x11111111, 0x1CC1911C, 0xDCDD3D66, 0x55558556, 0xA6568668, 0x3555444C, 0xCC4CCCC1, 0x11111111, 0x11111111, 0x1C11C119, 0x9C5C35D8, 0x54558568, 0xA8668368, 0x354544DC, 0xCCCCCC11, 0x11111111, 0x111C111C, 0x111C1111, 0xC9993656, 0x55568563, 0x78563A88, 0x3D45D4C9, 0xCC1CCC11, 0x11111111, 0xC191999C, 0xCC9C199C, 0xC3113565, 0x5658856A, 0x7356A73A, 0x3646D5CC, 0x91111C11, 0x11111111, 0x19191999, 0x9999999C, 0xD1303D56, 0x56586637, 0x7366A73A, 0xA646CDC9, 0x11111111, 0x11111111, 0x11111111, 0x99911999, 0xD1103556, 0x56888637, 0x7363A73A, 0xA556DCC1, 0x11111C11, 0x11111111, 0x11111011, 0x11111819, 0xC981A446, 0x6883863B, 0x7368AA3A, 0xAD589C91, 0x11111C11, 0x11111111, 0x10100110, 0x10101019, 0x9989B455, 0x68333637, 0x7368AAA7, 0x76531911, 0x11111111, 0x11111111, 0x11010000, 0x00000131, 0x89C9B446, 0x83AA3637, 0x7363AB37, 0xBD531911, 0x19111111, 0x11111111, 0x10101010, 0x00000001, 0x9981B546, 0x8AA7A637, 0x7363A737, 0x7D6A1119, 0x19C91911, 0x11111111, 0x01010000, 0x00200003, 0x0319B456, 0x63AA363A, 0x7363AB37, 0x7D671111, 0x9CC11111, 0x11111111, 0x10101100, 0x00220000, 0x0309B546, 0x86A38663, 0x7363A7AB, 0xB6D71111, 0x94499191, 0x11111111, 0x11010010, 0x00022202, 0x2231A558, 0x88386563, 0x7363AB37, 0xBD6B1999, 0x944CC991, 0x11110101, 0x00101010, 0x10190020, 0x0910AD43, 0xA8A3666A, 0x7363AB3B, 0xB6671C94, 0x44444C91, 0x11011111, 0x11010100, 0x000D9000, 0x95108D6A, 0x7ABA856A, 0x73637B3B, 0xB867199C, 0x4444D111, 0x11100000, 0x00000000, 0x00094D14, 0x4100A98A, 0x737A3687, 0x7383ABAB, 0xB89B0011, 0xD4444101, 0x10110000, 0x00000000, 0x0000444D, 0x4001B88B, 0x7AB7366A, 0x7363AB3B, 0xB88B0001, 0xDDD44111, 0x01000000, 0x00000000, 0x0001C444, 0xC000B98B, 0x7AB7368A, 0x73637BA7, 0xB89B0000, 0xD9119910, 0x10000000, 0x00000000, 0x001D4444, 0x4C10B38F, 0xBAB73663, 0x7363A7A7, 0xB88B2021, 0x10010110, 0x00000000, 0x00020202, 0x01CCD444, 0xDCD1B83B, 0xBAB7A663, 0x7363A737, 0xB98B2200, 0x00000000, 0x00000000, 0x10000000, 0x00001D4D, 0x1000B93B, 0x7AB73563, 0x7363A737, 0xB68B2220, 0x00000000, 0x00002200, 0xD0020202, 0x00000941, 0x0101B38B, 0xBABA3563, 0x7363AB37, 0xB8672222, 0x02020002, 0x0202011C, 0x49012000, 0x00001191, 0x0111B88B, 0x7A7A3668, 0x7363A7A7, 0xB89B2222, 0x20002000, 0x000000C4, 0x44C00200, 0x00100191, 0x1131B98B, 0x737A363A, 0x7363A737, 0xB86B2272, 0x22220020, 0x2020220D, 0x44000000, 0x00011131, 0x3111B88B, 0xA8AA3687, 0x7363A737, 0xB6972B22, 0x22222202, 0x02020014, 0x94902000, 0x00003100, 0x003178CB, 0xA8AA363A, 0x736A7BA7, 0xB88B2272, 0x22202000, 0x000000C1, 0x01C00020, 0x00000000, 0x0300788B, 0xA3A38687, 0x73837B3B, 0xB98B2722, 0x22222020, 0x00000001, 0x00000000, 0x00000020, 0x2001B96B, 0x7A73868A, 0x7363AB37, 0xB88B2272, 0x22220202, 0x00000001, 0x11000200, 0x00202002, 0x0200A867, 0xA37A668A, 0x736AAB37, 0xB89B2722, 0x22220200, 0x00020000, 0x01310000, 0x00000202, 0x00007D6B, 0xA37A866A, 0x73637B37, 0xB88B2220, 0x12220020, 0x20110000, 0x11103030, 0x32022020, 0x0020789B, 0xA3733637, 0x73637BA7, 0xB83B2221, 0x49120200, 0x19410000, 0x00010100, 0x00000222, 0x2000766B, 0xA37A868A, 0x7363ABAB, 0xB98B2222, 0x94910021, 0x94902202, 0x00000000, 0x00222022, 0x2020796B, 0xA3AA8637, 0x73637BA7, 0xB33B2222, 0x144491C4, 0x44100000, 0x00000000, 0x00000220, 0x0001B89B, 0xA3733687, 0x738A7BAB, 0xB89B2222, 0x294D44D4, 0x49020220, 0x20200200, 0x20000000, 0x0010788B, 0x737A8637, 0x73637BA7, 0xF83B0222, 0x21444444, 0x41202002, 0x02020020, 0x00000000, 0x0031796B, 0x73733637, 0x73637BA7, 0xB88B2020, 0x21C44D44, 0xD1002202, 0x02022202, 0x00000001, 0x3011B86B, 0x737A3687, 0x736A7BAB, 0xF89B0202, 0x19C4444D, 0xC9120020, 0x20200000, 0x00001010, 0x0113B967, 0x7A7A3637, 0x7363A737, 0xB86B0211, 0x9444D444, 0x44911202, 0x02002000, 0x00010113, 0x1131B86A, 0xA3B73637, 0x73637BAB, 0xB66A0194, 0x444444D4, 0x4444C102, 0x02220200, 0x01301311, 0x3111B86A, 0xA37A3687, 0x7363A7A7, 0xBD630011, 0x11CC444D, 0xC1113000, 0x20222000, 0x00010131, 0x1311B8DA, 0x737A3637, 0x7363A7AB, 0xB6630010, 0x001C5449, 0x12020022, 0x22222220, 0x00000111, 0x3003B95A, 0x737A3687, 0x7383AB37, 0xB6D81100, 0x00014451, 0x22220222, 0x22222222, 0x20030303, 0x103078DA, 0x337A3637, 0x73637BA7, 0x7D660110, 0x0000C4C0, 0x20222222, 0x27222222, 0x22200230, 0x3000B6DA, 0xA37A868A, 0x73837BAB, 0xB6D61811, 0x10001C10, 0x20202222, 0x22272272, 0x22222D02, 0x1D00B653, 0x333A3637, 0x7363A737, 0x75561993, 0x11101C10, 0x00020022, 0x22222722, 0x72272049, 0x413276D8, 0x83A33687, 0xB38377A7, 0x765D9991, 0x19313900, 0x00000202, 0x02222227, 0x22222254, 0x4232B6D8, 0x68888637, 0x736377A7, 0x7D566669, 0x31119310, 0x01000020, 0x22200222, 0x27220C45, 0x4D02B6D6, 0x56886687, 0x7366A73A, 0x36469D98, 0x13131931, 0x30300002, 0x02291222, 0x222A2094, 0xD032A656, 0x6668663A, 0x7366A733, 0x3545CD99, 0x30303903, 0x00000020, 0x220D9222, 0x22222724, 0x8222A566, 0x56686537, 0x78563783, 0x36456593, 0x91099310, 0x03002002, 0x0214C022, 0x222222AC, 0x92233DD5, 0x5556856A, 0xA8668388, 0x3554D460, 0x88888003, 0x00222019, 0x19C44111, 0x12222223, 0x33993556, 0x45568563, 0xA6568568, 0x355454D0, 0x99993322, 0x0222220C, 0x4444D5DC, 0x02222201, 0x98D88D56, 0x54558568, 0x36556668, 0xAD545451, 0x3D6D9300, 0x22222222, 0x1D4444C0, 0x22220203, 0xDCDC8556, 0x55556556, 0x86566658, 0xA545445D, 0x569D3000, 0x22222222, 0x29444D12, 0x22202019, 0x9DDD8D55, 0x4E555458, 0x86555658, 0x84454445, 0xDCDD9930, 0x22222222, 0x2CDD4412, 0x22220038, 0xC54D6545, 0x5555E556, 0x65555556, 0x54455444, 0x4545C693, 0x22222222, 0x0D111D92, 0x2222009C, 0xDD5554E5, 0x5E545E45, 0x65555555, 0x54E55455, 0x454545C9, 0x32222222, 0x00222010, 0x2200196C, 0xD54D5445, 0x54554445, 0x54445544, 0x5E444444, 0x4444454D, 0x90222222, 0x22222202, 0x20039DD4, 0x545444E5, 0x44544E45, 0x33E944AF, 0x33677467, 0xCEFBC675, 0x9DAF4B1B, 0x8CE97533, 0x5B5F4257, 0x85B5A5F3, 0xFFFF2109, 0xE3001001, 0x00008000, 0xFD100000, 0x802445F0, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x80243DF0, 0xF5500000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5400800, 0x00018060, 0xF2000000, 0x000FC0FC, 0xE3000C00, 0x00080000, 0xE3001201, 0x00002000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0x6B997399, 0x6B996357, 0x73997399, 0x73996B99, 0x6B997399, 0x73996B99, 0x73997399, 0x63576357, 0x73DB73DB, 0x73DB7399, 0x73DB73DB, 0x73DB7399, 0x73DB73DB, 0x739973DB, 0x5AD55AD5, 0x4A534211, 0x73DB7399, 0x6B996357, 0x6B996B99, 0x63176B99, 0x4A536B57, 0x6B596B57, 0x6B996317, 0x73DB6B57, 0x73997399, 0x73DB73DB, 0x73996B99, 0x73997399, 0x739973DB, 0x73DB7399, 0x5AD55293, 0x4A534251, 0x73997399, 0x6B577399, 0x6B995AD5, 0x63176B57, 0x5AD55AD5, 0x63576357, 0x6B996B99, 0x73996B99, 0x73DB73DB, 0x73997399, 0x635773DB, 0x73997399, 0x73DB73DB, 0x739973DB, 0x5AD54251, 0x52934A53, 0x73DB6B99, 0x63576B59, 0x6B9952D5, 0x63576B57, 0x6B996B99, 0x6B596317, 0x63177399, 0x6B996357, 0x63577399, 0x63176B99, 0x63576B59, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x5AD54211, 0x52934211, 0x73996B99, 0x63176357, 0x63175AD5, 0x52D56317, 0x63175AD5, 0x5AD56357, 0x6B996357, 0x63176317, 0x6B596B57, 0x6B996B99, 0x63176357, 0x6B9973DB, 0x739973DB, 0x73DB73DB, 0x52934211, 0x42514211, 0x73DB5295, 0x6B576357, 0x5AD56317, 0x5AD55AD5, 0x63176357, 0x6B575AD5, 0x6B995AD5, 0x63576357, 0x63176357, 0x63576B59, 0x63576B57, 0x73996B57, 0x6B997399, 0x739973DB, 0x52D54211, 0x42114211, 0x73996357, 0x63175AD5, 0x63576357, 0x5AD56357, 0x5AD56357, 0x5AD56317, 0x6B596317, 0x63576317, 0x63176317, 0x6B996357, 0x6B576B99, 0x739973DB, 0x6B996B57, 0x73DB73DB, 0x52934251, 0x4A534251, 0x73996357, 0x63176317, 0x63175AD5, 0x63175AD5, 0x63576357, 0x63576317, 0x6B576357, 0x63576B57, 0x63176357, 0x73996B99, 0x73996B99, 0x739973DB, 0x73996B99, 0x73DB73DB, 0x52935AD5, 0x42114211, 0x73996B99, 0x63576B99, 0x63176317, 0x63576317, 0x63176B99, 0x5AD56317, 0x63576317, 0x6B996B99, 0x63577399, 0x739973DB, 0x739973DB, 0x739973DB, 0x73996B99, 0x73997399, 0x52D55AD5, 0x42114251, 0x6B996B99, 0x6B597399, 0x63576317, 0x73996357, 0x63176B99, 0x63575AD5, 0x63577399, 0x63576357, 0x73997399, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x6B996B99, 0x739973DB, 0x5AD54251, 0x42114211, 0x73996357, 0x6B996B57, 0x63576317, 0x6B995AD5, 0x635773DB, 0x63576317, 0x73DB7399, 0x73DB6B99, 0x739973DB, 0x73DB73DB, 0x739973DB, 0x73DB73DB, 0x73996B99, 0x6B9973DB, 0x5AD54A53, 0x42114211, 0x73995AD5, 0x6B596357, 0x6B996357, 0x6B996357, 0x6B576B99, 0x63576357, 0x73997399, 0x6B997399, 0x6B997399, 0x73DB6B57, 0x73DB73DB, 0x6B996B99, 0x73DB6B57, 0x6B997399, 0x52D55AD5, 0x42114211, 0x73DB6B57, 0x5AD56357, 0x6B576317, 0x73996B99, 0x6B996357, 0x73996357, 0x73DB6B99, 0x73997399, 0x5AD573DB, 0x6B996B99, 0x73DB7399, 0x6B996B57, 0x6B576B99, 0x6B9973DB, 0x5AD56317, 0x42114211, 0x6B9973DB, 0x73994A53, 0x73996B99, 0x739973DB, 0x73996B99, 0x73996B99, 0x73997399, 0x739973DB, 0x6B997399, 0x6B997399, 0x73997399, 0x6B996B99, 0x6B996B99, 0x6B5773DB, 0x4A535293, 0x42514211, 0x6B997399, 0x6B996B57, 0x6B996357, 0x73DB73DB, 0x73997399, 0x73996B99, 0x6B996B99, 0x73DB7399, 0x73996B99, 0x73DB6B99, 0x6B997399, 0x6B997399, 0x73997399, 0x73DB6B99, 0x4A534A53, 0x42114211, 0x63176357, 0x63176357, 0x739973DB, 0x73997399, 0x73DB7399, 0x73DB7399, 0x6B5773DB, 0x6B576B99, 0x6B996B99, 0x73997399, 0x73DB6B57, 0x6B996357, 0x6B996B99, 0x73996357, 0x4A535293, 0x4A534211, 0x73996B99, 0x73996B99, 0x73DB7399, 0x73DB7399, 0x73997399, 0x73997399, 0x6B997399, 0x73DB7399, 0x73996B99, 0x73DB7399, 0x73DB6357, 0x6B996B59, 0x52936B99, 0x6B996B99, 0x52934251, 0x42514211, 0x73DB6B57, 0x6B9973DB, 0x739973DB, 0x739973DB, 0x73997399, 0x73DB7399, 0x6B5773DB, 0x73DB7399, 0x73DB7399, 0x6B996B99, 0x73996B99, 0x73997399, 0x73996B99, 0x6B576317, 0x52D54A53, 0x42514211, 0x73996B99, 0x73997399, 0x73996B99, 0x73997399, 0x73DB73DB, 0x73DB7399, 0x6B997399, 0x73997399, 0x73997399, 0x73997399, 0x6B997399, 0x73996B99, 0x6B997399, 0x6B996357, 0x52955293, 0x52954211, 0x73DB7399, 0x73DB6B99, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x739973DB, 0x73997399, 0x73DB7399, 0x73DB7399, 0x6B997399, 0x73DB6B99, 0x73996B99, 0x6B996B57, 0x631773DB, 0x52935293, 0x52D54211, 0x739973DB, 0x739973DB, 0x739973DB, 0x739973DB, 0x73997399, 0x73DB73DB, 0x73997399, 0x73DB7399, 0x6B997399, 0x73DB6B99, 0x73997399, 0x6B997399, 0x6B996B99, 0x5AD57399, 0x52D54A53, 0x52934211, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x739973DB, 0x739973DB, 0x73DB7399, 0x73DB73DB, 0x73997399, 0x739973DB, 0x6B997399, 0x63577399, 0x6B996B59, 0x6B576357, 0x63575293, 0x4A534211, 0x739973DB, 0x73DB73DB, 0x73DB73DB, 0x73DB7399, 0x6B997399, 0x73DB7399, 0x73DB73DB, 0x73996B99, 0x73997399, 0x6B997399, 0x73996B99, 0x73997399, 0x6B996357, 0x63576B99, 0x5AD55293, 0x52954251, 0x73DB73DB, 0x739973DB, 0x739973DB, 0x739973DB, 0x739973DB, 0x73DB73DB, 0x73DB7399, 0x73DB6B99, 0x6B5773DB, 0x73996B99, 0x73DB6357, 0x6B996317, 0x6B996B57, 0x6B9973DB, 0x4A535293, 0x52D54211, 0x739973DB, 0x73DB7399, 0x73DB7399, 0x73DB6B57, 0x6B997399, 0x73DB7399, 0x739973DB, 0x73996B59, 0x6B576B99, 0x63577399, 0x63576B57, 0x63176357, 0x6B596357, 0x6B996357, 0x52935AD5, 0x5AD54211, 0x73DB7399, 0x73DB73DB, 0x73DB6B59, 0x73996B99, 0x6B9973DB, 0x6B996357, 0x73DB73DB, 0x73DB6B99, 0x6B995AD5, 0x5AD56B99, 0x6B596B99, 0x63576317, 0x63576317, 0x63576357, 0x52935AD5, 0x5AD54211, 0x739973DB, 0x73997399, 0x73996357, 0x635773DB, 0x73996357, 0x63176B99, 0x73996357, 0x6B576357, 0x6B996357, 0x6B576B59, 0x6B576357, 0x6B996B57, 0x5AD56357, 0x5AD57399, 0x4A535AD5, 0x4A534251, 0x73DB73DB, 0x73DB6B99, 0x6B996B57, 0x73DB7399, 0x73996B57, 0x6B576B99, 0x52957399, 0x6B996B57, 0x73DB5AD5, 0x6B9952D5, 0x6B996B59, 0x73996357, 0x6B596B57, 0x6B596B99, 0x421152D5, 0x52934211, 0x739973DB, 0x739973DB, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x73DB5AD5, 0x6B5773DB, 0x5AD57399, 0x73DB6B57, 0x6B995AD5, 0x63576B99, 0x6B576317, 0x63576B99, 0x6B576317, 0x42516317, 0x4A534A53, 0x73DB7399, 0x6B596B57, 0x6B996B99, 0x6B997399, 0x73DB73DB, 0x6B996B57, 0x73DB7399, 0x73DB6B99, 0x5AD56B99, 0x52936B99, 0x52D56317, 0x63176B57, 0x63176357, 0x6B997399, 0x42515293, 0x52934251, 0x739973DB, 0x6B577399, 0x739973DB, 0x739973DB, 0x739973DB, 0x6B577399, 0x739973DB, 0x73DB7399, 0x739973DB, 0x6B996317, 0x6B596317, 0x63576357, 0x6B995AD5, 0x63575AD5, 0x4A534211, 0x52D54251, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB7399, 0x6B997399, 0x63576357, 0x63576B57, 0x6B5952D5, 0x63176317, 0x6B997399, 0x42514211, 0x5AD55293, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD100000, 0x802446C0, 0xF5100000, 0x07054150, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF100, 0xE7000000, 0x00000000, 0xF5101000, 0x00054150, 0xF2000000, 0x0007C07C, 0xE3000C00, 0x00080000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247A80, 0xDE000000, 0x80244F50, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247A40, 0xDE000000, 0x80245000, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247A00, 0xDE000000, 0x802450A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x802479C0, 0xDE000000, 0x80245150, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247980, 0xDE000000, 0x80245200, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247940, 0xDE000000, 0x802452A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247900, 0xDE000000, 0x80245350, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x802478C0, 0xDE000000, 0x80245400, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247880, 0xDE000000, 0x802454A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247840, 0xDE000000, 0x80245550, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247800, 0xDE000000, 0x80245600, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x802477C0, 0xDE000000, 0x802456A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247780, 0xDE000000, 0x80245750, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244610, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x01001002, 0x80247B20, 0x01003008, 0x80247B60, 0x06020406, 0x00020600, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244610, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x01004008, 0x80247B20, 0x06000204, 0x00000406, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100600C, 0x80247AC0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247740, 0xDE000000, 0x802458C8, 0xDE000000, 0x80245868, 0xDE000000, 0x80245800, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245930, 0xDE000000, 0x802457C8, 0xDE000000, 0x80245718, 0xDE000000, 0x80245668, 0xDE000000, 0x802455C8, 0xDE000000, 0x80245518, 0xDE000000, 0x80245468, 0xDE000000, 0x802453C8, 0xDE000000, 0x80245318, 0xDE000000, 0x80245268, 0xDE000000, 0x802451C8, 0xDE000000, 0x80245118, 0xDE000000, 0x80245068, 0xDE000000, 0x80244FC8, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245978, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245A08, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245A30, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802458C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245A90, 0x00000000, 0x00000000, 0x00000000, 0x80245868, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245ABC, 0x80245AE8, 0x00000000, 0x00000000, 0x00000000, 0x80245800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245B14, 0x80245B40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43FA0000, 0x42480000, 0x00000000, 0x00000000, 0x80245B6C, 0x00000000, 0x00000000, 0x00000000, 0x80245750, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43D20000, 0x42480000, 0x00000000, 0x80245B98, 0x80245BC4, 0x00000000, 0x00000000, 0x00000000, 0x80245600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43CD0000, 0x42200000, 0x00000000, 0x80245BF0, 0x80245C1C, 0x00000000, 0x00000000, 0x00000000, 0x80245550, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43C80000, 0x42200000, 0x00000000, 0x80245C48, 0x80245C74, 0x00000000, 0x00000000, 0x00000000, 0x80245400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43C30000, 0x41F00000, 0x00000000, 0x80245CA0, 0x80245CCC, 0x00000000, 0x00000000, 0x00000000, 0x80245350, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43BE0000, 0x41F00000, 0x00000000, 0x80245CF8, 0x80245D24, 0x00000000, 0x00000000, 0x00000000, 0x802452A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43BE0000, 0x41A00000, 0x00000000, 0x80245D50, 0x80245D7C, 0x00000000, 0x00000000, 0x00000000, 0x80245200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43B90000, 0x41A00000, 0x00000000, 0x80245DA8, 0x80245DD4, 0x00000000, 0x00000000, 0x00000000, 0x80245150, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43B40000, 0x41A00000, 0x00000000, 0x80245E00, 0x80245E2C, 0x00000000, 0x00000000, 0x00000000, 0x802450A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43B40000, 0x41200000, 0x00000000, 0x80245E58, 0x80245E84, 0x00000000, 0x00000000, 0x00000000, 0x80245000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43AF0000, 0x41200000, 0x00000000, 0x80245EB0, 0x80245EDC, 0x00000000, 0x00000000, 0x00000000, 0x80244F50, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43AA0000, 0x41200000, 0x00000000, 0x80245F08, 0x80245F34, 0x00000000, 0x00000000, 0x00000000, 0x802454A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43C80000, 0x41F00000, 0x00000000, 0x80245F60, 0x80245F8C, 0x00000000, 0x00000000, 0x00000000, 0x802456A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43D20000, 0x42200000, 0x00000000, 0x80245FB8, 0x80245FE4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80246010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024603C, 0x00000000, 0x00000000, 0x00000000, 0x80246068, 0x8024603C, 0x80246010, 0x80245FE4, 0x80245FB8, 0x80245F8C, 0x80245F60, 0x80245F34, 0x80245F08, 0x80245EDC, 0x80245EB0, 0x80245E84, 0x80245E58, 0x80245E2C, 0x80245E00, 0x80245DD4, 0x80245DA8, 0x80245D7C, 0x80245D50, 0x80245D24, 0x80245CF8, 0x80245CCC, 0x80245CA0, 0x80245C74, 0x80245C48, 0x80245C1C, 0x80245BF0, 0x80245BC4, 0x80245B98, 0x80245B6C, 0x80245B40, 0x80245B14, 0x80245AE8, 0x80245ABC, 0x80245A90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x01A4FFC4, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x0190FFBA, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0154FFA6, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x015EFFA6, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x0168FFA6, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x0168FFB0, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x0172FFB0, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x017CFFB0, 0x00000011, 0x001100B6, 0x00B600B6, 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0x00000000, 0x00110012, 0x00B600B6, 0x00B60005, 0x00130000, 0x00000000, 0x00080013, 0x017CFFBA, 0x00000011, 0x001300B6, 0x00B600B6, 0x00050014, 0x00000000, 0x00000008, 0x00140000, 0x00000000, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, 0x00000000, 0x00080015, 0x0186FFBA, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, 0x00080017, 0x0190FFC4, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, 0x019AFFC4, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x01A4FFCE, 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x01F40032, 0x00000011, 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0x00000000, 0x00110022, 0x00B600B6, 0x00B60005, 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x00010001, 0x000A0001, 0x00010003, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x01A4FFC4, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x0190FFBA, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0154FFA6, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x015EFFA6, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x0168FFA6, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x0168FFB0, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x0172FFB0, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x017CFFB0, 0x00000011, 0x001100B6, 0x00B600B6, 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0x00000000, 0x00110012, 0x00B600B6, 0x00B60005, 0x00130000, 0x00000000, 0x00080013, 0x017CFFBA, 0x00000011, 0x001300B6, 0x00B600B6, 0x00050014, 0x00000000, 0x00000008, 0x00140000, 0x00000000, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, 0x00000000, 0x00080015, 0x0186FFBA, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, 0x00080017, 0x0190FFC4, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, 0x019AFFC4, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x01A4FFCE, 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x01F40032, 0x00000011, 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0x00000000, 0x00110022, 0x00B600B6, 0x00B60005, 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x0005001D, 0x00000000, 0xFFFA0001, 0x00010005, 0x001D0000, 0x0000FFEF, 0x00010001, 0x0005001D, 0x00000000, 0xFFF00001, 0x00010005, 0x001D0000, 0x0000000A, 0x00010001, 0x0005001D, 0x00000000, 0x00500001, 0x00010005, 0x001D0000, 0x000000CD, 0x00010001, 0x0005001D, 0x00000000, 0x01930001, 0x00010005, 0x001D0000, 0x000002B0, 0x00010001, 0x0005001D, 0x00000000, 0x04330001, 0x00010005, 0x001D0000, 0x0000062A, 0x00010001, 0x0005001D, 0x00000000, 0x08A70001, 0x00010005, 0x001D0000, 0x00000BB6, 0x00010001, 0x0005001D, 0x00000000, 0x0F680001, 0x00010005, 0x001D0000, 0x000013CB, 0x00010001, 0x0005001D, 0x00000000, 0x18F00001, 0x00010005, 0x001D0000, 0x00001EE4, 0x00010001, 0x0005001D, 0x00000000, 0x25B60001, 0x00010005, 0x001D0000, 0x00002D77, 0x00010001, 0x0005001D, 0x00000000, 0x36350001, 0x00010005, 0x001D0000, 0x00003FFF, 0x00010001, 0x0005001D, 0x00000000, 0x3CB70001, 0x00010005, 0x001D0000, 0x00003AA2, 0x00010001, 0x0005001D, 0x00000000, 0x397C0001, 0x00010005, 0x001D0000, 0x000038FD, 0x00010001, 0x0005001D, 0x00000000, 0x38E30001, 0x00010005, 0x001D0000, 0x000038FC, 0x00010001, 0x0005001D, 0x00000000, 0x39780001, 0x00010005, 0x001D0000, 0x00003A9C, 0x00010001, 0x0005001D, 0x00000000, 0x3CB20001, 0x00010005, 0x001D0000, 0x00003FFF, 0x00010001, 0x0005001B, 0x00000000, 0x15620008, 0x001B01A4, 0x00320000, 0x00010001, 0x0005001B, 0x00000000, 0x2AB60001, 0x00010005, 0x001B0000, 0x00003FFF, 0x00010001, 0x0005001B, 0x00000000, 0x40260001, 0x00010005, 0x001B0000, 0x000040D8, 0x00010001, 0x0005001B, 0x00000000, 0x427E0001, 0x00010005, 0x001B0000, 0x00004580, 0x00010001, 0x0005001B, 0x00000000, 0x4A490001, 0x00010005, 0x001B0000, 0x00005142, 0x00010001, 0x0005001B, 0x00000000, 0x5AD30001, 0x00010005, 0x001B0000, 0x00006766, 0x00010001, 0x0005001B, 0x00000000, 0x77640001, 0x00010005, 0x001B0000, 0x00008B3A, 0x00010001, 0x0005001B, 0x00000000, 0xA34A0001, 0x00010005, 0x001B0000, 0x0000C001, 0x00010001, 0x00050003, 0x00000000, 0x00330008, 0x000301A4, 0x00280000, 0x00010001, 0x00050003, 0x00000000, 0x00FE0001, 0x00010005, 0x00030000, 0x000002AD, 0x00010001, 0x00050003, 0x00000000, 0x058A0001, 0x00010005, 0x00030000, 0x000009E2, 0x00010001, 0x00050003, 0x00000000, 0x0FFE0001, 0x00010005, 0x00030000, 0x0000182A, 0x00010001, 0x00050003, 0x00000000, 0x22B20001, 0x00010005, 0x00030000, 0x00002FDF, 0x00010001, 0x00050003, 0x00000000, 0x3FFF0001, 0x00010005, 0x00190000, 0x0000020E, 0x00080019, 0x019A0028, 0x00000001, 0x00010005, 0x00190000, 0x000008A5, 0x00010001, 0x00050019, 0x00000000, 0x144A0001, 0x00010005, 0x00190000, 0x00002585, 0x00010001, 0x00050019, 0x00000000, 0x3CDD0001, 0x00010005, 0x00190000, 0x00005AD8, 0x00010001, 0x00050019, 0x00000000, 0x80010001, 0x00010005, 0x00170000, 0x00000006, 0x00080017, 0x01900028, 0x00000001, 0x00010005, 0x00170000, 0x000000EF, 0x00010001, 0x00050017, 0x00000000, 0x04010001, 0x00010005, 0x00170000, 0x00000A7D, 0x00010001, 0x00050017, 0x00000000, 0x15A80001, 0x00010005, 0x00170000, 0x000026C6, 0x00010001, 0x00050017, 0x00000000, 0x3F1A0001, 0x00010005, 0x00170000, 0x00005FE7, 0x00010001, 0x00050017, 0x00000000, 0x8A750001, 0x00010005, 0x00170000, 0x0000C001, 0x00010001, 0x00050005, 0x00000000, 0x00710008, 0x00050190, 0x001E0000, 0x00010001, 0x00050005, 0x00000000, 0x03E30001, 0x00010005, 0x00050000, 0x00000D83, 0x00010001, 0x00050005, 0x00000000, 0x207D0001, 0x00010005, 0x00050000, 0x00003FFF, 0x00010001, 0x00050015, 0x00000000, 0x00560008, 0x00150186, 0x001E0000, 0x00010001, 0x00050015, 0x00000000, 0x06220001, 0x00010005, 0x00150000, 0x0000188F, 0x00010001, 0x00050015, 0x00000000, 0x3ECA0001, 0x00010005, 0x00150000, 0x00008001, 0x00010001, 0x00050013, 0x00000000, 0x001E0008, 0x0013017C, 0x001E0000, 0x00010001, 0x00050013, 0x00000000, 0x03020001, 0x00010005, 0x00130000, 0x00000C77, 0x00010001, 0x00050013, 0x00000000, 0x204C0001, 0x00010005, 0x00130000, 0x0000424B, 0x00010001, 0x00050013, 0x00000000, 0x76420001, 0x00010005, 0x00130000, 0x0000C001, 0x00010001, 0x00050011, 0x00000000, 0x01750008, 0x0011017C, 0x00140000, 0x00010001, 0x00050011, 0x00000000, 0x11240001, 0x00010005, 0x00110000, 0x00003FFF, 0x00010001, 0x0005000F, 0x00000000, 0x009D0008, 0x000F0172, 0x00140000, 0x00010001, 0x0005000F, 0x00000000, 0x06F70001, 0x00010005, 0x000F0000, 0x000019CF, 0x00010001, 0x0005000F, 0x00000000, 0x3FE60001, 0x00010005, 0x000F0000, 0x00008001, 0x00010001, 0x0005000D, 0x00000000, 0x00030008, 0x000D0168, 0x00140000, 0x00010001, 0x0005000D, 0x00000000, 0x02A90001, 0x00010005, 0x000D0000, 0x00000BD7, 0x00010001, 0x0005000D, 0x00000000, 0x1F760001, 0x00010005, 0x000D0000, 0x0000416C, 0x00010001, 0x0005000D, 0x00000000, 0x75A20001, 0x00010005, 0x000D0000, 0x0000C001, 0x00010001, 0x0005000B, 0x00000000, 0x017A0008, 0x000B0168, 0x000A0000, 0x00010001, 0x0005000B, 0x00000000, 0x112D0001, 0x00010005, 0x000B0000, 0x00003FFF, 0x00010001, 0x00050009, 0x00000000, 0x00520008, 0x0009015E, 0x000A0000, 0x00010001, 0x00050009, 0x00000000, 0x06150001, 0x00010005, 0x00090000, 0x0000187B, 0x00010001, 0x00050009, 0x00000000, 0x3EB80001, 0x00010005, 0x00090000, 0x00008001, 0x00010001, 0x00050007, 0x00000000, 0x00660008, 0x00070154, 0x000A0000, 0x00010001, 0x00050007, 0x00000000, 0x03150001, 0x00010005, 0x00070000, 0x00000A49, 0x00010001, 0x00050007, 0x00000000, 0x183A0001, 0x00010005, 0x00070000, 0x00002F24, 0x00010001, 0x00050007, 0x00000000, 0x51410001, 0x00010005, 0x00070000, 0x000080CE, 0x00010001, 0x00050007, 0x00000000, 0xC0010001, 0x00010005, 0x00070000, 0x0000B528, 0x00010001, 0x00050007, 0x00000000, 0xAECA0001, 0x00010005, 0x00070000, 0x0000ABB6, 0x00010001, 0x00050007, 0x00000000, 0xAABC0001, 0x00010005, 0x00070000, 0x0000AAAC, 0x00010001, 0x00050007, 0x00000000, 0xAAC90001, 0x00010005, 0x00070000, 0x0000ABDD, 0x00010001, 0x00050007, 0x00000000, 0xAF050001, 0x00010005, 0x00070000, 0x0000B55D, 0x00010001, 0x00050007, 0x00000000, 0xC0010001, 0x00010005, 0x00070000, 0x0000BCD8, 0x00010001, 0x00050007, 0x00000000, 0xBC730001, 0x00010005, 0x00070000, 0x0000BCD7, 0x00010001, 0x00050007, 0x00000000, 0xC0010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x0001000A, 0x00010001, 0x00030000, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x01A4FFC4, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x0190FFBA, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0154FFA6, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x015EFFA6, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x0168FFA6, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x0168FFB0, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x0172FFB0, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x017CFFB0, 0x00000011, 0x001100B6, 0x00B600B6, 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0x00000000, 0x00110012, 0x00B600B6, 0x00B60005, 0x00130000, 0x00000000, 0x00080013, 0x017CFFBA, 0x00000011, 0x001300B6, 0x00B600B6, 0x00050014, 0x00000000, 0x00000008, 0x00140000, 0x00000000, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, 0x00000000, 0x00080015, 0x0186FFBA, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, 0x00080017, 0x0190FFC4, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, 0x019AFFC4, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x01A4FFCE, 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x01F40032, 0x00000011, 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0x00000000, 0x00110022, 0x00B600B6, 0x00B60005, 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x0005001D, 0x00000000, 0x3FFF0008, 0x001B01A4, 0x00320000, 0x0005001B, 0x00000000, 0xC0010008, 0x000301A4, 0x00280000, 0x00050003, 0x00000000, 0x3FFF0008, 0x0019019A, 0x00280000, 0x00050019, 0x00000000, 0x80010008, 0x00170190, 0x00280000, 0x00050017, 0x00000000, 0xC0010008, 0x00050190, 0x001E0000, 0x00050005, 0x00000000, 0x3FFF0008, 0x00150186, 0x001E0000, 0x00050015, 0x00000000, 0x80010008, 0x0013017C, 0x001E0000, 0x00050013, 0x00000000, 0xC0010008, 0x0011017C, 0x00140000, 0x00050011, 0x00000000, 0x3FFF0008, 0x000F0172, 0x00140000, 0x0005000F, 0x00000000, 0x80010008, 0x000D0168, 0x00140000, 0x0005000D, 0x00000000, 0xC0010008, 0x000B0168, 0x000A0000, 0x0005000B, 0x00000000, 0x3FFF0008, 0x0009015E, 0x000A0000, 0x00050009, 0x00000000, 0x80010008, 0x00070154, 0x000A0000, 0x00050007, 0x00000000, 0xC001000A, 0x00010001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01F40032, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01A40032, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01A40028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x019A0028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01900028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0190001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0186001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x017C001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x017C0014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01720014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01680014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0168000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x015E000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0154000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x00280000, 0x04000800, 0xBE1F1FFF, 0x00000000, 0x00280000, 0x04000000, 0xBE1F1FFF, 0x00000000, 0x00000000, 0x00000000, 0xBE1F1FFF, 0x00000050, 0x00000000, 0x00000800, 0xBE1F1FFF, 0x00000000, 0xFFD80000, 0x04000000, 0xBE1F1FFF, 0x00000050, 0xFFD80000, 0x04000800, 0xBE1F1FFF, 0x00000050, 0x00000000, 0x06AB0466, 0x8080D1FF, 0x00000000, 0x00000000, 0x06AB0133, 0xB2B2FFFF, 0x00000000, 0x00280000, 0x059A0133, 0xB2B2FFFF, 0x00000050, 0x00280000, 0x059A0466, 0x8080D1FF, 0x00000050, 0xFFD80000, 0x059A0466, 0x8080D1FF, 0x00000000, 0xFFD80000, 0x059A0133, 0xB2B2FFFF, 0x00000000, 0x00000000, 0x06AB0133, 0xB2B2FFFF, 0x00000000, 0xFFD80000, 0x04000800, 0x6E1212FF, 0x000A0000, 0xFFD80000, 0x04000700, 0x6E1212FF, 0x000A0000, 0x00000000, 0x00000700, 0x6E1212FF, 0x00000000, 0x00000000, 0x00000800, 0x6E1212FF, 0x000A0000, 0x00280000, 0x04000700, 0x6E1212FF, 0x00000000, 0x00280000, 0x04000800, 0x6E1212FF, 0x00000000, 0x00280000, 0x04000800, 0xBE1F1FFF, 0x000A0000, 0x00280000, 0x04000700, 0xBE1F1FFF, 0x000A0000, 0x00000000, 0x00000700, 0xBE1F1FFF, 0x00000000, 0x00000000, 0x00000800, 0xBE1F1FFF, 0x000A0000, 0xFFD80000, 0x04000700, 0xBE1F1FFF, 0x00000000, 0xFFD80000, 0x04000800, 0xBE1F1FFF, 0x0000000A, 0x00280000, 0x04000700, 0xBE1F1FFF, 0x0000000A, 0x00000000, 0x00000700, 0xBE1F1FFF, 0x0000000A, 0xFFD80000, 0x04000700, 0xBE1F1FFF +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x0000FFFF, 0x00000000, 0xFFFF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000145, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24F87B4, 0xF2497080, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24F1DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000021, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000023, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000030, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000032, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000018, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000056, 0x00000030, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000057, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000058, 0x000001EE, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000051, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000008, 0x00000001, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x00000053, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80246558, 0x00000008, 0x00000001, 0x000000C8, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C82, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000001, 0x00000024, 0x00000002, 0xFD050F87, 0xFE363C82, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000002, 0x00000024, 0x00000002, 0xFD050F88, 0xFE363C82, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003B, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000038, 0xFD050F86, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0xFD050F87, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240E70_D7FBD0, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000004B, 0xFE363C80, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, RotateGroup, 0x00000048, 0xFD050F88, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, func_80240F2C_D7FC8C, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0xFE363C81, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, delete_actor_D7F91C, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240C70_D7F9D0, 0xFE363C8A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C84, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, pra_31_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000028, 0xF24A7BB4, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x0000002D, 0x00000000, 0x00000043, 0x00000002, func_80240A3C_D7F79C, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000043, 0x00000001, func_80240FD0_D7FD30, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80240FF0_D7FD50, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001B, 0x00000046, 0x00000001, 0x80242E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000046, 0x00000001, 0x80242E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240894_D7F5F4, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000046, 0x00000001, 0x80242E04, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802CCCB0, 0x00000043, 0x00000003, LoadModelAnimation, 0x00000000, 0x80246094, 0x00000043, 0x00000005, SetAnimModelPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, func_802CD348, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240510_D7F270, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000034, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000022, 0x0000003C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x00000044, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x00000044, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000044, 0x00000001, 0x80242B40, 0x00000047, 0x00000005, 0x80243078, 0x00000040, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243104, 0x00000040, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243190, 0x00000040, 0x00000025, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000055, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x802471E4, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005B, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80246130, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000021, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000030, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000055, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000005B, 0x00000000, 0x00000044, 0x00000001, 0x80242570, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x2BC17217, 0x2DD00000, 0x00000000, 0x00000000, 0x00000111, 0x11111111, 0x10C3CDD2, 0x712ABC18, 0x81C1F817, 0x8DD03300, 0x11000000, 0x00000000, 0x00000111, 0x11111111, 0x11330DD2, 0x712ABC18, 0x81C1F817, 0x2DD13000, 0x00000000, 0x00000000, 0x000B1011, 0x11111111, 0x11031332, 0x8B2A1C18, 0x80C17817, 0x2DD13004, 0x00000000, 0x00000000, 0x000B7B00, 0x11111111, 0x1100F332, 0xAB2A1C08, 0x80C17217, 0x8DD10400, 0x00000000, 0x00000000, 0x00BBBBB0, 0x01111111, 0x11007332, 0xAB2A1C08, 0x80C17817, 0x8DD03304, 0x00000111, 0x00000000, 0x0B0BB77B, 0xB1111111, 0x1100F332, 0xAB271C08, 0x80C1F817, 0x2D3B0000, 0x00000111, 0x00000000, 0x0B0B7777, 0x7F111111, 0x1110B332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000011, 0x00000B00, 0x00BB7777, 0x7777B110, 0x0010F332, 0xA18F0C08, 0x80C0F817, 0x233F0000, 0x00000001, 0x0001B000, 0x11117777, 0x77777703, 0x3400F332, 0xA12F0C08, 0x80C072B8, 0x63370011, 0x00000000, 0x00000000, 0xBF777777, 0x7777B000, 0x30330DD2, 0x71271C18, 0x80C0F2B8, 0x633A0001, 0x11000000, 0x10330001, 0xB777B777, 0x777B3DDD, 0xD3330DD2, 0x712F1C18, 0x80C0F21A, 0x233A0001, 0x11000000, 0x03DD001B, 0x777B7BBB, 0xBB0DDDDD, 0xDD3DDDD8, 0x2F2ABC12, 0x80C0F8BA, 0x23370000, 0x11100000, 0x4DD3400B, 0x777B7000, 0x003DDDDD, 0xDDDDDDD7, 0xAB2A1C12, 0x80C0F2B8, 0x63370000, 0x01110000, 0x3DDDD30B, 0x777B1100, 0x043DDDDD, 0xDDDDDDDB, 0x7F271C08, 0x80C0F2B2, 0x93370000, 0x00011103, 0xDD33330B, 0x77B11110, 0x003DDDDD, 0xDDDDDDD1, 0xFF68BC1A, 0x80C0721A, 0x63370000, 0x0000003D, 0xD3333330, 0xBB711111, 0x0043DDD3, 0xDDDDDDD1, 0x00871C0B, 0x80C17218, 0x63370000, 0x000003DD, 0x3333403D, 0x4BB11111, 0x100043DD, 0xDDDDDDD1, 0x0CF103C1, 0x80C172B2, 0x63377700, 0x00003D33, 0x33334003, 0x33B11111, 0x10000033, 0x3DDDDDDF, 0x1010333F, 0x80C0F2B8, 0x63370000, 0x00043DD3, 0x33340000, 0x43B11110, 0x000000B3, 0x3DDDDDDA, 0xF171C33F, 0x80C072B8, 0x63370000, 0x00333333, 0x33300000, 0x03111110, 0x00000000, 0x33DD3D36, 0x2B27030F, 0x80C1A2B2, 0x63370700, 0x33333333, 0x33300001, 0x03111100, 0x00000000, 0x00330336, 0x8B2703C7, 0x81C1A2F2, 0x63370870, 0x33333333, 0x3333C400, 0x33010000, 0x00000000, 0x00047339, 0x2F2A1307, 0x80C172B2, 0x63370080, 0x3333333C, 0x33334040, 0x3D0100BB, D_B0000000, 0x0000A339, 0x2F2A13CF, 0x80C172F2, 0x63370000, 0x43333000, 0x00433333, 0x3D000BBB, D_B0000000, 0x0000A339, 0x2F68B3C1, 0x80C172B8, 0x63370008, 0x03333000, 0xE0003333, 0x3300B77B, 0x00000000, 0x0008A339, 0x2F68B3C1, 0x80C0F81A, 0x63370007, 0x04333030, 0x00043333, 0xD3400BBB, 0x00000111, 0x0078A336, 0x2F2A1331, 0x80C0F817, 0x233F0770, 0x00433003, 0x00E4333D, 0xD340BB00, 0x00011111, 0x5178A336, 0x2F270331, 0x80C172BA, 0x633BB444, 0x440033C0, 0x000C3DDD, 0x0000B000, 0x00100111, 0x17887336, 0x2B270330, 0x80C172B8, 0x633B0044, 0x4440033C, 0xCC33DDD0, 0x0000B000, 0x00110011, 0x11157332, 0xA08F030A, 0x81C1F81A, 0x2D3B4040, 0x0000000C, 0x333DDD30, 0x00000000, 0x01110000, 0x01117336, 0x70FF130A, 0x81C172BA, 0x23310444, 0x44440000, 0xCDDD3330, 0x000B0000, 0x01100000, 0x0400B332, 0x70FF0C0A, 0x81CBA2F2, 0x63377000, 0x00000000, 0x04333344, 0x00010000, 0x01100000, 0x00C3F332, 0xA1F1030A, 0x81C172B2, 0x63370000, 0x00000000, 0x00043304, 0x40000000, 0x00000000, 0x0C30B332, 0xAB210307, 0x81CBA2BA, 0x233F0000, 0x00000000, 0x00000C04, 0x4C000000, 0x0000004C, 0x333C0DD2, 0x718F0307, 0x80C1A2BA, 0x63370000, 0x00000000, 0x00000000, 0xCCCC4440, 0x3400400C, 0x3C041DD2, 0x70AB03CB, 0x80C1A2BA, 0x23370000, 0x00000000, 0x00000000, 0x00000000, 0x043CCC33, 0x34041332, 0xA1AF030A, 0x80C1A2B2, 0x63370000, 0x000000B0, 0x00000000, 0x00000000, 0x04433C33, 0x444C13D2, 0x71AF030A, 0x80C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x04444444, 0x4444B3D2, 0xF0AB030A, 0x81C1A2F2, 0x633A0000, 0x00000000, 0x00000000, 0x00000000, 0x00444444, 0x4444F332, 0x70AB030A, 0x81CB86F2, 0x933A0110, 0x11111100, 0x00000000, 0x00000000, 0x00000444, 0x4444B332, 0xA1AB030A, 0x80CB86F2, 0x933A1111, 0x11111110, 0x00000000, 0x000000C0, 0x00000000, 0x0444B336, 0x8BAB030A, 0x80C1A2F2, 0x933A1111, 0x11100111, 0x00000000, 0x00000400, 0x00000000, 0x0004F332, 0x8BAF1C0A, 0x80C1A2F2, 0x933A0111, 0x10000011, 0x1100000B, 0x77504000, 0x00000000, 0x0000F336, 0x8B8F1C0A, 0x81C172B8, 0x633A1111, 0x00000011, 0x11111850, 0x0007B000, 0x00000000, 0x0000F332, 0xA127030A, 0x81C1A2F2, 0x9331CC55, 0x87000111, 0x11118111, 0x00000070, 0x05700777, 0xBBB7F332, 0x812F030A, 0x81C172B2, 0x63303330, 0x78787111, 0x11108111, 0x00000000, 0x0000B077, 0x77777336, 0x812F030A, 0x81C1F2F2, 0x933C33DD, 0x07588111, 0x11115511, 0x0000000B, 0x0000700B, 0x0E077336, 0x8127030A, 0x81C172B8, 0x633C3DDD, 0x34580581, 0x11110501, 0x00000000, 0x00007000, 0x00077336, 0xA1871C0A, 0x81CBA2F2, 0x63333DDD, 0x33005850, 0x11111500, 0x00000000, 0x00000700, 0x00077332, 0x718F030A, 0x81CB8672, 0x9333DD33, 0xD3333070, 0x11110700, 0x00000000, 0x00000B00, 0x000E7336, 0x2B2F030A, 0x80C172F8, 0x633CDD3D, 0x33DDD370, 0x11110500, 0x00000000, 0x00000750, 0x00EE7336, 0x8B2F030A, 0x21C1A2B2, 0x6330DD33, 0xDDDDD301, 0x11115000, 0x000000BE, 0x00000070, 0x0000F332, 0x718F030A, 0x21CBA2F2, 0x63310DDD, 0xDDD33D40, 0x11108100, 0x040000BE, 0xE0000770, 0x00007332, 0x718F030A, 0x81C1F217, 0x23300DDD, 0xDDD3330C, 0x01118100, 0x040000EE, 0xE0000070, 0x00007336, 0xA18F030A, 0x81C17217, 0x2D3003DD, 0xDDD33403, 0x01118000, 0x044000EE, 0xE0000700, 0x000BF336, 0xAB2F030A, 0x80C0F21A, 0x2330103D, 0xDDD40403, 0x00110570, 0x00400E0E, 0x00000700, 0x777BB3D2, 0xF0AF030A, 0x80C0F81A, 0x23300033, 0xDD3C0040, 0x00110075, 0x00000EE0, 0x00000770, 0x0007BDD2, 0x70AF030A, 0x80C0F81A, 0x233C333C, 0xDD340010, 0x01000004, 0x17100B08, 0x71100F00, 0x00001DD2, 0xF0AF030A, 0x80C172BA, 0x633C3103, 0x3D301075, 0x10000443, 0xD4717777, 0x88F100B0, 0x04CC0DDA, 0xF08F030A, 0x80C1A2BA, 0x63300700, 0x33D005B7, 0x70004043, 0xD400B001, 0x78A55770, 0x000B0DD8, 0xF18F130A, 0x80C1A2BA, 0x233B0070, 0x30040100, 0x4004444D, 0x3000E011, 0x11AA7710, 0x00100DD2, 0x718F0C0A, 0x81C1A2B8, 0x23310070, 0x000533C0, 0x4040443D, 0x40000111, 0x115A7510, 0x04010DD2, 0x718F0C0A, 0x81CBA217, 0x2DD04400, 0x50053330, 0x33444433, 0x04000111, 0x1117F101, 0x00400DD8, 0xF08F0C0A, 0x81CBA217, 0x2DDC0C40, 0xCC033300, 0x03444330, 0x04000111, 0x111A7111, 0x10000DD2, 0xF1871CB2, 0xD675C637, 0x8C63EF7B, 0xCEB9B5F5, 0x739DAD6B, 0x9CE76319, 0xA529BDEF, 0xDEF7F7BD, 0xCE31B5AD, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x80243510, 0xF5500000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5400800, 0x00018060, 0xF2000000, 0x000FC0FC, 0xE3000C00, 0x00080000, 0xE3001001, 0x00008000, 0xFD100000, 0x80243D10, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0x55E45545, 0x5445E4E4, 0x44444444, 0x4C111111, 0x1111111C, 0x44C44CCC, 0xCD445EE5, 0x5E545E54, 0x65555555, 0x5E444E4E, 0x4E44444C, 0x11111111, 0x11111111, 0xC44C4C11, 0xCD445445, 0x55555E45, 0x65555555, 0x64E544E4, 0x444444C4, 0xC1111111, 0x11111111, 0xCDD4C111, 0xD44464E5, 0x5455E455, 0x86555558, 0x6E454E44, 0x4444C44C, 0xC1111111, 0x11111111, 0x9CCC111C, 0xD44D8545, 0x55545456, 0x86565658, 0xA545E4E4, 0x44C4CCCC, 0x11111111, 0x11111111, 0x1C911199, 0xDDDD3655, 0x5E555558, 0x36556658, 0x3D44444C, 0xC444CCCC, 0x11111111, 0x11111111, 0x1CC1911C, 0xDCDD3D66, 0x55558556, 0xA6568668, 0x3555444C, 0xCC4CCCC1, 0x11111111, 0x11111111, 0x1C11C119, 0x9C5C35D8, 0x54558568, 0xA8668368, 0x354544DC, 0xCCCCCC11, 0x11111111, 0x111C111C, 0x111C1111, 0xC9993656, 0x55568563, 0x78563A88, 0x3D45D4C9, 0xCC1CCC11, 0x11111111, 0xC191999C, 0xCC9C199C, 0xC3113565, 0x5658856A, 0x7356A73A, 0x3646D5CC, 0x91111C11, 0x11111111, 0x19191999, 0x9999999C, 0xD1303D56, 0x56586637, 0x7366A73A, 0xA646CDC9, 0x11111111, 0x11111111, 0x11111111, 0x99911999, 0xD1103556, 0x56888637, 0x7363A73A, 0xA556DCC1, 0x11111C11, 0x11111111, 0x11111011, 0x11111819, 0xC981A446, 0x6883863B, 0x7368AA3A, 0xAD589C91, 0x11111C11, 0x11111111, 0x10100110, 0x10101019, 0x9989B455, 0x68333637, 0x7368AAA7, 0x76531911, 0x11111111, 0x11111111, 0x11010000, 0x00000131, 0x89C9B446, 0x83AA3637, 0x7363AB37, 0xBD531911, 0x19111111, 0x11111111, 0x10101010, 0x00000001, 0x9981B546, 0x8AA7A637, 0x7363A737, 0x7D6A1119, 0x19C91911, 0x11111111, 0x01010000, 0x00200003, 0x0319B456, 0x63AA363A, 0x7363AB37, 0x7D671111, 0x9CC11111, 0x11111111, 0x10101100, 0x00220000, 0x0309B546, 0x86A38663, 0x7363A7AB, 0xB6D71111, 0x94499191, 0x11111111, 0x11010010, 0x00022202, 0x2231A558, 0x88386563, 0x7363AB37, 0xBD6B1999, 0x944CC991, 0x11110101, 0x00101010, 0x10190020, 0x0910AD43, 0xA8A3666A, 0x7363AB3B, 0xB6671C94, 0x44444C91, 0x11011111, 0x11010100, 0x000D9000, 0x95108D6A, 0x7ABA856A, 0x73637B3B, 0xB867199C, 0x4444D111, 0x11100000, 0x00000000, 0x00094D14, 0x4100A98A, 0x737A3687, 0x7383ABAB, 0xB89B0011, 0xD4444101, 0x10110000, 0x00000000, 0x0000444D, 0x4001B88B, 0x7AB7366A, 0x7363AB3B, 0xB88B0001, 0xDDD44111, 0x01000000, 0x00000000, 0x0001C444, 0xC000B98B, 0x7AB7368A, 0x73637BA7, 0xB89B0000, 0xD9119910, 0x10000000, 0x00000000, 0x001D4444, 0x4C10B38F, 0xBAB73663, 0x7363A7A7, 0xB88B2021, 0x10010110, 0x00000000, 0x00020202, 0x01CCD444, 0xDCD1B83B, 0xBAB7A663, 0x7363A737, 0xB98B2200, 0x00000000, 0x00000000, 0x10000000, 0x00001D4D, 0x1000B93B, 0x7AB73563, 0x7363A737, 0xB68B2220, 0x00000000, 0x00002200, 0xD0020202, 0x00000941, 0x0101B38B, 0xBABA3563, 0x7363AB37, 0xB8672222, 0x02020002, 0x0202011C, 0x49012000, 0x00001191, 0x0111B88B, 0x7A7A3668, 0x7363A7A7, 0xB89B2222, 0x20002000, 0x000000C4, 0x44C00200, 0x00100191, 0x1131B98B, 0x737A363A, 0x7363A737, 0xB86B2272, 0x22220020, 0x2020220D, 0x44000000, 0x00011131, 0x3111B88B, 0xA8AA3687, 0x7363A737, 0xB6972B22, 0x22222202, 0x02020014, 0x94902000, 0x00003100, 0x003178CB, 0xA8AA363A, 0x736A7BA7, 0xB88B2272, 0x22202000, 0x000000C1, 0x01C00020, 0x00000000, 0x0300788B, 0xA3A38687, 0x73837B3B, 0xB98B2722, 0x22222020, 0x00000001, 0x00000000, 0x00000020, 0x2001B96B, 0x7A73868A, 0x7363AB37, 0xB88B2272, 0x22220202, 0x00000001, 0x11000200, 0x00202002, 0x0200A867, 0xA37A668A, 0x736AAB37, 0xB89B2722, 0x22220200, 0x00020000, 0x01310000, 0x00000202, 0x00007D6B, 0xA37A866A, 0x73637B37, 0xB88B2220, 0x12220020, 0x20110000, 0x11103030, 0x32022020, 0x0020789B, 0xA3733637, 0x73637BA7, 0xB83B2221, 0x49120200, 0x19410000, 0x00010100, 0x00000222, 0x2000766B, 0xA37A868A, 0x7363ABAB, 0xB98B2222, 0x94910021, 0x94902202, 0x00000000, 0x00222022, 0x2020796B, 0xA3AA8637, 0x73637BA7, 0xB33B2222, 0x144491C4, 0x44100000, 0x00000000, 0x00000220, 0x0001B89B, 0xA3733687, 0x738A7BAB, 0xB89B2222, 0x294D44D4, 0x49020220, 0x20200200, 0x20000000, 0x0010788B, 0x737A8637, 0x73637BA7, 0xF83B0222, 0x21444444, 0x41202002, 0x02020020, 0x00000000, 0x0031796B, 0x73733637, 0x73637BA7, 0xB88B2020, 0x21C44D44, 0xD1002202, 0x02022202, 0x00000001, 0x3011B86B, 0x737A3687, 0x736A7BAB, 0xF89B0202, 0x19C4444D, 0xC9120020, 0x20200000, 0x00001010, 0x0113B967, 0x7A7A3637, 0x7363A737, 0xB86B0211, 0x9444D444, 0x44911202, 0x02002000, 0x00010113, 0x1131B86A, 0xA3B73637, 0x73637BAB, 0xB66A0194, 0x444444D4, 0x4444C102, 0x02220200, 0x01301311, 0x3111B86A, 0xA37A3687, 0x7363A7A7, 0xBD630011, 0x11CC444D, 0xC1113000, 0x20222000, 0x00010131, 0x1311B8DA, 0x737A3637, 0x7363A7AB, 0xB6630010, 0x001C5449, 0x12020022, 0x22222220, 0x00000111, 0x3003B95A, 0x737A3687, 0x7383AB37, 0xB6D81100, 0x00014451, 0x22220222, 0x22222222, 0x20030303, 0x103078DA, 0x337A3637, 0x73637BA7, 0x7D660110, 0x0000C4C0, 0x20222222, 0x27222222, 0x22200230, 0x3000B6DA, 0xA37A868A, 0x73837BAB, 0xB6D61811, 0x10001C10, 0x20202222, 0x22272272, 0x22222D02, 0x1D00B653, 0x333A3637, 0x7363A737, 0x75561993, 0x11101C10, 0x00020022, 0x22222722, 0x72272049, 0x413276D8, 0x83A33687, 0xB38377A7, 0x765D9991, 0x19313900, 0x00000202, 0x02222227, 0x22222254, 0x4232B6D8, 0x68888637, 0x736377A7, 0x7D566669, 0x31119310, 0x01000020, 0x22200222, 0x27220C45, 0x4D02B6D6, 0x56886687, 0x7366A73A, 0x36469D98, 0x13131931, 0x30300002, 0x02291222, 0x222A2094, 0xD032A656, 0x6668663A, 0x7366A733, 0x3545CD99, 0x30303903, 0x00000020, 0x220D9222, 0x22222724, 0x8222A566, 0x56686537, 0x78563783, 0x36456593, 0x91099310, 0x03002002, 0x0214C022, 0x222222AC, 0x92233DD5, 0x5556856A, 0xA8668388, 0x3554D460, 0x88888003, 0x00222019, 0x19C44111, 0x12222223, 0x33993556, 0x45568563, 0xA6568568, 0x355454D0, 0x99993322, 0x0222220C, 0x4444D5DC, 0x02222201, 0x98D88D56, 0x54558568, 0x36556668, 0xAD545451, 0x3D6D9300, 0x22222222, 0x1D4444C0, 0x22220203, 0xDCDC8556, 0x55556556, 0x86566658, 0xA545445D, 0x569D3000, 0x22222222, 0x29444D12, 0x22202019, 0x9DDD8D55, 0x4E555458, 0x86555658, 0x84454445, 0xDCDD9930, 0x22222222, 0x2CDD4412, 0x22220038, 0xC54D6545, 0x5555E556, 0x65555556, 0x54455444, 0x4545C693, 0x22222222, 0x0D111D92, 0x2222009C, 0xDD5554E5, 0x5E545E45, 0x65555555, 0x54E55455, 0x454545C9, 0x32222222, 0x00222010, 0x2200196C, 0xD54D5445, 0x54554445, 0x54445544, 0x5E444444, 0x4444454D, 0x90222222, 0x22222202, 0x20039DD4, 0x545444E5, 0x44544E45, 0x33E944AF, 0x33677467, 0xCEFBC675, 0x9DAF4B1B, 0x8CE97533, 0x5B5F4257, 0x85B5A5F3, 0xFFFF2109, 0xE3001001, 0x00008000, 0xFD100000, 0x802445F0, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x80243DF0, 0xF5500000, 0x07018060, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5400800, 0x00018060, 0xF2000000, 0x000FC0FC, 0xE3000C00, 0x00080000, 0xE3001201, 0x00002000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0x6B997399, 0x6B996357, 0x73997399, 0x73996B99, 0x6B997399, 0x73996B99, 0x73997399, 0x63576357, 0x73DB73DB, 0x73DB7399, 0x73DB73DB, 0x73DB7399, 0x73DB73DB, 0x739973DB, 0x5AD55AD5, 0x4A534211, 0x73DB7399, 0x6B996357, 0x6B996B99, 0x63176B99, 0x4A536B57, 0x6B596B57, 0x6B996317, 0x73DB6B57, 0x73997399, 0x73DB73DB, 0x73996B99, 0x73997399, 0x739973DB, 0x73DB7399, 0x5AD55293, 0x4A534251, 0x73997399, 0x6B577399, 0x6B995AD5, 0x63176B57, 0x5AD55AD5, 0x63576357, 0x6B996B99, 0x73996B99, 0x73DB73DB, 0x73997399, 0x635773DB, 0x73997399, 0x73DB73DB, 0x739973DB, 0x5AD54251, 0x52934A53, 0x73DB6B99, 0x63576B59, 0x6B9952D5, 0x63576B57, 0x6B996B99, 0x6B596317, 0x63177399, 0x6B996357, 0x63577399, 0x63176B99, 0x63576B59, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x5AD54211, 0x52934211, 0x73996B99, 0x63176357, 0x63175AD5, 0x52D56317, 0x63175AD5, 0x5AD56357, 0x6B996357, 0x63176317, 0x6B596B57, 0x6B996B99, 0x63176357, 0x6B9973DB, 0x739973DB, 0x73DB73DB, 0x52934211, 0x42514211, 0x73DB5295, 0x6B576357, 0x5AD56317, 0x5AD55AD5, 0x63176357, 0x6B575AD5, 0x6B995AD5, 0x63576357, 0x63176357, 0x63576B59, 0x63576B57, 0x73996B57, 0x6B997399, 0x739973DB, 0x52D54211, 0x42114211, 0x73996357, 0x63175AD5, 0x63576357, 0x5AD56357, 0x5AD56357, 0x5AD56317, 0x6B596317, 0x63576317, 0x63176317, 0x6B996357, 0x6B576B99, 0x739973DB, 0x6B996B57, 0x73DB73DB, 0x52934251, 0x4A534251, 0x73996357, 0x63176317, 0x63175AD5, 0x63175AD5, 0x63576357, 0x63576317, 0x6B576357, 0x63576B57, 0x63176357, 0x73996B99, 0x73996B99, 0x739973DB, 0x73996B99, 0x73DB73DB, 0x52935AD5, 0x42114211, 0x73996B99, 0x63576B99, 0x63176317, 0x63576317, 0x63176B99, 0x5AD56317, 0x63576317, 0x6B996B99, 0x63577399, 0x739973DB, 0x739973DB, 0x739973DB, 0x73996B99, 0x73997399, 0x52D55AD5, 0x42114251, 0x6B996B99, 0x6B597399, 0x63576317, 0x73996357, 0x63176B99, 0x63575AD5, 0x63577399, 0x63576357, 0x73997399, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x6B996B99, 0x739973DB, 0x5AD54251, 0x42114211, 0x73996357, 0x6B996B57, 0x63576317, 0x6B995AD5, 0x635773DB, 0x63576317, 0x73DB7399, 0x73DB6B99, 0x739973DB, 0x73DB73DB, 0x739973DB, 0x73DB73DB, 0x73996B99, 0x6B9973DB, 0x5AD54A53, 0x42114211, 0x73995AD5, 0x6B596357, 0x6B996357, 0x6B996357, 0x6B576B99, 0x63576357, 0x73997399, 0x6B997399, 0x6B997399, 0x73DB6B57, 0x73DB73DB, 0x6B996B99, 0x73DB6B57, 0x6B997399, 0x52D55AD5, 0x42114211, 0x73DB6B57, 0x5AD56357, 0x6B576317, 0x73996B99, 0x6B996357, 0x73996357, 0x73DB6B99, 0x73997399, 0x5AD573DB, 0x6B996B99, 0x73DB7399, 0x6B996B57, 0x6B576B99, 0x6B9973DB, 0x5AD56317, 0x42114211, 0x6B9973DB, 0x73994A53, 0x73996B99, 0x739973DB, 0x73996B99, 0x73996B99, 0x73997399, 0x739973DB, 0x6B997399, 0x6B997399, 0x73997399, 0x6B996B99, 0x6B996B99, 0x6B5773DB, 0x4A535293, 0x42514211, 0x6B997399, 0x6B996B57, 0x6B996357, 0x73DB73DB, 0x73997399, 0x73996B99, 0x6B996B99, 0x73DB7399, 0x73996B99, 0x73DB6B99, 0x6B997399, 0x6B997399, 0x73997399, 0x73DB6B99, 0x4A534A53, 0x42114211, 0x63176357, 0x63176357, 0x739973DB, 0x73997399, 0x73DB7399, 0x73DB7399, 0x6B5773DB, 0x6B576B99, 0x6B996B99, 0x73997399, 0x73DB6B57, 0x6B996357, 0x6B996B99, 0x73996357, 0x4A535293, 0x4A534211, 0x73996B99, 0x73996B99, 0x73DB7399, 0x73DB7399, 0x73997399, 0x73997399, 0x6B997399, 0x73DB7399, 0x73996B99, 0x73DB7399, 0x73DB6357, 0x6B996B59, 0x52936B99, 0x6B996B99, 0x52934251, 0x42514211, 0x73DB6B57, 0x6B9973DB, 0x739973DB, 0x739973DB, 0x73997399, 0x73DB7399, 0x6B5773DB, 0x73DB7399, 0x73DB7399, 0x6B996B99, 0x73996B99, 0x73997399, 0x73996B99, 0x6B576317, 0x52D54A53, 0x42514211, 0x73996B99, 0x73997399, 0x73996B99, 0x73997399, 0x73DB73DB, 0x73DB7399, 0x6B997399, 0x73997399, 0x73997399, 0x73997399, 0x6B997399, 0x73996B99, 0x6B997399, 0x6B996357, 0x52955293, 0x52954211, 0x73DB7399, 0x73DB6B99, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x739973DB, 0x73997399, 0x73DB7399, 0x73DB7399, 0x6B997399, 0x73DB6B99, 0x73996B99, 0x6B996B57, 0x631773DB, 0x52935293, 0x52D54211, 0x739973DB, 0x739973DB, 0x739973DB, 0x739973DB, 0x73997399, 0x73DB73DB, 0x73997399, 0x73DB7399, 0x6B997399, 0x73DB6B99, 0x73997399, 0x6B997399, 0x6B996B99, 0x5AD57399, 0x52D54A53, 0x52934211, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x739973DB, 0x739973DB, 0x73DB7399, 0x73DB73DB, 0x73997399, 0x739973DB, 0x6B997399, 0x63577399, 0x6B996B59, 0x6B576357, 0x63575293, 0x4A534211, 0x739973DB, 0x73DB73DB, 0x73DB73DB, 0x73DB7399, 0x6B997399, 0x73DB7399, 0x73DB73DB, 0x73996B99, 0x73997399, 0x6B997399, 0x73996B99, 0x73997399, 0x6B996357, 0x63576B99, 0x5AD55293, 0x52954251, 0x73DB73DB, 0x739973DB, 0x739973DB, 0x739973DB, 0x739973DB, 0x73DB73DB, 0x73DB7399, 0x73DB6B99, 0x6B5773DB, 0x73996B99, 0x73DB6357, 0x6B996317, 0x6B996B57, 0x6B9973DB, 0x4A535293, 0x52D54211, 0x739973DB, 0x73DB7399, 0x73DB7399, 0x73DB6B57, 0x6B997399, 0x73DB7399, 0x739973DB, 0x73996B59, 0x6B576B99, 0x63577399, 0x63576B57, 0x63176357, 0x6B596357, 0x6B996357, 0x52935AD5, 0x5AD54211, 0x73DB7399, 0x73DB73DB, 0x73DB6B59, 0x73996B99, 0x6B9973DB, 0x6B996357, 0x73DB73DB, 0x73DB6B99, 0x6B995AD5, 0x5AD56B99, 0x6B596B99, 0x63576317, 0x63576317, 0x63576357, 0x52935AD5, 0x5AD54211, 0x739973DB, 0x73997399, 0x73996357, 0x635773DB, 0x73996357, 0x63176B99, 0x73996357, 0x6B576357, 0x6B996357, 0x6B576B59, 0x6B576357, 0x6B996B57, 0x5AD56357, 0x5AD57399, 0x4A535AD5, 0x4A534251, 0x73DB73DB, 0x73DB6B99, 0x6B996B57, 0x73DB7399, 0x73996B57, 0x6B576B99, 0x52957399, 0x6B996B57, 0x73DB5AD5, 0x6B9952D5, 0x6B996B59, 0x73996357, 0x6B596B57, 0x6B596B99, 0x421152D5, 0x52934211, 0x739973DB, 0x739973DB, 0x73DB7399, 0x73DB7399, 0x73DB7399, 0x73DB5AD5, 0x6B5773DB, 0x5AD57399, 0x73DB6B57, 0x6B995AD5, 0x63576B99, 0x6B576317, 0x63576B99, 0x6B576317, 0x42516317, 0x4A534A53, 0x73DB7399, 0x6B596B57, 0x6B996B99, 0x6B997399, 0x73DB73DB, 0x6B996B57, 0x73DB7399, 0x73DB6B99, 0x5AD56B99, 0x52936B99, 0x52D56317, 0x63176B57, 0x63176357, 0x6B997399, 0x42515293, 0x52934251, 0x739973DB, 0x6B577399, 0x739973DB, 0x739973DB, 0x739973DB, 0x6B577399, 0x739973DB, 0x73DB7399, 0x739973DB, 0x6B996317, 0x6B596317, 0x63576357, 0x6B995AD5, 0x63575AD5, 0x4A534211, 0x52D54251, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB73DB, 0x73DB7399, 0x6B997399, 0x63576357, 0x63576B57, 0x6B5952D5, 0x63176317, 0x6B997399, 0x42514211, 0x5AD55293, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD100000, 0x802446C0, 0xF5100000, 0x07054150, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF100, 0xE7000000, 0x00000000, 0xF5101000, 0x00054150, 0xF2000000, 0x0007C07C, 0xE3000C00, 0x00080000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247A80, 0xDE000000, 0x80244F50, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247A40, 0xDE000000, 0x80245000, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247A00, 0xDE000000, 0x802450A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x802479C0, 0xDE000000, 0x80245150, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247980, 0xDE000000, 0x80245200, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247940, 0xDE000000, 0x802452A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247900, 0xDE000000, 0x80245350, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x802478C0, 0xDE000000, 0x80245400, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247880, 0xDE000000, 0x802454A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247840, 0xDE000000, 0x80245550, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x0100600C, 0x80247BF0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247800, 0xDE000000, 0x80245600, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFBFF, 0x00000000, 0xD9FFFFFF, 0x00200000, 0x01001002, 0x80247BF0, 0x01001004, 0x80247C20, 0x0100400C, 0x80247C40, 0x06000608, 0x00000802, 0x0602080A, 0x00020A04, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x802477C0, 0xDE000000, 0x802456A0, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100C018, 0x80247B90, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060C0E10, 0x000C1012, 0x06121014, 0x00121416, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247780, 0xDE000000, 0x80245750, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244610, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x01001002, 0x80247B20, 0x01003008, 0x80247B60, 0x06020406, 0x00020600, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244610, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x01004008, 0x80247B20, 0x06000204, 0x00000406, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xDE000000, 0x80244EC0, 0xD9FDFFFF, 0x00000000, 0xD9FFFFFF, 0x00200400, 0x0100600C, 0x80247AC0, 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDA380000, 0x80247740, 0xDE000000, 0x802458C8, 0xDE000000, 0x80245868, 0xDE000000, 0x80245800, 0xD8380002, 0x00000040, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245930, 0xDE000000, 0x802457C8, 0xDE000000, 0x80245718, 0xDE000000, 0x80245668, 0xDE000000, 0x802455C8, 0xDE000000, 0x80245518, 0xDE000000, 0x80245468, 0xDE000000, 0x802453C8, 0xDE000000, 0x80245318, 0xDE000000, 0x80245268, 0xDE000000, 0x802451C8, 0xDE000000, 0x80245118, 0xDE000000, 0x80245068, 0xDE000000, 0x80244FC8, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245978, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245A08, 0xDF000000, 0x00000000, 0xDB020000, 0x00000018, 0xDC08060A, 0x80247728, 0xDC08090A, 0x80247720, 0xDE000000, 0x80245A30, 0xDF000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802458C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245A90, 0x00000000, 0x00000000, 0x00000000, 0x80245868, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245ABC, 0x80245AE8, 0x00000000, 0x00000000, 0x00000000, 0x80245800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245B14, 0x80245B40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43FA0000, 0x42480000, 0x00000000, 0x00000000, 0x80245B6C, 0x00000000, 0x00000000, 0x00000000, 0x80245750, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43D20000, 0x42480000, 0x00000000, 0x80245B98, 0x80245BC4, 0x00000000, 0x00000000, 0x00000000, 0x80245600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43CD0000, 0x42200000, 0x00000000, 0x80245BF0, 0x80245C1C, 0x00000000, 0x00000000, 0x00000000, 0x80245550, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43C80000, 0x42200000, 0x00000000, 0x80245C48, 0x80245C74, 0x00000000, 0x00000000, 0x00000000, 0x80245400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43C30000, 0x41F00000, 0x00000000, 0x80245CA0, 0x80245CCC, 0x00000000, 0x00000000, 0x00000000, 0x80245350, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43BE0000, 0x41F00000, 0x00000000, 0x80245CF8, 0x80245D24, 0x00000000, 0x00000000, 0x00000000, 0x802452A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43BE0000, 0x41A00000, 0x00000000, 0x80245D50, 0x80245D7C, 0x00000000, 0x00000000, 0x00000000, 0x80245200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43B90000, 0x41A00000, 0x00000000, 0x80245DA8, 0x80245DD4, 0x00000000, 0x00000000, 0x00000000, 0x80245150, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43B40000, 0x41A00000, 0x00000000, 0x80245E00, 0x80245E2C, 0x00000000, 0x00000000, 0x00000000, 0x802450A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43B40000, 0x41200000, 0x00000000, 0x80245E58, 0x80245E84, 0x00000000, 0x00000000, 0x00000000, 0x80245000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80010000, 0x43AF0000, 0x41200000, 0x00000000, 0x80245EB0, 0x80245EDC, 0x00000000, 0x00000000, 0x00000000, 0x80244F50, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC0010000, 0x43AA0000, 0x41200000, 0x00000000, 0x80245F08, 0x80245F34, 0x00000000, 0x00000000, 0x00000000, 0x802454A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43C80000, 0x41F00000, 0x00000000, 0x80245F60, 0x80245F8C, 0x00000000, 0x00000000, 0x00000000, 0x802456A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3FFF0000, 0x43D20000, 0x42200000, 0x00000000, 0x80245FB8, 0x80245FE4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80246010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024603C, 0x00000000, 0x00000000, 0x00000000, 0x80246068, 0x8024603C, 0x80246010, 0x80245FE4, 0x80245FB8, 0x80245F8C, 0x80245F60, 0x80245F34, 0x80245F08, 0x80245EDC, 0x80245EB0, 0x80245E84, 0x80245E58, 0x80245E2C, 0x80245E00, 0x80245DD4, 0x80245DA8, 0x80245D7C, 0x80245D50, 0x80245D24, 0x80245CF8, 0x80245CCC, 0x80245CA0, 0x80245C74, 0x80245C48, 0x80245C1C, 0x80245BF0, 0x80245BC4, 0x80245B98, 0x80245B6C, 0x80245B40, 0x80245B14, 0x80245AE8, 0x80245ABC, 0x80245A90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x01A4FFC4, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x0190FFBA, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0154FFA6, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x015EFFA6, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x0168FFA6, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x0168FFB0, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x0172FFB0, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x017CFFB0, 0x00000011, 0x001100B6, 0x00B600B6, 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0x00000000, 0x00110012, 0x00B600B6, 0x00B60005, 0x00130000, 0x00000000, 0x00080013, 0x017CFFBA, 0x00000011, 0x001300B6, 0x00B600B6, 0x00050014, 0x00000000, 0x00000008, 0x00140000, 0x00000000, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, 0x00000000, 0x00080015, 0x0186FFBA, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, 0x00080017, 0x0190FFC4, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, 0x019AFFC4, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x01A4FFCE, 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x01F40032, 0x00000011, 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0x00000000, 0x00110022, 0x00B600B6, 0x00B60005, 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x00010001, 0x000A0001, 0x00010003, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x01A4FFC4, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x0190FFBA, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0154FFA6, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x015EFFA6, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x0168FFA6, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x0168FFB0, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x0172FFB0, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x017CFFB0, 0x00000011, 0x001100B6, 0x00B600B6, 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0x00000000, 0x00110012, 0x00B600B6, 0x00B60005, 0x00130000, 0x00000000, 0x00080013, 0x017CFFBA, 0x00000011, 0x001300B6, 0x00B600B6, 0x00050014, 0x00000000, 0x00000008, 0x00140000, 0x00000000, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, 0x00000000, 0x00080015, 0x0186FFBA, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, 0x00080017, 0x0190FFC4, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, 0x019AFFC4, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x01A4FFCE, 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x01F40032, 0x00000011, 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0x00000000, 0x00110022, 0x00B600B6, 0x00B60005, 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x0005001D, 0x00000000, 0xFFFA0001, 0x00010005, 0x001D0000, 0x0000FFEF, 0x00010001, 0x0005001D, 0x00000000, 0xFFF00001, 0x00010005, 0x001D0000, 0x0000000A, 0x00010001, 0x0005001D, 0x00000000, 0x00500001, 0x00010005, 0x001D0000, 0x000000CD, 0x00010001, 0x0005001D, 0x00000000, 0x01930001, 0x00010005, 0x001D0000, 0x000002B0, 0x00010001, 0x0005001D, 0x00000000, 0x04330001, 0x00010005, 0x001D0000, 0x0000062A, 0x00010001, 0x0005001D, 0x00000000, 0x08A70001, 0x00010005, 0x001D0000, 0x00000BB6, 0x00010001, 0x0005001D, 0x00000000, 0x0F680001, 0x00010005, 0x001D0000, 0x000013CB, 0x00010001, 0x0005001D, 0x00000000, 0x18F00001, 0x00010005, 0x001D0000, 0x00001EE4, 0x00010001, 0x0005001D, 0x00000000, 0x25B60001, 0x00010005, 0x001D0000, 0x00002D77, 0x00010001, 0x0005001D, 0x00000000, 0x36350001, 0x00010005, 0x001D0000, 0x00003FFF, 0x00010001, 0x0005001D, 0x00000000, 0x3CB70001, 0x00010005, 0x001D0000, 0x00003AA2, 0x00010001, 0x0005001D, 0x00000000, 0x397C0001, 0x00010005, 0x001D0000, 0x000038FD, 0x00010001, 0x0005001D, 0x00000000, 0x38E30001, 0x00010005, 0x001D0000, 0x000038FC, 0x00010001, 0x0005001D, 0x00000000, 0x39780001, 0x00010005, 0x001D0000, 0x00003A9C, 0x00010001, 0x0005001D, 0x00000000, 0x3CB20001, 0x00010005, 0x001D0000, 0x00003FFF, 0x00010001, 0x0005001B, 0x00000000, 0x15620008, 0x001B01A4, 0x00320000, 0x00010001, 0x0005001B, 0x00000000, 0x2AB60001, 0x00010005, 0x001B0000, 0x00003FFF, 0x00010001, 0x0005001B, 0x00000000, 0x40260001, 0x00010005, 0x001B0000, 0x000040D8, 0x00010001, 0x0005001B, 0x00000000, 0x427E0001, 0x00010005, 0x001B0000, 0x00004580, 0x00010001, 0x0005001B, 0x00000000, 0x4A490001, 0x00010005, 0x001B0000, 0x00005142, 0x00010001, 0x0005001B, 0x00000000, 0x5AD30001, 0x00010005, 0x001B0000, 0x00006766, 0x00010001, 0x0005001B, 0x00000000, 0x77640001, 0x00010005, 0x001B0000, 0x00008B3A, 0x00010001, 0x0005001B, 0x00000000, 0xA34A0001, 0x00010005, 0x001B0000, 0x0000C001, 0x00010001, 0x00050003, 0x00000000, 0x00330008, 0x000301A4, 0x00280000, 0x00010001, 0x00050003, 0x00000000, 0x00FE0001, 0x00010005, 0x00030000, 0x000002AD, 0x00010001, 0x00050003, 0x00000000, 0x058A0001, 0x00010005, 0x00030000, 0x000009E2, 0x00010001, 0x00050003, 0x00000000, 0x0FFE0001, 0x00010005, 0x00030000, 0x0000182A, 0x00010001, 0x00050003, 0x00000000, 0x22B20001, 0x00010005, 0x00030000, 0x00002FDF, 0x00010001, 0x00050003, 0x00000000, 0x3FFF0001, 0x00010005, 0x00190000, 0x0000020E, 0x00080019, 0x019A0028, 0x00000001, 0x00010005, 0x00190000, 0x000008A5, 0x00010001, 0x00050019, 0x00000000, 0x144A0001, 0x00010005, 0x00190000, 0x00002585, 0x00010001, 0x00050019, 0x00000000, 0x3CDD0001, 0x00010005, 0x00190000, 0x00005AD8, 0x00010001, 0x00050019, 0x00000000, 0x80010001, 0x00010005, 0x00170000, 0x00000006, 0x00080017, 0x01900028, 0x00000001, 0x00010005, 0x00170000, 0x000000EF, 0x00010001, 0x00050017, 0x00000000, 0x04010001, 0x00010005, 0x00170000, 0x00000A7D, 0x00010001, 0x00050017, 0x00000000, 0x15A80001, 0x00010005, 0x00170000, 0x000026C6, 0x00010001, 0x00050017, 0x00000000, 0x3F1A0001, 0x00010005, 0x00170000, 0x00005FE7, 0x00010001, 0x00050017, 0x00000000, 0x8A750001, 0x00010005, 0x00170000, 0x0000C001, 0x00010001, 0x00050005, 0x00000000, 0x00710008, 0x00050190, 0x001E0000, 0x00010001, 0x00050005, 0x00000000, 0x03E30001, 0x00010005, 0x00050000, 0x00000D83, 0x00010001, 0x00050005, 0x00000000, 0x207D0001, 0x00010005, 0x00050000, 0x00003FFF, 0x00010001, 0x00050015, 0x00000000, 0x00560008, 0x00150186, 0x001E0000, 0x00010001, 0x00050015, 0x00000000, 0x06220001, 0x00010005, 0x00150000, 0x0000188F, 0x00010001, 0x00050015, 0x00000000, 0x3ECA0001, 0x00010005, 0x00150000, 0x00008001, 0x00010001, 0x00050013, 0x00000000, 0x001E0008, 0x0013017C, 0x001E0000, 0x00010001, 0x00050013, 0x00000000, 0x03020001, 0x00010005, 0x00130000, 0x00000C77, 0x00010001, 0x00050013, 0x00000000, 0x204C0001, 0x00010005, 0x00130000, 0x0000424B, 0x00010001, 0x00050013, 0x00000000, 0x76420001, 0x00010005, 0x00130000, 0x0000C001, 0x00010001, 0x00050011, 0x00000000, 0x01750008, 0x0011017C, 0x00140000, 0x00010001, 0x00050011, 0x00000000, 0x11240001, 0x00010005, 0x00110000, 0x00003FFF, 0x00010001, 0x0005000F, 0x00000000, 0x009D0008, 0x000F0172, 0x00140000, 0x00010001, 0x0005000F, 0x00000000, 0x06F70001, 0x00010005, 0x000F0000, 0x000019CF, 0x00010001, 0x0005000F, 0x00000000, 0x3FE60001, 0x00010005, 0x000F0000, 0x00008001, 0x00010001, 0x0005000D, 0x00000000, 0x00030008, 0x000D0168, 0x00140000, 0x00010001, 0x0005000D, 0x00000000, 0x02A90001, 0x00010005, 0x000D0000, 0x00000BD7, 0x00010001, 0x0005000D, 0x00000000, 0x1F760001, 0x00010005, 0x000D0000, 0x0000416C, 0x00010001, 0x0005000D, 0x00000000, 0x75A20001, 0x00010005, 0x000D0000, 0x0000C001, 0x00010001, 0x0005000B, 0x00000000, 0x017A0008, 0x000B0168, 0x000A0000, 0x00010001, 0x0005000B, 0x00000000, 0x112D0001, 0x00010005, 0x000B0000, 0x00003FFF, 0x00010001, 0x00050009, 0x00000000, 0x00520008, 0x0009015E, 0x000A0000, 0x00010001, 0x00050009, 0x00000000, 0x06150001, 0x00010005, 0x00090000, 0x0000187B, 0x00010001, 0x00050009, 0x00000000, 0x3EB80001, 0x00010005, 0x00090000, 0x00008001, 0x00010001, 0x00050007, 0x00000000, 0x00660008, 0x00070154, 0x000A0000, 0x00010001, 0x00050007, 0x00000000, 0x03150001, 0x00010005, 0x00070000, 0x00000A49, 0x00010001, 0x00050007, 0x00000000, 0x183A0001, 0x00010005, 0x00070000, 0x00002F24, 0x00010001, 0x00050007, 0x00000000, 0x51410001, 0x00010005, 0x00070000, 0x000080CE, 0x00010001, 0x00050007, 0x00000000, 0xC0010001, 0x00010005, 0x00070000, 0x0000B528, 0x00010001, 0x00050007, 0x00000000, 0xAECA0001, 0x00010005, 0x00070000, 0x0000ABB6, 0x00010001, 0x00050007, 0x00000000, 0xAABC0001, 0x00010005, 0x00070000, 0x0000AAAC, 0x00010001, 0x00050007, 0x00000000, 0xAAC90001, 0x00010005, 0x00070000, 0x0000ABDD, 0x00010001, 0x00050007, 0x00000000, 0xAF050001, 0x00010005, 0x00070000, 0x0000B55D, 0x00010001, 0x00050007, 0x00000000, 0xC0010001, 0x00010005, 0x00070000, 0x0000BCD8, 0x00010001, 0x00050007, 0x00000000, 0xBC730001, 0x00010005, 0x00070000, 0x0000BCD7, 0x00010001, 0x00050007, 0x00000000, 0xC0010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x0001000A, 0x00010001, 0x00030000, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x01A4FFC4, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x0190FFBA, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x0154FFA6, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x015EFFA6, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x0168FFA6, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x0168FFB0, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x0172FFB0, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x017CFFB0, 0x00000011, 0x001100B6, 0x00B600B6, 0x00050012, 0x00000000, 0x00000008, 0x00120000, 0x00000000, 0x00110012, 0x00B600B6, 0x00B60005, 0x00130000, 0x00000000, 0x00080013, 0x017CFFBA, 0x00000011, 0x001300B6, 0x00B600B6, 0x00050014, 0x00000000, 0x00000008, 0x00140000, 0x00000000, 0x00110014, 0x00B600B6, 0x00B60005, 0x00150000, 0x00000000, 0x00080015, 0x0186FFBA, 0x00000011, 0x001500B6, 0x00B600B6, 0x00050016, 0x00000000, 0x00000008, 0x00160000, 0x00000000, 0x00110016, 0x00B600B6, 0x00B60005, 0x00170000, 0x00000000, 0x00080017, 0x0190FFC4, 0x00000011, 0x001700B6, 0x00B600B6, 0x00050018, 0x00000000, 0x00000008, 0x00180000, 0x00000000, 0x00110018, 0x00B600B6, 0x00B60005, 0x00190000, 0x00000000, 0x00080019, 0x019AFFC4, 0x00000011, 0x001900B6, 0x00B600B6, 0x0005001A, 0x00000000, 0x00000008, 0x001A0000, 0x00000000, 0x0011001A, 0x00B600B6, 0x00B60005, 0x001B0000, 0x00000000, 0x0008001B, 0x01A4FFCE, 0x00000011, 0x001B00B6, 0x00B600B6, 0x0005001C, 0x00000000, 0x00000008, 0x001C0000, 0x00000000, 0x0011001C, 0x00B600B6, 0x00B60005, 0x001D0000, 0x00000000, 0x0008001D, 0x01F40032, 0x00000011, 0x001D00B6, 0x00B600B6, 0x0005001E, 0x00000000, 0x00000008, 0x001E0000, 0x00000000, 0x0011001E, 0x00B600B6, 0x00B60005, 0x001F0000, 0x00000000, 0x0008001F, 0x00000000, 0x00000011, 0x001F00B6, 0x00B600B6, 0x00050020, 0x00000000, 0x00000008, 0x00200000, 0x00000000, 0x00110020, 0x00B600B6, 0x00B60005, 0x00210000, 0x00000000, 0x00080021, 0x00000000, 0x00000011, 0x002100B6, 0x00B600B6, 0x00050022, 0x00000000, 0x00000008, 0x00220000, 0x00000000, 0x00110022, 0x00B600B6, 0x00B60005, 0x00230000, 0x00000000, 0x00080023, 0x00000000, 0x00000011, 0x002300B6, 0x00B600B6, 0x0005001D, 0x00000000, 0x3FFF0008, 0x001B01A4, 0x00320000, 0x0005001B, 0x00000000, 0xC0010008, 0x000301A4, 0x00280000, 0x00050003, 0x00000000, 0x3FFF0008, 0x0019019A, 0x00280000, 0x00050019, 0x00000000, 0x80010008, 0x00170190, 0x00280000, 0x00050017, 0x00000000, 0xC0010008, 0x00050190, 0x001E0000, 0x00050005, 0x00000000, 0x3FFF0008, 0x00150186, 0x001E0000, 0x00050015, 0x00000000, 0x80010008, 0x0013017C, 0x001E0000, 0x00050013, 0x00000000, 0xC0010008, 0x0011017C, 0x00140000, 0x00050011, 0x00000000, 0x3FFF0008, 0x000F0172, 0x00140000, 0x0005000F, 0x00000000, 0x80010008, 0x000D0168, 0x00140000, 0x0005000D, 0x00000000, 0xC0010008, 0x000B0168, 0x000A0000, 0x0005000B, 0x00000000, 0x3FFF0008, 0x0009015E, 0x000A0000, 0x00050009, 0x00000000, 0x80010008, 0x00070154, 0x000A0000, 0x00050007, 0x00000000, 0xC001000A, 0x00010001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01F40032, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01A40032, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01A40028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x019A0028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01900028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0190001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0186001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x017C001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x017C0014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01720014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x01680014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0168000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x015E000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x0154000A, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x00280000, 0x04000800, 0xBE1F1FFF, 0x00000000, 0x00280000, 0x04000000, 0xBE1F1FFF, 0x00000000, 0x00000000, 0x00000000, 0xBE1F1FFF, 0x00000050, 0x00000000, 0x00000800, 0xBE1F1FFF, 0x00000000, 0xFFD80000, 0x04000000, 0xBE1F1FFF, 0x00000050, 0xFFD80000, 0x04000800, 0xBE1F1FFF, 0x00000050, 0x00000000, 0x06AB0466, 0x8080D1FF, 0x00000000, 0x00000000, 0x06AB0133, 0xB2B2FFFF, 0x00000000, 0x00280000, 0x059A0133, 0xB2B2FFFF, 0x00000050, 0x00280000, 0x059A0466, 0x8080D1FF, 0x00000050, 0xFFD80000, 0x059A0466, 0x8080D1FF, 0x00000000, 0xFFD80000, 0x059A0133, 0xB2B2FFFF, 0x00000000, 0x00000000, 0x06AB0133, 0xB2B2FFFF, 0x00000000, 0xFFD80000, 0x04000800, 0x6E1212FF, 0x000A0000, 0xFFD80000, 0x04000700, 0x6E1212FF, 0x000A0000, 0x00000000, 0x00000700, 0x6E1212FF, 0x00000000, 0x00000000, 0x00000800, 0x6E1212FF, 0x000A0000, 0x00280000, 0x04000700, 0x6E1212FF, 0x00000000, 0x00280000, 0x04000800, 0x6E1212FF, 0x00000000, 0x00280000, 0x04000800, 0xBE1F1FFF, 0x000A0000, 0x00280000, 0x04000700, 0xBE1F1FFF, 0x000A0000, 0x00000000, 0x00000700, 0xBE1F1FFF, 0x00000000, 0x00000000, 0x00000800, 0xBE1F1FFF, 0x000A0000, 0xFFD80000, 0x04000700, 0xBE1F1FFF, 0x00000000, 0xFFD80000, 0x04000800, 0xBE1F1FFF, 0x0000000A, 0x00280000, 0x04000700, 0xBE1F1FFF, 0x0000000A, 0x00000000, 0x00000700, 0xBE1F1FFF, 0x0000000A, 0xFFD80000, 0x04000700, 0xBE1F1FFF diff --git a/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s b/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s index 46afea2cd0..f77406f5dd 100644 --- a/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s +++ b/ver/us/asm/data/world/area_pra/pra_35/D90700.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802434B0_D90700 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x40000000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42480000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_802423CC_D8F61C, 0x8024359C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802435CC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, func_8024216C_D8F3BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80243668, 0x00000000, 0x00000000, D_802434B0_D90700, 0x00000000, 0x00000000, 0x00170008, 0x40000000, 0x00000000, 0x00000000, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241AB4_D8ED04, 0x8024373C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x00000000, 0x8024376C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024363C, 0x43480000, 0x00000000, 0x42960000, 0x00000C00, 0x802437B8, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000002, 0x000000C8, 0x00000000, 0x0000004B, 0x0000012C, 0x00000000, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000000FA, 0x00000000, 0x0000004B, 0x000000C8, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243710, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x80243594, 0x00000000, 0x00000004, 0x8024378C, 0x43480000, 0x00000000, 0xC2960000, 0x00200C00, 0x802437B8, 0x00000000, 0x00000000, 0x0000005A, 0x80050096, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000002, 0x000000C8, 0x00000000, 0xFFFFFFB5, 0x0000012C, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000000FA, 0x00000000, 0x0000004B, 0x000000C8, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802437E0, 0x1F080002, 0x00000001, 0x80243BC0, 0x21040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x40000000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42480000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_802423CC_D8F61C, 0x8024359C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x802435CC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_35_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80243668, 0x00000000, 0x00000000, D_802434B0_D90700, 0x00000000, 0x00000000, 0x00170008, 0x40000000, 0x00000000, 0x00000000, 0x42C80000, 0x00000000, 0x00000004, 0x40600000, 0x0000001E, 0x00000003, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241AB4_D8ED04, 0x8024373C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E001E, 0x00000000, 0x00000000, 0x8024376C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024363C, 0x43480000, 0x00000000, 0x42960000, 0x00000C00, 0x802437B8, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000002, 0x000000C8, 0x00000000, 0x0000004B, 0x0000012C, 0x00000000, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000000FA, 0x00000000, 0x0000004B, 0x000000C8, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243710, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x80243594, 0x00000000, 0x00000004, 0x8024378C, 0x43480000, 0x00000000, 0xC2960000, 0x00200C00, 0x802437B8, 0x00000000, 0x00000000, 0x0000005A, 0x80050096, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000002, 0x000000C8, 0x00000000, 0xFFFFFFB5, 0x0000012C, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x000000FA, 0x00000000, 0x0000004B, 0x000000C8, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802437E0, 0x1F080002, 0x00000001, 0x80243BC0, 0x21040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s index 411844ab0e..28f016c6bd 100644 --- a/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s +++ b/ver/us/asm/data/world/area_pra/pra_37/D94800.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802418C0_D94800 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_8024011C_D9305C, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_8024011C_D9305C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802404CC_D9340C, 0xFE363C80, 0x00000043, 0x00000002, func_80240D6C_D93CAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802424FC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242504, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241A78, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241B3C, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x80241C00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802424C4, 0x00000044, 0x00000001, 0x80241880, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, 0x802419D0, 0x00000044, 0x00000001, 0x80241C48, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_8024156C_D944AC, 0x80241F1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241F4C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, func_8024130C_D9424C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80241FE8, 0x00000000, 0x00000000, 0x80241E30, 0x00000000, 0x00000000, 0x00170008, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80241FBC, 0x432F0000, 0x00000000, 0x42960000, 0x00000C00, 0x802420BC, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000AF, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80242090, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x80241F14, 0x00000000, 0x00000002, 0x802420E4, 0x1F0D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_8024011C_D9305C, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_8024011C_D9305C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802404CC_D9340C, 0xFE363C80, 0x00000043, 0x00000002, func_80240D6C_D93CAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802424FC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242504, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241A78, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241B3C, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000018, 0x00000024, 0x00000002, 0xFE363C85, 0x00000015, 0x00000046, 0x00000001, 0x80285EC4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001F, 0x00000046, 0x00000001, 0x80285EC4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x80241C00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000015, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000018, 0x00000018, 0x00000028, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802424C4, 0x00000044, 0x00000001, 0x80241880, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, 0x802419D0, 0x00000044, 0x00000001, 0x80241C48, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_8024156C_D944AC, 0x80241F1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80241F4C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, pra_37_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80241FE8, 0x00000000, 0x00000000, 0x80241E30, 0x00000000, 0x00000000, 0x00170008, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00080000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80241FBC, 0x432F0000, 0x00000000, 0x42960000, 0x00000C00, 0x802420BC, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000AF, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80242090, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x80241F14, 0x00000000, 0x00000002, 0x802420E4, 0x1F0D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s b/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s index 0bd721a010..da8dc77b23 100644 --- a/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s +++ b/ver/us/asm/data/world/area_sam/sam_03/D11D40.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80240C80_D11D40 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000044, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000190, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00210016, 0x00210003, 0x00000000, 0x001200D8, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000208, 0x00000000, 0xFFFFFFBC, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0021001A, 0x00210003, 0x00000000, 0x001200D9, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00210016, 0x00210003, 0x00000000, 0x001200DA, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C86, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7D4D, 0x00000043, 0x00000001, func_80240000_D110C0, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C83, 0xFE363C85, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0021000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C85, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000004, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210014, 0x00210014, 0x00000005, 0x001200DF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210011, 0x00210027, 0x00000005, 0x001200DF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000044, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00210014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00210014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00210014, 0x00210014, 0x00000005, 0x001200DF, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000000, 0x0000001A, 0x00000018, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x0000001A, 0x00000018, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241094, 0x00000043, 0x00000003, BindNpcHit, 0x00000001, 0x802410C4, 0x00000044, 0x00000001, 0x80240980, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80240CAC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80241164, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000044, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFBF, 0x0000001B, 0x00000001, 0x00000044, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000018F, 0x00000006, 0xFFFFFF9C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00210027, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, D_80240C80_D11D40, 0x43828000, 0x00000000, 0xC2980000, 0x00440D0D, 0x802413F0, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x001A0006, 0x00000001, D_80240C80_D11D40, 0x43828000, 0x00000000, 0xC2980000, 0x21540F0C, 0x802414CC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x001A0006, 0x00000002, 0x802414F8, 0x02060000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, func_8024066C_D1172C, 0x802419AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00300024, 0x00000000, 0x00000000, 0x802419DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_8024040C_D114CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200016, 0x00000000, 0x00000000, 0x80241A78, 0x00000000, 0x00000000, 0x802418F0, 0x00000000, 0x00000000, 0x00160008, 0x00520000, 0xFFFFFFFF, 0x00520000, 0x00520001, 0x0052000B, 0x00520004, 0x00520002, 0x00520003, 0xFFFFFFFF, 0x00000000, 0x80241A4C, 0xC3AC8000, 0x00000000, 0x42E60000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFEA7, 0x00000000, 0x00000073, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEA7, 0x00000000, 0x00000073, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x80241B54, 0x00000000, 0x00000001, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x80241B4C, 0x00000000, 0x00000002, 0x80241A4C, 0x43480000, 0x00000000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x000000C8, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x80241B54, 0x00000000, 0x00000003, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x80241B4C, 0x00000000, 0x00000002, 0x80241B70, 0x1D010001, 0x00000002, 0x80241F50, 0x1D020001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000044, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000190, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00210016, 0x00210003, 0x00000000, 0x001200D8, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000208, 0x00000000, 0xFFFFFFBC, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DFE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x0021001A, 0x00210003, 0x00000000, 0x001200D9, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00210016, 0x00210003, 0x00000000, 0x001200DA, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, GetDist2D, 0xFE363C86, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7D4D, 0x00000043, 0x00000001, func_80240000_D110C0, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C83, 0xFE363C85, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0021000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C83, 0xFE363C85, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000004, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210014, 0x00210014, 0x00000005, 0x001200DF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210011, 0x00210027, 0x00000005, 0x001200DF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000044, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00210014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00210014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24D9A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00210014, 0x00210014, 0x00000005, 0x001200DF, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000000, 0x0000001A, 0x00000018, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x0000001A, 0x00000018, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000002, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241094, 0x00000043, 0x00000003, BindNpcHit, 0x00000001, 0x802410C4, 0x00000044, 0x00000001, 0x80240980, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80240CAC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x80241164, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000044, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000258, 0x00000000, 0xFFFFFFBF, 0x0000001B, 0x00000001, 0x00000044, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000018F, 0x00000006, 0xFFFFFF9C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00210027, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, D_80240C80_D11D40, 0x43828000, 0x00000000, 0xC2980000, 0x00440D0D, 0x802413F0, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x001A0006, 0x00000001, D_80240C80_D11D40, 0x43828000, 0x00000000, 0xC2980000, 0x21540F0C, 0x802414CC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x001A0006, 0x00000002, 0x802414F8, 0x02060000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, func_8024066C_D1172C, 0x802419AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00300024, 0x00000000, 0x00000000, 0x802419DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_03_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200016, 0x00000000, 0x00000000, 0x80241A78, 0x00000000, 0x00000000, 0x802418F0, 0x00000000, 0x00000000, 0x00160008, 0x00520000, 0xFFFFFFFF, 0x00520000, 0x00520001, 0x0052000B, 0x00520004, 0x00520002, 0x00520003, 0xFFFFFFFF, 0x00000000, 0x80241A4C, 0xC3AC8000, 0x00000000, 0x42E60000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFEA7, 0x00000000, 0x00000073, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEA7, 0x00000000, 0x00000073, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x80241B54, 0x00000000, 0x00000001, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x80241B4C, 0x00000000, 0x00000002, 0x80241A4C, 0x43480000, 0x00000000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x000000C8, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x80241B54, 0x00000000, 0x00000003, 0x80241B20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x80241B4C, 0x00000000, 0x00000002, 0x80241B70, 0x1D010001, 0x00000002, 0x80241F50, 0x1D020001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s b/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s index 8bccba6945..4985e64dcf 100644 --- a/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_05/D1A900.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80242120_D1A900 -.word 0x00000000, 0x00960096, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, func_8024061C_D18DFC, 0x80242234, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00300024, 0x00000000, 0x00000000, 0x80242264, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, update_starpoints_display_D18B9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200016, 0x00000000, 0x00000000, 0x80242300, 0x00000000, 0x00000000, 0x80242178, 0x00000000, 0x00000000, 0x00160008, 0x00520000, 0xFFFFFFFF, 0x00520000, 0x00520001, 0x0052000B, 0x00520004, 0x00520002, 0x00520003, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241754_D19F34, 0x802423F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80242428, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, update_starpoints_display_D18B9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80242528, 0x00000000, 0x00000000, 0x80242178, 0x00000000, 0x00000000, 0x00160000, 0x00360100, 0xFFFFFFFF, 0x00360100, 0x00360101, 0x0036010E, 0x00360105, 0x00360106, 0x00360118, 0x00360117, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAux, 0xFFFFFFFF, 0x80242FA8, 0x00000046, 0x00000001, 0x80246CDC, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x00000000, 0x00000000, 0x00000000, 0x00000133, 0x10000000, 0x00000000, 0x00000000, 0x00000133, 0x10000000, 0x00000000, 0x14100000, 0x00000011, 0x00000000, 0x00000001, 0x55510000, 0x00000000, 0x00000000, 0x00000001, 0x25210000, 0x00000000, 0x00000000, 0x00000001, 0x42410000, 0x00000000, 0x0000000B, 0xEB000000, 0x11100000, 0x00000000, 0x000000BF, 0xFFB00000, 0x00000000, 0x00000000, 0x000000BC, 0xFCB00000, 0x00000000, 0x06A00000, 0x000000BF, 0xCFB00000, 0x00000000, 0x6AAA6000, 0x0000000B, 0xBB000000, 0x00000000, 0x67A76000, 0x00000000, 0x00000000, 0x00000000, 0x6A7A6000, 0x00000000, 0x00000000, 0x06660000, 0x06660000, 0x00000000, 0x00000000, 0x66966000, 0x00000000, 0x00000000, 0x00000006, 0x67A76600, 0x00000000, 0x00001100, 0x00000007, 0xAAAAA700, 0x00000000, 0x00015510, 0x00000006, 0x79A97600, 0x00000000, 0x00015510, 0x00000006, 0x8A8A8600, 0x00000000, 0x00001100, 0x00000006, 0x98689600, 0x00000000, 0x00000000, 0x00000000, 0x66666000, 0x0000BEB0, 0x00000000, 0x00000000, 0x00000000, 0x000BEFEB, 0x00000000, 0x00000000, 0x00000000, 0x000BCECB, 0x00000000, 0x00000000, 0x00000000, 0x000BECEB, 0x00000000, 0x00000000, 0x00000000, 0x0000BBB0, 0x00000000, 0x00000000, 0x00000066, 0x60000000, 0x00000000, 0x12100000, 0x000006AA, 0x60000000, 0x00000001, 0x15110000, 0x000006AA, 0x00000000, 0x00000002, 0x55520000, 0x00000066, 0x00000000, 0x00000001, 0x25210000, 0x00000000, 0x00000000, 0x00000002, 0x51520000, 0x00000000, 0x00000000, 0x00000000, 0x11100000, 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, 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, 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, 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, 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, 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, 0x11142A55, 0x43D75517, 0x6E9987D9, 0x4119715D, 0x9963C9A7, 0xF9AB1A1D, 0x22E52BEF, 0x34B73DBF +.word 0x00000000, 0x00960096, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, func_8024061C_D18DFC, 0x80242234, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00300024, 0x00000000, 0x00000000, 0x80242264, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200016, 0x00000000, 0x00000000, 0x80242300, 0x00000000, 0x00000000, 0x80242178, 0x00000000, 0x00000000, 0x00160008, 0x00520000, 0xFFFFFFFF, 0x00520000, 0x00520001, 0x0052000B, 0x00520004, 0x00520002, 0x00520003, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241754_D19F34, 0x802423F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80242428, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, sam_05_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80242528, 0x00000000, 0x00000000, 0x80242178, 0x00000000, 0x00000000, 0x00160000, 0x00360100, 0xFFFFFFFF, 0x00360100, 0x00360101, 0x0036010E, 0x00360105, 0x00360106, 0x00360118, 0x00360117, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAux, 0xFFFFFFFF, 0x80242FA8, 0x00000046, 0x00000001, 0x80246CDC, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x00000000, 0x00000000, 0x00000000, 0x00000133, 0x10000000, 0x00000000, 0x00000000, 0x00000133, 0x10000000, 0x00000000, 0x14100000, 0x00000011, 0x00000000, 0x00000001, 0x55510000, 0x00000000, 0x00000000, 0x00000001, 0x25210000, 0x00000000, 0x00000000, 0x00000001, 0x42410000, 0x00000000, 0x0000000B, 0xEB000000, 0x11100000, 0x00000000, 0x000000BF, 0xFFB00000, 0x00000000, 0x00000000, 0x000000BC, 0xFCB00000, 0x00000000, 0x06A00000, 0x000000BF, 0xCFB00000, 0x00000000, 0x6AAA6000, 0x0000000B, 0xBB000000, 0x00000000, 0x67A76000, 0x00000000, 0x00000000, 0x00000000, 0x6A7A6000, 0x00000000, 0x00000000, 0x06660000, 0x06660000, 0x00000000, 0x00000000, 0x66966000, 0x00000000, 0x00000000, 0x00000006, 0x67A76600, 0x00000000, 0x00001100, 0x00000007, 0xAAAAA700, 0x00000000, 0x00015510, 0x00000006, 0x79A97600, 0x00000000, 0x00015510, 0x00000006, 0x8A8A8600, 0x00000000, 0x00001100, 0x00000006, 0x98689600, 0x00000000, 0x00000000, 0x00000000, 0x66666000, 0x0000BEB0, 0x00000000, 0x00000000, 0x00000000, 0x000BEFEB, 0x00000000, 0x00000000, 0x00000000, 0x000BCECB, 0x00000000, 0x00000000, 0x00000000, 0x000BECEB, 0x00000000, 0x00000000, 0x00000000, 0x0000BBB0, 0x00000000, 0x00000000, 0x00000066, 0x60000000, 0x00000000, 0x12100000, 0x000006AA, 0x60000000, 0x00000001, 0x15110000, 0x000006AA, 0x00000000, 0x00000002, 0x55520000, 0x00000066, 0x00000000, 0x00000001, 0x25210000, 0x00000000, 0x00000000, 0x00000002, 0x51520000, 0x00000000, 0x00000000, 0x00000000, 0x11100000, 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, 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, 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, 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, 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, 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, 0x11142A55, 0x43D75517, 0x6E9987D9, 0x4119715D, 0x9963C9A7, 0xF9AB1A1D, 0x22E52BEF, 0x34B73DBF glabel D_80242F90_D1B770 .word 0x80242770, 0x80242F70, 0x00200020, 0xFFFFFFFE, 0x00000000, 0x80246FA0, 0x00000043, 0x00000001, func_802419A4_D1A184, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000006, 0x00000003, 0x000000FF, 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, 0x80242FA8, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000045, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80245E00, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x802426F8, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, 0x80242688, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0020000C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x007E0000, 0x007E0001, 0x007E0008, 0x007E0009, 0x007E000B, 0x007E000C, 0x007E000D, 0x007E000E, 0xFFFFFFFF, 0x00000006, D_80242120_D1A900, 0x00000000, 0xC47A0000, 0x00000000, 0x00040F01, 0x80242FC4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 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, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x007E0001, 0x00000000, 0x00000000, 0x802430CC, 0x00000000, 0x00200001, 0x00200005, 0x00200008, 0x0020000C, 0xFFFFFFFF, 0x00000007, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000008, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000009, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x0000000A, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x0000000B, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x0000000C, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x0000000D, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x0000000E, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x0000000F, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000010, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000011, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000012, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000013, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000014, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000015, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000016, 0x8024214C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, 0x80243094, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 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, 0x00200001, 0x00200005, 0x00200008, 0x00200008, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00000000, 0x00000000, 0x802432E0, 0x00000000, 0x00000000, 0x802422D4, 0xC2960000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x000000C8, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x802423DC, 0x00000000, 0x00000001, 0x802423A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x802423D4, 0x00000000, 0x00000002, 0x802424FC, 0x42C80000, 0x00000000, 0x42480000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x00000064, 0x00000000, 0x00000032, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000064, 0x00000000, 0x00000032, 0x000000C8, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000003, 0x00000000, 0x80242668, 0x00000000, 0x00000003, 0x80242634, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000000, 0x00000000, 0x80242660, 0x00000000, 0x00000004, 0x802424FC, 0xC3C80000, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFE70, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE70, 0x00000000, 0x00000000, 0x000000C8, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000003, 0x00000000, 0x80242668, 0x00000000, 0x00000005, 0x80242634, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000000, 0x00000000, 0x80242660, 0x00000000, 0x00000001, 0x802430F0, 0x1E000006, 0x00000010, 0x802432F4, 0x1E000006, 0x00000002, 0x802455D4, 0x1D060006, 0x00000002, 0x802459B4, 0x1D0A0006, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802455D4, 0x1D060006, 0x00000002, 0x802459B4, 0x1D0A0006, 0x00000002, 0x802451F4, 0x1D010006, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005C, 0x00000000, 0x00000008, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001200E0, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007E0001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x0000027B, 0x00000055, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0x00000267, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A3E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000267, 0x00000055, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000008, SpeakToPlayer, 0x00000006, 0x007E0009, 0x007E0001, 0x00000100, 0x00000032, 0x00000064, 0x001200E1, 0x00000043, 0x00000004, SetPlayerPos, 0x000001EF, 0x00000050, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2511E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000008, SpeakToPlayer, 0x00000006, 0x007E0009, 0x007E0001, 0x00000100, 0x00000000, 0x00000064, 0x001200E2, 0x00000043, 0x00000002, ShowChoice, 0x001E0015, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000008, ContinueSpeech, 0x00000006, 0x007E000B, 0x007E000B, 0x00000100, 0x00000000, 0x00000064, 0x001200E3, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007E0001, 0x00000044, 0x00000001, 0x80241DA0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005C, 0x00000000, 0x00000008, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x000001A4, 0x00000004, 0x00000001, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007E000E, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFDD, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000008, SpeakToPlayer, 0x00000006, 0x007E000E, 0x007E000E, 0x00000100, 0x00000000, 0x000000C8, 0x001200E4, 0x00000043, 0x00000004, SetNpcVar, 0x00000006, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000007, 0x00000267, 0x00000081, 0x00000000, 0x00000008, 0x00000264, 0x0000009D, 0x00000002, 0x00000009, 0x0000025E, 0x00000092, 0x00000004, 0x0000000A, 0x00000289, 0x0000008C, 0x00000006, 0x0000000B, 0x00000271, 0x00000091, 0x00000000, 0x0000000C, 0x00000244, 0x00000083, 0x00000004, 0x0000000D, 0x00000276, 0x00000058, 0x00000006, 0x0000000E, 0x0000027B, 0x00000086, 0x00000000, 0x0000000F, 0x00000271, 0x00000079, 0x00000002, 0x00000010, 0x0000024E, 0x0000007A, 0x00000004, 0x00000011, 0x00000253, 0x0000006C, 0x00000006, 0x00000012, 0x00000258, 0x00000084, 0x00000000, 0x00000013, 0x0000025C, 0x00000063, 0x00000002, 0x00000014, 0x00000262, 0x00000072, 0x00000004, 0x00000015, 0x0000027B, 0x00000070, 0x00000006, 0x00000016, 0x0000026C, 0x00000060, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x42200000, 0x41200000, 0x00000000, 0x42480000, 0x41700000, 0x00000000, 0x428C0000, 0x41C80000, 0x00000000, 0x42A00000, 0x41F00000, 0x00000000, 0x42C80000, 0x420C0000, 0x00000000, 0x43480000, 0x42340000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C80, 0x00000008, 0x00000001, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C8A, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C8A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000007, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000028, 0x00000013, 0x00000000, 0x00000045, 0x00000002, 0x802466B4, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000008, 0x00000001, 0xFE363C8B, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C8A, 0x0000013E, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, LoadPath, 0x0000003C, 0x80246660, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000003, RandInt, 0x00000050, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0x00000050, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x0000023F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000059, 0x00000027, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RandInt, 0x00000050, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0x00000050, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x0000023F, 0x00000027, 0x00000002, 0xFE363C81, 0x00000059, 0x00000027, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x8024655C, 0x00000005, 0x00000001, 0x00000000, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000006, 0x0000013D, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0x00000267, 0xFFFFFFFB, 0x0000000A, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802468C4, 0x00000043, 0x00000005, MakeLerp, 0x000000DC, 0x00000000, 0x0000005A, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetNpcVar, 0x00000006, 0x00000003, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FF, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000030, 0x00000001, 0x8024655C, 0x00000005, 0x00000001, 0x00000000, 0x00000034, 0x00000004, 0xFE363C8A, 0xFE363C89, 0xFE363C89, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0xFE363C8A, 0x00000007, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000030, 0x00000001, 0x8024655C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000034, 0x00000004, 0xFE363C8A, 0xFE363C89, 0xFE363C89, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80246740, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000267, 0x00000057, 0xFFFFFFFC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x007E000C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8280, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2505680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000008, SpeakToPlayer, 0x00000006, 0x007E000C, 0x007E000C, 0x00000100, 0x000000AA, 0x00000096, 0x001200E8, 0x00000046, 0x00000001, 0x80246A38, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000045, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0x80241DA0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s b/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s index 2d88369f0b..08070af765 100644 --- a/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_07/D2E9C0.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80242C90_D2E9C0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, func_80240C6C_D2C99C, 0x80242D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00300024, 0x00000000, 0x00000000, 0x80242D7C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, func_80240A0C_D2C73C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200016, 0x00000000, 0x00000000, 0x80242E18, 0x00000000, 0x00000000, D_80242C90_D2E9C0, 0x00000000, 0x00000000, 0x00160008, 0x00520000, 0xFFFFFFFF, 0x00520000, 0x00520001, 0x0052000B, 0x00520004, 0x00520002, 0x00520003, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241DA4_D2DAD4, 0x80242F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80242F40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_80240A0C_D2C73C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x00000000, D_80242C90_D2E9C0, 0x00000000, 0x00000000, 0x00160000, 0x00360100, 0xFFFFFFFF, 0x00360100, 0x00360101, 0x0036010E, 0x00360105, 0x00360106, 0x00360118, 0x00360117, 0xFFFFFFFF, 0x00000000, 0x80242DEC, 0xC3FA0000, 0xC3160000, 0xC2960000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFE0C, 0xFFFFFF6A, 0xFFFFFFB5, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE0C, 0xFFFFFF6A, 0xFFFFFFB5, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80242EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x80242EEC, 0x00000000, 0x00000002, 0x80243014, 0x437A0000, 0x42F00000, 0xC2960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x000000FA, 0x00000078, 0xFFFFFFB5, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000014A, 0x00000078, 0xFFFFFFBF, 0x00000104, 0x00000041, 0x00000001, 0x00000001, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x8024314C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000000, 0x00000000, 0x80243178, 0x00000000, 0x00000004, 0x80243014, 0x43C80000, 0x42F00000, 0xC2960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x00000190, 0x00000078, 0xFFFFFFB5, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000014A, 0x00000078, 0xFFFFFFBF, 0x00000104, 0x00000041, 0x00000001, 0x00000001, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x8024314C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000000, 0x00000000, 0x80243178, 0x00000000, 0x00000002, 0x802431A0, 0x1D030003, 0x00000002, 0x80243580, 0x1D090003, 0x00000002, 0x80243960, 0x1D070003, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000002, func_80240C6C_D2C99C, 0x80242D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00300024, 0x00000000, 0x00000000, 0x80242D7C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, sam_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00200016, 0x00000000, 0x00000000, 0x80242E18, 0x00000000, 0x00000000, D_80242C90_D2E9C0, 0x00000000, 0x00000000, 0x00160008, 0x00520000, 0xFFFFFFFF, 0x00520000, 0x00520001, 0x0052000B, 0x00520004, 0x00520002, 0x00520003, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241DA4_D2DAD4, 0x80242F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80242F40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00160000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, sam_07_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x00000000, D_80242C90_D2E9C0, 0x00000000, 0x00000000, 0x00160000, 0x00360100, 0xFFFFFFFF, 0x00360100, 0x00360101, 0x0036010E, 0x00360105, 0x00360106, 0x00360118, 0x00360117, 0xFFFFFFFF, 0x00000000, 0x80242DEC, 0xC3FA0000, 0xC3160000, 0xC2960000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050085, 0x00020000, 0x008C0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFE0C, 0xFFFFFF6A, 0xFFFFFFB5, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE0C, 0xFFFFFF6A, 0xFFFFFFB5, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80242EC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00520001, 0x00520002, 0x00520003, 0x00520003, 0x00520001, 0x00520001, 0x0052000B, 0x0052000B, 0x00520004, 0x00520004, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00520001, 0x00000000, 0x00000000, 0x80242EEC, 0x00000000, 0x00000002, 0x80243014, 0x437A0000, 0x42F00000, 0xC2960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x000000FA, 0x00000078, 0xFFFFFFB5, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000014A, 0x00000078, 0xFFFFFFBF, 0x00000104, 0x00000041, 0x00000001, 0x00000001, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x8024314C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000000, 0x00000000, 0x80243178, 0x00000000, 0x00000004, 0x80243014, 0x43C80000, 0x42F00000, 0xC2960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0x00000190, 0x00000078, 0xFFFFFFB5, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000014A, 0x00000078, 0xFFFFFFBF, 0x00000104, 0x00000041, 0x00000001, 0x00000001, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x8024314C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00360101, 0x00360102, 0x00360103, 0x00360103, 0x00360101, 0x00360101, 0x0036010E, 0x0036010E, 0x00360118, 0x00360117, 0x00360105, 0x00360106, 0x00360112, 0x00360113, 0x00360114, 0x00360101, 0x00000000, 0x00000000, 0x80243178, 0x00000000, 0x00000002, 0x802431A0, 0x1D030003, 0x00000002, 0x80243580, 0x1D090003, 0x00000002, 0x80243960, 0x1D070003, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s index b9a734e7fc..f204397087 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s @@ -15,4 +15,4 @@ glabel D_80241AF8_D31778 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80241B38_D317B8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240544_D301C4, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_D307B8, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_D307B8, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_D30228, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_D30280, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_D30988, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_D30100, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_D2FDA0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_D2FC9C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_D2FC9C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_D3009C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_D2FC9C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241B44, 0x00000043, 0x00000003, func_80240068_D2FCE8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_D300C8, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_D2FC9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, 0x80241CA8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_UnkFunc21, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_UnkFunc22, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_D30280, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_D30988, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_D2FDA0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_D3009C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241B44, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, func_80240510_D30190, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, 0x80241CA8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s b/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s index 687a0a68bc..66798d2716 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D31E80.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80242200_D31E80 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_8024135C_D30FDC, 0x80242344, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80242374, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, func_802410FC_D30D7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80242410, 0x00000000, 0x00000000, 0x80242258, 0x00000000, 0x00000000, 0x00170008, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0002000D, 0x00020003, 0x00000000, 0x0012012B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000046, 0x00000001, 0x80244680, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0002000D, 0x00020003, 0x00000000, 0x0012012A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000046, 0x00000001, 0x80245EB0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0004, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x802424E4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80242560, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802425DC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x8024264C, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40D09, 0x802428AC, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40D09, 0x802428F8, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x8024222C, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40D09, 0x80242944, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80242F74, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, 0x80242514, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024306C, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, 0x80242590, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D0D, 0x80242FDC, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D0D, 0x802430D4, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x802423E4, 0xC3E10000, 0x00000000, 0xC2B40000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFA6, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x802424B8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x8024233C, 0x00000000, 0x00000003, 0x802429A4, 0x1D000005, 0x00000002, 0x80243164, 0x1D000005, 0x00000002, 0x80243544, 0x1D0B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_8024135C_D30FDC, 0x80242344, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x80242374, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, sam_08_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80242410, 0x00000000, 0x00000000, 0x80242258, 0x00000000, 0x00000000, 0x00170008, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0002000D, 0x00020003, 0x00000000, 0x0012012B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000046, 0x00000001, 0x80244680, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0002000D, 0x00020003, 0x00000000, 0x0012012A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000046, 0x00000001, 0x80245EB0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x004E0004, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000002CA, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x802424E4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80242560, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x802425DC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, 0x8024264C, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40D09, 0x802428AC, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40D09, 0x802428F8, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x8024222C, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40D09, 0x80242944, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x004E0002, 0x004E0003, 0x004E0004, 0x004E0004, 0x004E0002, 0x004E0002, 0x004E000A, 0x004E000A, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x004E0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80242F74, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, 0x80242514, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024306C, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, 0x80242590, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D0D, 0x80242FDC, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80242200_D31E80, 0x00000000, 0xC47A0000, 0x00000000, 0x03F44D0D, 0x802430D4, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x802423E4, 0xC3E10000, 0x00000000, 0xC2B40000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFA6, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE3E, 0x00000000, 0xFFFFFFA6, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x802424B8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x8024233C, 0x00000000, 0x00000003, 0x802429A4, 0x1D000005, 0x00000002, 0x80243164, 0x1D000005, 0x00000002, 0x80243544, 0x1D0B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s index 9937c8ff80..f7762146d3 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s @@ -3,4 +3,4 @@ .section .data glabel D_80241040_D38840 -.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000028, 0xFFFFFF38, 0x0000002B, 0xFFFFFF1A, 0x0000002E, 0xFFFFFEFC, 0x00000031, 0xFFFFFEDE, 0x00000034, 0xFFFFFEC0, 0x00000037, 0xFFFFFEA2, 0x0000003A, 0xFFFFFE84, 0x0000003D, 0xFFFFFE66, 0x00000040, 0xFFFFFE48, 0x00000043, 0xFFFFFE2A, 0x00000046, 0xFFFFFDEE, 0x00000049, 0xFFFFFDD0, 0x0000004C, 0xFFFFFDB2, 0x0000004F, 0xFFFFFD94, 0x00000052, 0xFFFFFD76, 0x00000055, 0xFFFFFD58, 0x00000058, 0xFFFFFD3A, 0x0000005B, 0xFFFFFD1C, 0x0000005E, 0xFFFFFCFE, 0x00000061, 0xFFFFFCE0, 0x00000064, 0xFFFFFCA4, 0x00000067, 0xFFFFFC86, 0x0000006A, 0xFFFFFC68, 0x0000006D, 0xFFFFFC4A, 0x00000070, 0xFFFFFC2C, 0x00000073, 0xFFFFFC0E, 0x00000076, 0xFFFFFBF0, 0x00000079, 0xFFFFFBD2, 0x0000007C, 0xFFFFFBB4, 0x0000007F, 0xFFFFFB96, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, FindKeyItem, 0x0000006C, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, func_802D6420, 0x00000043, 0x00000001, func_802D6954, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0161, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFE0, 0x00000043, 0x00000006, PlaySoundAt, 0x000001EB, 0x00000000, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFE0, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE0, 0xFFFFFFC9, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFFFFFF8B, 0x000000B3, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x0000039C, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFE9, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8280, 0xF24A8E80, 0x00000043, 0x00000001, func_802402F0_D37AF0, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000039D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8680, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFFFFFFEC, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000014, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000003C, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000064, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000008C, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000B4, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000DC, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000F0, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000118, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFFFFFFEC, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000014, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000003C, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000064, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000008C, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000B4, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000DC, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000F0, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000118, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000040, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000258, 0xF24A7B1A, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0x802411F0, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C85, 0xFFFFFFFE, 0x00000043, 0x00000005, MakeLerp, 0xFE363C84, 0x00000000, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000039F, 0x00000043, 0x00000002, StopSound, 0x80000040, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFEC, 0x00000028, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001EC, 0x00000000, 0xFE363C80, 0xFE363C8A, 0xFE363C82, 0x0000002B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000008C, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000096, 0x0000041A, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x00000096, 0xFFFFFFBA, 0x00000003, 0x00000001, 0x00000064, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2563280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000001E0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x43A88000, 0xC1A00000, 0xC2CE0000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000002, 0x00000087, 0x0000000B, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000087, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000088, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000088, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406136, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000006C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000E, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000001, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000006, 0x00000008, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x0000008A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000008, 0x00000030, 0x00000001, 0x802411F0, 0x00000005, 0x00000001, 0x0000001E, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C8A, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000006, 0x00000000, 0x0000004E, 0x00000006, 0x802412E0, 0x00000100, 0x0000002B, 0x8024225C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0x00000000, 0x00000000, 0xFFFFFFE9, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004C, 0x00000024, 0x00000002, 0xF8406136, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406136, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000047, 0x00000005, 0x80242148, 0x00100000, 0x80242138, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000088, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_802409EC_D381EC, 0x8024266C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x8024269C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, func_8024078C_D37F8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80242738, 0x00000000, 0x00000000, 0x80242580, 0x00000000, 0x00000000, 0x00170008, 0x00000000, 0x8024270C, 0x440FC000, 0x43F00000, 0xC2480000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000023F, 0x000001E0, 0xFFFFFFCE, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000023F, 0x000001E0, 0xFFFFFFCE, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802427E0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x80242664, 0x00000000, 0x00000002, 0x8024280C, 0x1D0C0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802D5830, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropItemEntityB, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000028, 0xFFFFFF38, 0x0000002B, 0xFFFFFF1A, 0x0000002E, 0xFFFFFEFC, 0x00000031, 0xFFFFFEDE, 0x00000034, 0xFFFFFEC0, 0x00000037, 0xFFFFFEA2, 0x0000003A, 0xFFFFFE84, 0x0000003D, 0xFFFFFE66, 0x00000040, 0xFFFFFE48, 0x00000043, 0xFFFFFE2A, 0x00000046, 0xFFFFFDEE, 0x00000049, 0xFFFFFDD0, 0x0000004C, 0xFFFFFDB2, 0x0000004F, 0xFFFFFD94, 0x00000052, 0xFFFFFD76, 0x00000055, 0xFFFFFD58, 0x00000058, 0xFFFFFD3A, 0x0000005B, 0xFFFFFD1C, 0x0000005E, 0xFFFFFCFE, 0x00000061, 0xFFFFFCE0, 0x00000064, 0xFFFFFCA4, 0x00000067, 0xFFFFFC86, 0x0000006A, 0xFFFFFC68, 0x0000006D, 0xFFFFFC4A, 0x00000070, 0xFFFFFC2C, 0x00000073, 0xFFFFFC0E, 0x00000076, 0xFFFFFBF0, 0x00000079, 0xFFFFFBD2, 0x0000007C, 0xFFFFFBB4, 0x0000007F, 0xFFFFFB96, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, FindKeyItem, 0x0000006C, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, func_802D6420, 0x00000043, 0x00000001, func_802D6954, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000023, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0161, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFE0, 0x00000043, 0x00000006, PlaySoundAt, 0x000001EB, 0x00000000, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFE0, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE0, 0xFFFFFFC9, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFFFFFF8B, 0x000000B3, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002B, 0x0000039C, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFE9, 0x00000064, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8280, 0xF24A8E80, 0x00000043, 0x00000001, func_802402F0_D37AF0, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000039D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8680, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFFFFFFEC, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000014, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000003C, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000064, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000008C, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000B4, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000DC, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000F0, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000118, 0xFFFFFFEC, 0xFFFFFFBE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFFFFFFEC, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000014, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000003C, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000064, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x0000008C, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000B4, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000DC, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x000000F0, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0x00000118, 0xFFFFFFEC, 0xFFFFFF5A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000040, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000258, 0xF24A7B1A, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0x802411F0, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000032, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C85, 0xFFFFFFFE, 0x00000043, 0x00000005, MakeLerp, 0xFE363C84, 0x00000000, 0xFE363C85, 0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C83, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000039F, 0x00000043, 0x00000002, StopSound, 0x80000040, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFEC, 0x00000028, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001EC, 0x00000000, 0xFE363C80, 0xFE363C8A, 0xFE363C82, 0x0000002B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000008C, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000096, 0x0000041A, 0x000000C8, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x00000096, 0xFFFFFFBA, 0x00000003, 0x00000001, 0x00000064, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2563280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA280, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000001E0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x43A88000, 0xC1A00000, 0xC2CE0000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000002, 0x00000087, 0x0000000B, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000087, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000088, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000088, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406136, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000006C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000E, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000001, 0x00000008, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000006, 0x00000008, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000002B, 0x0000008A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000008, 0x00000030, 0x00000001, 0x802411F0, 0x00000005, 0x00000001, 0x0000001E, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C8A, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000006, 0x00000000, 0x0000004E, 0x00000006, 0x802412E0, 0x00000100, 0x0000002B, 0x8024225C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000008C, 0x00000000, 0x00000000, 0xFFFFFFE9, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000002B, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000080, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000004C, 0x00000024, 0x00000002, 0xF8406136, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406136, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000019, 0x00000000, 0x00000047, 0x00000005, 0x80242148, 0x00100000, 0x80242138, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000087, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000088, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, func_80045900, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00390000, 0x00390002, 0x00390003, 0x00390004, 0x0039000C, 0x00390007, 0x00390008, 0x00390011, 0x00390012, 0xFFFFFFFF, 0x00390000, 0xFFFFFFFF, 0x3FC00000, 0x00000078, 0x0000001E, 0x42C80000, 0x42200000, 0x00000007, 0x40733333, 0x0000005A, 0x0000000F, 0x43480000, 0x43200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000007, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, func_802409EC_D381EC, 0x8024266C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00240022, 0x00000000, 0x00000000, 0x8024269C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00170000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000030, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020C5, 0x00000043, 0x00000001, sam_10_UnkFunc7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x000E0010, 0x00000000, 0x00000000, 0x80242738, 0x00000000, 0x00000000, 0x80242580, 0x00000000, 0x00000000, 0x00170008, 0x00000000, 0x8024270C, 0x440FC000, 0x43F00000, 0xC2480000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x0000023F, 0x000001E0, 0xFFFFFFCE, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000023F, 0x000001E0, 0xFFFFFFCE, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802427E0, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 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, 0x00390102, 0x00390103, 0x00390104, 0x00390104, 0x00390102, 0x00390102, 0x0039010C, 0x0039010C, 0x00390111, 0x00390112, 0x00390107, 0x00390108, 0x00390102, 0x00390102, 0x00390102, 0x00390102, 0x00000000, 0x00000000, 0x80242664, 0x00000000, 0x00000002, 0x8024280C, 0x1D0C0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s index 462c68206b..e4d196c823 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s @@ -12,4 +12,4 @@ glabel D_80241448_955408 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80241488_955448 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_802405C4_954584, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240BB8_954B78, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240BB8_954B78, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240628_9545E8, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240680_954640, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D88_954D48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240500_9544C0, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802401A0_954160, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024009C_95405C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024009C_95405C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024049C_95445C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024009C_95405C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241494, 0x00000043, 0x00000003, func_802400E8_9540A8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000001, func_802404C8_954488, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024009C_95405C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, 0x802415F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, 0x00000001, 0x00000019, 0x00000001, 0x0000001A, 0x00000001, 0x0000009C, 0xFFFFFED0, 0x0000005C, 0xFFFFFF50, 0x0000000E, 0xF8405E98, 0xFAA2B58A, 0x80242464, 0x8024246C, 0x80242474, 0x00000000, 0x00000000, 0xC3818000, 0x00000000, 0xC3200000, 0x00000000, 0x00000001, 0x00000019, 0x00000001, 0x0000001A, 0x00000001, 0x0000009D, 0x000000E6, 0x0000004D, 0xFFFFFED0, 0x0000000E, 0xF8405E9A, 0xFAA2B58C, 0x802424B8, 0x802424C0, 0x802424C8, 0x00000000, 0x00000000, 0x432B0000, 0x00000000, 0xC3918000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x0000001F, 0x00000001, 0x00000157, 0xFFFFFE4C, 0x00000064, 0x000000F9, 0x0000000F, 0xF8405ECE, 0x00000000, 0x8024250C, 0x80242514, 0x8024251C, 0x00000000, 0x00000000, 0xC3DA0000, 0x00000000, 0x43600000, 0x00000000, 0x00000001, 0x00000024, 0x00000001, 0x00000023, 0x80242560, 0x80242568, 0x00000000, 0x00000000, 0x00000000, 0xC3A00000, 0x00000000, 0xC1A80000, 0x00000000, 0x00000001, 0x00000028, 0x00000001, 0x00000027, 0x80242594, 0x8024259C, 0x00000000, 0x00000000, 0x00000000, 0xC3720000, 0x00000000, 0x42B00000, 0x00000000, 0x00000001, 0x0000002C, 0x00000001, 0x0000002B, 0x802425C8, 0x802425D0, 0x00000000, 0x00000000, 0x00000000, 0xC34B0000, 0x00000000, 0xC3560000, 0x00000000, 0x00000001, 0x00000030, 0x00000001, 0x0000002F, 0x802425FC, 0x80242604, 0x00000000, 0x00000000, 0x00000000, 0xC2CA0000, 0x00000000, 0xC3BC0000, 0x00000000, 0x00000001, 0x00000034, 0x00000001, 0x00000033, 0x80242630, 0x80242638, 0x00000000, 0x00000000, 0x00000000, 0x42D00000, 0x00000000, 0xC3C10000, 0x00000000, 0x00000001, 0x0000003A, 0x00000001, 0x00000039, 0x00000001, 0x00000157, 0x0000010A, 0x00000064, 0x00000095, 0x0000000F, 0xF8405ECF, 0x00000000, 0x80242664, 0x8024266C, 0x80242674, 0x00000000, 0x00000000, 0x43850000, 0x00000000, 0x42F80000, 0x00000000, 0x00000001, 0x0000003D, 0x00000001, 0x0000003C, 0x802426B8, 0x802426C0, 0x00000000, 0x00000000, 0x00000000, 0x43B50000, 0x00000000, 0xC2940000, 0x00000000, 0x00000024, 0x00000002, 0xF8405E98, 0x00000000, 0x00000024, 0x00000002, 0xF8405E99, 0x00000000, 0x00000024, 0x00000002, 0xF8405E9A, 0x00000000, 0x00000024, 0x00000002, 0xF8405E9B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242494, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802424A8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802424E8, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802424FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024253C, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242550, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242570, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242584, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802425A4, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802425B8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802425D8, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802425EC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024260C, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242620, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242640, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242654, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242694, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802426A8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802426C8, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802426DC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_UnkFunc22, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240680_954640, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D88_954D48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802401A0_954160, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024049C_95445C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241494, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, func_80240590_954550, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, 0x802415F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, sbk_56_SomeMatrixOperation2, 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, 0x00000001, 0x00000019, 0x00000001, 0x0000001A, 0x00000001, 0x0000009C, 0xFFFFFED0, 0x0000005C, 0xFFFFFF50, 0x0000000E, 0xF8405E98, 0xFAA2B58A, 0x80242464, 0x8024246C, 0x80242474, 0x00000000, 0x00000000, 0xC3818000, 0x00000000, 0xC3200000, 0x00000000, 0x00000001, 0x00000019, 0x00000001, 0x0000001A, 0x00000001, 0x0000009D, 0x000000E6, 0x0000004D, 0xFFFFFED0, 0x0000000E, 0xF8405E9A, 0xFAA2B58C, 0x802424B8, 0x802424C0, 0x802424C8, 0x00000000, 0x00000000, 0x432B0000, 0x00000000, 0xC3918000, 0x00000000, 0x00000001, 0x00000020, 0x00000001, 0x0000001F, 0x00000001, 0x00000157, 0xFFFFFE4C, 0x00000064, 0x000000F9, 0x0000000F, 0xF8405ECE, 0x00000000, 0x8024250C, 0x80242514, 0x8024251C, 0x00000000, 0x00000000, 0xC3DA0000, 0x00000000, 0x43600000, 0x00000000, 0x00000001, 0x00000024, 0x00000001, 0x00000023, 0x80242560, 0x80242568, 0x00000000, 0x00000000, 0x00000000, 0xC3A00000, 0x00000000, 0xC1A80000, 0x00000000, 0x00000001, 0x00000028, 0x00000001, 0x00000027, 0x80242594, 0x8024259C, 0x00000000, 0x00000000, 0x00000000, 0xC3720000, 0x00000000, 0x42B00000, 0x00000000, 0x00000001, 0x0000002C, 0x00000001, 0x0000002B, 0x802425C8, 0x802425D0, 0x00000000, 0x00000000, 0x00000000, 0xC34B0000, 0x00000000, 0xC3560000, 0x00000000, 0x00000001, 0x00000030, 0x00000001, 0x0000002F, 0x802425FC, 0x80242604, 0x00000000, 0x00000000, 0x00000000, 0xC2CA0000, 0x00000000, 0xC3BC0000, 0x00000000, 0x00000001, 0x00000034, 0x00000001, 0x00000033, 0x80242630, 0x80242638, 0x00000000, 0x00000000, 0x00000000, 0x42D00000, 0x00000000, 0xC3C10000, 0x00000000, 0x00000001, 0x0000003A, 0x00000001, 0x00000039, 0x00000001, 0x00000157, 0x0000010A, 0x00000064, 0x00000095, 0x0000000F, 0xF8405ECF, 0x00000000, 0x80242664, 0x8024266C, 0x80242674, 0x00000000, 0x00000000, 0x43850000, 0x00000000, 0x42F80000, 0x00000000, 0x00000001, 0x0000003D, 0x00000001, 0x0000003C, 0x802426B8, 0x802426C0, 0x00000000, 0x00000000, 0x00000000, 0x43B50000, 0x00000000, 0xC2940000, 0x00000000, 0x00000024, 0x00000002, 0xF8405E98, 0x00000000, 0x00000024, 0x00000002, 0xF8405E99, 0x00000000, 0x00000024, 0x00000002, 0xF8405E9A, 0x00000000, 0x00000024, 0x00000002, 0xF8405E9B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242494, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802424A8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802424E8, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802424FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024253C, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242550, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242570, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242584, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802425A4, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802425B8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802425D8, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802425EC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024260C, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242620, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242640, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x80242654, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242694, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802426A8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802426C8, 0x00000047, 0x00000005, 0x80241E60, 0x00001000, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241E60, 0x00100000, 0x802426DC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s index 94f5bfa5b5..c1455b03e8 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s @@ -12,4 +12,4 @@ glabel D_80243A08_87D5E8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243A48_87D628 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240824_87A404, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240E18_87A9F8, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240E18_87A9F8, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240888_87A468, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408E0_87A4C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240FE8_87ABC8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240760_87A340, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240400_879FE0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802402FC_879EDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802402FC_879EDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802406FC_87A2DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802402FC_879EDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243A54, 0x00000043, 0x00000003, func_80240348_879F28, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000001, func_80240728_87A308, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802402FC_879EDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, 0x80243BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80241020_87AC00, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, 0x802440C0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, 0x80244590, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0xFFFFFEF8, 0xFFFFFFC3, 0x00000096, 0x000000BC, 0x000000E6, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x0000001F, 0xFFFFFFEC, 0x00000129, 0x0000009C, 0x000000E6, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x0000006C, 0xFFFFFF8B, 0x00000038, 0x0000002B, 0x000000E6, 0x0000005A, 0x00000028, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x80244914, 0x00000044, 0x00000001, 0x80244768, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_UnkFunc22, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408E0_87A4C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240FE8_87ABC8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240400_879FE0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802406FC_87A2DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243A54, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, func_802407F0_87A3D0, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, 0x80243BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80241020_87AC00, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, 0x802440C0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, 0x80244590, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0xFFFFFEF8, 0xFFFFFFC3, 0x00000096, 0x000000BC, 0x000000E6, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x0000001F, 0xFFFFFFEC, 0x00000129, 0x0000009C, 0x000000E6, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x0000006C, 0xFFFFFF8B, 0x00000038, 0x0000002B, 0x000000E6, 0x0000005A, 0x00000028, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x80244914, 0x00000044, 0x00000001, 0x80244768, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s index 16925d4d69..3216092307 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s @@ -12,4 +12,4 @@ glabel D_80242048_888408 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80242088_888448 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240BC4_886F84, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_802411B8_887578, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_802411B8_887578, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240C28_886FE8, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C80_887040, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241388_887748, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240B00_886EC0, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802407A0_886B60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024069C_886A5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024069C_886A5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A9C_886E5C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024069C_886A5C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242094, 0x00000043, 0x00000003, func_802406E8_886AA8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000001, func_80240AC8_886E88, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024069C_886A5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, 0x802421F8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_UnkFunc22, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C80_887040, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241388_887748, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_802407A0_886B60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A9C_886E5C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242094, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, func_80240B90_886F50, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, 0x802421F8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index 33f2272eff..4003d3eeda 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -15,4 +15,4 @@ glabel D_80243CC4_88C894 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243D04_88C8D4 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80241160_889D30, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80241754_88A324, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80241754_88A324, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802411C4_889D94, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024121C_889DEC, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241924_88A4F4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_8024109C_889C6C, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240D3C_88990C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_80240C38_889808, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_80240C38_889808, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80241038_889C08, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_80240C38_889808, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D10, 0x00000043, 0x00000003, func_80240C84_889854, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000001, func_80241064_889C34, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_80240C38_889808, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405D0C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000F0, 0x00000000, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D33, 0x00000043, 0x00000002, AssignScript, 0x80243E74, 0x0000000A, 0x00000002, 0xF8405D0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA22C, 0x0000008C, 0xFFFFFF79, 0x00000037, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x802442F4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA22C, 0x0000008C, 0xFFFFFF79, 0x00000069, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x80244314, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x80244430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x802444D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x80244570, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x80244430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244460, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244610, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244500, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x802445A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000000, 0x80244704, 0xC0C00000, 0xC3070000, 0x42960000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005009B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFFFA, 0xFFFFFF79, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0xFFFFFF79, 0x00000005, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802447B4, 0x1A150002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_UnkFunc22, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024121C_889DEC, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241924_88A4F4, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240D3C_88990C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80241038_889C08, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D10, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, func_8024112C_889CFC, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405D0C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000F0, 0x00000000, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D33, 0x00000043, 0x00000002, AssignScript, 0x80243E74, 0x0000000A, 0x00000002, 0xF8405D0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA22C, 0x0000008C, 0xFFFFFF79, 0x00000037, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x802442F4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA22C, 0x0000008C, 0xFFFFFF79, 0x00000069, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, 0x80244314, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x80244430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x802444D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x80244570, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SyncOverrideEnemyPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_80241CF4_88A8C4, 0x80244430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244460, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244610, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80244500, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x802445A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000, 0x00000000, 0x80244704, 0xC0C00000, 0xC3070000, 0x42960000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005009B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFFFA, 0xFFFFFF79, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0xFFFFFF79, 0x00000005, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 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, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802447B4, 0x1A150002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s index ce49c2bf3e..e064bfc30d 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s @@ -12,4 +12,4 @@ glabel D_80241438_893E58 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80241478_893E98 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240574_892F94, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80240B68_893588, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80240B68_893588, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405D8_892FF8, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240630_893050, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D38_893758, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_802404B0_892ED0, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240150_892B70, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024004C_892A6C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024004C_892A6C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024044C_892E6C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024004C_892A6C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241484, 0x00000043, 0x00000003, func_80240098_892AB8, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000001, func_80240478_892E98, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024004C_892A6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, 0x802415E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_UnkFunc22, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240630_893050, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D38_893758, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240150_892B70, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024044C_892E6C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80241484, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, func_80240540_892F60, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, 0x802415E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s index 84bbac31d4..c5b917b7cf 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s @@ -12,4 +12,4 @@ glabel D_802426C8_899CA8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80242708_899CE8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, func_80240B34_898114, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80241128_898708, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80241128_898708, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240B98_898178, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240BF0_8981D0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802412F8_8988D8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240A70_898050, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240710_897CF0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024060C_897BEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024060C_897BEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A0C_897FEC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024060C_897BEC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242714, 0x00000043, 0x00000003, func_80240658_897C38, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000001, func_80240A38_898018, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024060C_897BEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, 0x80242878, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_UnkFunc22, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240BF0_8981D0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802412F8_8988D8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D585C, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240710_897CF0, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A0C_897FEC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242714, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, func_80240B00_8980E0, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, func_802D585C, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, 0x80242878, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/arn_02_func_80240000_BDD1B0.s b/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/arn_02_func_80240000_BDD1B0.s deleted file mode 100644 index d59d97960d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/arn_02_func_80240000_BDD1B0.s +++ /dev/null @@ -1,104 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata -glabel D_80241AE0_BDEC90 -.double 180.0 - -glabel D_80241AE8_BDEC98 -.double 75.0 - -.section .text -glabel func_80240000_BDD1B0 -/* BDD1B0 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDD1B4 80240004 AFBF001C */ sw $ra, 0x1c($sp) -/* BDD1B8 80240008 AFB20018 */ sw $s2, 0x18($sp) -/* BDD1BC 8024000C AFB10014 */ sw $s1, 0x14($sp) -/* BDD1C0 80240010 AFB00010 */ sw $s0, 0x10($sp) -/* BDD1C4 80240014 F7B40020 */ sdc1 $f20, 0x20($sp) -/* BDD1C8 80240018 8C900148 */ lw $s0, 0x148($a0) -/* BDD1CC 8024001C 86040008 */ lh $a0, 8($s0) -/* BDD1D0 80240020 3C014387 */ lui $at, 0x4387 -/* BDD1D4 80240024 4481A000 */ mtc1 $at, $f20 -/* BDD1D8 80240028 0C00EABB */ jal get_npc_unsafe -/* BDD1DC 8024002C 00A0882D */ daddu $s1, $a1, $zero -/* BDD1E0 80240030 0200202D */ daddu $a0, $s0, $zero -/* BDD1E4 80240034 8E26000C */ lw $a2, 0xc($s1) -/* BDD1E8 80240038 8E270010 */ lw $a3, 0x10($s1) -/* BDD1EC 8024003C 0040882D */ daddu $s1, $v0, $zero -/* BDD1F0 80240040 3C03800B */ lui $v1, %hi(gCameras) -/* BDD1F4 80240044 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BDD1F8 80240048 3C02800A */ lui $v0, %hi(D_8009A634) -/* BDD1FC 8024004C 8442A634 */ lh $v0, %lo(D_8009A634)($v0) -/* BDD200 80240050 0000282D */ daddu $a1, $zero, $zero -/* BDD204 80240054 00028080 */ sll $s0, $v0, 2 -/* BDD208 80240058 02028021 */ addu $s0, $s0, $v0 -/* BDD20C 8024005C 00108080 */ sll $s0, $s0, 2 -/* BDD210 80240060 02028023 */ subu $s0, $s0, $v0 -/* BDD214 80240064 001010C0 */ sll $v0, $s0, 3 -/* BDD218 80240068 02028021 */ addu $s0, $s0, $v0 -/* BDD21C 8024006C 001080C0 */ sll $s0, $s0, 3 -/* BDD220 80240070 0C0124FB */ jal func_800493EC -/* BDD224 80240074 02038021 */ addu $s0, $s0, $v1 -/* BDD228 80240078 C60C006C */ lwc1 $f12, 0x6c($s0) -/* BDD22C 8024007C C62E000C */ lwc1 $f14, 0xc($s1) -/* BDD230 80240080 0C00A70A */ jal get_clamped_angle_diff -/* BDD234 80240084 0002802B */ sltu $s0, $zero, $v0 -/* BDD238 80240088 0C00A6C9 */ jal clamp_angle -/* BDD23C 8024008C 46000306 */ mov.s $f12, $f0 -/* BDD240 80240090 3C018024 */ lui $at, %hi(D_80241AE0_BDEC90) -/* BDD244 80240094 D4221AE0 */ ldc1 $f2, %lo(D_80241AE0_BDEC90)($at) -/* BDD248 80240098 46000021 */ cvt.d.s $f0, $f0 -/* BDD24C 8024009C 4622003C */ c.lt.d $f0, $f2 -/* BDD250 802400A0 00000000 */ nop -/* BDD254 802400A4 45000003 */ bc1f .L802400B4 -/* BDD258 802400A8 00000000 */ nop -/* BDD25C 802400AC 3C0142B4 */ lui $at, 0x42b4 -/* BDD260 802400B0 4481A000 */ mtc1 $at, $f20 -.L802400B4: -/* BDD264 802400B4 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* BDD268 802400B8 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* BDD26C 802400BC C62C0038 */ lwc1 $f12, 0x38($s1) -/* BDD270 802400C0 8E420000 */ lw $v0, ($s2) -/* BDD274 802400C4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BDD278 802400C8 8C460028 */ lw $a2, 0x28($v0) -/* BDD27C 802400CC 0C00A720 */ jal atan2 -/* BDD280 802400D0 8C470030 */ lw $a3, 0x30($v0) -/* BDD284 802400D4 4600A306 */ mov.s $f12, $f20 -/* BDD288 802400D8 0C00A70A */ jal get_clamped_angle_diff -/* BDD28C 802400DC 46000386 */ mov.s $f14, $f0 -/* BDD290 802400E0 46000005 */ abs.s $f0, $f0 -/* BDD294 802400E4 3C018024 */ lui $at, %hi(D_80241AE8_BDEC98) -/* BDD298 802400E8 D4221AE8 */ ldc1 $f2, %lo(D_80241AE8_BDEC98)($at) -/* BDD29C 802400EC 46000021 */ cvt.d.s $f0, $f0 -/* BDD2A0 802400F0 4620103C */ c.lt.d $f2, $f0 -/* BDD2A4 802400F4 00000000 */ nop -/* BDD2A8 802400F8 45030001 */ bc1tl .L80240100 -/* BDD2AC 802400FC 0000802D */ daddu $s0, $zero, $zero -.L80240100: -/* BDD2B0 80240100 8E420000 */ lw $v0, ($s2) -/* BDD2B4 80240104 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDD2B8 80240108 C442002C */ lwc1 $f2, 0x2c($v0) -/* BDD2BC 8024010C 46020001 */ sub.s $f0, $f0, $f2 -/* BDD2C0 80240110 3C014220 */ lui $at, 0x4220 -/* BDD2C4 80240114 44811000 */ mtc1 $at, $f2 -/* BDD2C8 80240118 46000005 */ abs.s $f0, $f0 -/* BDD2CC 8024011C 4600103E */ c.le.s $f2, $f0 -/* BDD2D0 80240120 00000000 */ nop -/* BDD2D4 80240124 45030001 */ bc1tl .L8024012C -/* BDD2D8 80240128 0000802D */ daddu $s0, $zero, $zero -.L8024012C: -/* BDD2DC 8024012C 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* BDD2E0 80240130 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* BDD2E4 80240134 24020009 */ addiu $v0, $zero, 9 -/* BDD2E8 80240138 50620001 */ beql $v1, $v0, .L80240140 -/* BDD2EC 8024013C 0000802D */ daddu $s0, $zero, $zero -.L80240140: -/* BDD2F0 80240140 0200102D */ daddu $v0, $s0, $zero -/* BDD2F4 80240144 8FBF001C */ lw $ra, 0x1c($sp) -/* BDD2F8 80240148 8FB20018 */ lw $s2, 0x18($sp) -/* BDD2FC 8024014C 8FB10014 */ lw $s1, 0x14($sp) -/* BDD300 80240150 8FB00010 */ lw $s0, 0x10($sp) -/* BDD304 80240154 D7B40020 */ ldc1 $f20, 0x20($sp) -/* BDD308 80240158 03E00008 */ jr $ra -/* BDD30C 8024015C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/arn_04_func_80242388_BE5B38.s b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/arn_04_func_80242388_BE5B38.s deleted file mode 100644 index 2a5d933082..0000000000 --- a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/arn_04_func_80242388_BE5B38.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata -glabel D_80244328_BE7AD8 -.double 180.0 -glabel D_80244330_BE7AE0 -.double 75.0 - -.section .text -glabel func_80242388_BE5B38 -/* BE5B38 80242388 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE5B3C 8024238C AFBF001C */ sw $ra, 0x1c($sp) -/* BE5B40 80242390 AFB20018 */ sw $s2, 0x18($sp) -/* BE5B44 80242394 AFB10014 */ sw $s1, 0x14($sp) -/* BE5B48 80242398 AFB00010 */ sw $s0, 0x10($sp) -/* BE5B4C 8024239C F7B40020 */ sdc1 $f20, 0x20($sp) -/* BE5B50 802423A0 8C900148 */ lw $s0, 0x148($a0) -/* BE5B54 802423A4 86040008 */ lh $a0, 8($s0) -/* BE5B58 802423A8 3C014387 */ lui $at, 0x4387 -/* BE5B5C 802423AC 4481A000 */ mtc1 $at, $f20 -/* BE5B60 802423B0 0C00EABB */ jal get_npc_unsafe -/* BE5B64 802423B4 00A0882D */ daddu $s1, $a1, $zero -/* BE5B68 802423B8 0200202D */ daddu $a0, $s0, $zero -/* BE5B6C 802423BC 8E26000C */ lw $a2, 0xc($s1) -/* BE5B70 802423C0 8E270010 */ lw $a3, 0x10($s1) -/* BE5B74 802423C4 0040882D */ daddu $s1, $v0, $zero -/* BE5B78 802423C8 3C03800B */ lui $v1, %hi(gCameras) -/* BE5B7C 802423CC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BE5B80 802423D0 3C02800A */ lui $v0, %hi(D_8009A634) -/* BE5B84 802423D4 8442A634 */ lh $v0, %lo(D_8009A634)($v0) -/* BE5B88 802423D8 0000282D */ daddu $a1, $zero, $zero -/* BE5B8C 802423DC 00028080 */ sll $s0, $v0, 2 -/* BE5B90 802423E0 02028021 */ addu $s0, $s0, $v0 -/* BE5B94 802423E4 00108080 */ sll $s0, $s0, 2 -/* BE5B98 802423E8 02028023 */ subu $s0, $s0, $v0 -/* BE5B9C 802423EC 001010C0 */ sll $v0, $s0, 3 -/* BE5BA0 802423F0 02028021 */ addu $s0, $s0, $v0 -/* BE5BA4 802423F4 001080C0 */ sll $s0, $s0, 3 -/* BE5BA8 802423F8 0C0124FB */ jal func_800493EC -/* BE5BAC 802423FC 02038021 */ addu $s0, $s0, $v1 -/* BE5BB0 80242400 C60C006C */ lwc1 $f12, 0x6c($s0) -/* BE5BB4 80242404 C62E000C */ lwc1 $f14, 0xc($s1) -/* BE5BB8 80242408 0C00A70A */ jal get_clamped_angle_diff -/* BE5BBC 8024240C 0002802B */ sltu $s0, $zero, $v0 -/* BE5BC0 80242410 0C00A6C9 */ jal clamp_angle -/* BE5BC4 80242414 46000306 */ mov.s $f12, $f0 -/* BE5BC8 80242418 3C018024 */ lui $at, %hi(D_80244328_BE7AD8) -/* BE5BCC 8024241C D4224328 */ ldc1 $f2, %lo(D_80244328_BE7AD8)($at) -/* BE5BD0 80242420 46000021 */ cvt.d.s $f0, $f0 -/* BE5BD4 80242424 4622003C */ c.lt.d $f0, $f2 -/* BE5BD8 80242428 00000000 */ nop -/* BE5BDC 8024242C 45000003 */ bc1f .L8024243C -/* BE5BE0 80242430 00000000 */ nop -/* BE5BE4 80242434 3C0142B4 */ lui $at, 0x42b4 -/* BE5BE8 80242438 4481A000 */ mtc1 $at, $f20 -.L8024243C: -/* BE5BEC 8024243C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* BE5BF0 80242440 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* BE5BF4 80242444 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BE5BF8 80242448 8E420000 */ lw $v0, ($s2) -/* BE5BFC 8024244C C62E0040 */ lwc1 $f14, 0x40($s1) -/* BE5C00 80242450 8C460028 */ lw $a2, 0x28($v0) -/* BE5C04 80242454 0C00A720 */ jal atan2 -/* BE5C08 80242458 8C470030 */ lw $a3, 0x30($v0) -/* BE5C0C 8024245C 4600A306 */ mov.s $f12, $f20 -/* BE5C10 80242460 0C00A70A */ jal get_clamped_angle_diff -/* BE5C14 80242464 46000386 */ mov.s $f14, $f0 -/* BE5C18 80242468 46000005 */ abs.s $f0, $f0 -/* BE5C1C 8024246C 3C018024 */ lui $at, %hi(D_80244330_BE7AE0) -/* BE5C20 80242470 D4224330 */ ldc1 $f2, %lo(D_80244330_BE7AE0)($at) -/* BE5C24 80242474 46000021 */ cvt.d.s $f0, $f0 -/* BE5C28 80242478 4620103C */ c.lt.d $f2, $f0 -/* BE5C2C 8024247C 00000000 */ nop -/* BE5C30 80242480 45030001 */ bc1tl .L80242488 -/* BE5C34 80242484 0000802D */ daddu $s0, $zero, $zero -.L80242488: -/* BE5C38 80242488 8E420000 */ lw $v0, ($s2) -/* BE5C3C 8024248C C620003C */ lwc1 $f0, 0x3c($s1) -/* BE5C40 80242490 C442002C */ lwc1 $f2, 0x2c($v0) -/* BE5C44 80242494 46020001 */ sub.s $f0, $f0, $f2 -/* BE5C48 80242498 3C014220 */ lui $at, 0x4220 -/* BE5C4C 8024249C 44811000 */ mtc1 $at, $f2 -/* BE5C50 802424A0 46000005 */ abs.s $f0, $f0 -/* BE5C54 802424A4 4600103E */ c.le.s $f2, $f0 -/* BE5C58 802424A8 00000000 */ nop -/* BE5C5C 802424AC 45030001 */ bc1tl .L802424B4 -/* BE5C60 802424B0 0000802D */ daddu $s0, $zero, $zero -.L802424B4: -/* BE5C64 802424B4 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* BE5C68 802424B8 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* BE5C6C 802424BC 24020009 */ addiu $v0, $zero, 9 -/* BE5C70 802424C0 50620001 */ beql $v1, $v0, .L802424C8 -/* BE5C74 802424C4 0000802D */ daddu $s0, $zero, $zero -.L802424C8: -/* BE5C78 802424C8 0200102D */ daddu $v0, $s0, $zero -/* BE5C7C 802424CC 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5C80 802424D0 8FB20018 */ lw $s2, 0x18($sp) -/* BE5C84 802424D4 8FB10014 */ lw $s1, 0x14($sp) -/* BE5C88 802424D8 8FB00010 */ lw $s0, 0x10($sp) -/* BE5C8C 802424DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* BE5C90 802424E0 03E00008 */ jr $ra -/* BE5C94 802424E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s deleted file mode 100644 index d80b5bc563..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BFA0A0 -/* BFA0A0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFA0A4 80240004 3C04800E */ lui $a0, %hi(D_800D9230) -/* BFA0A8 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) -/* BFA0AC 8024000C 3C058024 */ lui $a1, %hi(D_802437A0_BFD840) -/* BFA0B0 80240010 24A537A0 */ addiu $a1, $a1, %lo(D_802437A0_BFD840) -/* BFA0B4 80240014 AFBF0010 */ sw $ra, 0x10($sp) -/* BFA0B8 80240018 0C01953C */ jal sprintf -/* BFA0BC 8024001C 00000000 */ nop -/* BFA0C0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) -/* BFA0C4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* BFA0C8 80240028 3C058024 */ lui $a1, %hi(D_802437B0_BFD850) -/* BFA0CC 8024002C 0C01953C */ jal sprintf -/* BFA0D0 80240030 24A537B0 */ addiu $a1, $a1, %lo(D_802437B0_BFD850) -/* BFA0D4 80240034 3C04800B */ lui $a0, %hi(D_800B0CF0) -/* BFA0D8 80240038 24840CF0 */ addiu $a0, $a0, %lo(D_800B0CF0) -/* BFA0DC 8024003C 3C058024 */ lui $a1, %hi(D_802437BC_BFD85C) -/* BFA0E0 80240040 0C01953C */ jal sprintf -/* BFA0E4 80240044 24A537BC */ addiu $a1, $a1, %lo(D_802437BC_BFD85C) -/* BFA0E8 80240048 8FBF0010 */ lw $ra, 0x10($sp) -/* BFA0EC 8024004C 0000102D */ daddu $v0, $zero, $zero -/* BFA0F0 80240050 03E00008 */ jr $ra -/* BFA0F4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 -/* BFA0F8 80240058 00000000 */ nop -/* BFA0FC 8024005C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/dgb_01_func_802402D0_BFDB50.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s rename to ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/dgb_01_func_802402D0_BFDB50.s index 8d3a5154da..b9bd96305d 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/dgb_01_func_802402D0_BFDB50.s @@ -1,6 +1,14 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata +glabel D_80263428_C20CA8 +.double 0.09 + +glabel D_80263430_C20CB0 +.double 0.09 + +.section .text glabel func_802402D0_BFDB50 /* BFDB50 802402D0 27BDFF80 */ addiu $sp, $sp, -0x80 /* BFDB54 802402D4 AFB3004C */ sw $s3, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s deleted file mode 100644 index 663422e5ad..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120_BFD9A0 -/* BFD9A0 80240120 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BFD9A4 80240124 AFB3002C */ sw $s3, 0x2c($sp) -/* BFD9A8 80240128 0080982D */ daddu $s3, $a0, $zero -/* BFD9AC 8024012C AFBF0030 */ sw $ra, 0x30($sp) -/* BFD9B0 80240130 AFB20028 */ sw $s2, 0x28($sp) -/* BFD9B4 80240134 AFB10024 */ sw $s1, 0x24($sp) -/* BFD9B8 80240138 AFB00020 */ sw $s0, 0x20($sp) -/* BFD9BC 8024013C 8E710148 */ lw $s1, 0x148($s3) -/* BFD9C0 80240140 86240008 */ lh $a0, 8($s1) -/* BFD9C4 80240144 0C00EABB */ jal get_npc_unsafe -/* BFD9C8 80240148 00A0902D */ daddu $s2, $a1, $zero -/* BFD9CC 8024014C 8E440004 */ lw $a0, 4($s2) -/* BFD9D0 80240150 0040802D */ daddu $s0, $v0, $zero -/* BFD9D4 80240154 00041FC2 */ srl $v1, $a0, 0x1f -/* BFD9D8 80240158 00832021 */ addu $a0, $a0, $v1 -/* BFD9DC 8024015C 00042043 */ sra $a0, $a0, 1 -/* BFD9E0 80240160 0C00A67F */ jal rand_int -/* BFD9E4 80240164 24840001 */ addiu $a0, $a0, 1 -/* BFD9E8 80240168 8E430004 */ lw $v1, 4($s2) -/* BFD9EC 8024016C 000327C2 */ srl $a0, $v1, 0x1f -/* BFD9F0 80240170 00641821 */ addu $v1, $v1, $a0 -/* BFD9F4 80240174 00031843 */ sra $v1, $v1, 1 -/* BFD9F8 80240178 00621821 */ addu $v1, $v1, $v0 -/* BFD9FC 8024017C A603008E */ sh $v1, 0x8e($s0) -/* BFDA00 80240180 8E2300D0 */ lw $v1, 0xd0($s1) -/* BFDA04 80240184 C6000040 */ lwc1 $f0, 0x40($s0) -/* BFDA08 80240188 C4640000 */ lwc1 $f4, ($v1) -/* BFDA0C 8024018C 46802120 */ cvt.s.w $f4, $f4 -/* BFDA10 80240190 C4620008 */ lwc1 $f2, 8($v1) -/* BFDA14 80240194 468010A0 */ cvt.s.w $f2, $f2 -/* BFDA18 80240198 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFDA1C 8024019C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDA20 802401A0 44061000 */ mfc1 $a2, $f2 -/* BFDA24 802401A4 C440000C */ lwc1 $f0, 0xc($v0) -/* BFDA28 802401A8 46800020 */ cvt.s.w $f0, $f0 -/* BFDA2C 802401AC E7A00014 */ swc1 $f0, 0x14($sp) -/* BFDA30 802401B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDA34 802401B4 44052000 */ mfc1 $a1, $f4 -/* BFDA38 802401B8 C4400010 */ lwc1 $f0, 0x10($v0) -/* BFDA3C 802401BC 46800020 */ cvt.s.w $f0, $f0 -/* BFDA40 802401C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFDA44 802401C4 8C640018 */ lw $a0, 0x18($v1) -/* BFDA48 802401C8 0C0123F5 */ jal is_point_within_region -/* BFDA4C 802401CC 8E070038 */ lw $a3, 0x38($s0) -/* BFDA50 802401D0 1040000E */ beqz $v0, .L8024020C -/* BFDA54 802401D4 00000000 */ nop -/* BFDA58 802401D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDA5C 802401DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFDA60 802401E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFDA64 802401E4 C4460000 */ lwc1 $f6, ($v0) -/* BFDA68 802401E8 468031A0 */ cvt.s.w $f6, $f6 -/* BFDA6C 802401EC 44063000 */ mfc1 $a2, $f6 -/* BFDA70 802401F0 C4460008 */ lwc1 $f6, 8($v0) -/* BFDA74 802401F4 468031A0 */ cvt.s.w $f6, $f6 -/* BFDA78 802401F8 44073000 */ mfc1 $a3, $f6 -/* BFDA7C 802401FC 0C00A720 */ jal atan2 -/* BFDA80 80240200 00000000 */ nop -/* BFDA84 80240204 0809008F */ j .L8024023C -/* BFDA88 80240208 E600000C */ swc1 $f0, 0xc($s0) -.L8024020C: -/* BFDA8C 8024020C 0C00A67F */ jal rand_int -/* BFDA90 80240210 2404003C */ addiu $a0, $zero, 0x3c -/* BFDA94 80240214 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFDA98 80240218 44820000 */ mtc1 $v0, $f0 -/* BFDA9C 8024021C 00000000 */ nop -/* BFDAA0 80240220 46800020 */ cvt.s.w $f0, $f0 -/* BFDAA4 80240224 46006300 */ add.s $f12, $f12, $f0 -/* BFDAA8 80240228 3C0141F0 */ lui $at, 0x41f0 -/* BFDAAC 8024022C 44810000 */ mtc1 $at, $f0 -/* BFDAB0 80240230 0C00A6C9 */ jal clamp_angle -/* BFDAB4 80240234 46006301 */ sub.s $f12, $f12, $f0 -/* BFDAB8 80240238 E600000C */ swc1 $f0, 0xc($s0) -.L8024023C: -/* BFDABC 8024023C 8E2200CC */ lw $v0, 0xcc($s1) -/* BFDAC0 80240240 8C420004 */ lw $v0, 4($v0) -/* BFDAC4 80240244 AE020028 */ sw $v0, 0x28($s0) -/* BFDAC8 80240248 AE600074 */ sw $zero, 0x74($s3) -/* BFDACC 8024024C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BFDAD0 80240250 8C420014 */ lw $v0, 0x14($v0) -/* BFDAD4 80240254 04410004 */ bgez $v0, .L80240268 -/* BFDAD8 80240258 00000000 */ nop -/* BFDADC 8024025C C6400000 */ lwc1 $f0, ($s2) -/* BFDAE0 80240260 080900A2 */ j .L80240288 -/* BFDAE4 80240264 E6000018 */ swc1 $f0, 0x18($s0) -.L80240268: -/* BFDAE8 80240268 3C018026 */ lui $at, %hi(D_80263420_C20CA0) -/* BFDAEC 8024026C D4223420 */ ldc1 $f2, %lo(D_80263420_C20CA0)($at) -/* BFDAF0 80240270 44820000 */ mtc1 $v0, $f0 -/* BFDAF4 80240274 00000000 */ nop -/* BFDAF8 80240278 46800021 */ cvt.d.w $f0, $f0 -/* BFDAFC 8024027C 46220003 */ div.d $f0, $f0, $f2 -/* BFDB00 80240280 46200020 */ cvt.s.d $f0, $f0 -/* BFDB04 80240284 E6000018 */ swc1 $f0, 0x18($s0) -.L80240288: -/* BFDB08 80240288 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFDB0C 8024028C 3C014059 */ lui $at, 0x4059 -/* BFDB10 80240290 44811800 */ mtc1 $at, $f3 -/* BFDB14 80240294 44801000 */ mtc1 $zero, $f2 -/* BFDB18 80240298 46000021 */ cvt.d.s $f0, $f0 -/* BFDB1C 8024029C 46220002 */ mul.d $f0, $f0, $f2 -/* BFDB20 802402A0 00000000 */ nop -/* BFDB24 802402A4 24020001 */ addiu $v0, $zero, 1 -/* BFDB28 802402A8 4620018D */ trunc.w.d $f6, $f0 -/* BFDB2C 802402AC E626007C */ swc1 $f6, 0x7c($s1) -/* BFDB30 802402B0 AE620070 */ sw $v0, 0x70($s3) -/* BFDB34 802402B4 8FBF0030 */ lw $ra, 0x30($sp) -/* BFDB38 802402B8 8FB3002C */ lw $s3, 0x2c($sp) -/* BFDB3C 802402BC 8FB20028 */ lw $s2, 0x28($sp) -/* BFDB40 802402C0 8FB10024 */ lw $s1, 0x24($sp) -/* BFDB44 802402C4 8FB00020 */ lw $s0, 0x20($sp) -/* BFDB48 802402C8 03E00008 */ jr $ra -/* BFDB4C 802402CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s deleted file mode 100644 index 1beda5d94b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409B8_BFE238 -/* BFE238 802409B8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BFE23C 802409BC AFB3004C */ sw $s3, 0x4c($sp) -/* BFE240 802409C0 0080982D */ daddu $s3, $a0, $zero -/* BFE244 802409C4 AFBF0054 */ sw $ra, 0x54($sp) -/* BFE248 802409C8 AFB40050 */ sw $s4, 0x50($sp) -/* BFE24C 802409CC AFB20048 */ sw $s2, 0x48($sp) -/* BFE250 802409D0 AFB10044 */ sw $s1, 0x44($sp) -/* BFE254 802409D4 AFB00040 */ sw $s0, 0x40($sp) -/* BFE258 802409D8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BFE25C 802409DC F7B80068 */ sdc1 $f24, 0x68($sp) -/* BFE260 802409E0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BFE264 802409E4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BFE268 802409E8 8E710148 */ lw $s1, 0x148($s3) -/* BFE26C 802409EC 00A0902D */ daddu $s2, $a1, $zero -/* BFE270 802409F0 86240008 */ lh $a0, 8($s1) -/* BFE274 802409F4 0C00EABB */ jal get_npc_unsafe -/* BFE278 802409F8 00C0A02D */ daddu $s4, $a2, $zero -/* BFE27C 802409FC 0040802D */ daddu $s0, $v0, $zero -/* BFE280 80240A00 C6200078 */ lwc1 $f0, 0x78($s1) -/* BFE284 80240A04 46800020 */ cvt.s.w $f0, $f0 -/* BFE288 80240A08 46000021 */ cvt.d.s $f0, $f0 -/* BFE28C 80240A0C 3C014059 */ lui $at, 0x4059 -/* BFE290 80240A10 44811800 */ mtc1 $at, $f3 -/* BFE294 80240A14 44801000 */ mtc1 $zero, $f2 -/* BFE298 80240A18 8602008E */ lh $v0, 0x8e($s0) -/* BFE29C 80240A1C 9603008E */ lhu $v1, 0x8e($s0) -/* BFE2A0 80240A20 46220003 */ div.d $f0, $f0, $f2 -/* BFE2A4 80240A24 46200620 */ cvt.s.d $f24, $f0 -/* BFE2A8 80240A28 C6200088 */ lwc1 $f0, 0x88($s1) -/* BFE2AC 80240A2C 46800020 */ cvt.s.w $f0, $f0 -/* BFE2B0 80240A30 46000021 */ cvt.d.s $f0, $f0 -/* BFE2B4 80240A34 46220003 */ div.d $f0, $f0, $f2 -/* BFE2B8 80240A38 46200020 */ cvt.s.d $f0, $f0 -/* BFE2BC 80240A3C 18400003 */ blez $v0, .L80240A4C -/* BFE2C0 80240A40 4600C680 */ add.s $f26, $f24, $f0 -/* BFE2C4 80240A44 2462FFFF */ addiu $v0, $v1, -1 -/* BFE2C8 80240A48 A602008E */ sh $v0, 0x8e($s0) -.L80240A4C: -/* BFE2CC 80240A4C 8E220070 */ lw $v0, 0x70($s1) -/* BFE2D0 80240A50 18400034 */ blez $v0, .L80240B24 -/* BFE2D4 80240A54 00000000 */ nop -/* BFE2D8 80240A58 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BFE2DC 80240A5C 46806320 */ cvt.s.w $f12, $f12 -/* BFE2E0 80240A60 44820000 */ mtc1 $v0, $f0 -/* BFE2E4 80240A64 00000000 */ nop -/* BFE2E8 80240A68 46800020 */ cvt.s.w $f0, $f0 -/* BFE2EC 80240A6C 46000021 */ cvt.d.s $f0, $f0 -/* BFE2F0 80240A70 46220003 */ div.d $f0, $f0, $f2 -/* BFE2F4 80240A74 0C00A8BB */ jal sin_deg -/* BFE2F8 80240A78 462005A0 */ cvt.s.d $f22, $f0 -/* BFE2FC 80240A7C 8E020000 */ lw $v0, ($s0) -/* BFE300 80240A80 30420008 */ andi $v0, $v0, 8 -/* BFE304 80240A84 10400003 */ beqz $v0, .L80240A94 -/* BFE308 80240A88 46000506 */ mov.s $f20, $f0 -/* BFE30C 80240A8C 080902B5 */ j .L80240AD4 -/* BFE310 80240A90 0000102D */ daddu $v0, $zero, $zero -.L80240A94: -/* BFE314 80240A94 27A50028 */ addiu $a1, $sp, 0x28 -/* BFE318 80240A98 27A6002C */ addiu $a2, $sp, 0x2c -/* BFE31C 80240A9C C6000038 */ lwc1 $f0, 0x38($s0) -/* BFE320 80240AA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFE324 80240AA4 C6040040 */ lwc1 $f4, 0x40($s0) -/* BFE328 80240AA8 3C01447A */ lui $at, 0x447a -/* BFE32C 80240AAC 44813000 */ mtc1 $at, $f6 -/* BFE330 80240AB0 27A20034 */ addiu $v0, $sp, 0x34 -/* BFE334 80240AB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFE338 80240AB8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFE33C 80240ABC E7A40030 */ swc1 $f4, 0x30($sp) -/* BFE340 80240AC0 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFE344 80240AC4 AFA20010 */ sw $v0, 0x10($sp) -/* BFE348 80240AC8 8E040080 */ lw $a0, 0x80($s0) -/* BFE34C 80240ACC 0C0372DF */ jal func_800DCB7C -/* BFE350 80240AD0 27A70030 */ addiu $a3, $sp, 0x30 -.L80240AD4: -/* BFE354 80240AD4 10400007 */ beqz $v0, .L80240AF4 -/* BFE358 80240AD8 00000000 */ nop -/* BFE35C 80240ADC 4616A082 */ mul.s $f2, $f20, $f22 -/* BFE360 80240AE0 00000000 */ nop -/* BFE364 80240AE4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFE368 80240AE8 46180000 */ add.s $f0, $f0, $f24 -/* BFE36C 80240AEC 080902C0 */ j .L80240B00 -/* BFE370 80240AF0 46020000 */ add.s $f0, $f0, $f2 -.L80240AF4: -/* BFE374 80240AF4 4616A002 */ mul.s $f0, $f20, $f22 -/* BFE378 80240AF8 00000000 */ nop -/* BFE37C 80240AFC 4600D000 */ add.s $f0, $f26, $f0 -.L80240B00: -/* BFE380 80240B00 E600003C */ swc1 $f0, 0x3c($s0) -/* BFE384 80240B04 8E220074 */ lw $v0, 0x74($s1) -/* BFE388 80240B08 2442000A */ addiu $v0, $v0, 0xa -/* BFE38C 80240B0C 44826000 */ mtc1 $v0, $f12 -/* BFE390 80240B10 00000000 */ nop -/* BFE394 80240B14 0C00A6C9 */ jal clamp_angle -/* BFE398 80240B18 46806320 */ cvt.s.w $f12, $f12 -/* BFE39C 80240B1C 4600020D */ trunc.w.s $f8, $f0 -/* BFE3A0 80240B20 E6280074 */ swc1 $f8, 0x74($s1) -.L80240B24: -/* BFE3A4 80240B24 8E220090 */ lw $v0, 0x90($s1) -/* BFE3A8 80240B28 1C400040 */ bgtz $v0, .L80240C2C -/* BFE3AC 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* BFE3B0 80240B30 860200A8 */ lh $v0, 0xa8($s0) -/* BFE3B4 80240B34 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE3B8 80240B38 44821000 */ mtc1 $v0, $f2 -/* BFE3BC 80240B3C 00000000 */ nop -/* BFE3C0 80240B40 468010A0 */ cvt.s.w $f2, $f2 -/* BFE3C4 80240B44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE3C8 80240B48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE3CC 80240B4C 46020000 */ add.s $f0, $f0, $f2 -/* BFE3D0 80240B50 3C014024 */ lui $at, 0x4024 -/* BFE3D4 80240B54 44812800 */ mtc1 $at, $f5 -/* BFE3D8 80240B58 44802000 */ mtc1 $zero, $f4 -/* BFE3DC 80240B5C C442002C */ lwc1 $f2, 0x2c($v0) -/* BFE3E0 80240B60 46000021 */ cvt.d.s $f0, $f0 -/* BFE3E4 80240B64 46240000 */ add.d $f0, $f0, $f4 -/* BFE3E8 80240B68 460010A1 */ cvt.d.s $f2, $f2 -/* BFE3EC 80240B6C 4620103C */ c.lt.d $f2, $f0 -/* BFE3F0 80240B70 00000000 */ nop -/* BFE3F4 80240B74 4500002E */ bc1f .L80240C30 -/* BFE3F8 80240B78 0280202D */ daddu $a0, $s4, $zero -/* BFE3FC 80240B7C 24020001 */ addiu $v0, $zero, 1 -/* BFE400 80240B80 AFA20010 */ sw $v0, 0x10($sp) -/* BFE404 80240B84 8E460024 */ lw $a2, 0x24($s2) -/* BFE408 80240B88 8E470028 */ lw $a3, 0x28($s2) -/* BFE40C 80240B8C 0C01242D */ jal func_800490B4 -/* BFE410 80240B90 0220282D */ daddu $a1, $s1, $zero -/* BFE414 80240B94 10400026 */ beqz $v0, .L80240C30 -/* BFE418 80240B98 0000202D */ daddu $a0, $zero, $zero -/* BFE41C 80240B9C 0200282D */ daddu $a1, $s0, $zero -/* BFE420 80240BA0 0000302D */ daddu $a2, $zero, $zero -/* BFE424 80240BA4 2412000C */ addiu $s2, $zero, 0xc -/* BFE428 80240BA8 860300A8 */ lh $v1, 0xa8($s0) -/* BFE42C 80240BAC 3C013F80 */ lui $at, 0x3f80 -/* BFE430 80240BB0 44810000 */ mtc1 $at, $f0 -/* BFE434 80240BB4 3C014000 */ lui $at, 0x4000 -/* BFE438 80240BB8 44811000 */ mtc1 $at, $f2 -/* BFE43C 80240BBC 3C01C1A0 */ lui $at, 0xc1a0 -/* BFE440 80240BC0 44812000 */ mtc1 $at, $f4 -/* BFE444 80240BC4 44834000 */ mtc1 $v1, $f8 -/* BFE448 80240BC8 00000000 */ nop -/* BFE44C 80240BCC 46804220 */ cvt.s.w $f8, $f8 -/* BFE450 80240BD0 44074000 */ mfc1 $a3, $f8 -/* BFE454 80240BD4 27A20038 */ addiu $v0, $sp, 0x38 -/* BFE458 80240BD8 AFB2001C */ sw $s2, 0x1c($sp) -/* BFE45C 80240BDC AFA20020 */ sw $v0, 0x20($sp) -/* BFE460 80240BE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFE464 80240BE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BFE468 80240BE8 0C01BFA4 */ jal fx_emote -/* BFE46C 80240BEC E7A40018 */ swc1 $f4, 0x18($sp) -/* BFE470 80240BF0 0200202D */ daddu $a0, $s0, $zero -/* BFE474 80240BF4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFE478 80240BF8 C480003C */ lwc1 $f0, 0x3c($a0) -/* BFE47C 80240BFC 3C060020 */ lui $a2, 0x20 -/* BFE480 80240C00 0C012530 */ jal func_800494C0 -/* BFE484 80240C04 E4800064 */ swc1 $f0, 0x64($a0) -/* BFE488 80240C08 8E220018 */ lw $v0, 0x18($s1) -/* BFE48C 80240C0C 9442002A */ lhu $v0, 0x2a($v0) -/* BFE490 80240C10 30420001 */ andi $v0, $v0, 1 -/* BFE494 80240C14 10400003 */ beqz $v0, .L80240C24 -/* BFE498 80240C18 2402000A */ addiu $v0, $zero, 0xa -/* BFE49C 80240C1C 08090333 */ j .L80240CCC -/* BFE4A0 80240C20 AE620070 */ sw $v0, 0x70($s3) -.L80240C24: -/* BFE4A4 80240C24 08090333 */ j .L80240CCC -/* BFE4A8 80240C28 AE720070 */ sw $s2, 0x70($s3) -.L80240C2C: -/* BFE4AC 80240C2C AE220090 */ sw $v0, 0x90($s1) -.L80240C30: -/* BFE4B0 80240C30 8602008C */ lh $v0, 0x8c($s0) -/* BFE4B4 80240C34 14400025 */ bnez $v0, .L80240CCC -/* BFE4B8 80240C38 00000000 */ nop -/* BFE4BC 80240C3C 8602008E */ lh $v0, 0x8e($s0) -/* BFE4C0 80240C40 1C400022 */ bgtz $v0, .L80240CCC -/* BFE4C4 80240C44 00000000 */ nop -/* BFE4C8 80240C48 8E620074 */ lw $v0, 0x74($s3) -/* BFE4CC 80240C4C 2442FFFF */ addiu $v0, $v0, -1 -/* BFE4D0 80240C50 1840001D */ blez $v0, .L80240CC8 -/* BFE4D4 80240C54 AE620074 */ sw $v0, 0x74($s3) -/* BFE4D8 80240C58 8E220018 */ lw $v0, 0x18($s1) -/* BFE4DC 80240C5C 9442002A */ lhu $v0, 0x2a($v0) -/* BFE4E0 80240C60 30420010 */ andi $v0, $v0, 0x10 -/* BFE4E4 80240C64 14400007 */ bnez $v0, .L80240C84 -/* BFE4E8 80240C68 00000000 */ nop -/* BFE4EC 80240C6C C600000C */ lwc1 $f0, 0xc($s0) -/* BFE4F0 80240C70 3C014334 */ lui $at, 0x4334 -/* BFE4F4 80240C74 44816000 */ mtc1 $at, $f12 -/* BFE4F8 80240C78 0C00A6C9 */ jal clamp_angle -/* BFE4FC 80240C7C 460C0300 */ add.s $f12, $f0, $f12 -/* BFE500 80240C80 E600000C */ swc1 $f0, 0xc($s0) -.L80240C84: -/* BFE504 80240C84 0C00A67F */ jal rand_int -/* BFE508 80240C88 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BFE50C 80240C8C 3C032E8B */ lui $v1, 0x2e8b -/* BFE510 80240C90 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BFE514 80240C94 00430018 */ mult $v0, $v1 -/* BFE518 80240C98 00021FC3 */ sra $v1, $v0, 0x1f -/* BFE51C 80240C9C 00004010 */ mfhi $t0 -/* BFE520 80240CA0 00082043 */ sra $a0, $t0, 1 -/* BFE524 80240CA4 00832023 */ subu $a0, $a0, $v1 -/* BFE528 80240CA8 00041840 */ sll $v1, $a0, 1 -/* BFE52C 80240CAC 00641821 */ addu $v1, $v1, $a0 -/* BFE530 80240CB0 00031880 */ sll $v1, $v1, 2 -/* BFE534 80240CB4 00641823 */ subu $v1, $v1, $a0 -/* BFE538 80240CB8 00431023 */ subu $v0, $v0, $v1 -/* BFE53C 80240CBC 24420005 */ addiu $v0, $v0, 5 -/* BFE540 80240CC0 08090333 */ j .L80240CCC -/* BFE544 80240CC4 A602008E */ sh $v0, 0x8e($s0) -.L80240CC8: -/* BFE548 80240CC8 AE600070 */ sw $zero, 0x70($s3) -.L80240CCC: -/* BFE54C 80240CCC 8FBF0054 */ lw $ra, 0x54($sp) -/* BFE550 80240CD0 8FB40050 */ lw $s4, 0x50($sp) -/* BFE554 80240CD4 8FB3004C */ lw $s3, 0x4c($sp) -/* BFE558 80240CD8 8FB20048 */ lw $s2, 0x48($sp) -/* BFE55C 80240CDC 8FB10044 */ lw $s1, 0x44($sp) -/* BFE560 80240CE0 8FB00040 */ lw $s0, 0x40($sp) -/* BFE564 80240CE4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BFE568 80240CE8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* BFE56C 80240CEC D7B60060 */ ldc1 $f22, 0x60($sp) -/* BFE570 80240CF0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BFE574 80240CF4 03E00008 */ jr $ra -/* BFE578 80240CF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s deleted file mode 100644 index fb3a0ec15b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D74_BFE5F4 -/* BFE5F4 80240D74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFE5F8 80240D78 AFB00010 */ sw $s0, 0x10($sp) -/* BFE5FC 80240D7C 0080802D */ daddu $s0, $a0, $zero -/* BFE600 80240D80 AFBF0014 */ sw $ra, 0x14($sp) -/* BFE604 80240D84 8E020148 */ lw $v0, 0x148($s0) -/* BFE608 80240D88 0C00EABB */ jal get_npc_unsafe -/* BFE60C 80240D8C 84440008 */ lh $a0, 8($v0) -/* BFE610 80240D90 9443008E */ lhu $v1, 0x8e($v0) -/* BFE614 80240D94 C440003C */ lwc1 $f0, 0x3c($v0) -/* BFE618 80240D98 24640001 */ addiu $a0, $v1, 1 -/* BFE61C 80240D9C 00031C00 */ sll $v1, $v1, 0x10 -/* BFE620 80240DA0 00031B83 */ sra $v1, $v1, 0xe -/* BFE624 80240DA4 A444008E */ sh $a0, 0x8e($v0) -/* BFE628 80240DA8 3C018024 */ lui $at, %hi(D_80244CD0_C02550) -/* BFE62C 80240DAC 00230821 */ addu $at, $at, $v1 -/* BFE630 80240DB0 C4224CD0 */ lwc1 $f2, %lo(D_80244CD0_C02550)($at) -/* BFE634 80240DB4 8443008E */ lh $v1, 0x8e($v0) -/* BFE638 80240DB8 46020000 */ add.s $f0, $f0, $f2 -/* BFE63C 80240DBC 28630005 */ slti $v1, $v1, 5 -/* BFE640 80240DC0 14600003 */ bnez $v1, .L80240DD0 -/* BFE644 80240DC4 E440003C */ swc1 $f0, 0x3c($v0) -/* BFE648 80240DC8 2402000C */ addiu $v0, $zero, 0xc -/* BFE64C 80240DCC AE020070 */ sw $v0, 0x70($s0) -.L80240DD0: -/* BFE650 80240DD0 8FBF0014 */ lw $ra, 0x14($sp) -/* BFE654 80240DD4 8FB00010 */ lw $s0, 0x10($sp) -/* BFE658 80240DD8 03E00008 */ jr $ra -/* BFE65C 80240DDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s deleted file mode 100644 index b43761c88a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F78_BFE7F8 -/* BFE7F8 80240F78 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BFE7FC 80240F7C AFB20030 */ sw $s2, 0x30($sp) -/* BFE800 80240F80 0080902D */ daddu $s2, $a0, $zero -/* BFE804 80240F84 AFBF0038 */ sw $ra, 0x38($sp) -/* BFE808 80240F88 AFB30034 */ sw $s3, 0x34($sp) -/* BFE80C 80240F8C AFB1002C */ sw $s1, 0x2c($sp) -/* BFE810 80240F90 AFB00028 */ sw $s0, 0x28($sp) -/* BFE814 80240F94 F7B60048 */ sdc1 $f22, 0x48($sp) -/* BFE818 80240F98 F7B40040 */ sdc1 $f20, 0x40($sp) -/* BFE81C 80240F9C 8E510148 */ lw $s1, 0x148($s2) -/* BFE820 80240FA0 86240008 */ lh $a0, 8($s1) -/* BFE824 80240FA4 0C00EABB */ jal get_npc_unsafe -/* BFE828 80240FA8 00A0982D */ daddu $s3, $a1, $zero -/* BFE82C 80240FAC 0040802D */ daddu $s0, $v0, $zero -/* BFE830 80240FB0 0200202D */ daddu $a0, $s0, $zero -/* BFE834 80240FB4 C6220088 */ lwc1 $f2, 0x88($s1) -/* BFE838 80240FB8 468010A0 */ cvt.s.w $f2, $f2 -/* BFE83C 80240FBC 460010A1 */ cvt.d.s $f2, $f2 -/* BFE840 80240FC0 C604001C */ lwc1 $f4, 0x1c($s0) -/* BFE844 80240FC4 C6000014 */ lwc1 $f0, 0x14($s0) -/* BFE848 80240FC8 8E050018 */ lw $a1, 0x18($s0) -/* BFE84C 80240FCC 46002100 */ add.s $f4, $f4, $f0 -/* BFE850 80240FD0 8E06000C */ lw $a2, 0xc($s0) -/* BFE854 80240FD4 C6200078 */ lwc1 $f0, 0x78($s1) -/* BFE858 80240FD8 46800020 */ cvt.s.w $f0, $f0 -/* BFE85C 80240FDC E604001C */ swc1 $f4, 0x1c($s0) -/* BFE860 80240FE0 3C014059 */ lui $at, 0x4059 -/* BFE864 80240FE4 44812800 */ mtc1 $at, $f5 -/* BFE868 80240FE8 44802000 */ mtc1 $zero, $f4 -/* BFE86C 80240FEC 46000021 */ cvt.d.s $f0, $f0 -/* BFE870 80240FF0 46240003 */ div.d $f0, $f0, $f4 -/* BFE874 80240FF4 46200520 */ cvt.s.d $f20, $f0 -/* BFE878 80240FF8 46241083 */ div.d $f2, $f2, $f4 -/* BFE87C 80240FFC 0C00EA95 */ jal npc_move_heading -/* BFE880 80241000 462015A0 */ cvt.s.d $f22, $f2 -/* BFE884 80241004 C604001C */ lwc1 $f4, 0x1c($s0) -/* BFE888 80241008 44801000 */ mtc1 $zero, $f2 -/* BFE88C 8024100C 44801800 */ mtc1 $zero, $f3 -/* BFE890 80241010 46002021 */ cvt.d.s $f0, $f4 -/* BFE894 80241014 4620103E */ c.le.d $f2, $f0 -/* BFE898 80241018 00000000 */ nop -/* BFE89C 8024101C 45000030 */ bc1f .L802410E0 -/* BFE8A0 80241020 00000000 */ nop -/* BFE8A4 80241024 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE8A8 80241028 46040000 */ add.s $f0, $f0, $f4 -/* BFE8AC 8024102C E600003C */ swc1 $f0, 0x3c($s0) -/* BFE8B0 80241030 8E2200CC */ lw $v0, 0xcc($s1) -/* BFE8B4 80241034 8C420024 */ lw $v0, 0x24($v0) -/* BFE8B8 80241038 AE020028 */ sw $v0, 0x28($s0) -/* BFE8BC 8024103C A2200007 */ sb $zero, 7($s1) -/* BFE8C0 80241040 8E020000 */ lw $v0, ($s0) -/* BFE8C4 80241044 30420008 */ andi $v0, $v0, 8 -/* BFE8C8 80241048 14400011 */ bnez $v0, .L80241090 -/* BFE8CC 8024104C 0000102D */ daddu $v0, $zero, $zero -/* BFE8D0 80241050 27A50018 */ addiu $a1, $sp, 0x18 -/* BFE8D4 80241054 27A6001C */ addiu $a2, $sp, 0x1c -/* BFE8D8 80241058 C6000038 */ lwc1 $f0, 0x38($s0) -/* BFE8DC 8024105C C602003C */ lwc1 $f2, 0x3c($s0) -/* BFE8E0 80241060 C6040040 */ lwc1 $f4, 0x40($s0) -/* BFE8E4 80241064 3C01447A */ lui $at, 0x447a -/* BFE8E8 80241068 44813000 */ mtc1 $at, $f6 -/* BFE8EC 8024106C 27A20024 */ addiu $v0, $sp, 0x24 -/* BFE8F0 80241070 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFE8F4 80241074 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BFE8F8 80241078 E7A40020 */ swc1 $f4, 0x20($sp) -/* BFE8FC 8024107C E7A60024 */ swc1 $f6, 0x24($sp) -/* BFE900 80241080 AFA20010 */ sw $v0, 0x10($sp) -/* BFE904 80241084 8E040080 */ lw $a0, 0x80($s0) -/* BFE908 80241088 0C0372DF */ jal func_800DCB7C -/* BFE90C 8024108C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241090: -/* BFE910 80241090 1040000B */ beqz $v0, .L802410C0 -/* BFE914 80241094 00000000 */ nop -/* BFE918 80241098 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BFE91C 8024109C 46140080 */ add.s $f2, $f0, $f20 -/* BFE920 802410A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE924 802410A4 4600103E */ c.le.s $f2, $f0 -/* BFE928 802410A8 00000000 */ nop -/* BFE92C 802410AC 4500008D */ bc1f .L802412E4 -/* BFE930 802410B0 00000000 */ nop -/* BFE934 802410B4 E602003C */ swc1 $f2, 0x3c($s0) -/* BFE938 802410B8 080904B9 */ j .L802412E4 -/* BFE93C 802410BC AE400070 */ sw $zero, 0x70($s2) -.L802410C0: -/* BFE940 802410C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFE944 802410C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* BFE948 802410C8 4602003E */ c.le.s $f0, $f2 -/* BFE94C 802410CC 00000000 */ nop -/* BFE950 802410D0 45030084 */ bc1tl .L802412E4 -/* BFE954 802410D4 AE400070 */ sw $zero, 0x70($s2) -/* BFE958 802410D8 080904B9 */ j .L802412E4 -/* BFE95C 802410DC 00000000 */ nop -.L802410E0: -/* BFE960 802410E0 4622003C */ c.lt.d $f0, $f2 -/* BFE964 802410E4 00000000 */ nop -/* BFE968 802410E8 4500007E */ bc1f .L802412E4 -/* BFE96C 802410EC 00000000 */ nop -/* BFE970 802410F0 9602008E */ lhu $v0, 0x8e($s0) -/* BFE974 802410F4 24420001 */ addiu $v0, $v0, 1 -/* BFE978 802410F8 A602008E */ sh $v0, 0x8e($s0) -/* BFE97C 802410FC 00021400 */ sll $v0, $v0, 0x10 -/* BFE980 80241100 8E630020 */ lw $v1, 0x20($s3) -/* BFE984 80241104 00021403 */ sra $v0, $v0, 0x10 -/* BFE988 80241108 0043102A */ slt $v0, $v0, $v1 -/* BFE98C 8024110C 14400026 */ bnez $v0, .L802411A8 -/* BFE990 80241110 00000000 */ nop -/* BFE994 80241114 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFE998 80241118 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFE99C 8024111C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE9A0 80241120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE9A4 80241124 A600008E */ sh $zero, 0x8e($s0) -/* BFE9A8 80241128 8C460028 */ lw $a2, 0x28($v0) -/* BFE9AC 8024112C 0C00A720 */ jal atan2 -/* BFE9B0 80241130 8C470030 */ lw $a3, 0x30($v0) -/* BFE9B4 80241134 46000506 */ mov.s $f20, $f0 -/* BFE9B8 80241138 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFE9BC 8024113C 0C00A70A */ jal get_clamped_angle_diff -/* BFE9C0 80241140 4600A386 */ mov.s $f14, $f20 -/* BFE9C4 80241144 46000086 */ mov.s $f2, $f0 -/* BFE9C8 80241148 8E62001C */ lw $v0, 0x1c($s3) -/* BFE9CC 8024114C 46001005 */ abs.s $f0, $f2 -/* BFE9D0 80241150 44822000 */ mtc1 $v0, $f4 -/* BFE9D4 80241154 00000000 */ nop -/* BFE9D8 80241158 46802120 */ cvt.s.w $f4, $f4 -/* BFE9DC 8024115C 4600203C */ c.lt.s $f4, $f0 -/* BFE9E0 80241160 00000000 */ nop -/* BFE9E4 80241164 4500000D */ bc1f .L8024119C -/* BFE9E8 80241168 00000000 */ nop -/* BFE9EC 8024116C 44800000 */ mtc1 $zero, $f0 -/* BFE9F0 80241170 C614000C */ lwc1 $f20, 0xc($s0) -/* BFE9F4 80241174 4600103C */ c.lt.s $f2, $f0 -/* BFE9F8 80241178 00000000 */ nop -/* BFE9FC 8024117C 45000006 */ bc1f .L80241198 -/* BFEA00 80241180 00021023 */ negu $v0, $v0 -/* BFEA04 80241184 44820000 */ mtc1 $v0, $f0 -/* BFEA08 80241188 00000000 */ nop -/* BFEA0C 8024118C 46800020 */ cvt.s.w $f0, $f0 -/* BFEA10 80241190 08090467 */ j .L8024119C -/* BFEA14 80241194 4600A500 */ add.s $f20, $f20, $f0 -.L80241198: -/* BFEA18 80241198 4604A500 */ add.s $f20, $f20, $f4 -.L8024119C: -/* BFEA1C 8024119C 0C00A6C9 */ jal clamp_angle -/* BFEA20 802411A0 4600A306 */ mov.s $f12, $f20 -/* BFEA24 802411A4 E600000C */ swc1 $f0, 0xc($s0) -.L802411A8: -/* BFEA28 802411A8 8E020000 */ lw $v0, ($s0) -/* BFEA2C 802411AC 30420008 */ andi $v0, $v0, 8 -/* BFEA30 802411B0 1040000A */ beqz $v0, .L802411DC -/* BFEA34 802411B4 27A50018 */ addiu $a1, $sp, 0x18 -/* BFEA38 802411B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFEA3C 802411BC C600001C */ lwc1 $f0, 0x1c($s0) -/* BFEA40 802411C0 46001080 */ add.s $f2, $f2, $f0 -/* BFEA44 802411C4 4616103C */ c.lt.s $f2, $f22 -/* BFEA48 802411C8 00000000 */ nop -/* BFEA4C 802411CC 45020045 */ bc1fl .L802412E4 -/* BFEA50 802411D0 E602003C */ swc1 $f2, 0x3c($s0) -/* BFEA54 802411D4 080904B8 */ j .L802412E0 -/* BFEA58 802411D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802411DC: -/* BFEA5C 802411DC C6000038 */ lwc1 $f0, 0x38($s0) -/* BFEA60 802411E0 27A6001C */ addiu $a2, $sp, 0x1c -/* BFEA64 802411E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFEA68 802411E8 860200A8 */ lh $v0, 0xa8($s0) -/* BFEA6C 802411EC C600001C */ lwc1 $f0, 0x1c($s0) -/* BFEA70 802411F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* BFEA74 802411F4 44821000 */ mtc1 $v0, $f2 -/* BFEA78 802411F8 00000000 */ nop -/* BFEA7C 802411FC 468010A0 */ cvt.s.w $f2, $f2 -/* BFEA80 80241200 46000005 */ abs.s $f0, $f0 -/* BFEA84 80241204 46020000 */ add.s $f0, $f0, $f2 -/* BFEA88 80241208 C6060040 */ lwc1 $f6, 0x40($s0) -/* BFEA8C 8024120C 27A20024 */ addiu $v0, $sp, 0x24 -/* BFEA90 80241210 46022100 */ add.s $f4, $f4, $f2 -/* BFEA94 80241214 3C014024 */ lui $at, 0x4024 -/* BFEA98 80241218 44811800 */ mtc1 $at, $f3 -/* BFEA9C 8024121C 44801000 */ mtc1 $zero, $f2 -/* BFEAA0 80241220 46000021 */ cvt.d.s $f0, $f0 -/* BFEAA4 80241224 46220000 */ add.d $f0, $f0, $f2 -/* BFEAA8 80241228 E7A60020 */ swc1 $f6, 0x20($sp) -/* BFEAAC 8024122C E7A4001C */ swc1 $f4, 0x1c($sp) -/* BFEAB0 80241230 46200020 */ cvt.s.d $f0, $f0 -/* BFEAB4 80241234 E7A00024 */ swc1 $f0, 0x24($sp) -/* BFEAB8 80241238 AFA20010 */ sw $v0, 0x10($sp) -/* BFEABC 8024123C 8E040080 */ lw $a0, 0x80($s0) -/* BFEAC0 80241240 0C0372DF */ jal func_800DCB7C -/* BFEAC4 80241244 27A70020 */ addiu $a3, $sp, 0x20 -/* BFEAC8 80241248 10400015 */ beqz $v0, .L802412A0 -/* BFEACC 8024124C 00000000 */ nop -/* BFEAD0 80241250 860200A8 */ lh $v0, 0xa8($s0) -/* BFEAD4 80241254 C604001C */ lwc1 $f4, 0x1c($s0) -/* BFEAD8 80241258 44820000 */ mtc1 $v0, $f0 -/* BFEADC 8024125C 00000000 */ nop -/* BFEAE0 80241260 46800020 */ cvt.s.w $f0, $f0 -/* BFEAE4 80241264 46002085 */ abs.s $f2, $f4 -/* BFEAE8 80241268 46020000 */ add.s $f0, $f0, $f2 -/* BFEAEC 8024126C C7A20024 */ lwc1 $f2, 0x24($sp) -/* BFEAF0 80241270 4600103E */ c.le.s $f2, $f0 -/* BFEAF4 80241274 00000000 */ nop -/* BFEAF8 80241278 45000005 */ bc1f .L80241290 -/* BFEAFC 8024127C 00000000 */ nop -/* BFEB00 80241280 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BFEB04 80241284 AE00001C */ sw $zero, 0x1c($s0) -/* BFEB08 80241288 080904B9 */ j .L802412E4 -/* BFEB0C 8024128C E600003C */ swc1 $f0, 0x3c($s0) -.L80241290: -/* BFEB10 80241290 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFEB14 80241294 46040000 */ add.s $f0, $f0, $f4 -/* BFEB18 80241298 080904B9 */ j .L802412E4 -/* BFEB1C 8024129C E600003C */ swc1 $f0, 0x3c($s0) -.L802412A0: -/* BFEB20 802412A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* BFEB24 802412A4 860200A8 */ lh $v0, 0xa8($s0) -/* BFEB28 802412A8 46163081 */ sub.s $f2, $f6, $f22 -/* BFEB2C 802412AC 44820000 */ mtc1 $v0, $f0 -/* BFEB30 802412B0 00000000 */ nop -/* BFEB34 802412B4 46800020 */ cvt.s.w $f0, $f0 -/* BFEB38 802412B8 46001080 */ add.s $f2, $f2, $f0 -/* BFEB3C 802412BC C604001C */ lwc1 $f4, 0x1c($s0) -/* BFEB40 802412C0 46002005 */ abs.s $f0, $f4 -/* BFEB44 802412C4 4602003C */ c.lt.s $f0, $f2 -/* BFEB48 802412C8 00000000 */ nop -/* BFEB4C 802412CC 45020005 */ bc1fl .L802412E4 -/* BFEB50 802412D0 AE00001C */ sw $zero, 0x1c($s0) -/* BFEB54 802412D4 46043000 */ add.s $f0, $f6, $f4 -/* BFEB58 802412D8 080904B9 */ j .L802412E4 -/* BFEB5C 802412DC E600003C */ swc1 $f0, 0x3c($s0) -.L802412E0: -/* BFEB60 802412E0 AE00001C */ sw $zero, 0x1c($s0) -.L802412E4: -/* BFEB64 802412E4 8FBF0038 */ lw $ra, 0x38($sp) -/* BFEB68 802412E8 8FB30034 */ lw $s3, 0x34($sp) -/* BFEB6C 802412EC 8FB20030 */ lw $s2, 0x30($sp) -/* BFEB70 802412F0 8FB1002C */ lw $s1, 0x2c($sp) -/* BFEB74 802412F4 8FB00028 */ lw $s0, 0x28($sp) -/* BFEB78 802412F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* BFEB7C 802412FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* BFEB80 80241300 03E00008 */ jr $ra -/* BFEB84 80241304 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s deleted file mode 100644 index 048b20e48d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241308_BFEB88 -/* BFEB88 80241308 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BFEB8C 8024130C AFB00028 */ sw $s0, 0x28($sp) -/* BFEB90 80241310 00A0802D */ daddu $s0, $a1, $zero -/* BFEB94 80241314 AFB1002C */ sw $s1, 0x2c($sp) -/* BFEB98 80241318 00C0882D */ daddu $s1, $a2, $zero -/* BFEB9C 8024131C AFBF0034 */ sw $ra, 0x34($sp) -/* BFEBA0 80241320 AFB20030 */ sw $s2, 0x30($sp) -/* BFEBA4 80241324 AE200070 */ sw $zero, 0x70($s1) -/* BFEBA8 80241328 8C830000 */ lw $v1, ($a0) -/* BFEBAC 8024132C 2402FDFF */ addiu $v0, $zero, -0x201 -/* BFEBB0 80241330 A480008E */ sh $zero, 0x8e($a0) -/* BFEBB4 80241334 00621824 */ and $v1, $v1, $v0 -/* BFEBB8 80241338 34650800 */ ori $a1, $v1, 0x800 -/* BFEBBC 8024133C AC850000 */ sw $a1, ($a0) -/* BFEBC0 80241340 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFEBC4 80241344 8C420034 */ lw $v0, 0x34($v0) -/* BFEBC8 80241348 10400003 */ beqz $v0, .L80241358 -/* BFEBCC 8024134C 00E0902D */ daddu $s2, $a3, $zero -/* BFEBD0 80241350 080904D8 */ j .L80241360 -/* BFEBD4 80241354 34620808 */ ori $v0, $v1, 0x808 -.L80241358: -/* BFEBD8 80241358 2402FFF7 */ addiu $v0, $zero, -9 -/* BFEBDC 8024135C 00A21024 */ and $v0, $a1, $v0 -.L80241360: -/* BFEBE0 80241360 AC820000 */ sw $v0, ($a0) -/* BFEBE4 80241364 27A20024 */ addiu $v0, $sp, 0x24 -/* BFEBE8 80241368 27A50018 */ addiu $a1, $sp, 0x18 -/* BFEBEC 8024136C C4800038 */ lwc1 $f0, 0x38($a0) -/* BFEBF0 80241370 C482003C */ lwc1 $f2, 0x3c($a0) -/* BFEBF4 80241374 C4840040 */ lwc1 $f4, 0x40($a0) -/* BFEBF8 80241378 3C01447A */ lui $at, 0x447a -/* BFEBFC 8024137C 44813000 */ mtc1 $at, $f6 -/* BFEC00 80241380 27A6001C */ addiu $a2, $sp, 0x1c -/* BFEC04 80241384 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFEC08 80241388 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BFEC0C 8024138C E7A40020 */ swc1 $f4, 0x20($sp) -/* BFEC10 80241390 E7A60024 */ swc1 $f6, 0x24($sp) -/* BFEC14 80241394 AFA20010 */ sw $v0, 0x10($sp) -/* BFEC18 80241398 8C840080 */ lw $a0, 0x80($a0) -/* BFEC1C 8024139C 0C0372DF */ jal func_800DCB7C -/* BFEC20 802413A0 27A70020 */ addiu $a3, $sp, 0x20 -/* BFEC24 802413A4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* BFEC28 802413A8 3C014059 */ lui $at, 0x4059 -/* BFEC2C 802413AC 44812800 */ mtc1 $at, $f5 -/* BFEC30 802413B0 44802000 */ mtc1 $zero, $f4 -/* BFEC34 802413B4 460010A1 */ cvt.d.s $f2, $f2 -/* BFEC38 802413B8 46241082 */ mul.d $f2, $f2, $f4 -/* BFEC3C 802413BC 00000000 */ nop -/* BFEC40 802413C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BFEC44 802413C4 46000021 */ cvt.d.s $f0, $f0 -/* BFEC48 802413C8 46240002 */ mul.d $f0, $f0, $f4 -/* BFEC4C 802413CC 00000000 */ nop -/* BFEC50 802413D0 3C013FE0 */ lui $at, 0x3fe0 -/* BFEC54 802413D4 44812800 */ mtc1 $at, $f5 -/* BFEC58 802413D8 44802000 */ mtc1 $zero, $f4 -/* BFEC5C 802413DC 00000000 */ nop -/* BFEC60 802413E0 46241080 */ add.d $f2, $f2, $f4 -/* BFEC64 802413E4 AE000074 */ sw $zero, 0x74($s0) -/* BFEC68 802413E8 46240000 */ add.d $f0, $f0, $f4 -/* BFEC6C 802413EC AE000090 */ sw $zero, 0x90($s0) -/* BFEC70 802413F0 4620120D */ trunc.w.d $f8, $f2 -/* BFEC74 802413F4 E6080078 */ swc1 $f8, 0x78($s0) -/* BFEC78 802413F8 4620020D */ trunc.w.d $f8, $f0 -/* BFEC7C 802413FC E6080088 */ swc1 $f8, 0x88($s0) -/* BFEC80 80241400 8E420014 */ lw $v0, 0x14($s2) -/* BFEC84 80241404 AE220074 */ sw $v0, 0x74($s1) -/* BFEC88 80241408 8E0200B0 */ lw $v0, 0xb0($s0) -/* BFEC8C 8024140C 34420010 */ ori $v0, $v0, 0x10 -/* BFEC90 80241410 AE0200B0 */ sw $v0, 0xb0($s0) -/* BFEC94 80241414 8FBF0034 */ lw $ra, 0x34($sp) -/* BFEC98 80241418 8FB20030 */ lw $s2, 0x30($sp) -/* BFEC9C 8024141C 8FB1002C */ lw $s1, 0x2c($sp) -/* BFECA0 80241420 8FB00028 */ lw $s0, 0x28($sp) -/* BFECA4 80241424 03E00008 */ jr $ra -/* BFECA8 80241428 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s deleted file mode 100644 index 503ee5722b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024142C_BFECAC -/* BFECAC 8024142C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BFECB0 80241430 AFB40040 */ sw $s4, 0x40($sp) -/* BFECB4 80241434 0080A02D */ daddu $s4, $a0, $zero -/* BFECB8 80241438 AFBF0048 */ sw $ra, 0x48($sp) -/* BFECBC 8024143C AFB50044 */ sw $s5, 0x44($sp) -/* BFECC0 80241440 AFB3003C */ sw $s3, 0x3c($sp) -/* BFECC4 80241444 AFB20038 */ sw $s2, 0x38($sp) -/* BFECC8 80241448 AFB10034 */ sw $s1, 0x34($sp) -/* BFECCC 8024144C AFB00030 */ sw $s0, 0x30($sp) -/* BFECD0 80241450 8E920148 */ lw $s2, 0x148($s4) -/* BFECD4 80241454 86440008 */ lh $a0, 8($s2) -/* BFECD8 80241458 8E90000C */ lw $s0, 0xc($s4) -/* BFECDC 8024145C 0C00EABB */ jal get_npc_unsafe -/* BFECE0 80241460 00A0882D */ daddu $s1, $a1, $zero -/* BFECE4 80241464 0280202D */ daddu $a0, $s4, $zero -/* BFECE8 80241468 8E050000 */ lw $a1, ($s0) -/* BFECEC 8024146C 0C0B1EAF */ jal get_variable -/* BFECF0 80241470 0040A82D */ daddu $s5, $v0, $zero -/* BFECF4 80241474 AFA00010 */ sw $zero, 0x10($sp) -/* BFECF8 80241478 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFECFC 8024147C 8C630030 */ lw $v1, 0x30($v1) -/* BFED00 80241480 AFA30014 */ sw $v1, 0x14($sp) -/* BFED04 80241484 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED08 80241488 8C63001C */ lw $v1, 0x1c($v1) -/* BFED0C 8024148C AFA30018 */ sw $v1, 0x18($sp) -/* BFED10 80241490 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED14 80241494 8C630024 */ lw $v1, 0x24($v1) -/* BFED18 80241498 AFA3001C */ sw $v1, 0x1c($sp) -/* BFED1C 8024149C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED20 802414A0 8C630028 */ lw $v1, 0x28($v1) -/* BFED24 802414A4 27B30010 */ addiu $s3, $sp, 0x10 -/* BFED28 802414A8 AFA30020 */ sw $v1, 0x20($sp) -/* BFED2C 802414AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED30 802414B0 3C0142F0 */ lui $at, 0x42f0 -/* BFED34 802414B4 44810000 */ mtc1 $at, $f0 -/* BFED38 802414B8 8C63002C */ lw $v1, 0x2c($v1) -/* BFED3C 802414BC 0040802D */ daddu $s0, $v0, $zero -/* BFED40 802414C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFED44 802414C4 A7A0002C */ sh $zero, 0x2c($sp) -/* BFED48 802414C8 12200006 */ beqz $s1, .L802414E4 -/* BFED4C 802414CC AFA30024 */ sw $v1, 0x24($sp) -/* BFED50 802414D0 02A0202D */ daddu $a0, $s5, $zero -/* BFED54 802414D4 0240282D */ daddu $a1, $s2, $zero -/* BFED58 802414D8 0280302D */ daddu $a2, $s4, $zero -/* BFED5C 802414DC 0C0904C2 */ jal func_80241308_BFEB88 -/* BFED60 802414E0 0200382D */ daddu $a3, $s0, $zero -.L802414E4: -/* BFED64 802414E4 2402FFFE */ addiu $v0, $zero, -2 -/* BFED68 802414E8 A2A200AB */ sb $v0, 0xab($s5) -/* BFED6C 802414EC 8E4300B0 */ lw $v1, 0xb0($s2) -/* BFED70 802414F0 30620004 */ andi $v0, $v1, 4 -/* BFED74 802414F4 10400007 */ beqz $v0, .L80241514 -/* BFED78 802414F8 00000000 */ nop -/* BFED7C 802414FC 824200B4 */ lb $v0, 0xb4($s2) -/* BFED80 80241500 1440003C */ bnez $v0, .L802415F4 -/* BFED84 80241504 0000102D */ daddu $v0, $zero, $zero -/* BFED88 80241508 2402FFFB */ addiu $v0, $zero, -5 -/* BFED8C 8024150C 00621024 */ and $v0, $v1, $v0 -/* BFED90 80241510 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241514: -/* BFED94 80241514 8E830070 */ lw $v1, 0x70($s4) -/* BFED98 80241518 2C62000F */ sltiu $v0, $v1, 0xf -/* BFED9C 8024151C 10400034 */ beqz $v0, L802415F0_BFEE70 -/* BFEDA0 80241520 00031080 */ sll $v0, $v1, 2 -/* BFEDA4 80241524 3C018026 */ lui $at, %hi(jtbl_80263438_C20CB8) -/* BFEDA8 80241528 00220821 */ addu $at, $at, $v0 -/* BFEDAC 8024152C 8C223438 */ lw $v0, %lo(jtbl_80263438_C20CB8)($at) -/* BFEDB0 80241530 00400008 */ jr $v0 -/* BFEDB4 80241534 00000000 */ nop -glabel L80241538_BFEDB8 -/* BFEDB8 80241538 0280202D */ daddu $a0, $s4, $zero -/* BFEDBC 8024153C 0200282D */ daddu $a1, $s0, $zero -/* BFEDC0 80241540 0C090048 */ jal func_80240120_BFD9A0 -/* BFEDC4 80241544 0260302D */ daddu $a2, $s3, $zero -glabel L80241548_BFEDC8 -/* BFEDC8 80241548 0280202D */ daddu $a0, $s4, $zero -/* BFEDCC 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BFEDD0 80241550 0C0900B4 */ jal func_802402D0_BFDB50 -/* BFEDD4 80241554 0260302D */ daddu $a2, $s3, $zero -/* BFEDD8 80241558 0809057D */ j .L802415F4 -/* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero -glabel L80241560_BFEDE0 -/* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero -/* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BFEDE8 80241568 0C09023E */ jal dgb_01_UnkNpcAIFunc1 -/* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero -glabel L80241570_BFEDF0 -/* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero -/* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero -/* BFEDF8 80241578 0C09026E */ jal func_802409B8_BFE238 -/* BFEDFC 8024157C 0260302D */ daddu $a2, $s3, $zero -/* BFEE00 80241580 0809057D */ j .L802415F4 -/* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero -glabel L80241588_BFEE08 -/* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero -/* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* BFEE10 80241590 0C09033F */ jal dgb_01_UnkNpcAIFunc2 -/* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero -glabel L80241598_BFEE18 -/* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero -/* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero -/* BFEE20 802415A0 0C09035D */ jal func_80240D74_BFE5F4 -/* BFEE24 802415A4 0260302D */ daddu $a2, $s3, $zero -/* BFEE28 802415A8 0809057D */ j .L802415F4 -/* BFEE2C 802415AC 0000102D */ daddu $v0, $zero, $zero -glabel L802415B0_BFEE30 -/* BFEE30 802415B0 0280202D */ daddu $a0, $s4, $zero -/* BFEE34 802415B4 0200282D */ daddu $a1, $s0, $zero -/* BFEE38 802415B8 0C090378 */ jal dgb_01_UnkNpcAIFunc14 -/* BFEE3C 802415BC 0260302D */ daddu $a2, $s3, $zero -/* BFEE40 802415C0 0809057D */ j .L802415F4 -/* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero -glabel L802415C8_BFEE48 -/* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero -/* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero -/* BFEE50 802415D0 0C0903C5 */ jal dgb_01_UnkNpcAIFunc3 -/* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero -/* BFEE58 802415D8 0809057D */ j .L802415F4 -/* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero -glabel L802415E0_BFEE60 -/* BFEE60 802415E0 0280202D */ daddu $a0, $s4, $zero -/* BFEE64 802415E4 0200282D */ daddu $a1, $s0, $zero -/* BFEE68 802415E8 0C0903DE */ jal func_80240F78_BFE7F8 -/* BFEE6C 802415EC 0260302D */ daddu $a2, $s3, $zero -glabel L802415F0_BFEE70 -/* BFEE70 802415F0 0000102D */ daddu $v0, $zero, $zero -.L802415F4: -/* BFEE74 802415F4 8FBF0048 */ lw $ra, 0x48($sp) -/* BFEE78 802415F8 8FB50044 */ lw $s5, 0x44($sp) -/* BFEE7C 802415FC 8FB40040 */ lw $s4, 0x40($sp) -/* BFEE80 80241600 8FB3003C */ lw $s3, 0x3c($sp) -/* BFEE84 80241604 8FB20038 */ lw $s2, 0x38($sp) -/* BFEE88 80241608 8FB10034 */ lw $s1, 0x34($sp) -/* BFEE8C 8024160C 8FB00030 */ lw $s0, 0x30($sp) -/* BFEE90 80241610 03E00008 */ jr $ra -/* BFEE94 80241614 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s deleted file mode 100644 index 7b9137c590..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241618_BFEE98 -/* BFEE98 80241618 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFEE9C 8024161C AFB3001C */ sw $s3, 0x1c($sp) -/* BFEEA0 80241620 0080982D */ daddu $s3, $a0, $zero -/* BFEEA4 80241624 AFBF0020 */ sw $ra, 0x20($sp) -/* BFEEA8 80241628 AFB20018 */ sw $s2, 0x18($sp) -/* BFEEAC 8024162C AFB10014 */ sw $s1, 0x14($sp) -/* BFEEB0 80241630 AFB00010 */ sw $s0, 0x10($sp) -/* BFEEB4 80241634 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BFEEB8 80241638 8E720148 */ lw $s2, 0x148($s3) -/* BFEEBC 8024163C 86440008 */ lh $a0, 8($s2) -/* BFEEC0 80241640 0C00EABB */ jal get_npc_unsafe -/* BFEEC4 80241644 00A0882D */ daddu $s1, $a1, $zero -/* BFEEC8 80241648 0040802D */ daddu $s0, $v0, $zero -/* BFEECC 8024164C 9602008E */ lhu $v0, 0x8e($s0) -/* BFEED0 80241650 2442FFFF */ addiu $v0, $v0, -1 -/* BFEED4 80241654 A602008E */ sh $v0, 0x8e($s0) -/* BFEED8 80241658 00021400 */ sll $v0, $v0, 0x10 -/* BFEEDC 8024165C 1C40003C */ bgtz $v0, .L80241750 -/* BFEEE0 80241660 3C03FFDF */ lui $v1, 0xffdf -/* BFEEE4 80241664 8E020000 */ lw $v0, ($s0) -/* BFEEE8 80241668 3463FFFF */ ori $v1, $v1, 0xffff -/* BFEEEC 8024166C 00431024 */ and $v0, $v0, $v1 -/* BFEEF0 80241670 AE020000 */ sw $v0, ($s0) -/* BFEEF4 80241674 8E240020 */ lw $a0, 0x20($s1) -/* BFEEF8 80241678 000417C2 */ srl $v0, $a0, 0x1f -/* BFEEFC 8024167C 00822021 */ addu $a0, $a0, $v0 -/* BFEF00 80241680 00042043 */ sra $a0, $a0, 1 -/* BFEF04 80241684 0C00A67F */ jal rand_int -/* BFEF08 80241688 24840001 */ addiu $a0, $a0, 1 -/* BFEF0C 8024168C 8E230020 */ lw $v1, 0x20($s1) -/* BFEF10 80241690 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFEF14 80241694 000327C2 */ srl $a0, $v1, 0x1f -/* BFEF18 80241698 00641821 */ addu $v1, $v1, $a0 -/* BFEF1C 8024169C 00031843 */ sra $v1, $v1, 1 -/* BFEF20 802416A0 00621821 */ addu $v1, $v1, $v0 -/* BFEF24 802416A4 A603008E */ sh $v1, 0x8e($s0) -/* BFEF28 802416A8 8E4200CC */ lw $v0, 0xcc($s2) -/* BFEF2C 802416AC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFEF30 802416B0 8C420020 */ lw $v0, 0x20($v0) -/* BFEF34 802416B4 AE020028 */ sw $v0, 0x28($s0) -/* BFEF38 802416B8 C6200018 */ lwc1 $f0, 0x18($s1) -/* BFEF3C 802416BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFEF40 802416C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFEF44 802416C4 E6000018 */ swc1 $f0, 0x18($s0) -/* BFEF48 802416C8 8C460028 */ lw $a2, 0x28($v0) -/* BFEF4C 802416CC 0C00A720 */ jal atan2 -/* BFEF50 802416D0 8C470030 */ lw $a3, 0x30($v0) -/* BFEF54 802416D4 46000506 */ mov.s $f20, $f0 -/* BFEF58 802416D8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFEF5C 802416DC 0C00A70A */ jal get_clamped_angle_diff -/* BFEF60 802416E0 4600A386 */ mov.s $f14, $f20 -/* BFEF64 802416E4 46000086 */ mov.s $f2, $f0 -/* BFEF68 802416E8 8E22001C */ lw $v0, 0x1c($s1) -/* BFEF6C 802416EC 46001005 */ abs.s $f0, $f2 -/* BFEF70 802416F0 44822000 */ mtc1 $v0, $f4 -/* BFEF74 802416F4 00000000 */ nop -/* BFEF78 802416F8 46802120 */ cvt.s.w $f4, $f4 -/* BFEF7C 802416FC 4600203C */ c.lt.s $f4, $f0 -/* BFEF80 80241700 00000000 */ nop -/* BFEF84 80241704 4500000D */ bc1f .L8024173C -/* BFEF88 80241708 00000000 */ nop -/* BFEF8C 8024170C 44800000 */ mtc1 $zero, $f0 -/* BFEF90 80241710 C614000C */ lwc1 $f20, 0xc($s0) -/* BFEF94 80241714 4600103C */ c.lt.s $f2, $f0 -/* BFEF98 80241718 00000000 */ nop -/* BFEF9C 8024171C 45000006 */ bc1f .L80241738 -/* BFEFA0 80241720 00021023 */ negu $v0, $v0 -/* BFEFA4 80241724 44820000 */ mtc1 $v0, $f0 -/* BFEFA8 80241728 00000000 */ nop -/* BFEFAC 8024172C 46800020 */ cvt.s.w $f0, $f0 -/* BFEFB0 80241730 080905CF */ j .L8024173C -/* BFEFB4 80241734 4600A500 */ add.s $f20, $f20, $f0 -.L80241738: -/* BFEFB8 80241738 4604A500 */ add.s $f20, $f20, $f4 -.L8024173C: -/* BFEFBC 8024173C 0C00A6C9 */ jal clamp_angle -/* BFEFC0 80241740 4600A306 */ mov.s $f12, $f20 -/* BFEFC4 80241744 2402000D */ addiu $v0, $zero, 0xd -/* BFEFC8 80241748 E600000C */ swc1 $f0, 0xc($s0) -/* BFEFCC 8024174C AE620070 */ sw $v0, 0x70($s3) -.L80241750: -/* BFEFD0 80241750 8FBF0020 */ lw $ra, 0x20($sp) -/* BFEFD4 80241754 8FB3001C */ lw $s3, 0x1c($sp) -/* BFEFD8 80241758 8FB20018 */ lw $s2, 0x18($sp) -/* BFEFDC 8024175C 8FB10014 */ lw $s1, 0x14($sp) -/* BFEFE0 80241760 8FB00010 */ lw $s0, 0x10($sp) -/* BFEFE4 80241764 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BFEFE8 80241768 03E00008 */ jr $ra -/* BFEFEC 8024176C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s deleted file mode 100644 index a9db1e53bc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241770_BFEFF0.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241770_BFEFF0 -/* BFEFF0 80241770 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFEFF4 80241774 AFB30024 */ sw $s3, 0x24($sp) -/* BFEFF8 80241778 0080982D */ daddu $s3, $a0, $zero -/* BFEFFC 8024177C AFBF0028 */ sw $ra, 0x28($sp) -/* BFF000 80241780 AFB20020 */ sw $s2, 0x20($sp) -/* BFF004 80241784 AFB1001C */ sw $s1, 0x1c($sp) -/* BFF008 80241788 AFB00018 */ sw $s0, 0x18($sp) -/* BFF00C 8024178C 8E700148 */ lw $s0, 0x148($s3) -/* BFF010 80241790 00A0902D */ daddu $s2, $a1, $zero -/* BFF014 80241794 86040008 */ lh $a0, 8($s0) -/* BFF018 80241798 0C00EABB */ jal get_npc_unsafe -/* BFF01C 8024179C 00C0882D */ daddu $s1, $a2, $zero -/* BFF020 802417A0 0220202D */ daddu $a0, $s1, $zero -/* BFF024 802417A4 0200282D */ daddu $a1, $s0, $zero -/* BFF028 802417A8 24030001 */ addiu $v1, $zero, 1 -/* BFF02C 802417AC AFA30010 */ sw $v1, 0x10($sp) -/* BFF030 802417B0 8E460024 */ lw $a2, 0x24($s2) -/* BFF034 802417B4 8E470028 */ lw $a3, 0x28($s2) -/* BFF038 802417B8 0C01242D */ jal func_800490B4 -/* BFF03C 802417BC 0040802D */ daddu $s0, $v0, $zero -/* BFF040 802417C0 10400024 */ beqz $v0, .L80241854 -/* BFF044 802417C4 24020010 */ addiu $v0, $zero, 0x10 -/* BFF048 802417C8 8E050018 */ lw $a1, 0x18($s0) -/* BFF04C 802417CC 8E06000C */ lw $a2, 0xc($s0) -/* BFF050 802417D0 0C00EA95 */ jal npc_move_heading -/* BFF054 802417D4 0200202D */ daddu $a0, $s0, $zero -/* BFF058 802417D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFF05C 802417DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFF060 802417E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFF064 802417E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFF068 802417E8 8C460028 */ lw $a2, 0x28($v0) -/* BFF06C 802417EC 0C00A7B5 */ jal dist2D -/* BFF070 802417F0 8C470030 */ lw $a3, 0x30($v0) -/* BFF074 802417F4 C6020018 */ lwc1 $f2, 0x18($s0) -/* BFF078 802417F8 3C014004 */ lui $at, 0x4004 -/* BFF07C 802417FC 44812800 */ mtc1 $at, $f5 -/* BFF080 80241800 44802000 */ mtc1 $zero, $f4 -/* BFF084 80241804 460010A1 */ cvt.d.s $f2, $f2 -/* BFF088 80241808 46241082 */ mul.d $f2, $f2, $f4 -/* BFF08C 8024180C 00000000 */ nop -/* BFF090 80241810 46000021 */ cvt.d.s $f0, $f0 -/* BFF094 80241814 4622003E */ c.le.d $f0, $f2 -/* BFF098 80241818 00000000 */ nop -/* BFF09C 8024181C 45000003 */ bc1f .L8024182C -/* BFF0A0 80241820 2402000E */ addiu $v0, $zero, 0xe -/* BFF0A4 80241824 08090615 */ j .L80241854 -/* BFF0A8 80241828 A600008E */ sh $zero, 0x8e($s0) -.L8024182C: -/* BFF0AC 8024182C 9602008E */ lhu $v0, 0x8e($s0) -/* BFF0B0 80241830 2442FFFF */ addiu $v0, $v0, -1 -/* BFF0B4 80241834 A602008E */ sh $v0, 0x8e($s0) -/* BFF0B8 80241838 00021400 */ sll $v0, $v0, 0x10 -/* BFF0BC 8024183C 1C400006 */ bgtz $v0, .L80241858 -/* BFF0C0 80241840 3C030020 */ lui $v1, 0x20 -/* BFF0C4 80241844 8E020000 */ lw $v0, ($s0) -/* BFF0C8 80241848 00431025 */ or $v0, $v0, $v1 -/* BFF0CC 8024184C AE020000 */ sw $v0, ($s0) -/* BFF0D0 80241850 2402000C */ addiu $v0, $zero, 0xc -.L80241854: -/* BFF0D4 80241854 AE620070 */ sw $v0, 0x70($s3) -.L80241858: -/* BFF0D8 80241858 8FBF0028 */ lw $ra, 0x28($sp) -/* BFF0DC 8024185C 8FB30024 */ lw $s3, 0x24($sp) -/* BFF0E0 80241860 8FB20020 */ lw $s2, 0x20($sp) -/* BFF0E4 80241864 8FB1001C */ lw $s1, 0x1c($sp) -/* BFF0E8 80241868 8FB00018 */ lw $s0, 0x18($sp) -/* BFF0EC 8024186C 03E00008 */ jr $ra -/* BFF0F0 80241870 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s deleted file mode 100644 index fe305a5c2f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241874_BFF0F4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241874_BFF0F4 -/* BFF0F4 80241874 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFF0F8 80241878 AFB30024 */ sw $s3, 0x24($sp) -/* BFF0FC 8024187C 0080982D */ daddu $s3, $a0, $zero -/* BFF100 80241880 AFBF0028 */ sw $ra, 0x28($sp) -/* BFF104 80241884 AFB20020 */ sw $s2, 0x20($sp) -/* BFF108 80241888 AFB1001C */ sw $s1, 0x1c($sp) -/* BFF10C 8024188C AFB00018 */ sw $s0, 0x18($sp) -/* BFF110 80241890 8E720148 */ lw $s2, 0x148($s3) -/* BFF114 80241894 86440008 */ lh $a0, 8($s2) -/* BFF118 80241898 0C00EABB */ jal get_npc_unsafe -/* BFF11C 8024189C 0000802D */ daddu $s0, $zero, $zero -/* BFF120 802418A0 0040882D */ daddu $s1, $v0, $zero -.L802418A4: -/* BFF124 802418A4 822200A4 */ lb $v0, 0xa4($s1) -/* BFF128 802418A8 52020007 */ beql $s0, $v0, .L802418C8 -/* BFF12C 802418AC 26100001 */ addiu $s0, $s0, 1 -/* BFF130 802418B0 0C00FB3A */ jal get_enemy -/* BFF134 802418B4 0200202D */ daddu $a0, $s0, $zero -/* BFF138 802418B8 8C42006C */ lw $v0, 0x6c($v0) -/* BFF13C 802418BC 30420100 */ andi $v0, $v0, 0x100 -/* BFF140 802418C0 1440001D */ bnez $v0, .L80241938 -/* BFF144 802418C4 26100001 */ addiu $s0, $s0, 1 -.L802418C8: -/* BFF148 802418C8 2A020004 */ slti $v0, $s0, 4 -/* BFF14C 802418CC 1440FFF5 */ bnez $v0, .L802418A4 -/* BFF150 802418D0 00000000 */ nop -/* BFF154 802418D4 8E42006C */ lw $v0, 0x6c($s2) -/* BFF158 802418D8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BFF15C 802418DC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BFF160 802418E0 34420100 */ ori $v0, $v0, 0x100 -/* BFF164 802418E4 AE42006C */ sw $v0, 0x6c($s2) -/* BFF168 802418E8 C4600028 */ lwc1 $f0, 0x28($v1) -/* BFF16C 802418EC E6200038 */ swc1 $f0, 0x38($s1) -/* BFF170 802418F0 C4600030 */ lwc1 $f0, 0x30($v1) -/* BFF174 802418F4 E6200040 */ swc1 $f0, 0x40($s1) -/* BFF178 802418F8 8E43006C */ lw $v1, 0x6c($s2) -/* BFF17C 802418FC 30621000 */ andi $v0, $v1, 0x1000 -/* BFF180 80241900 14400003 */ bnez $v0, .L80241910 -/* BFF184 80241904 3C048000 */ lui $a0, 0x8000 -/* BFF188 80241908 34621000 */ ori $v0, $v1, 0x1000 -/* BFF18C 8024190C AE42006C */ sw $v0, 0x6c($s2) -.L80241910: -/* BFF190 80241910 C6200040 */ lwc1 $f0, 0x40($s1) -/* BFF194 80241914 34840011 */ ori $a0, $a0, 0x11 -/* BFF198 80241918 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF19C 8024191C 8E260038 */ lw $a2, 0x38($s1) -/* BFF1A0 80241920 8E27003C */ lw $a3, 0x3c($s1) -/* BFF1A4 80241924 0C052757 */ jal sfx_play_sound_at_position -/* BFF1A8 80241928 24050002 */ addiu $a1, $zero, 2 -/* BFF1AC 8024192C 2402000F */ addiu $v0, $zero, 0xf -/* BFF1B0 80241930 A620008E */ sh $zero, 0x8e($s1) -/* BFF1B4 80241934 AE620070 */ sw $v0, 0x70($s3) -.L80241938: -/* BFF1B8 80241938 8FBF0028 */ lw $ra, 0x28($sp) -/* BFF1BC 8024193C 8FB30024 */ lw $s3, 0x24($sp) -/* BFF1C0 80241940 8FB20020 */ lw $s2, 0x20($sp) -/* BFF1C4 80241944 8FB1001C */ lw $s1, 0x1c($sp) -/* BFF1C8 80241948 8FB00018 */ lw $s0, 0x18($sp) -/* BFF1CC 8024194C 03E00008 */ jr $ra -/* BFF1D0 80241950 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s deleted file mode 100644 index 5c14cd8518..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241954_BFF1D4 -/* BFF1D4 80241954 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BFF1D8 80241958 AFB40040 */ sw $s4, 0x40($sp) -/* BFF1DC 8024195C 0080A02D */ daddu $s4, $a0, $zero -/* BFF1E0 80241960 AFBF0044 */ sw $ra, 0x44($sp) -/* BFF1E4 80241964 AFB3003C */ sw $s3, 0x3c($sp) -/* BFF1E8 80241968 AFB20038 */ sw $s2, 0x38($sp) -/* BFF1EC 8024196C AFB10034 */ sw $s1, 0x34($sp) -/* BFF1F0 80241970 AFB00030 */ sw $s0, 0x30($sp) -/* BFF1F4 80241974 8E930148 */ lw $s3, 0x148($s4) -/* BFF1F8 80241978 00A0802D */ daddu $s0, $a1, $zero -/* BFF1FC 8024197C 86640008 */ lh $a0, 8($s3) -/* BFF200 80241980 0C00EABB */ jal get_npc_unsafe -/* BFF204 80241984 00C0882D */ daddu $s1, $a2, $zero -/* BFF208 80241988 3C048000 */ lui $a0, 0x8000 -/* BFF20C 8024198C 0040902D */ daddu $s2, $v0, $zero -/* BFF210 80241990 C6400040 */ lwc1 $f0, 0x40($s2) -/* BFF214 80241994 34840011 */ ori $a0, $a0, 0x11 -/* BFF218 80241998 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF21C 8024199C 8E460038 */ lw $a2, 0x38($s2) -/* BFF220 802419A0 8E47003C */ lw $a3, 0x3c($s2) -/* BFF224 802419A4 0C05267B */ jal sfx_adjust_env_sound_pos -/* BFF228 802419A8 24050002 */ addiu $a1, $zero, 2 -/* BFF22C 802419AC 0220202D */ daddu $a0, $s1, $zero -/* BFF230 802419B0 24020001 */ addiu $v0, $zero, 1 -/* BFF234 802419B4 AFA20010 */ sw $v0, 0x10($sp) -/* BFF238 802419B8 8E060024 */ lw $a2, 0x24($s0) -/* BFF23C 802419BC 8E070028 */ lw $a3, 0x28($s0) -/* BFF240 802419C0 0C01242D */ jal func_800490B4 -/* BFF244 802419C4 0260282D */ daddu $a1, $s3, $zero -/* BFF248 802419C8 1440000B */ bnez $v0, .L802419F8 -/* BFF24C 802419CC 3C04FFDF */ lui $a0, 0xffdf -/* BFF250 802419D0 8E62006C */ lw $v0, 0x6c($s3) -/* BFF254 802419D4 2403FEFF */ addiu $v1, $zero, -0x101 -/* BFF258 802419D8 00431024 */ and $v0, $v0, $v1 -/* BFF25C 802419DC AE62006C */ sw $v0, 0x6c($s3) -/* BFF260 802419E0 8E420000 */ lw $v0, ($s2) -/* BFF264 802419E4 3484FFFF */ ori $a0, $a0, 0xffff -/* BFF268 802419E8 AE400048 */ sw $zero, 0x48($s2) -/* BFF26C 802419EC 00441024 */ and $v0, $v0, $a0 -/* BFF270 802419F0 080906F2 */ j .L80241BC8 -/* BFF274 802419F4 AE420000 */ sw $v0, ($s2) -.L802419F8: -/* BFF278 802419F8 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* BFF27C 802419FC 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* BFF280 80241A00 C6440048 */ lwc1 $f4, 0x48($s2) -/* BFF284 80241A04 3C0141C8 */ lui $at, 0x41c8 -/* BFF288 80241A08 44810000 */ mtc1 $at, $f0 -/* BFF28C 80241A0C 8E020000 */ lw $v0, ($s0) -/* BFF290 80241A10 46002100 */ add.s $f4, $f4, $f0 -/* BFF294 80241A14 C4420028 */ lwc1 $f2, 0x28($v0) -/* BFF298 80241A18 3C014000 */ lui $at, 0x4000 -/* BFF29C 80241A1C 44810000 */ mtc1 $at, $f0 -/* BFF2A0 80241A20 E6420038 */ swc1 $f2, 0x38($s2) -/* BFF2A4 80241A24 C4420030 */ lwc1 $f2, 0x30($v0) -/* BFF2A8 80241A28 46001080 */ add.s $f2, $f2, $f0 -/* BFF2AC 80241A2C 3C018026 */ lui $at, %hi(D_80263478_C20CF8) -/* BFF2B0 80241A30 D4263478 */ ldc1 $f6, %lo(D_80263478_C20CF8)($at) -/* BFF2B4 80241A34 46002021 */ cvt.d.s $f0, $f4 -/* BFF2B8 80241A38 4620303C */ c.lt.d $f6, $f0 -/* BFF2BC 80241A3C E6440048 */ swc1 $f4, 0x48($s2) -/* BFF2C0 80241A40 45000004 */ bc1f .L80241A54 -/* BFF2C4 80241A44 E6420040 */ swc1 $f2, 0x40($s2) -/* BFF2C8 80241A48 46260001 */ sub.d $f0, $f0, $f6 -/* BFF2CC 80241A4C 46200020 */ cvt.s.d $f0, $f0 -/* BFF2D0 80241A50 E6400048 */ swc1 $f0, 0x48($s2) -.L80241A54: -/* BFF2D4 80241A54 3C02B60B */ lui $v0, 0xb60b -/* BFF2D8 80241A58 C6400048 */ lwc1 $f0, 0x48($s2) -/* BFF2DC 80241A5C 344260B7 */ ori $v0, $v0, 0x60b7 -/* BFF2E0 80241A60 4600020D */ trunc.w.s $f8, $f0 -/* BFF2E4 80241A64 44044000 */ mfc1 $a0, $f8 -/* BFF2E8 80241A68 00000000 */ nop -/* BFF2EC 80241A6C 00820018 */ mult $a0, $v0 -/* BFF2F0 80241A70 00041FC3 */ sra $v1, $a0, 0x1f -/* BFF2F4 80241A74 00004010 */ mfhi $t0 -/* BFF2F8 80241A78 01041021 */ addu $v0, $t0, $a0 -/* BFF2FC 80241A7C 000211C3 */ sra $v0, $v0, 7 -/* BFF300 80241A80 00431023 */ subu $v0, $v0, $v1 -/* BFF304 80241A84 00021840 */ sll $v1, $v0, 1 -/* BFF308 80241A88 00621821 */ addu $v1, $v1, $v0 -/* BFF30C 80241A8C 00031100 */ sll $v0, $v1, 4 -/* BFF310 80241A90 00431023 */ subu $v0, $v0, $v1 -/* BFF314 80241A94 00021080 */ sll $v0, $v0, 2 -/* BFF318 80241A98 00822023 */ subu $a0, $a0, $v0 -/* BFF31C 80241A9C 00042400 */ sll $a0, $a0, 0x10 -/* BFF320 80241AA0 0C00A4F5 */ jal cosine -/* BFF324 80241AA4 00042403 */ sra $a0, $a0, 0x10 -/* BFF328 80241AA8 3C014260 */ lui $at, 0x4260 -/* BFF32C 80241AAC 44811000 */ mtc1 $at, $f2 -/* BFF330 80241AB0 00000000 */ nop -/* BFF334 80241AB4 46020002 */ mul.s $f0, $f0, $f2 -/* BFF338 80241AB8 00000000 */ nop -/* BFF33C 80241ABC 24050006 */ addiu $a1, $zero, 6 -/* BFF340 80241AC0 3C01437F */ lui $at, 0x437f -/* BFF344 80241AC4 44811000 */ mtc1 $at, $f2 -/* BFF348 80241AC8 240200FF */ addiu $v0, $zero, 0xff -/* BFF34C 80241ACC 46001081 */ sub.s $f2, $f2, $f0 -/* BFF350 80241AD0 AFA20014 */ sw $v0, 0x14($sp) -/* BFF354 80241AD4 AFA00018 */ sw $zero, 0x18($sp) -/* BFF358 80241AD8 4600120D */ trunc.w.s $f8, $f2 -/* BFF35C 80241ADC 44064000 */ mfc1 $a2, $f8 -/* BFF360 80241AE0 00000000 */ nop -/* BFF364 80241AE4 AFA60010 */ sw $a2, 0x10($sp) -/* BFF368 80241AE8 8E440024 */ lw $a0, 0x24($s2) -/* BFF36C 80241AEC 0C0B7A25 */ jal func_802DE894 -/* BFF370 80241AF0 00C0382D */ daddu $a3, $a2, $zero -/* BFF374 80241AF4 27A50020 */ addiu $a1, $sp, 0x20 -/* BFF378 80241AF8 27A60024 */ addiu $a2, $sp, 0x24 -/* BFF37C 80241AFC 8E020000 */ lw $v0, ($s0) -/* BFF380 80241B00 3C01447A */ lui $at, 0x447a -/* BFF384 80241B04 44810000 */ mtc1 $at, $f0 -/* BFF388 80241B08 C4420028 */ lwc1 $f2, 0x28($v0) -/* BFF38C 80241B0C C444002C */ lwc1 $f4, 0x2c($v0) -/* BFF390 80241B10 C4460030 */ lwc1 $f6, 0x30($v0) -/* BFF394 80241B14 27A2002C */ addiu $v0, $sp, 0x2c -/* BFF398 80241B18 E7A0002C */ swc1 $f0, 0x2c($sp) -/* BFF39C 80241B1C E7A20020 */ swc1 $f2, 0x20($sp) -/* BFF3A0 80241B20 E7A40024 */ swc1 $f4, 0x24($sp) -/* BFF3A4 80241B24 E7A60028 */ swc1 $f6, 0x28($sp) -/* BFF3A8 80241B28 AFA20010 */ sw $v0, 0x10($sp) -/* BFF3AC 80241B2C 8E440080 */ lw $a0, 0x80($s2) -/* BFF3B0 80241B30 0C0372DF */ jal func_800DCB7C -/* BFF3B4 80241B34 27A70028 */ addiu $a3, $sp, 0x28 -/* BFF3B8 80241B38 C644003C */ lwc1 $f4, 0x3c($s2) -/* BFF3BC 80241B3C C7A00024 */ lwc1 $f0, 0x24($sp) -/* BFF3C0 80241B40 46002001 */ sub.s $f0, $f4, $f0 -/* BFF3C4 80241B44 3C014038 */ lui $at, 0x4038 -/* BFF3C8 80241B48 44811800 */ mtc1 $at, $f3 -/* BFF3CC 80241B4C 44801000 */ mtc1 $zero, $f2 -/* BFF3D0 80241B50 46000005 */ abs.s $f0, $f0 -/* BFF3D4 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* BFF3D8 80241B58 4620103C */ c.lt.d $f2, $f0 -/* BFF3DC 80241B5C 00000000 */ nop -/* BFF3E0 80241B60 45000008 */ bc1f .L80241B84 -/* BFF3E4 80241B64 3C03FFDF */ lui $v1, 0xffdf -/* BFF3E8 80241B68 3C018026 */ lui $at, %hi(D_80263480_C20D00) -/* BFF3EC 80241B6C D4223480 */ ldc1 $f2, %lo(D_80263480_C20D00)($at) -/* BFF3F0 80241B70 46002021 */ cvt.d.s $f0, $f4 -/* BFF3F4 80241B74 46220001 */ sub.d $f0, $f0, $f2 -/* BFF3F8 80241B78 46200020 */ cvt.s.d $f0, $f0 -/* BFF3FC 80241B7C 080906F4 */ j .L80241BD0 -/* BFF400 80241B80 E640003C */ swc1 $f0, 0x3c($s2) -.L80241B84: -/* BFF404 80241B84 8E420000 */ lw $v0, ($s2) -/* BFF408 80241B88 3463FFFF */ ori $v1, $v1, 0xffff -/* BFF40C 80241B8C AE400048 */ sw $zero, 0x48($s2) -/* BFF410 80241B90 00431024 */ and $v0, $v0, $v1 -/* BFF414 80241B94 AE420000 */ sw $v0, ($s2) -/* BFF418 80241B98 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* BFF41C 80241B9C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* BFF420 80241BA0 24020009 */ addiu $v0, $zero, 9 -/* BFF424 80241BA4 10620009 */ beq $v1, $v0, .L80241BCC -/* BFF428 80241BA8 24020010 */ addiu $v0, $zero, 0x10 -/* BFF42C 80241BAC 0C03805E */ jal disable_player_input -/* BFF430 80241BB0 00000000 */ nop -/* BFF434 80241BB4 0C03BD8A */ jal func_800EF628 -/* BFF438 80241BB8 00000000 */ nop -/* BFF43C 80241BBC 24020014 */ addiu $v0, $zero, 0x14 -/* BFF440 80241BC0 080906F3 */ j .L80241BCC -/* BFF444 80241BC4 A640008E */ sh $zero, 0x8e($s2) -.L80241BC8: -/* BFF448 80241BC8 24020010 */ addiu $v0, $zero, 0x10 -.L80241BCC: -/* BFF44C 80241BCC AE820070 */ sw $v0, 0x70($s4) -.L80241BD0: -/* BFF450 80241BD0 8FBF0044 */ lw $ra, 0x44($sp) -/* BFF454 80241BD4 8FB40040 */ lw $s4, 0x40($sp) -/* BFF458 80241BD8 8FB3003C */ lw $s3, 0x3c($sp) -/* BFF45C 80241BDC 8FB20038 */ lw $s2, 0x38($sp) -/* BFF460 80241BE0 8FB10034 */ lw $s1, 0x34($sp) -/* BFF464 80241BE4 8FB00030 */ lw $s0, 0x30($sp) -/* BFF468 80241BE8 03E00008 */ jr $ra -/* BFF46C 80241BEC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s deleted file mode 100644 index fe03dff0b5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BF0_BFF470 -/* BFF470 80241BF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFF474 80241BF4 AFB20028 */ sw $s2, 0x28($sp) -/* BFF478 80241BF8 0080902D */ daddu $s2, $a0, $zero -/* BFF47C 80241BFC AFBF002C */ sw $ra, 0x2c($sp) -/* BFF480 80241C00 AFB10024 */ sw $s1, 0x24($sp) -/* BFF484 80241C04 AFB00020 */ sw $s0, 0x20($sp) -/* BFF488 80241C08 8E500148 */ lw $s0, 0x148($s2) -/* BFF48C 80241C0C 0C00EABB */ jal get_npc_unsafe -/* BFF490 80241C10 86040008 */ lh $a0, 8($s0) -/* BFF494 80241C14 2404FEFF */ addiu $a0, $zero, -0x101 -/* BFF498 80241C18 0040882D */ daddu $s1, $v0, $zero -/* BFF49C 80241C1C 0000282D */ daddu $a1, $zero, $zero -/* BFF4A0 80241C20 8E03006C */ lw $v1, 0x6c($s0) -/* BFF4A4 80241C24 00A0302D */ daddu $a2, $a1, $zero -/* BFF4A8 80241C28 00641824 */ and $v1, $v1, $a0 -/* BFF4AC 80241C2C AE03006C */ sw $v1, 0x6c($s0) -/* BFF4B0 80241C30 AFA00010 */ sw $zero, 0x10($sp) -/* BFF4B4 80241C34 AFA00014 */ sw $zero, 0x14($sp) -/* BFF4B8 80241C38 AFA00018 */ sw $zero, 0x18($sp) -/* BFF4BC 80241C3C 8E240024 */ lw $a0, 0x24($s1) -/* BFF4C0 80241C40 0C0B7A25 */ jal func_802DE894 -/* BFF4C4 80241C44 00A0382D */ daddu $a3, $a1, $zero -/* BFF4C8 80241C48 8E02006C */ lw $v0, 0x6c($s0) -/* BFF4CC 80241C4C 30421000 */ andi $v0, $v0, 0x1000 -/* BFF4D0 80241C50 10400008 */ beqz $v0, .L80241C74 -/* BFF4D4 80241C54 00000000 */ nop -/* BFF4D8 80241C58 3C048000 */ lui $a0, 0x8000 -/* BFF4DC 80241C5C 0C05271B */ jal sfx_stop_sound -/* BFF4E0 80241C60 34840011 */ ori $a0, $a0, 0x11 -/* BFF4E4 80241C64 8E02006C */ lw $v0, 0x6c($s0) -/* BFF4E8 80241C68 2403EFFF */ addiu $v1, $zero, -0x1001 -/* BFF4EC 80241C6C 00431024 */ and $v0, $v0, $v1 -/* BFF4F0 80241C70 AE02006C */ sw $v0, 0x6c($s0) -.L80241C74: -/* BFF4F4 80241C74 8E0200CC */ lw $v0, 0xcc($s0) -/* BFF4F8 80241C78 8C430024 */ lw $v1, 0x24($v0) -/* BFF4FC 80241C7C 24020014 */ addiu $v0, $zero, 0x14 -/* BFF500 80241C80 A622008E */ sh $v0, 0x8e($s1) -/* BFF504 80241C84 24020011 */ addiu $v0, $zero, 0x11 -/* BFF508 80241C88 AE230028 */ sw $v1, 0x28($s1) -/* BFF50C 80241C8C AE420070 */ sw $v0, 0x70($s2) -/* BFF510 80241C90 8FBF002C */ lw $ra, 0x2c($sp) -/* BFF514 80241C94 8FB20028 */ lw $s2, 0x28($sp) -/* BFF518 80241C98 8FB10024 */ lw $s1, 0x24($sp) -/* BFF51C 80241C9C 8FB00020 */ lw $s0, 0x20($sp) -/* BFF520 80241CA0 03E00008 */ jr $ra -/* BFF524 80241CA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s deleted file mode 100644 index dd00c68286..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241CA8_BFF528.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA8_BFF528 -/* BFF528 80241CA8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BFF52C 80241CAC AFB20048 */ sw $s2, 0x48($sp) -/* BFF530 80241CB0 0080902D */ daddu $s2, $a0, $zero -/* BFF534 80241CB4 AFBF004C */ sw $ra, 0x4c($sp) -/* BFF538 80241CB8 AFB10044 */ sw $s1, 0x44($sp) -/* BFF53C 80241CBC AFB00040 */ sw $s0, 0x40($sp) -/* BFF540 80241CC0 F7B40050 */ sdc1 $f20, 0x50($sp) -/* BFF544 80241CC4 8E500148 */ lw $s0, 0x148($s2) -/* BFF548 80241CC8 0C00EABB */ jal get_npc_unsafe -/* BFF54C 80241CCC 86040008 */ lh $a0, 8($s0) -/* BFF550 80241CD0 27A50028 */ addiu $a1, $sp, 0x28 -/* BFF554 80241CD4 0040882D */ daddu $s1, $v0, $zero -/* BFF558 80241CD8 27A6002C */ addiu $a2, $sp, 0x2c -/* BFF55C 80241CDC 27A70030 */ addiu $a3, $sp, 0x30 -/* BFF560 80241CE0 C620003C */ lwc1 $f0, 0x3c($s1) -/* BFF564 80241CE4 3C014004 */ lui $at, 0x4004 -/* BFF568 80241CE8 44811800 */ mtc1 $at, $f3 -/* BFF56C 80241CEC 44801000 */ mtc1 $zero, $f2 -/* BFF570 80241CF0 C6260038 */ lwc1 $f6, 0x38($s1) -/* BFF574 80241CF4 46000021 */ cvt.d.s $f0, $f0 -/* BFF578 80241CF8 46220000 */ add.d $f0, $f0, $f2 -/* BFF57C 80241CFC 3C01447A */ lui $at, 0x447a -/* BFF580 80241D00 44812000 */ mtc1 $at, $f4 -/* BFF584 80241D04 C6020078 */ lwc1 $f2, 0x78($s0) -/* BFF588 80241D08 468010A0 */ cvt.s.w $f2, $f2 -/* BFF58C 80241D0C 46200020 */ cvt.s.d $f0, $f0 -/* BFF590 80241D10 E620003C */ swc1 $f0, 0x3c($s1) -/* BFF594 80241D14 46000206 */ mov.s $f8, $f0 -/* BFF598 80241D18 C6200040 */ lwc1 $f0, 0x40($s1) -/* BFF59C 80241D1C 27A20034 */ addiu $v0, $sp, 0x34 -/* BFF5A0 80241D20 E7A00030 */ swc1 $f0, 0x30($sp) -/* BFF5A4 80241D24 3C014059 */ lui $at, 0x4059 -/* BFF5A8 80241D28 44810800 */ mtc1 $at, $f1 -/* BFF5AC 80241D2C 44800000 */ mtc1 $zero, $f0 -/* BFF5B0 80241D30 460010A1 */ cvt.d.s $f2, $f2 -/* BFF5B4 80241D34 E7A60028 */ swc1 $f6, 0x28($sp) -/* BFF5B8 80241D38 E7A40034 */ swc1 $f4, 0x34($sp) -/* BFF5BC 80241D3C E7A8002C */ swc1 $f8, 0x2c($sp) -/* BFF5C0 80241D40 AFA20010 */ sw $v0, 0x10($sp) -/* BFF5C4 80241D44 8E240080 */ lw $a0, 0x80($s1) -/* BFF5C8 80241D48 46201083 */ div.d $f2, $f2, $f0 -/* BFF5CC 80241D4C 0C0372DF */ jal func_800DCB7C -/* BFF5D0 80241D50 46201520 */ cvt.s.d $f20, $f2 -/* BFF5D4 80241D54 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFF5D8 80241D58 46140000 */ add.s $f0, $f0, $f20 -/* BFF5DC 80241D5C C622003C */ lwc1 $f2, 0x3c($s1) -/* BFF5E0 80241D60 4600103C */ c.lt.s $f2, $f0 -/* BFF5E4 80241D64 00000000 */ nop -/* BFF5E8 80241D68 45010028 */ bc1t .L80241E0C -/* BFF5EC 80241D6C 00000000 */ nop -/* BFF5F0 80241D70 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFF5F4 80241D74 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFF5F8 80241D78 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFF5FC 80241D7C C44A0000 */ lwc1 $f10, ($v0) -/* BFF600 80241D80 468052A0 */ cvt.s.w $f10, $f10 -/* BFF604 80241D84 44065000 */ mfc1 $a2, $f10 -/* BFF608 80241D88 C44A0008 */ lwc1 $f10, 8($v0) -/* BFF60C 80241D8C 468052A0 */ cvt.s.w $f10, $f10 -/* BFF610 80241D90 44075000 */ mfc1 $a3, $f10 -/* BFF614 80241D94 0C00A720 */ jal atan2 -/* BFF618 80241D98 2410000A */ addiu $s0, $zero, 0xa -/* BFF61C 80241D9C 24040002 */ addiu $a0, $zero, 2 -/* BFF620 80241DA0 0220282D */ daddu $a1, $s1, $zero -/* BFF624 80241DA4 0000302D */ daddu $a2, $zero, $zero -/* BFF628 80241DA8 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* BFF62C 80241DAC 862200A8 */ lh $v0, 0xa8($s1) -/* BFF630 80241DB0 E620000C */ swc1 $f0, 0xc($s1) -/* BFF634 80241DB4 3C013F80 */ lui $at, 0x3f80 -/* BFF638 80241DB8 44810000 */ mtc1 $at, $f0 -/* BFF63C 80241DBC 3C014000 */ lui $at, 0x4000 -/* BFF640 80241DC0 44812000 */ mtc1 $at, $f4 -/* BFF644 80241DC4 3C01C1A0 */ lui $at, 0xc1a0 -/* BFF648 80241DC8 44813000 */ mtc1 $at, $f6 -/* BFF64C 80241DCC 44825000 */ mtc1 $v0, $f10 -/* BFF650 80241DD0 00000000 */ nop -/* BFF654 80241DD4 468052A0 */ cvt.s.w $f10, $f10 -/* BFF658 80241DD8 46141080 */ add.s $f2, $f2, $f20 -/* BFF65C 80241DDC 44075000 */ mfc1 $a3, $f10 -/* BFF660 80241DE0 27A20038 */ addiu $v0, $sp, 0x38 -/* BFF664 80241DE4 E622003C */ swc1 $f2, 0x3c($s1) -/* BFF668 80241DE8 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF66C 80241DEC E7A40014 */ swc1 $f4, 0x14($sp) -/* BFF670 80241DF0 E7A60018 */ swc1 $f6, 0x18($sp) -/* BFF674 80241DF4 AFB0001C */ sw $s0, 0x1c($sp) -/* BFF678 80241DF8 0C01BFA4 */ jal fx_emote -/* BFF67C 80241DFC AFA20020 */ sw $v0, 0x20($sp) -/* BFF680 80241E00 24020012 */ addiu $v0, $zero, 0x12 -/* BFF684 80241E04 A630008E */ sh $s0, 0x8e($s1) -/* BFF688 80241E08 AE420070 */ sw $v0, 0x70($s2) -.L80241E0C: -/* BFF68C 80241E0C 8FBF004C */ lw $ra, 0x4c($sp) -/* BFF690 80241E10 8FB20048 */ lw $s2, 0x48($sp) -/* BFF694 80241E14 8FB10044 */ lw $s1, 0x44($sp) -/* BFF698 80241E18 8FB00040 */ lw $s0, 0x40($sp) -/* BFF69C 80241E1C D7B40050 */ ldc1 $f20, 0x50($sp) -/* BFF6A0 80241E20 03E00008 */ jr $ra -/* BFF6A4 80241E24 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E28_BFF6A8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E28_BFF6A8.s deleted file mode 100644 index ed09e9a075..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E28_BFF6A8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E28_BFF6A8 -/* BFF6A8 80241E28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFF6AC 80241E2C AFB00010 */ sw $s0, 0x10($sp) -/* BFF6B0 80241E30 0080802D */ daddu $s0, $a0, $zero -/* BFF6B4 80241E34 AFBF0014 */ sw $ra, 0x14($sp) -/* BFF6B8 80241E38 8E020148 */ lw $v0, 0x148($s0) -/* BFF6BC 80241E3C 0C00EABB */ jal get_npc_unsafe -/* BFF6C0 80241E40 84440008 */ lh $a0, 8($v0) -/* BFF6C4 80241E44 9443008E */ lhu $v1, 0x8e($v0) -/* BFF6C8 80241E48 2463FFFF */ addiu $v1, $v1, -1 -/* BFF6CC 80241E4C A443008E */ sh $v1, 0x8e($v0) -/* BFF6D0 80241E50 00031C00 */ sll $v1, $v1, 0x10 -/* BFF6D4 80241E54 1C600002 */ bgtz $v1, .L80241E60 -/* BFF6D8 80241E58 2402001E */ addiu $v0, $zero, 0x1e -/* BFF6DC 80241E5C AE020070 */ sw $v0, 0x70($s0) -.L80241E60: -/* BFF6E0 80241E60 8FBF0014 */ lw $ra, 0x14($sp) -/* BFF6E4 80241E64 8FB00010 */ lw $s0, 0x10($sp) -/* BFF6E8 80241E68 03E00008 */ jr $ra -/* BFF6EC 80241E6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s deleted file mode 100644 index 89fb449f3f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E70_BFF6F0 -/* BFF6F0 80241E70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFF6F4 80241E74 AFB00010 */ sw $s0, 0x10($sp) -/* BFF6F8 80241E78 0080802D */ daddu $s0, $a0, $zero -/* BFF6FC 80241E7C AFBF0014 */ sw $ra, 0x14($sp) -/* BFF700 80241E80 8E020148 */ lw $v0, 0x148($s0) -/* BFF704 80241E84 0C00EABB */ jal get_npc_unsafe -/* BFF708 80241E88 84440008 */ lh $a0, 8($v0) -/* BFF70C 80241E8C 0040202D */ daddu $a0, $v0, $zero -/* BFF710 80241E90 9482008E */ lhu $v0, 0x8e($a0) -/* BFF714 80241E94 24420001 */ addiu $v0, $v0, 1 -/* BFF718 80241E98 A482008E */ sh $v0, 0x8e($a0) -/* BFF71C 80241E9C 00021400 */ sll $v0, $v0, 0x10 -/* BFF720 80241EA0 00021403 */ sra $v0, $v0, 0x10 -/* BFF724 80241EA4 28420003 */ slti $v0, $v0, 3 -/* BFF728 80241EA8 1440000D */ bnez $v0, .L80241EE0 -/* BFF72C 80241EAC 24020009 */ addiu $v0, $zero, 9 -/* BFF730 80241EB0 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* BFF734 80241EB4 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* BFF738 80241EB8 10620003 */ beq $v1, $v0, .L80241EC8 -/* BFF73C 80241EBC 24020064 */ addiu $v0, $zero, 0x64 -/* BFF740 80241EC0 080907B7 */ j .L80241EDC -/* BFF744 80241EC4 A480008E */ sh $zero, 0x8e($a0) -.L80241EC8: -/* BFF748 80241EC8 0C038069 */ jal enable_player_input -/* BFF74C 80241ECC 00000000 */ nop -/* BFF750 80241ED0 0C03BD80 */ jal func_800EF600 -/* BFF754 80241ED4 00000000 */ nop -/* BFF758 80241ED8 24020010 */ addiu $v0, $zero, 0x10 -.L80241EDC: -/* BFF75C 80241EDC AE020070 */ sw $v0, 0x70($s0) -.L80241EE0: -/* BFF760 80241EE0 8FBF0014 */ lw $ra, 0x14($sp) -/* BFF764 80241EE4 8FB00010 */ lw $s0, 0x10($sp) -/* BFF768 80241EE8 03E00008 */ jr $ra -/* BFF76C 80241EEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s deleted file mode 100644 index cf63b3a01a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241EF0_BFF770.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF0_BFF770 -/* BFF770 80241EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BFF774 80241EF4 AFB20018 */ sw $s2, 0x18($sp) -/* BFF778 80241EF8 0080902D */ daddu $s2, $a0, $zero -/* BFF77C 80241EFC AFBF001C */ sw $ra, 0x1c($sp) -/* BFF780 80241F00 AFB10014 */ sw $s1, 0x14($sp) -/* BFF784 80241F04 AFB00010 */ sw $s0, 0x10($sp) -/* BFF788 80241F08 8E500148 */ lw $s0, 0x148($s2) -/* BFF78C 80241F0C 86040008 */ lh $a0, 8($s0) -/* BFF790 80241F10 0C00EABB */ jal get_npc_unsafe -/* BFF794 80241F14 00A0882D */ daddu $s1, $a1, $zero -/* BFF798 80241F18 3C05FFDF */ lui $a1, 0xffdf -/* BFF79C 80241F1C 8E03006C */ lw $v1, 0x6c($s0) -/* BFF7A0 80241F20 2404FEFF */ addiu $a0, $zero, -0x101 -/* BFF7A4 80241F24 00641824 */ and $v1, $v1, $a0 -/* BFF7A8 80241F28 AE03006C */ sw $v1, 0x6c($s0) -/* BFF7AC 80241F2C 8C430000 */ lw $v1, ($v0) -/* BFF7B0 80241F30 34A5FFFF */ ori $a1, $a1, 0xffff -/* BFF7B4 80241F34 00651824 */ and $v1, $v1, $a1 -/* BFF7B8 80241F38 AC430000 */ sw $v1, ($v0) -/* BFF7BC 80241F3C C6200000 */ lwc1 $f0, ($s1) -/* BFF7C0 80241F40 46000021 */ cvt.d.s $f0, $f0 -/* BFF7C4 80241F44 46200000 */ add.d $f0, $f0, $f0 -/* BFF7C8 80241F48 46200020 */ cvt.s.d $f0, $f0 -/* BFF7CC 80241F4C E4400018 */ swc1 $f0, 0x18($v0) -/* BFF7D0 80241F50 AE000074 */ sw $zero, 0x74($s0) -/* BFF7D4 80241F54 C440003C */ lwc1 $f0, 0x3c($v0) -/* BFF7D8 80241F58 3C014059 */ lui $at, 0x4059 -/* BFF7DC 80241F5C 44811800 */ mtc1 $at, $f3 -/* BFF7E0 80241F60 44801000 */ mtc1 $zero, $f2 -/* BFF7E4 80241F64 46000021 */ cvt.d.s $f0, $f0 -/* BFF7E8 80241F68 46220002 */ mul.d $f0, $f0, $f2 -/* BFF7EC 80241F6C 00000000 */ nop -/* BFF7F0 80241F70 2402001E */ addiu $v0, $zero, 0x1e -/* BFF7F4 80241F74 4620010D */ trunc.w.d $f4, $f0 -/* BFF7F8 80241F78 E604007C */ swc1 $f4, 0x7c($s0) -/* BFF7FC 80241F7C AE420074 */ sw $v0, 0x74($s2) -/* BFF800 80241F80 8FBF001C */ lw $ra, 0x1c($sp) -/* BFF804 80241F84 8FB20018 */ lw $s2, 0x18($sp) -/* BFF808 80241F88 8FB10014 */ lw $s1, 0x14($sp) -/* BFF80C 80241F8C 8FB00010 */ lw $s0, 0x10($sp) -/* BFF810 80241F90 03E00008 */ jr $ra -/* BFF814 80241F94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s deleted file mode 100644 index 078e65a414..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241F98_BFF818.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F98_BFF818 -/* BFF818 80241F98 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BFF81C 80241F9C AFB20048 */ sw $s2, 0x48($sp) -/* BFF820 80241FA0 0080902D */ daddu $s2, $a0, $zero -/* BFF824 80241FA4 AFBF0054 */ sw $ra, 0x54($sp) -/* BFF828 80241FA8 AFB40050 */ sw $s4, 0x50($sp) -/* BFF82C 80241FAC AFB3004C */ sw $s3, 0x4c($sp) -/* BFF830 80241FB0 AFB10044 */ sw $s1, 0x44($sp) -/* BFF834 80241FB4 AFB00040 */ sw $s0, 0x40($sp) -/* BFF838 80241FB8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BFF83C 80241FBC F7B80068 */ sdc1 $f24, 0x68($sp) -/* BFF840 80241FC0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BFF844 80241FC4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BFF848 80241FC8 8E500148 */ lw $s0, 0x148($s2) -/* BFF84C 80241FCC 00A0982D */ daddu $s3, $a1, $zero -/* BFF850 80241FD0 86040008 */ lh $a0, 8($s0) -/* BFF854 80241FD4 0C00EABB */ jal get_npc_unsafe -/* BFF858 80241FD8 00C0A02D */ daddu $s4, $a2, $zero -/* BFF85C 80241FDC 0040882D */ daddu $s1, $v0, $zero -/* BFF860 80241FE0 C6200038 */ lwc1 $f0, 0x38($s1) -/* BFF864 80241FE4 C622003C */ lwc1 $f2, 0x3c($s1) -/* BFF868 80241FE8 C6240040 */ lwc1 $f4, 0x40($s1) -/* BFF86C 80241FEC 3C01447A */ lui $at, 0x447a -/* BFF870 80241FF0 44813000 */ mtc1 $at, $f6 -/* BFF874 80241FF4 C60C0074 */ lwc1 $f12, 0x74($s0) -/* BFF878 80241FF8 46806320 */ cvt.s.w $f12, $f12 -/* BFF87C 80241FFC E7A00028 */ swc1 $f0, 0x28($sp) -/* BFF880 80242000 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFF884 80242004 E7A40030 */ swc1 $f4, 0x30($sp) -/* BFF888 80242008 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFF88C 8024200C C6000078 */ lwc1 $f0, 0x78($s0) -/* BFF890 80242010 46800020 */ cvt.s.w $f0, $f0 -/* BFF894 80242014 46000021 */ cvt.d.s $f0, $f0 -/* BFF898 80242018 C6020088 */ lwc1 $f2, 0x88($s0) -/* BFF89C 8024201C 468010A0 */ cvt.s.w $f2, $f2 -/* BFF8A0 80242020 3C014059 */ lui $at, 0x4059 -/* BFF8A4 80242024 44812800 */ mtc1 $at, $f5 -/* BFF8A8 80242028 44802000 */ mtc1 $zero, $f4 -/* BFF8AC 8024202C 460010A1 */ cvt.d.s $f2, $f2 -/* BFF8B0 80242030 46240003 */ div.d $f0, $f0, $f4 -/* BFF8B4 80242034 462006A0 */ cvt.s.d $f26, $f0 -/* BFF8B8 80242038 46241083 */ div.d $f2, $f2, $f4 -/* BFF8BC 8024203C 462010A0 */ cvt.s.d $f2, $f2 -/* BFF8C0 80242040 C6000070 */ lwc1 $f0, 0x70($s0) -/* BFF8C4 80242044 46800020 */ cvt.s.w $f0, $f0 -/* BFF8C8 80242048 46000021 */ cvt.d.s $f0, $f0 -/* BFF8CC 8024204C 46240003 */ div.d $f0, $f0, $f4 -/* BFF8D0 80242050 462005A0 */ cvt.s.d $f22, $f0 -/* BFF8D4 80242054 0C00A8BB */ jal sin_deg -/* BFF8D8 80242058 4602D600 */ add.s $f24, $f26, $f2 -/* BFF8DC 8024205C 27A50028 */ addiu $a1, $sp, 0x28 -/* BFF8E0 80242060 27A6002C */ addiu $a2, $sp, 0x2c -/* BFF8E4 80242064 27A70030 */ addiu $a3, $sp, 0x30 -/* BFF8E8 80242068 27A20034 */ addiu $v0, $sp, 0x34 -/* BFF8EC 8024206C AFA20010 */ sw $v0, 0x10($sp) -/* BFF8F0 80242070 8E240080 */ lw $a0, 0x80($s1) -/* BFF8F4 80242074 0C0372DF */ jal func_800DCB7C -/* BFF8F8 80242078 46000506 */ mov.s $f20, $f0 -/* BFF8FC 8024207C 10400007 */ beqz $v0, .L8024209C -/* BFF900 80242080 00000000 */ nop -/* BFF904 80242084 4616A082 */ mul.s $f2, $f20, $f22 -/* BFF908 80242088 00000000 */ nop -/* BFF90C 8024208C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFF910 80242090 461A0000 */ add.s $f0, $f0, $f26 -/* BFF914 80242094 0809082A */ j .L802420A8 -/* BFF918 80242098 46020000 */ add.s $f0, $f0, $f2 -.L8024209C: -/* BFF91C 8024209C 4616A002 */ mul.s $f0, $f20, $f22 -/* BFF920 802420A0 00000000 */ nop -/* BFF924 802420A4 4600C000 */ add.s $f0, $f24, $f0 -.L802420A8: -/* BFF928 802420A8 E620003C */ swc1 $f0, 0x3c($s1) -/* BFF92C 802420AC 8E020074 */ lw $v0, 0x74($s0) -/* BFF930 802420B0 2442000C */ addiu $v0, $v0, 0xc -/* BFF934 802420B4 44826000 */ mtc1 $v0, $f12 -/* BFF938 802420B8 00000000 */ nop -/* BFF93C 802420BC 0C00A6C9 */ jal clamp_angle -/* BFF940 802420C0 46806320 */ cvt.s.w $f12, $f12 -/* BFF944 802420C4 4600020D */ trunc.w.s $f8, $f0 -/* BFF948 802420C8 E6080074 */ swc1 $f8, 0x74($s0) -/* BFF94C 802420CC 8E420074 */ lw $v0, 0x74($s2) -/* BFF950 802420D0 1C400037 */ bgtz $v0, .L802421B0 -/* BFF954 802420D4 2442FFFF */ addiu $v0, $v0, -1 -/* BFF958 802420D8 8E620014 */ lw $v0, 0x14($s3) -/* BFF95C 802420DC AE420074 */ sw $v0, 0x74($s2) -/* BFF960 802420E0 C662000C */ lwc1 $f2, 0xc($s3) -/* BFF964 802420E4 3C013FE0 */ lui $at, 0x3fe0 -/* BFF968 802420E8 44812800 */ mtc1 $at, $f5 -/* BFF96C 802420EC 44802000 */ mtc1 $zero, $f4 -/* BFF970 802420F0 460010A1 */ cvt.d.s $f2, $f2 -/* BFF974 802420F4 46241082 */ mul.d $f2, $f2, $f4 -/* BFF978 802420F8 00000000 */ nop -/* BFF97C 802420FC C6600010 */ lwc1 $f0, 0x10($s3) -/* BFF980 80242100 46000021 */ cvt.d.s $f0, $f0 -/* BFF984 80242104 46240002 */ mul.d $f0, $f0, $f4 -/* BFF988 80242108 00000000 */ nop -/* BFF98C 8024210C 0280202D */ daddu $a0, $s4, $zero -/* BFF990 80242110 462010A0 */ cvt.s.d $f2, $f2 -/* BFF994 80242114 46200020 */ cvt.s.d $f0, $f0 -/* BFF998 80242118 44061000 */ mfc1 $a2, $f2 -/* BFF99C 8024211C 44070000 */ mfc1 $a3, $f0 -/* BFF9A0 80242120 0200282D */ daddu $a1, $s0, $zero -/* BFF9A4 80242124 0C01242D */ jal func_800490B4 -/* BFF9A8 80242128 AFA00010 */ sw $zero, 0x10($sp) -/* BFF9AC 8024212C 1040001E */ beqz $v0, .L802421A8 -/* BFF9B0 80242130 0000202D */ daddu $a0, $zero, $zero -/* BFF9B4 80242134 0220282D */ daddu $a1, $s1, $zero -/* BFF9B8 80242138 0000302D */ daddu $a2, $zero, $zero -/* BFF9BC 8024213C 2410000C */ addiu $s0, $zero, 0xc -/* BFF9C0 80242140 862300A8 */ lh $v1, 0xa8($s1) -/* BFF9C4 80242144 3C013F80 */ lui $at, 0x3f80 -/* BFF9C8 80242148 44810000 */ mtc1 $at, $f0 -/* BFF9CC 8024214C 3C014000 */ lui $at, 0x4000 -/* BFF9D0 80242150 44811000 */ mtc1 $at, $f2 -/* BFF9D4 80242154 3C01C1A0 */ lui $at, 0xc1a0 -/* BFF9D8 80242158 44812000 */ mtc1 $at, $f4 -/* BFF9DC 8024215C 44834000 */ mtc1 $v1, $f8 -/* BFF9E0 80242160 00000000 */ nop -/* BFF9E4 80242164 46804220 */ cvt.s.w $f8, $f8 -/* BFF9E8 80242168 44074000 */ mfc1 $a3, $f8 -/* BFF9EC 8024216C 27A20038 */ addiu $v0, $sp, 0x38 -/* BFF9F0 80242170 AFB0001C */ sw $s0, 0x1c($sp) -/* BFF9F4 80242174 AFA20020 */ sw $v0, 0x20($sp) -/* BFF9F8 80242178 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFF9FC 8024217C E7A20014 */ swc1 $f2, 0x14($sp) -/* BFFA00 80242180 0C01BFA4 */ jal fx_emote -/* BFFA04 80242184 E7A40018 */ swc1 $f4, 0x18($sp) -/* BFFA08 80242188 0220202D */ daddu $a0, $s1, $zero -/* BFFA0C 8024218C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFFA10 80242190 0C012530 */ jal func_800494C0 -/* BFFA14 80242194 3C060020 */ lui $a2, 0x20 -/* BFFA18 80242198 C620003C */ lwc1 $f0, 0x3c($s1) -/* BFFA1C 8024219C E6200064 */ swc1 $f0, 0x64($s1) -/* BFFA20 802421A0 080908A0 */ j .L80242280 -/* BFFA24 802421A4 AE500070 */ sw $s0, 0x70($s2) -.L802421A8: -/* BFFA28 802421A8 8E420074 */ lw $v0, 0x74($s2) -/* BFFA2C 802421AC 2442FFFF */ addiu $v0, $v0, -1 -.L802421B0: -/* BFFA30 802421B0 AE420074 */ sw $v0, 0x74($s2) -/* BFFA34 802421B4 8622008C */ lh $v0, 0x8c($s1) -/* BFFA38 802421B8 14400031 */ bnez $v0, .L80242280 -/* BFFA3C 802421BC 00000000 */ nop -/* BFFA40 802421C0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFFA44 802421C4 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFFA48 802421C8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFFA4C 802421CC C4480000 */ lwc1 $f8, ($v0) -/* BFFA50 802421D0 46804220 */ cvt.s.w $f8, $f8 -/* BFFA54 802421D4 44064000 */ mfc1 $a2, $f8 -/* BFFA58 802421D8 C4480008 */ lwc1 $f8, 8($v0) -/* BFFA5C 802421DC 46804220 */ cvt.s.w $f8, $f8 -/* BFFA60 802421E0 44074000 */ mfc1 $a3, $f8 -/* BFFA64 802421E4 0C00A720 */ jal atan2 -/* BFFA68 802421E8 00000000 */ nop -/* BFFA6C 802421EC 8E250018 */ lw $a1, 0x18($s1) -/* BFFA70 802421F0 44060000 */ mfc1 $a2, $f0 -/* BFFA74 802421F4 0220202D */ daddu $a0, $s1, $zero -/* BFFA78 802421F8 0C00EA95 */ jal npc_move_heading -/* BFFA7C 802421FC AE26000C */ sw $a2, 0xc($s1) -/* BFFA80 80242200 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFFA84 80242204 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFFA88 80242208 C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFFA8C 8024220C C4480000 */ lwc1 $f8, ($v0) -/* BFFA90 80242210 46804220 */ cvt.s.w $f8, $f8 -/* BFFA94 80242214 44064000 */ mfc1 $a2, $f8 -/* BFFA98 80242218 C4480008 */ lwc1 $f8, 8($v0) -/* BFFA9C 8024221C 46804220 */ cvt.s.w $f8, $f8 -/* BFFAA0 80242220 44074000 */ mfc1 $a3, $f8 -/* BFFAA4 80242224 0C00A7B5 */ jal dist2D -/* BFFAA8 80242228 00000000 */ nop -/* BFFAAC 8024222C C6220018 */ lwc1 $f2, 0x18($s1) -/* BFFAB0 80242230 46021080 */ add.s $f2, $f2, $f2 -/* BFFAB4 80242234 4602003E */ c.le.s $f0, $f2 -/* BFFAB8 80242238 00000000 */ nop -/* BFFABC 8024223C 45000010 */ bc1f .L80242280 -/* BFFAC0 80242240 E7A00034 */ swc1 $f0, 0x34($sp) -/* BFFAC4 80242244 0C00A67F */ jal rand_int -/* BFFAC8 80242248 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BFFACC 8024224C 3C035555 */ lui $v1, 0x5555 -/* BFFAD0 80242250 34635556 */ ori $v1, $v1, 0x5556 -/* BFFAD4 80242254 00430018 */ mult $v0, $v1 -/* BFFAD8 80242258 24030002 */ addiu $v1, $zero, 2 -/* BFFADC 8024225C 000227C3 */ sra $a0, $v0, 0x1f -/* BFFAE0 80242260 AE430070 */ sw $v1, 0x70($s2) -/* BFFAE4 80242264 00004010 */ mfhi $t0 -/* BFFAE8 80242268 01042023 */ subu $a0, $t0, $a0 -/* BFFAEC 8024226C 00041840 */ sll $v1, $a0, 1 -/* BFFAF0 80242270 00641821 */ addu $v1, $v1, $a0 -/* BFFAF4 80242274 00431023 */ subu $v0, $v0, $v1 -/* BFFAF8 80242278 24420002 */ addiu $v0, $v0, 2 -/* BFFAFC 8024227C AE420074 */ sw $v0, 0x74($s2) -.L80242280: -/* BFFB00 80242280 8FBF0054 */ lw $ra, 0x54($sp) -/* BFFB04 80242284 8FB40050 */ lw $s4, 0x50($sp) -/* BFFB08 80242288 8FB3004C */ lw $s3, 0x4c($sp) -/* BFFB0C 8024228C 8FB20048 */ lw $s2, 0x48($sp) -/* BFFB10 80242290 8FB10044 */ lw $s1, 0x44($sp) -/* BFFB14 80242294 8FB00040 */ lw $s0, 0x40($sp) -/* BFFB18 80242298 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BFFB1C 8024229C D7B80068 */ ldc1 $f24, 0x68($sp) -/* BFFB20 802422A0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* BFFB24 802422A4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BFFB28 802422A8 03E00008 */ jr $ra -/* BFFB2C 802422AC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s deleted file mode 100644 index 1ad52aee97..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ /dev/null @@ -1,180 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422B0_BFFB30 -/* BFFB30 802422B0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* BFFB34 802422B4 AFB40050 */ sw $s4, 0x50($sp) -/* BFFB38 802422B8 0080A02D */ daddu $s4, $a0, $zero -/* BFFB3C 802422BC AFBF0058 */ sw $ra, 0x58($sp) -/* BFFB40 802422C0 AFB50054 */ sw $s5, 0x54($sp) -/* BFFB44 802422C4 AFB3004C */ sw $s3, 0x4c($sp) -/* BFFB48 802422C8 AFB20048 */ sw $s2, 0x48($sp) -/* BFFB4C 802422CC AFB10044 */ sw $s1, 0x44($sp) -/* BFFB50 802422D0 AFB00040 */ sw $s0, 0x40($sp) -/* BFFB54 802422D4 8E920148 */ lw $s2, 0x148($s4) -/* BFFB58 802422D8 86440008 */ lh $a0, 8($s2) -/* BFFB5C 802422DC 0C00EABB */ jal get_npc_unsafe -/* BFFB60 802422E0 00A0802D */ daddu $s0, $a1, $zero -/* BFFB64 802422E4 8E83000C */ lw $v1, 0xc($s4) -/* BFFB68 802422E8 0280202D */ daddu $a0, $s4, $zero -/* BFFB6C 802422EC 8C650000 */ lw $a1, ($v1) -/* BFFB70 802422F0 0C0B1EAF */ jal get_variable -/* BFFB74 802422F4 0040A82D */ daddu $s5, $v0, $zero -/* BFFB78 802422F8 AFA00020 */ sw $zero, 0x20($sp) -/* BFFB7C 802422FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFB80 80242300 8C630030 */ lw $v1, 0x30($v1) -/* BFFB84 80242304 AFA30024 */ sw $v1, 0x24($sp) -/* BFFB88 80242308 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFB8C 8024230C 8C63001C */ lw $v1, 0x1c($v1) -/* BFFB90 80242310 AFA30028 */ sw $v1, 0x28($sp) -/* BFFB94 80242314 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFB98 80242318 8C630024 */ lw $v1, 0x24($v1) -/* BFFB9C 8024231C AFA3002C */ sw $v1, 0x2c($sp) -/* BFFBA0 80242320 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFBA4 80242324 8C630028 */ lw $v1, 0x28($v1) -/* BFFBA8 80242328 27B30020 */ addiu $s3, $sp, 0x20 -/* BFFBAC 8024232C AFA30030 */ sw $v1, 0x30($sp) -/* BFFBB0 80242330 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFFBB4 80242334 3C0142FA */ lui $at, 0x42fa -/* BFFBB8 80242338 44810000 */ mtc1 $at, $f0 -/* BFFBBC 8024233C 8C63002C */ lw $v1, 0x2c($v1) -/* BFFBC0 80242340 0040882D */ daddu $s1, $v0, $zero -/* BFFBC4 80242344 E7A00038 */ swc1 $f0, 0x38($sp) -/* BFFBC8 80242348 A7A0003C */ sh $zero, 0x3c($sp) -/* BFFBCC 8024234C 12000007 */ beqz $s0, .L8024236C -/* BFFBD0 80242350 AFA30034 */ sw $v1, 0x34($sp) -/* BFFBD4 80242354 AE800070 */ sw $zero, 0x70($s4) -/* BFFBD8 80242358 02A0202D */ daddu $a0, $s5, $zero -/* BFFBDC 8024235C 0240282D */ daddu $a1, $s2, $zero -/* BFFBE0 80242360 0280302D */ daddu $a2, $s4, $zero -/* BFFBE4 80242364 0C0904C2 */ jal func_80241308_BFEB88 -/* BFFBE8 80242368 0220382D */ daddu $a3, $s1, $zero -.L8024236C: -/* BFFBEC 8024236C 8E830070 */ lw $v1, 0x70($s4) -/* BFFBF0 80242370 2C620020 */ sltiu $v0, $v1, 0x20 -/* BFFBF4 80242374 10400060 */ beqz $v0, L802424F8_BFFD78 -/* BFFBF8 80242378 00031080 */ sll $v0, $v1, 2 -/* BFFBFC 8024237C 3C018026 */ lui $at, %hi(jtbl_80263488_C20D08) -/* BFFC00 80242380 00220821 */ addu $at, $at, $v0 -/* BFFC04 80242384 8C223488 */ lw $v0, %lo(jtbl_80263488_C20D08)($at) -/* BFFC08 80242388 00400008 */ jr $v0 -/* BFFC0C 8024238C 00000000 */ nop -glabel L80242390_BFFC10 -/* BFFC10 80242390 0280202D */ daddu $a0, $s4, $zero -/* BFFC14 80242394 0220282D */ daddu $a1, $s1, $zero -/* BFFC18 80242398 0C090048 */ jal func_80240120_BFD9A0 -/* BFFC1C 8024239C 0260302D */ daddu $a2, $s3, $zero -/* BFFC20 802423A0 0000282D */ daddu $a1, $zero, $zero -/* BFFC24 802423A4 00A0302D */ daddu $a2, $a1, $zero -/* BFFC28 802423A8 AFA00010 */ sw $zero, 0x10($sp) -/* BFFC2C 802423AC AFA00014 */ sw $zero, 0x14($sp) -/* BFFC30 802423B0 AFA00018 */ sw $zero, 0x18($sp) -/* BFFC34 802423B4 8EA40024 */ lw $a0, 0x24($s5) -/* BFFC38 802423B8 0C0B7A25 */ jal func_802DE894 -/* BFFC3C 802423BC 00A0382D */ daddu $a3, $a1, $zero -glabel L802423C0_BFFC40 -/* BFFC40 802423C0 0280202D */ daddu $a0, $s4, $zero -/* BFFC44 802423C4 0220282D */ daddu $a1, $s1, $zero -/* BFFC48 802423C8 0C0900B4 */ jal func_802402D0_BFDB50 -/* BFFC4C 802423CC 0260302D */ daddu $a2, $s3, $zero -/* BFFC50 802423D0 080908FE */ j .L802423F8 -/* BFFC54 802423D4 00000000 */ nop -glabel L802423D8_BFFC58 -/* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero -/* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero -/* BFFC60 802423E0 0C09023E */ jal dgb_01_UnkNpcAIFunc1 -/* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero -glabel L802423E8_BFFC68 -/* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero -/* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero -/* BFFC70 802423F0 0C09026E */ jal func_802409B8_BFE238 -/* BFFC74 802423F4 0260302D */ daddu $a2, $s3, $zero -.L802423F8: -/* BFFC78 802423F8 8E830070 */ lw $v1, 0x70($s4) -/* BFFC7C 802423FC 2402000C */ addiu $v0, $zero, 0xc -/* BFFC80 80242400 1462003D */ bne $v1, $v0, L802424F8_BFFD78 -/* BFFC84 80242404 24020006 */ addiu $v0, $zero, 6 -/* BFFC88 80242408 0809093E */ j L802424F8_BFFD78 -/* BFFC8C 8024240C A6A2008E */ sh $v0, 0x8e($s5) -glabel L80242410_BFFC90 -/* BFFC90 80242410 0280202D */ daddu $a0, $s4, $zero -/* BFFC94 80242414 0220282D */ daddu $a1, $s1, $zero -/* BFFC98 80242418 0C090586 */ jal func_80241618_BFEE98 -/* BFFC9C 8024241C 0260302D */ daddu $a2, $s3, $zero -/* BFFCA0 80242420 8E830070 */ lw $v1, 0x70($s4) -/* BFFCA4 80242424 2402000D */ addiu $v0, $zero, 0xd -/* BFFCA8 80242428 14620033 */ bne $v1, $v0, L802424F8_BFFD78 -/* BFFCAC 8024242C 00000000 */ nop -glabel L80242430_BFFCB0 -/* BFFCB0 80242430 0280202D */ daddu $a0, $s4, $zero -/* BFFCB4 80242434 0220282D */ daddu $a1, $s1, $zero -/* BFFCB8 80242438 0C0905DC */ jal func_80241770_BFEFF0 -/* BFFCBC 8024243C 0260302D */ daddu $a2, $s3, $zero -/* BFFCC0 80242440 0809093E */ j L802424F8_BFFD78 -/* BFFCC4 80242444 00000000 */ nop -glabel L80242448_BFFCC8 -/* BFFCC8 80242448 0280202D */ daddu $a0, $s4, $zero -/* BFFCCC 8024244C 0220282D */ daddu $a1, $s1, $zero -/* BFFCD0 80242450 0C09061D */ jal func_80241874_BFF0F4 -/* BFFCD4 80242454 0260302D */ daddu $a2, $s3, $zero -/* BFFCD8 80242458 8E830070 */ lw $v1, 0x70($s4) -/* BFFCDC 8024245C 2402000F */ addiu $v0, $zero, 0xf -/* BFFCE0 80242460 14620025 */ bne $v1, $v0, L802424F8_BFFD78 -/* BFFCE4 80242464 00000000 */ nop -glabel L80242468_BFFCE8 -/* BFFCE8 80242468 0280202D */ daddu $a0, $s4, $zero -/* BFFCEC 8024246C 0220282D */ daddu $a1, $s1, $zero -/* BFFCF0 80242470 0C090655 */ jal func_80241954_BFF1D4 -/* BFFCF4 80242474 0260302D */ daddu $a2, $s3, $zero -/* BFFCF8 80242478 0809093E */ j L802424F8_BFFD78 -/* BFFCFC 8024247C 00000000 */ nop -glabel L80242480_BFFD00 -/* BFFD00 80242480 0280202D */ daddu $a0, $s4, $zero -/* BFFD04 80242484 0220282D */ daddu $a1, $s1, $zero -/* BFFD08 80242488 0C0906FC */ jal func_80241BF0_BFF470 -/* BFFD0C 8024248C 0260302D */ daddu $a2, $s3, $zero -glabel L80242490_BFFD10 -/* BFFD10 80242490 0280202D */ daddu $a0, $s4, $zero -/* BFFD14 80242494 0220282D */ daddu $a1, $s1, $zero -/* BFFD18 80242498 0C09072A */ jal func_80241CA8_BFF528 -/* BFFD1C 8024249C 0260302D */ daddu $a2, $s3, $zero -/* BFFD20 802424A0 0809093E */ j L802424F8_BFFD78 -/* BFFD24 802424A4 00000000 */ nop -glabel L802424A8_BFFD28 -/* BFFD28 802424A8 0280202D */ daddu $a0, $s4, $zero -/* BFFD2C 802424AC 0220282D */ daddu $a1, $s1, $zero -/* BFFD30 802424B0 0C09078A */ jal func_80241E28_BFF6A8 -/* BFFD34 802424B4 0260302D */ daddu $a2, $s3, $zero -/* BFFD38 802424B8 0809093E */ j L802424F8_BFFD78 -/* BFFD3C 802424BC 00000000 */ nop -glabel L802424C0_BFFD40 -/* BFFD40 802424C0 0280202D */ daddu $a0, $s4, $zero -/* BFFD44 802424C4 0220282D */ daddu $a1, $s1, $zero -/* BFFD48 802424C8 0C09079C */ jal func_80241E70_BFF6F0 -/* BFFD4C 802424CC 0260302D */ daddu $a2, $s3, $zero -/* BFFD50 802424D0 0809093E */ j L802424F8_BFFD78 -/* BFFD54 802424D4 00000000 */ nop -glabel L802424D8_BFFD58 -/* BFFD58 802424D8 0280202D */ daddu $a0, $s4, $zero -/* BFFD5C 802424DC 0220282D */ daddu $a1, $s1, $zero -/* BFFD60 802424E0 0C0907BC */ jal func_80241EF0_BFF770 -/* BFFD64 802424E4 0260302D */ daddu $a2, $s3, $zero -glabel L802424E8_BFFD68 -/* BFFD68 802424E8 0280202D */ daddu $a0, $s4, $zero -/* BFFD6C 802424EC 0220282D */ daddu $a1, $s1, $zero -/* BFFD70 802424F0 0C0907E6 */ jal func_80241F98_BFF818 -/* BFFD74 802424F4 0260302D */ daddu $a2, $s3, $zero -glabel L802424F8_BFFD78 -/* BFFD78 802424F8 8E820070 */ lw $v0, 0x70($s4) -/* BFFD7C 802424FC 8FBF0058 */ lw $ra, 0x58($sp) -/* BFFD80 80242500 8FB50054 */ lw $s5, 0x54($sp) -/* BFFD84 80242504 8FB40050 */ lw $s4, 0x50($sp) -/* BFFD88 80242508 8FB3004C */ lw $s3, 0x4c($sp) -/* BFFD8C 8024250C 8FB20048 */ lw $s2, 0x48($sp) -/* BFFD90 80242510 8FB10044 */ lw $s1, 0x44($sp) -/* BFFD94 80242514 8FB00040 */ lw $s0, 0x40($sp) -/* BFFD98 80242518 38420064 */ xori $v0, $v0, 0x64 -/* BFFD9C 8024251C 2C420001 */ sltiu $v0, $v0, 1 -/* BFFDA0 80242520 00021040 */ sll $v0, $v0, 1 -/* BFFDA4 80242524 03E00008 */ jr $ra -/* BFFDA8 80242528 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s deleted file mode 100644 index 68f8e033b5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024252C_BFFDAC -/* BFFDAC 8024252C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BFFDB0 80242530 AFB50024 */ sw $s5, 0x24($sp) -/* BFFDB4 80242534 0080A82D */ daddu $s5, $a0, $zero -/* BFFDB8 80242538 AFBF002C */ sw $ra, 0x2c($sp) -/* BFFDBC 8024253C AFB60028 */ sw $s6, 0x28($sp) -/* BFFDC0 80242540 AFB40020 */ sw $s4, 0x20($sp) -/* BFFDC4 80242544 AFB3001C */ sw $s3, 0x1c($sp) -/* BFFDC8 80242548 AFB20018 */ sw $s2, 0x18($sp) -/* BFFDCC 8024254C AFB10014 */ sw $s1, 0x14($sp) -/* BFFDD0 80242550 AFB00010 */ sw $s0, 0x10($sp) -/* BFFDD4 80242554 F7B80040 */ sdc1 $f24, 0x40($sp) -/* BFFDD8 80242558 F7B60038 */ sdc1 $f22, 0x38($sp) -/* BFFDDC 8024255C F7B40030 */ sdc1 $f20, 0x30($sp) -/* BFFDE0 80242560 8EB30148 */ lw $s3, 0x148($s5) -/* BFFDE4 80242564 86640008 */ lh $a0, 8($s3) -/* BFFDE8 80242568 0C00EABB */ jal get_npc_unsafe -/* BFFDEC 8024256C 00A0B02D */ daddu $s6, $a1, $zero -/* BFFDF0 80242570 0040A02D */ daddu $s4, $v0, $zero -/* BFFDF4 80242574 AEA00074 */ sw $zero, 0x74($s5) -/* BFFDF8 80242578 C6980038 */ lwc1 $f24, 0x38($s4) -/* BFFDFC 8024257C C6960040 */ lwc1 $f22, 0x40($s4) -/* BFFE00 80242580 0000902D */ daddu $s2, $zero, $zero -/* BFFE04 80242584 AEA00078 */ sw $zero, 0x78($s5) -/* BFFE08 80242588 8E6300D0 */ lw $v1, 0xd0($s3) -/* BFFE0C 8024258C 8C620000 */ lw $v0, ($v1) -/* BFFE10 80242590 3C0146FF */ lui $at, 0x46ff -/* BFFE14 80242594 3421FE00 */ ori $at, $at, 0xfe00 -/* BFFE18 80242598 4481A000 */ mtc1 $at, $f20 -/* BFFE1C 8024259C 18400018 */ blez $v0, .L80242600 -/* BFFE20 802425A0 0240802D */ daddu $s0, $s2, $zero -/* BFFE24 802425A4 0240882D */ daddu $s1, $s2, $zero -.L802425A8: -/* BFFE28 802425A8 02231021 */ addu $v0, $s1, $v1 -/* BFFE2C 802425AC 4600C306 */ mov.s $f12, $f24 -/* BFFE30 802425B0 C4440004 */ lwc1 $f4, 4($v0) -/* BFFE34 802425B4 46802120 */ cvt.s.w $f4, $f4 -/* BFFE38 802425B8 44062000 */ mfc1 $a2, $f4 -/* BFFE3C 802425BC C444000C */ lwc1 $f4, 0xc($v0) -/* BFFE40 802425C0 46802120 */ cvt.s.w $f4, $f4 -/* BFFE44 802425C4 44072000 */ mfc1 $a3, $f4 -/* BFFE48 802425C8 0C00A7B5 */ jal dist2D -/* BFFE4C 802425CC 4600B386 */ mov.s $f14, $f22 -/* BFFE50 802425D0 4614003C */ c.lt.s $f0, $f20 -/* BFFE54 802425D4 00000000 */ nop -/* BFFE58 802425D8 45000003 */ bc1f .L802425E8 -/* BFFE5C 802425DC 2631000C */ addiu $s1, $s1, 0xc -/* BFFE60 802425E0 46000506 */ mov.s $f20, $f0 -/* BFFE64 802425E4 AEB20078 */ sw $s2, 0x78($s5) -.L802425E8: -/* BFFE68 802425E8 8E6300D0 */ lw $v1, 0xd0($s3) -/* BFFE6C 802425EC 26100001 */ addiu $s0, $s0, 1 -/* BFFE70 802425F0 8C620000 */ lw $v0, ($v1) -/* BFFE74 802425F4 0202102A */ slt $v0, $s0, $v0 -/* BFFE78 802425F8 1440FFEB */ bnez $v0, .L802425A8 -/* BFFE7C 802425FC 26520001 */ addiu $s2, $s2, 1 -.L80242600: -/* BFFE80 80242600 8E6200CC */ lw $v0, 0xcc($s3) -/* BFFE84 80242604 8C420004 */ lw $v0, 4($v0) -/* BFFE88 80242608 AE820028 */ sw $v0, 0x28($s4) -/* BFFE8C 8024260C 8E6200D0 */ lw $v0, 0xd0($s3) -/* BFFE90 80242610 8C42007C */ lw $v0, 0x7c($v0) -/* BFFE94 80242614 04410004 */ bgez $v0, .L80242628 -/* BFFE98 80242618 00000000 */ nop -/* BFFE9C 8024261C C6C00000 */ lwc1 $f0, ($s6) -/* BFFEA0 80242620 08090992 */ j .L80242648 -/* BFFEA4 80242624 E6800018 */ swc1 $f0, 0x18($s4) -.L80242628: -/* BFFEA8 80242628 3C018026 */ lui $at, %hi(D_80263510_C20D90) -/* BFFEAC 8024262C D4223510 */ ldc1 $f2, %lo(D_80263510_C20D90)($at) -/* BFFEB0 80242630 44820000 */ mtc1 $v0, $f0 -/* BFFEB4 80242634 00000000 */ nop -/* BFFEB8 80242638 46800021 */ cvt.d.w $f0, $f0 -/* BFFEBC 8024263C 46220003 */ div.d $f0, $f0, $f2 -/* BFFEC0 80242640 46200020 */ cvt.s.d $f0, $f0 -/* BFFEC4 80242644 E6800018 */ swc1 $f0, 0x18($s4) -.L80242648: -/* BFFEC8 80242648 24020001 */ addiu $v0, $zero, 1 -/* BFFECC 8024264C AEA20070 */ sw $v0, 0x70($s5) -/* BFFED0 80242650 8FBF002C */ lw $ra, 0x2c($sp) -/* BFFED4 80242654 8FB60028 */ lw $s6, 0x28($sp) -/* BFFED8 80242658 8FB50024 */ lw $s5, 0x24($sp) -/* BFFEDC 8024265C 8FB40020 */ lw $s4, 0x20($sp) -/* BFFEE0 80242660 8FB3001C */ lw $s3, 0x1c($sp) -/* BFFEE4 80242664 8FB20018 */ lw $s2, 0x18($sp) -/* BFFEE8 80242668 8FB10014 */ lw $s1, 0x14($sp) -/* BFFEEC 8024266C 8FB00010 */ lw $s0, 0x10($sp) -/* BFFEF0 80242670 D7B80040 */ ldc1 $f24, 0x40($sp) -/* BFFEF4 80242674 D7B60038 */ ldc1 $f22, 0x38($sp) -/* BFFEF8 80242678 D7B40030 */ ldc1 $f20, 0x30($sp) -/* BFFEFC 8024267C 03E00008 */ jr $ra -/* BFFF00 80242680 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s deleted file mode 100644 index 3ea6a48499..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242684_BFFF04 -/* BFFF04 80242684 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BFFF08 80242688 AFB20038 */ sw $s2, 0x38($sp) -/* BFFF0C 8024268C 0080902D */ daddu $s2, $a0, $zero -/* BFFF10 80242690 AFBF0044 */ sw $ra, 0x44($sp) -/* BFFF14 80242694 AFB40040 */ sw $s4, 0x40($sp) -/* BFFF18 80242698 AFB3003C */ sw $s3, 0x3c($sp) -/* BFFF1C 8024269C AFB10034 */ sw $s1, 0x34($sp) -/* BFFF20 802426A0 AFB00030 */ sw $s0, 0x30($sp) -/* BFFF24 802426A4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BFFF28 802426A8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BFFF2C 802426AC 8E510148 */ lw $s1, 0x148($s2) -/* BFFF30 802426B0 00A0982D */ daddu $s3, $a1, $zero -/* BFFF34 802426B4 86240008 */ lh $a0, 8($s1) -/* BFFF38 802426B8 0C00EABB */ jal get_npc_unsafe -/* BFFF3C 802426BC 00C0A02D */ daddu $s4, $a2, $zero -/* BFFF40 802426C0 8E630014 */ lw $v1, 0x14($s3) -/* BFFF44 802426C4 04600030 */ bltz $v1, .L80242788 -/* BFFF48 802426C8 0040802D */ daddu $s0, $v0, $zero -/* BFFF4C 802426CC 8E420074 */ lw $v0, 0x74($s2) -/* BFFF50 802426D0 1C40002C */ bgtz $v0, .L80242784 -/* BFFF54 802426D4 2442FFFF */ addiu $v0, $v0, -1 -/* BFFF58 802426D8 0280202D */ daddu $a0, $s4, $zero -/* BFFF5C 802426DC AE430074 */ sw $v1, 0x74($s2) -/* BFFF60 802426E0 AFA00010 */ sw $zero, 0x10($sp) -/* BFFF64 802426E4 8E66000C */ lw $a2, 0xc($s3) -/* BFFF68 802426E8 8E670010 */ lw $a3, 0x10($s3) -/* BFFF6C 802426EC 0C01242D */ jal func_800490B4 -/* BFFF70 802426F0 0220282D */ daddu $a1, $s1, $zero -/* BFFF74 802426F4 10400021 */ beqz $v0, .L8024277C -/* BFFF78 802426F8 0000202D */ daddu $a0, $zero, $zero -/* BFFF7C 802426FC 0200282D */ daddu $a1, $s0, $zero -/* BFFF80 80242700 0000302D */ daddu $a2, $zero, $zero -/* BFFF84 80242704 860300A8 */ lh $v1, 0xa8($s0) -/* BFFF88 80242708 3C013F80 */ lui $at, 0x3f80 -/* BFFF8C 8024270C 44810000 */ mtc1 $at, $f0 -/* BFFF90 80242710 3C014000 */ lui $at, 0x4000 -/* BFFF94 80242714 44811000 */ mtc1 $at, $f2 -/* BFFF98 80242718 3C01C1A0 */ lui $at, 0xc1a0 -/* BFFF9C 8024271C 44812000 */ mtc1 $at, $f4 -/* BFFFA0 80242720 2402000F */ addiu $v0, $zero, 0xf -/* BFFFA4 80242724 AFA2001C */ sw $v0, 0x1c($sp) -/* BFFFA8 80242728 44833000 */ mtc1 $v1, $f6 -/* BFFFAC 8024272C 00000000 */ nop -/* BFFFB0 80242730 468031A0 */ cvt.s.w $f6, $f6 -/* BFFFB4 80242734 44073000 */ mfc1 $a3, $f6 -/* BFFFB8 80242738 27A20028 */ addiu $v0, $sp, 0x28 -/* BFFFBC 8024273C AFA20020 */ sw $v0, 0x20($sp) -/* BFFFC0 80242740 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFFFC4 80242744 E7A20014 */ swc1 $f2, 0x14($sp) -/* BFFFC8 80242748 0C01BFA4 */ jal fx_emote -/* BFFFCC 8024274C E7A40018 */ swc1 $f4, 0x18($sp) -/* BFFFD0 80242750 0200202D */ daddu $a0, $s0, $zero -/* BFFFD4 80242754 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFFFD8 80242758 0C012530 */ jal func_800494C0 -/* BFFFDC 8024275C 3C060020 */ lui $a2, 0x20 -/* BFFFE0 80242760 8E220018 */ lw $v0, 0x18($s1) -/* BFFFE4 80242764 9442002A */ lhu $v0, 0x2a($v0) -/* BFFFE8 80242768 30420001 */ andi $v0, $v0, 1 -/* BFFFEC 8024276C 14400064 */ bnez $v0, .L80242900 -/* BFFFF0 80242770 2402000A */ addiu $v0, $zero, 0xa -/* BFFFF4 80242774 08090A40 */ j .L80242900 -/* BFFFF8 80242778 2402000C */ addiu $v0, $zero, 0xc -.L8024277C: -/* BFFFFC 8024277C 8E420074 */ lw $v0, 0x74($s2) -/* C00000 80242780 2442FFFF */ addiu $v0, $v0, -1 -.L80242784: -/* C00004 80242784 AE420074 */ sw $v0, 0x74($s2) -.L80242788: -/* C00008 80242788 8602008C */ lh $v0, 0x8c($s0) -/* C0000C 8024278C 1440005D */ bnez $v0, .L80242904 -/* C00010 80242790 00000000 */ nop -/* C00014 80242794 C6000018 */ lwc1 $f0, 0x18($s0) -/* C00018 80242798 3C014010 */ lui $at, 0x4010 -/* C0001C 8024279C 44811800 */ mtc1 $at, $f3 -/* C00020 802427A0 44801000 */ mtc1 $zero, $f2 -/* C00024 802427A4 46000021 */ cvt.d.s $f0, $f0 -/* C00028 802427A8 4622003C */ c.lt.d $f0, $f2 -/* C0002C 802427AC 00000000 */ nop -/* C00030 802427B0 45000003 */ bc1f .L802427C0 -/* C00034 802427B4 0200202D */ daddu $a0, $s0, $zero -/* C00038 802427B8 080909F1 */ j .L802427C4 -/* C0003C 802427BC 0000282D */ daddu $a1, $zero, $zero -.L802427C0: -/* C00040 802427C0 24050001 */ addiu $a1, $zero, 1 -.L802427C4: -/* C00044 802427C4 0C00F598 */ jal func_8003D660 -/* C00048 802427C8 00000000 */ nop -/* C0004C 802427CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C00050 802427D0 8E430078 */ lw $v1, 0x78($s2) -/* C00054 802427D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C00058 802427D8 00031040 */ sll $v0, $v1, 1 -/* C0005C 802427DC 00431021 */ addu $v0, $v0, $v1 -/* C00060 802427E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C00064 802427E4 00021080 */ sll $v0, $v0, 2 -/* C00068 802427E8 00431021 */ addu $v0, $v0, $v1 -/* C0006C 802427EC C4560004 */ lwc1 $f22, 4($v0) -/* C00070 802427F0 4680B5A0 */ cvt.s.w $f22, $f22 -/* C00074 802427F4 C454000C */ lwc1 $f20, 0xc($v0) -/* C00078 802427F8 4680A520 */ cvt.s.w $f20, $f20 -/* C0007C 802427FC 4406B000 */ mfc1 $a2, $f22 -/* C00080 80242800 4407A000 */ mfc1 $a3, $f20 -/* C00084 80242804 0C00A720 */ jal atan2 -/* C00088 80242808 00000000 */ nop -/* C0008C 8024280C 8E050018 */ lw $a1, 0x18($s0) -/* C00090 80242810 44060000 */ mfc1 $a2, $f0 -/* C00094 80242814 0200202D */ daddu $a0, $s0, $zero -/* C00098 80242818 0C00EA95 */ jal npc_move_heading -/* C0009C 8024281C AE06000C */ sw $a2, 0xc($s0) -/* C000A0 80242820 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C000A4 80242824 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C000A8 80242828 4406B000 */ mfc1 $a2, $f22 -/* C000AC 8024282C 4407A000 */ mfc1 $a3, $f20 -/* C000B0 80242830 0C00A7B5 */ jal dist2D -/* C000B4 80242834 00000000 */ nop -/* C000B8 80242838 C6020018 */ lwc1 $f2, 0x18($s0) -/* C000BC 8024283C 4602003E */ c.le.s $f0, $f2 -/* C000C0 80242840 00000000 */ nop -/* C000C4 80242844 4500002F */ bc1f .L80242904 -/* C000C8 80242848 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C000CC 8024284C 24020002 */ addiu $v0, $zero, 2 -/* C000D0 80242850 0C00A67F */ jal rand_int -/* C000D4 80242854 AE420070 */ sw $v0, 0x70($s2) -/* C000D8 80242858 3C035555 */ lui $v1, 0x5555 -/* C000DC 8024285C 34635556 */ ori $v1, $v1, 0x5556 -/* C000E0 80242860 00430018 */ mult $v0, $v1 -/* C000E4 80242864 000227C3 */ sra $a0, $v0, 0x1f -/* C000E8 80242868 00004010 */ mfhi $t0 -/* C000EC 8024286C 01042023 */ subu $a0, $t0, $a0 -/* C000F0 80242870 00041840 */ sll $v1, $a0, 1 -/* C000F4 80242874 00641821 */ addu $v1, $v1, $a0 -/* C000F8 80242878 00431023 */ subu $v0, $v0, $v1 -/* C000FC 8024287C 24430002 */ addiu $v1, $v0, 2 -/* C00100 80242880 AE430074 */ sw $v1, 0x74($s2) -/* C00104 80242884 8E62002C */ lw $v0, 0x2c($s3) -/* C00108 80242888 18400009 */ blez $v0, .L802428B0 -/* C0010C 8024288C 24020004 */ addiu $v0, $zero, 4 -/* C00110 80242890 8E620004 */ lw $v0, 4($s3) -/* C00114 80242894 18400006 */ blez $v0, .L802428B0 -/* C00118 80242898 24020004 */ addiu $v0, $zero, 4 -/* C0011C 8024289C 8E620008 */ lw $v0, 8($s3) -/* C00120 802428A0 18400003 */ blez $v0, .L802428B0 -/* C00124 802428A4 24020004 */ addiu $v0, $zero, 4 -/* C00128 802428A8 14600002 */ bnez $v1, .L802428B4 -/* C0012C 802428AC 00000000 */ nop -.L802428B0: -/* C00130 802428B0 AE420070 */ sw $v0, 0x70($s2) -.L802428B4: -/* C00134 802428B4 0C00A67F */ jal rand_int -/* C00138 802428B8 24042710 */ addiu $a0, $zero, 0x2710 -/* C0013C 802428BC 3C0351EB */ lui $v1, 0x51eb -/* C00140 802428C0 3463851F */ ori $v1, $v1, 0x851f -/* C00144 802428C4 00430018 */ mult $v0, $v1 -/* C00148 802428C8 00021FC3 */ sra $v1, $v0, 0x1f -/* C0014C 802428CC 00004010 */ mfhi $t0 -/* C00150 802428D0 00082143 */ sra $a0, $t0, 5 -/* C00154 802428D4 00832023 */ subu $a0, $a0, $v1 -/* C00158 802428D8 00041840 */ sll $v1, $a0, 1 -/* C0015C 802428DC 00641821 */ addu $v1, $v1, $a0 -/* C00160 802428E0 000318C0 */ sll $v1, $v1, 3 -/* C00164 802428E4 00641821 */ addu $v1, $v1, $a0 -/* C00168 802428E8 00031880 */ sll $v1, $v1, 2 -/* C0016C 802428EC 8E640004 */ lw $a0, 4($s3) -/* C00170 802428F0 00431023 */ subu $v0, $v0, $v1 -/* C00174 802428F4 0044102A */ slt $v0, $v0, $a0 -/* C00178 802428F8 10400002 */ beqz $v0, .L80242904 -/* C0017C 802428FC 24020004 */ addiu $v0, $zero, 4 -.L80242900: -/* C00180 80242900 AE420070 */ sw $v0, 0x70($s2) -.L80242904: -/* C00184 80242904 8FBF0044 */ lw $ra, 0x44($sp) -/* C00188 80242908 8FB40040 */ lw $s4, 0x40($sp) -/* C0018C 8024290C 8FB3003C */ lw $s3, 0x3c($sp) -/* C00190 80242910 8FB20038 */ lw $s2, 0x38($sp) -/* C00194 80242914 8FB10034 */ lw $s1, 0x34($sp) -/* C00198 80242918 8FB00030 */ lw $s0, 0x30($sp) -/* C0019C 8024291C D7B60050 */ ldc1 $f22, 0x50($sp) -/* C001A0 80242920 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C001A4 80242924 03E00008 */ jr $ra -/* C001A8 80242928 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s deleted file mode 100644 index a5ddcb2312..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429EC_C0026C -/* C0026C 802429EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C00270 802429F0 AFB40040 */ sw $s4, 0x40($sp) -/* C00274 802429F4 0080A02D */ daddu $s4, $a0, $zero -/* C00278 802429F8 AFBF0044 */ sw $ra, 0x44($sp) -/* C0027C 802429FC AFB3003C */ sw $s3, 0x3c($sp) -/* C00280 80242A00 AFB20038 */ sw $s2, 0x38($sp) -/* C00284 80242A04 AFB10034 */ sw $s1, 0x34($sp) -/* C00288 80242A08 AFB00030 */ sw $s0, 0x30($sp) -/* C0028C 80242A0C 8E910148 */ lw $s1, 0x148($s4) -/* C00290 80242A10 00A0902D */ daddu $s2, $a1, $zero -/* C00294 80242A14 86240008 */ lh $a0, 8($s1) -/* C00298 80242A18 0C00EABB */ jal get_npc_unsafe -/* C0029C 80242A1C 00C0982D */ daddu $s3, $a2, $zero -/* C002A0 80242A20 8E430014 */ lw $v1, 0x14($s2) -/* C002A4 80242A24 04600031 */ bltz $v1, .L80242AEC -/* C002A8 80242A28 0040802D */ daddu $s0, $v0, $zero -/* C002AC 80242A2C 0260202D */ daddu $a0, $s3, $zero -/* C002B0 80242A30 AFA00010 */ sw $zero, 0x10($sp) -/* C002B4 80242A34 8E460024 */ lw $a2, 0x24($s2) -/* C002B8 80242A38 8E470028 */ lw $a3, 0x28($s2) -/* C002BC 80242A3C 0C01242D */ jal func_800490B4 -/* C002C0 80242A40 0220282D */ daddu $a1, $s1, $zero -/* C002C4 80242A44 10400029 */ beqz $v0, .L80242AEC -/* C002C8 80242A48 0000202D */ daddu $a0, $zero, $zero -/* C002CC 80242A4C 0200282D */ daddu $a1, $s0, $zero -/* C002D0 80242A50 0000302D */ daddu $a2, $zero, $zero -/* C002D4 80242A54 860300A8 */ lh $v1, 0xa8($s0) -/* C002D8 80242A58 3C013F80 */ lui $at, 0x3f80 -/* C002DC 80242A5C 44810000 */ mtc1 $at, $f0 -/* C002E0 80242A60 3C014000 */ lui $at, 0x4000 -/* C002E4 80242A64 44811000 */ mtc1 $at, $f2 -/* C002E8 80242A68 3C01C1A0 */ lui $at, 0xc1a0 -/* C002EC 80242A6C 44812000 */ mtc1 $at, $f4 -/* C002F0 80242A70 2402000F */ addiu $v0, $zero, 0xf -/* C002F4 80242A74 AFA2001C */ sw $v0, 0x1c($sp) -/* C002F8 80242A78 44833000 */ mtc1 $v1, $f6 -/* C002FC 80242A7C 00000000 */ nop -/* C00300 80242A80 468031A0 */ cvt.s.w $f6, $f6 -/* C00304 80242A84 44073000 */ mfc1 $a3, $f6 -/* C00308 80242A88 27A20028 */ addiu $v0, $sp, 0x28 -/* C0030C 80242A8C AFA20020 */ sw $v0, 0x20($sp) -/* C00310 80242A90 E7A00010 */ swc1 $f0, 0x10($sp) -/* C00314 80242A94 E7A20014 */ swc1 $f2, 0x14($sp) -/* C00318 80242A98 0C01BFA4 */ jal fx_emote -/* C0031C 80242A9C E7A40018 */ swc1 $f4, 0x18($sp) -/* C00320 80242AA0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C00324 80242AA4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C00328 80242AA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C0032C 80242AAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C00330 80242AB0 8C460028 */ lw $a2, 0x28($v0) -/* C00334 80242AB4 0C00A720 */ jal atan2 -/* C00338 80242AB8 8C470030 */ lw $a3, 0x30($v0) -/* C0033C 80242ABC 0200202D */ daddu $a0, $s0, $zero -/* C00340 80242AC0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C00344 80242AC4 3C060020 */ lui $a2, 0x20 -/* C00348 80242AC8 0C012530 */ jal func_800494C0 -/* C0034C 80242ACC E480000C */ swc1 $f0, 0xc($a0) -/* C00350 80242AD0 8E220018 */ lw $v0, 0x18($s1) -/* C00354 80242AD4 9442002A */ lhu $v0, 0x2a($v0) -/* C00358 80242AD8 30420001 */ andi $v0, $v0, 1 -/* C0035C 80242ADC 14400029 */ bnez $v0, .L80242B84 -/* C00360 80242AE0 2402000A */ addiu $v0, $zero, 0xa -/* C00364 80242AE4 08090AE1 */ j .L80242B84 -/* C00368 80242AE8 2402000C */ addiu $v0, $zero, 0xc -.L80242AEC: -/* C0036C 80242AEC 8602008C */ lh $v0, 0x8c($s0) -/* C00370 80242AF0 14400025 */ bnez $v0, .L80242B88 -/* C00374 80242AF4 00000000 */ nop -/* C00378 80242AF8 9602008E */ lhu $v0, 0x8e($s0) -/* C0037C 80242AFC 2442FFFF */ addiu $v0, $v0, -1 -/* C00380 80242B00 A602008E */ sh $v0, 0x8e($s0) -/* C00384 80242B04 00021400 */ sll $v0, $v0, 0x10 -/* C00388 80242B08 1440001F */ bnez $v0, .L80242B88 -/* C0038C 80242B0C 00000000 */ nop -/* C00390 80242B10 8E820074 */ lw $v0, 0x74($s4) -/* C00394 80242B14 2442FFFF */ addiu $v0, $v0, -1 -/* C00398 80242B18 10400019 */ beqz $v0, .L80242B80 -/* C0039C 80242B1C AE820074 */ sw $v0, 0x74($s4) -/* C003A0 80242B20 8E220018 */ lw $v0, 0x18($s1) -/* C003A4 80242B24 9442002A */ lhu $v0, 0x2a($v0) -/* C003A8 80242B28 30420010 */ andi $v0, $v0, 0x10 -/* C003AC 80242B2C 14400007 */ bnez $v0, .L80242B4C -/* C003B0 80242B30 00000000 */ nop -/* C003B4 80242B34 C600000C */ lwc1 $f0, 0xc($s0) -/* C003B8 80242B38 3C014334 */ lui $at, 0x4334 -/* C003BC 80242B3C 44816000 */ mtc1 $at, $f12 -/* C003C0 80242B40 0C00A6C9 */ jal clamp_angle -/* C003C4 80242B44 460C0300 */ add.s $f12, $f0, $f12 -/* C003C8 80242B48 E600000C */ swc1 $f0, 0xc($s0) -.L80242B4C: -/* C003CC 80242B4C 8E440008 */ lw $a0, 8($s2) -/* C003D0 80242B50 000417C2 */ srl $v0, $a0, 0x1f -/* C003D4 80242B54 00822021 */ addu $a0, $a0, $v0 -/* C003D8 80242B58 00042043 */ sra $a0, $a0, 1 -/* C003DC 80242B5C 0C00A67F */ jal rand_int -/* C003E0 80242B60 24840001 */ addiu $a0, $a0, 1 -/* C003E4 80242B64 8E430008 */ lw $v1, 8($s2) -/* C003E8 80242B68 000327C2 */ srl $a0, $v1, 0x1f -/* C003EC 80242B6C 00641821 */ addu $v1, $v1, $a0 -/* C003F0 80242B70 00031843 */ sra $v1, $v1, 1 -/* C003F4 80242B74 00621821 */ addu $v1, $v1, $v0 -/* C003F8 80242B78 08090AE2 */ j .L80242B88 -/* C003FC 80242B7C A603008E */ sh $v1, 0x8e($s0) -.L80242B80: -/* C00400 80242B80 24020004 */ addiu $v0, $zero, 4 -.L80242B84: -/* C00404 80242B84 AE820070 */ sw $v0, 0x70($s4) -.L80242B88: -/* C00408 80242B88 8FBF0044 */ lw $ra, 0x44($sp) -/* C0040C 80242B8C 8FB40040 */ lw $s4, 0x40($sp) -/* C00410 80242B90 8FB3003C */ lw $s3, 0x3c($sp) -/* C00414 80242B94 8FB20038 */ lw $s2, 0x38($sp) -/* C00418 80242B98 8FB10034 */ lw $s1, 0x34($sp) -/* C0041C 80242B9C 8FB00030 */ lw $s0, 0x30($sp) -/* C00420 80242BA0 03E00008 */ jr $ra -/* C00424 80242BA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s deleted file mode 100644 index 9e5970651e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BA8_C00428 -/* C00428 80242BA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C0042C 80242BAC AFB10014 */ sw $s1, 0x14($sp) -/* C00430 80242BB0 0080882D */ daddu $s1, $a0, $zero -/* C00434 80242BB4 AFBF001C */ sw $ra, 0x1c($sp) -/* C00438 80242BB8 AFB20018 */ sw $s2, 0x18($sp) -/* C0043C 80242BBC AFB00010 */ sw $s0, 0x10($sp) -/* C00440 80242BC0 8E300148 */ lw $s0, 0x148($s1) -/* C00444 80242BC4 86040008 */ lh $a0, 8($s0) -/* C00448 80242BC8 0C00EABB */ jal get_npc_unsafe -/* C0044C 80242BCC 00A0902D */ daddu $s2, $a1, $zero -/* C00450 80242BD0 8E230078 */ lw $v1, 0x78($s1) -/* C00454 80242BD4 24630001 */ addiu $v1, $v1, 1 -/* C00458 80242BD8 AE230078 */ sw $v1, 0x78($s1) -/* C0045C 80242BDC 8E0400D0 */ lw $a0, 0xd0($s0) -/* C00460 80242BE0 8C840000 */ lw $a0, ($a0) -/* C00464 80242BE4 0064182A */ slt $v1, $v1, $a0 -/* C00468 80242BE8 14600002 */ bnez $v1, .L80242BF4 -/* C0046C 80242BEC 0040282D */ daddu $a1, $v0, $zero -/* C00470 80242BF0 AE200078 */ sw $zero, 0x78($s1) -.L80242BF4: -/* C00474 80242BF4 8E0200CC */ lw $v0, 0xcc($s0) -/* C00478 80242BF8 8C420004 */ lw $v0, 4($v0) -/* C0047C 80242BFC ACA20028 */ sw $v0, 0x28($a1) -/* C00480 80242C00 8E0200D0 */ lw $v0, 0xd0($s0) -/* C00484 80242C04 8C42007C */ lw $v0, 0x7c($v0) -/* C00488 80242C08 04410004 */ bgez $v0, .L80242C1C -/* C0048C 80242C0C 00000000 */ nop -/* C00490 80242C10 C6400000 */ lwc1 $f0, ($s2) -/* C00494 80242C14 08090B0F */ j .L80242C3C -/* C00498 80242C18 E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C1C: -/* C0049C 80242C1C 3C018026 */ lui $at, %hi(D_80263518_C20D98) -/* C004A0 80242C20 D4223518 */ ldc1 $f2, %lo(D_80263518_C20D98)($at) -/* C004A4 80242C24 44820000 */ mtc1 $v0, $f0 -/* C004A8 80242C28 00000000 */ nop -/* C004AC 80242C2C 46800021 */ cvt.d.w $f0, $f0 -/* C004B0 80242C30 46220003 */ div.d $f0, $f0, $f2 -/* C004B4 80242C34 46200020 */ cvt.s.d $f0, $f0 -/* C004B8 80242C38 E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C3C: -/* C004BC 80242C3C 24020001 */ addiu $v0, $zero, 1 -/* C004C0 80242C40 AE220070 */ sw $v0, 0x70($s1) -/* C004C4 80242C44 8FBF001C */ lw $ra, 0x1c($sp) -/* C004C8 80242C48 8FB20018 */ lw $s2, 0x18($sp) -/* C004CC 80242C4C 8FB10014 */ lw $s1, 0x14($sp) -/* C004D0 80242C50 8FB00010 */ lw $s0, 0x10($sp) -/* C004D4 80242C54 03E00008 */ jr $ra -/* C004D8 80242C58 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s deleted file mode 100644 index 975d01847c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E78_C006F8 -/* C006F8 80242E78 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C006FC 80242E7C AFB3003C */ sw $s3, 0x3c($sp) -/* C00700 80242E80 0080982D */ daddu $s3, $a0, $zero -/* C00704 80242E84 AFBF0040 */ sw $ra, 0x40($sp) -/* C00708 80242E88 AFB20038 */ sw $s2, 0x38($sp) -/* C0070C 80242E8C AFB10034 */ sw $s1, 0x34($sp) -/* C00710 80242E90 AFB00030 */ sw $s0, 0x30($sp) -/* C00714 80242E94 8E720148 */ lw $s2, 0x148($s3) -/* C00718 80242E98 00A0882D */ daddu $s1, $a1, $zero -/* C0071C 80242E9C 86440008 */ lh $a0, 8($s2) -/* C00720 80242EA0 0C00EABB */ jal get_npc_unsafe -/* C00724 80242EA4 00C0802D */ daddu $s0, $a2, $zero -/* C00728 80242EA8 0200202D */ daddu $a0, $s0, $zero -/* C0072C 80242EAC 0240282D */ daddu $a1, $s2, $zero -/* C00730 80242EB0 24030001 */ addiu $v1, $zero, 1 -/* C00734 80242EB4 AFA30010 */ sw $v1, 0x10($sp) -/* C00738 80242EB8 8E260024 */ lw $a2, 0x24($s1) -/* C0073C 80242EBC 8E270028 */ lw $a3, 0x28($s1) -/* C00740 80242EC0 0C01242D */ jal func_800490B4 -/* C00744 80242EC4 0040802D */ daddu $s0, $v0, $zero -/* C00748 80242EC8 1440001E */ bnez $v0, .L80242F44 -/* C0074C 80242ECC 0200202D */ daddu $a0, $s0, $zero -/* C00750 80242ED0 24040002 */ addiu $a0, $zero, 2 -/* C00754 80242ED4 0200282D */ daddu $a1, $s0, $zero -/* C00758 80242ED8 0000302D */ daddu $a2, $zero, $zero -/* C0075C 80242EDC 860300A8 */ lh $v1, 0xa8($s0) -/* C00760 80242EE0 3C013F80 */ lui $at, 0x3f80 -/* C00764 80242EE4 44810000 */ mtc1 $at, $f0 -/* C00768 80242EE8 3C014000 */ lui $at, 0x4000 -/* C0076C 80242EEC 44811000 */ mtc1 $at, $f2 -/* C00770 80242EF0 3C01C1A0 */ lui $at, 0xc1a0 -/* C00774 80242EF4 44812000 */ mtc1 $at, $f4 -/* C00778 80242EF8 2402000F */ addiu $v0, $zero, 0xf -/* C0077C 80242EFC AFA2001C */ sw $v0, 0x1c($sp) -/* C00780 80242F00 44833000 */ mtc1 $v1, $f6 -/* C00784 80242F04 00000000 */ nop -/* C00788 80242F08 468031A0 */ cvt.s.w $f6, $f6 -/* C0078C 80242F0C 44073000 */ mfc1 $a3, $f6 -/* C00790 80242F10 27A20028 */ addiu $v0, $sp, 0x28 -/* C00794 80242F14 AFA20020 */ sw $v0, 0x20($sp) -/* C00798 80242F18 E7A00010 */ swc1 $f0, 0x10($sp) -/* C0079C 80242F1C E7A20014 */ swc1 $f2, 0x14($sp) -/* C007A0 80242F20 0C01BFA4 */ jal fx_emote -/* C007A4 80242F24 E7A40018 */ swc1 $f4, 0x18($sp) -/* C007A8 80242F28 8E4200CC */ lw $v0, 0xcc($s2) -/* C007AC 80242F2C 8C430000 */ lw $v1, ($v0) -/* C007B0 80242F30 24020019 */ addiu $v0, $zero, 0x19 -/* C007B4 80242F34 A602008E */ sh $v0, 0x8e($s0) -/* C007B8 80242F38 2402000E */ addiu $v0, $zero, 0xe -/* C007BC 80242F3C 08090BDE */ j .L80242F78 -/* C007C0 80242F40 AE030028 */ sw $v1, 0x28($s0) -.L80242F44: -/* C007C4 80242F44 0C00F598 */ jal func_8003D660 -/* C007C8 80242F48 24050001 */ addiu $a1, $zero, 1 -/* C007CC 80242F4C 8E050018 */ lw $a1, 0x18($s0) -/* C007D0 80242F50 8E06000C */ lw $a2, 0xc($s0) -/* C007D4 80242F54 0C00EA95 */ jal npc_move_heading -/* C007D8 80242F58 0200202D */ daddu $a0, $s0, $zero -/* C007DC 80242F5C 8602008E */ lh $v0, 0x8e($s0) -/* C007E0 80242F60 9603008E */ lhu $v1, 0x8e($s0) -/* C007E4 80242F64 18400003 */ blez $v0, .L80242F74 -/* C007E8 80242F68 2462FFFF */ addiu $v0, $v1, -1 -/* C007EC 80242F6C 08090BDF */ j .L80242F7C -/* C007F0 80242F70 A602008E */ sh $v0, 0x8e($s0) -.L80242F74: -/* C007F4 80242F74 2402000C */ addiu $v0, $zero, 0xc -.L80242F78: -/* C007F8 80242F78 AE620070 */ sw $v0, 0x70($s3) -.L80242F7C: -/* C007FC 80242F7C 8FBF0040 */ lw $ra, 0x40($sp) -/* C00800 80242F80 8FB3003C */ lw $s3, 0x3c($sp) -/* C00804 80242F84 8FB20038 */ lw $s2, 0x38($sp) -/* C00808 80242F88 8FB10034 */ lw $s1, 0x34($sp) -/* C0080C 80242F8C 8FB00030 */ lw $s0, 0x30($sp) -/* C00810 80242F90 03E00008 */ jr $ra -/* C00814 80242F94 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s deleted file mode 100644 index ad775cb660..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80243000_C00880.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243000_C00880 -/* C00880 80243000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C00884 80243004 AFB10014 */ sw $s1, 0x14($sp) -/* C00888 80243008 0080882D */ daddu $s1, $a0, $zero -/* C0088C 8024300C AFBF001C */ sw $ra, 0x1c($sp) -/* C00890 80243010 AFB20018 */ sw $s2, 0x18($sp) -/* C00894 80243014 AFB00010 */ sw $s0, 0x10($sp) -/* C00898 80243018 8E300148 */ lw $s0, 0x148($s1) -/* C0089C 8024301C 86040008 */ lh $a0, 8($s0) -/* C008A0 80243020 0C00EABB */ jal get_npc_unsafe -/* C008A4 80243024 00A0902D */ daddu $s2, $a1, $zero -/* C008A8 80243028 8E0300D0 */ lw $v1, 0xd0($s0) -/* C008AC 8024302C 8E240078 */ lw $a0, 0x78($s1) -/* C008B0 80243030 8C630000 */ lw $v1, ($v1) -/* C008B4 80243034 0083182A */ slt $v1, $a0, $v1 -/* C008B8 80243038 10600013 */ beqz $v1, .L80243088 -/* C008BC 8024303C 0040302D */ daddu $a2, $v0, $zero -/* C008C0 80243040 00041040 */ sll $v0, $a0, 1 -/* C008C4 80243044 00441021 */ addu $v0, $v0, $a0 -/* C008C8 80243048 00022880 */ sll $a1, $v0, 2 -.L8024304C: -/* C008CC 8024304C 8E0300D0 */ lw $v1, 0xd0($s0) -/* C008D0 80243050 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C008D4 80243054 00A31021 */ addu $v0, $a1, $v1 -/* C008D8 80243058 C4400008 */ lwc1 $f0, 8($v0) -/* C008DC 8024305C 46800020 */ cvt.s.w $f0, $f0 -/* C008E0 80243060 4602003E */ c.le.s $f0, $f2 -/* C008E4 80243064 00000000 */ nop -/* C008E8 80243068 45020003 */ bc1fl .L80243078 -/* C008EC 8024306C 24840001 */ addiu $a0, $a0, 1 -/* C008F0 80243070 08090C22 */ j .L80243088 -/* C008F4 80243074 AE240078 */ sw $a0, 0x78($s1) -.L80243078: -/* C008F8 80243078 8C620000 */ lw $v0, ($v1) -/* C008FC 8024307C 0082102A */ slt $v0, $a0, $v0 -/* C00900 80243080 1440FFF2 */ bnez $v0, .L8024304C -/* C00904 80243084 24A5000C */ addiu $a1, $a1, 0xc -.L80243088: -/* C00908 80243088 C6400000 */ lwc1 $f0, ($s2) -/* C0090C 8024308C E4C00018 */ swc1 $f0, 0x18($a2) -/* C00910 80243090 8E0200CC */ lw $v0, 0xcc($s0) -/* C00914 80243094 8C420004 */ lw $v0, 4($v0) -/* C00918 80243098 ACC20028 */ sw $v0, 0x28($a2) -/* C0091C 8024309C 24020001 */ addiu $v0, $zero, 1 -/* C00920 802430A0 AE200074 */ sw $zero, 0x74($s1) -/* C00924 802430A4 AE220070 */ sw $v0, 0x70($s1) -/* C00928 802430A8 8FBF001C */ lw $ra, 0x1c($sp) -/* C0092C 802430AC 8FB20018 */ lw $s2, 0x18($sp) -/* C00930 802430B0 8FB10014 */ lw $s1, 0x14($sp) -/* C00934 802430B4 8FB00010 */ lw $s0, 0x10($sp) -/* C00938 802430B8 03E00008 */ jr $ra -/* C0093C 802430BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s deleted file mode 100644 index 8d6801b36c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ /dev/null @@ -1,214 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430C0_C00940 -/* C00940 802430C0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C00944 802430C4 AFB40058 */ sw $s4, 0x58($sp) -/* C00948 802430C8 0080A02D */ daddu $s4, $a0, $zero -/* C0094C 802430CC AFBF0060 */ sw $ra, 0x60($sp) -/* C00950 802430D0 AFB5005C */ sw $s5, 0x5c($sp) -/* C00954 802430D4 AFB30054 */ sw $s3, 0x54($sp) -/* C00958 802430D8 AFB20050 */ sw $s2, 0x50($sp) -/* C0095C 802430DC AFB1004C */ sw $s1, 0x4c($sp) -/* C00960 802430E0 AFB00048 */ sw $s0, 0x48($sp) -/* C00964 802430E4 8E910148 */ lw $s1, 0x148($s4) -/* C00968 802430E8 86240008 */ lh $a0, 8($s1) -/* C0096C 802430EC 0C00EABB */ jal get_npc_unsafe -/* C00970 802430F0 00A0802D */ daddu $s0, $a1, $zero -/* C00974 802430F4 8E83000C */ lw $v1, 0xc($s4) -/* C00978 802430F8 0280202D */ daddu $a0, $s4, $zero -/* C0097C 802430FC 8C650000 */ lw $a1, ($v1) -/* C00980 80243100 0C0B1EAF */ jal get_variable -/* C00984 80243104 0040902D */ daddu $s2, $v0, $zero -/* C00988 80243108 AFA00018 */ sw $zero, 0x18($sp) -/* C0098C 8024310C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C00990 80243110 8C630094 */ lw $v1, 0x94($v1) -/* C00994 80243114 AFA3001C */ sw $v1, 0x1c($sp) -/* C00998 80243118 8E2300D0 */ lw $v1, 0xd0($s1) -/* C0099C 8024311C 8C630080 */ lw $v1, 0x80($v1) -/* C009A0 80243120 AFA30020 */ sw $v1, 0x20($sp) -/* C009A4 80243124 8E2300D0 */ lw $v1, 0xd0($s1) -/* C009A8 80243128 8C630088 */ lw $v1, 0x88($v1) -/* C009AC 8024312C AFA30024 */ sw $v1, 0x24($sp) -/* C009B0 80243130 8E2300D0 */ lw $v1, 0xd0($s1) -/* C009B4 80243134 8C63008C */ lw $v1, 0x8c($v1) -/* C009B8 80243138 27B50018 */ addiu $s5, $sp, 0x18 -/* C009BC 8024313C AFA30028 */ sw $v1, 0x28($sp) -/* C009C0 80243140 8E2300D0 */ lw $v1, 0xd0($s1) -/* C009C4 80243144 3C014282 */ lui $at, 0x4282 -/* C009C8 80243148 44810000 */ mtc1 $at, $f0 -/* C009CC 8024314C 8C630090 */ lw $v1, 0x90($v1) -/* C009D0 80243150 0040982D */ daddu $s3, $v0, $zero -/* C009D4 80243154 E7A00030 */ swc1 $f0, 0x30($sp) -/* C009D8 80243158 A7A00034 */ sh $zero, 0x34($sp) -/* C009DC 8024315C 16000005 */ bnez $s0, .L80243174 -/* C009E0 80243160 AFA3002C */ sw $v1, 0x2c($sp) -/* C009E4 80243164 8E2200B0 */ lw $v0, 0xb0($s1) -/* C009E8 80243168 30420004 */ andi $v0, $v0, 4 -/* C009EC 8024316C 10400044 */ beqz $v0, .L80243280 -/* C009F0 80243170 00000000 */ nop -.L80243174: -/* C009F4 80243174 2404F7FF */ addiu $a0, $zero, -0x801 -/* C009F8 80243178 AE800070 */ sw $zero, 0x70($s4) -/* C009FC 8024317C A640008E */ sh $zero, 0x8e($s2) -/* C00A00 80243180 8E2200CC */ lw $v0, 0xcc($s1) -/* C00A04 80243184 8E430000 */ lw $v1, ($s2) -/* C00A08 80243188 8C420000 */ lw $v0, ($v0) -/* C00A0C 8024318C 00641824 */ and $v1, $v1, $a0 -/* C00A10 80243190 AE430000 */ sw $v1, ($s2) -/* C00A14 80243194 AE420028 */ sw $v0, 0x28($s2) -/* C00A18 80243198 8E2200D0 */ lw $v0, 0xd0($s1) -/* C00A1C 8024319C 8C420098 */ lw $v0, 0x98($v0) -/* C00A20 802431A0 54400005 */ bnel $v0, $zero, .L802431B8 -/* C00A24 802431A4 2402FDFF */ addiu $v0, $zero, -0x201 -/* C00A28 802431A8 34620200 */ ori $v0, $v1, 0x200 -/* C00A2C 802431AC 2403FFF7 */ addiu $v1, $zero, -9 -/* C00A30 802431B0 08090C70 */ j .L802431C0 -/* C00A34 802431B4 00431024 */ and $v0, $v0, $v1 -.L802431B8: -/* C00A38 802431B8 00621024 */ and $v0, $v1, $v0 -/* C00A3C 802431BC 34420008 */ ori $v0, $v0, 8 -.L802431C0: -/* C00A40 802431C0 AE420000 */ sw $v0, ($s2) -/* C00A44 802431C4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C00A48 802431C8 30420004 */ andi $v0, $v0, 4 -/* C00A4C 802431CC 10400008 */ beqz $v0, .L802431F0 -/* C00A50 802431D0 24020063 */ addiu $v0, $zero, 0x63 -/* C00A54 802431D4 AE820070 */ sw $v0, 0x70($s4) -/* C00A58 802431D8 AE800074 */ sw $zero, 0x74($s4) -/* C00A5C 802431DC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C00A60 802431E0 2403FFFB */ addiu $v1, $zero, -5 -/* C00A64 802431E4 00431024 */ and $v0, $v0, $v1 -/* C00A68 802431E8 08090C87 */ j .L8024321C -/* C00A6C 802431EC AE2200B0 */ sw $v0, 0xb0($s1) -.L802431F0: -/* C00A70 802431F0 8E220000 */ lw $v0, ($s1) -/* C00A74 802431F4 3C034000 */ lui $v1, 0x4000 -/* C00A78 802431F8 00431024 */ and $v0, $v0, $v1 -/* C00A7C 802431FC 10400007 */ beqz $v0, .L8024321C -/* C00A80 80243200 3C03BFFF */ lui $v1, 0xbfff -/* C00A84 80243204 2402000C */ addiu $v0, $zero, 0xc -/* C00A88 80243208 AE820070 */ sw $v0, 0x70($s4) -/* C00A8C 8024320C 8E220000 */ lw $v0, ($s1) -/* C00A90 80243210 3463FFFF */ ori $v1, $v1, 0xffff -/* C00A94 80243214 00431024 */ and $v0, $v0, $v1 -/* C00A98 80243218 AE220000 */ sw $v0, ($s1) -.L8024321C: -/* C00A9C 8024321C 27A50038 */ addiu $a1, $sp, 0x38 -/* C00AA0 80243220 27A6003C */ addiu $a2, $sp, 0x3c -/* C00AA4 80243224 C6400038 */ lwc1 $f0, 0x38($s2) -/* C00AA8 80243228 864200A8 */ lh $v0, 0xa8($s2) -/* C00AAC 8024322C 3C0142C8 */ lui $at, 0x42c8 -/* C00AB0 80243230 44812000 */ mtc1 $at, $f4 -/* C00AB4 80243234 44823000 */ mtc1 $v0, $f6 -/* C00AB8 80243238 00000000 */ nop -/* C00ABC 8024323C 468031A0 */ cvt.s.w $f6, $f6 -/* C00AC0 80243240 27A20044 */ addiu $v0, $sp, 0x44 -/* C00AC4 80243244 E7A00038 */ swc1 $f0, 0x38($sp) -/* C00AC8 80243248 C640003C */ lwc1 $f0, 0x3c($s2) -/* C00ACC 8024324C C6420040 */ lwc1 $f2, 0x40($s2) -/* C00AD0 80243250 46060000 */ add.s $f0, $f0, $f6 -/* C00AD4 80243254 E7A40044 */ swc1 $f4, 0x44($sp) -/* C00AD8 80243258 E7A20040 */ swc1 $f2, 0x40($sp) -/* C00ADC 8024325C E7A0003C */ swc1 $f0, 0x3c($sp) -/* C00AE0 80243260 AFA20010 */ sw $v0, 0x10($sp) -/* C00AE4 80243264 8E440080 */ lw $a0, 0x80($s2) -/* C00AE8 80243268 0C0372DF */ jal func_800DCB7C -/* C00AEC 8024326C 27A70040 */ addiu $a3, $sp, 0x40 -/* C00AF0 80243270 10400003 */ beqz $v0, .L80243280 -/* C00AF4 80243274 00000000 */ nop -/* C00AF8 80243278 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C00AFC 8024327C E640003C */ swc1 $f0, 0x3c($s2) -.L80243280: -/* C00B00 80243280 8E830070 */ lw $v1, 0x70($s4) -/* C00B04 80243284 2C620064 */ sltiu $v0, $v1, 0x64 -/* C00B08 80243288 10400042 */ beqz $v0, L80243394_C00C14 -/* C00B0C 8024328C 00031080 */ sll $v0, $v1, 2 -/* C00B10 80243290 3C018026 */ lui $at, %hi(jtbl_80263520_C20DA0) -/* C00B14 80243294 00220821 */ addu $at, $at, $v0 -/* C00B18 80243298 8C223520 */ lw $v0, %lo(jtbl_80263520_C20DA0)($at) -/* C00B1C 8024329C 00400008 */ jr $v0 -/* C00B20 802432A0 00000000 */ nop -glabel L802432A4_C00B24 -/* C00B24 802432A4 0280202D */ daddu $a0, $s4, $zero -/* C00B28 802432A8 0260282D */ daddu $a1, $s3, $zero -/* C00B2C 802432AC 0C09094B */ jal func_8024252C_BFFDAC -/* C00B30 802432B0 02A0302D */ daddu $a2, $s5, $zero -glabel L802432B4_C00B34 -/* C00B34 802432B4 0280202D */ daddu $a0, $s4, $zero -/* C00B38 802432B8 0260282D */ daddu $a1, $s3, $zero -/* C00B3C 802432BC 0C0909A1 */ jal func_80242684_BFFF04 -/* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero -/* C00B44 802432C4 08090CE5 */ j L80243394_C00C14 -/* C00B48 802432C8 00000000 */ nop -glabel L802432CC_C00B4C -/* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero -/* C00B50 802432D0 0260282D */ daddu $a1, $s3, $zero -/* C00B54 802432D4 0C090A4B */ jal dup_dgb_01_UnkNpcAIFunc1 -/* C00B58 802432D8 02A0302D */ daddu $a2, $s5, $zero -glabel L802432DC_C00B5C -/* C00B5C 802432DC 0280202D */ daddu $a0, $s4, $zero -/* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero -/* C00B64 802432E4 0C090A7B */ jal func_802429EC_C0026C -/* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero -/* C00B6C 802432EC 08090CE5 */ j L80243394_C00C14 -/* C00B70 802432F0 00000000 */ nop -glabel L802432F4_C00B74 -/* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero -/* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero -/* C00B7C 802432FC 0C090AEA */ jal func_80242BA8_C00428 -/* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero -/* C00B84 80243304 08090CE5 */ j L80243394_C00C14 -/* C00B88 80243308 00000000 */ nop -glabel L8024330C_C00B8C -/* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero -/* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero -/* C00B94 80243314 0C090B17 */ jal dgb_01_NpcJumpFunc2 -/* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero -glabel L8024331C_C00B9C -/* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero -/* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero -/* C00BA4 80243324 0C090B34 */ jal dgb_01_NpcJumpFunc -/* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero -/* C00BAC 8024332C 08090CE5 */ j L80243394_C00C14 -/* C00BB0 80243330 00000000 */ nop -glabel L80243334_C00BB4 -/* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero -/* C00BB8 80243338 0260282D */ daddu $a1, $s3, $zero -/* C00BBC 8024333C 0C090B52 */ jal dgb_01_UnkNpcAIFunc13 -/* C00BC0 80243340 02A0302D */ daddu $a2, $s5, $zero -glabel L80243344_C00BC4 -/* C00BC4 80243344 0280202D */ daddu $a0, $s4, $zero -/* C00BC8 80243348 0260282D */ daddu $a1, $s3, $zero -/* C00BCC 8024334C 0C090B9E */ jal func_80242E78_C006F8 -/* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero -/* C00BD4 80243354 08090CE5 */ j L80243394_C00C14 -/* C00BD8 80243358 00000000 */ nop -glabel L8024335C_C00BDC -/* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero -/* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal dgb_01_UnkNpcDurationFlagFunc -/* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero -/* C00BEC 8024336C 08090CE5 */ j L80243394_C00C14 -/* C00BF0 80243370 00000000 */ nop -glabel L80243374_C00BF4 -/* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero -/* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero -/* C00BFC 8024337C 0C090C00 */ jal func_80243000_C00880 -/* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero -/* C00C04 80243384 08090CE5 */ j L80243394_C00C14 -/* C00C08 80243388 00000000 */ nop -glabel L8024338C_C00C0C -/* C00C0C 8024338C 0C0129CF */ jal func_8004A73C -/* C00C10 80243390 0280202D */ daddu $a0, $s4, $zero -glabel L80243394_C00C14 -/* C00C14 80243394 8FBF0060 */ lw $ra, 0x60($sp) -/* C00C18 80243398 8FB5005C */ lw $s5, 0x5c($sp) -/* C00C1C 8024339C 8FB40058 */ lw $s4, 0x58($sp) -/* C00C20 802433A0 8FB30054 */ lw $s3, 0x54($sp) -/* C00C24 802433A4 8FB20050 */ lw $s2, 0x50($sp) -/* C00C28 802433A8 8FB1004C */ lw $s1, 0x4c($sp) -/* C00C2C 802433AC 8FB00048 */ lw $s0, 0x48($sp) -/* C00C30 802433B0 0000102D */ daddu $v0, $zero, $zero -/* C00C34 802433B4 03E00008 */ jr $ra -/* C00C38 802433B8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s deleted file mode 100644 index 88b0c792fc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C2EDA8 -/* C2EDA8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C2EDAC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C2EDB0 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C2EDB4 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C2EDB8 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C2EDBC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C2EDC0 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C2EDC4 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C2EDC8 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C2EDCC 8024022C 86040008 */ lh $a0, 8($s0) -/* C2EDD0 80240230 0C00EABB */ jal get_npc_unsafe -/* C2EDD4 80240234 24110001 */ addiu $s1, $zero, 1 -/* C2EDD8 80240238 86040008 */ lh $a0, 8($s0) -/* C2EDDC 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C2EDE0 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C2EDE4 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C2EDE8 80240248 3C03800A */ lui $v1, %hi(D_8009A634) -/* C2EDEC 8024024C 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C2EDF0 80240250 00912021 */ addu $a0, $a0, $s1 -/* C2EDF4 80240254 00031080 */ sll $v0, $v1, 2 -/* C2EDF8 80240258 00431021 */ addu $v0, $v0, $v1 -/* C2EDFC 8024025C 00021080 */ sll $v0, $v0, 2 -/* C2EE00 80240260 00431023 */ subu $v0, $v0, $v1 -/* C2EE04 80240264 000218C0 */ sll $v1, $v0, 3 -/* C2EE08 80240268 00431021 */ addu $v0, $v0, $v1 -/* C2EE0C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C2EE10 80240270 0C00FB3A */ jal get_enemy -/* C2EE14 80240274 00459021 */ addu $s2, $v0, $a1 -/* C2EE18 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C2EE1C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C2EE20 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2EE24 80240284 8E830000 */ lw $v1, ($s4) -/* C2EE28 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2EE2C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C2EE30 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C2EE34 80240294 0C00A7B5 */ jal dist2D -/* C2EE38 80240298 0040982D */ daddu $s3, $v0, $zero -/* C2EE3C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C2EE40 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C2EE44 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C2EE48 802402A8 00000000 */ nop -/* C2EE4C 802402AC 45030001 */ bc1tl .L802402B4 -/* C2EE50 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C2EE54 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C2EE58 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C2EE5C 802402BC 3C014387 */ lui $at, 0x4387 -/* C2EE60 802402C0 4481A000 */ mtc1 $at, $f20 -/* C2EE64 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C2EE68 802402C8 00000000 */ nop -/* C2EE6C 802402CC 0C00A6C9 */ jal clamp_angle -/* C2EE70 802402D0 46000306 */ mov.s $f12, $f0 -/* C2EE74 802402D4 3C018024 */ lui $at, %hi(D_80242610_C311B0) -/* C2EE78 802402D8 D4222610 */ ldc1 $f2, %lo(D_80242610_C311B0)($at) -/* C2EE7C 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C2EE80 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C2EE84 802402E4 00000000 */ nop -/* C2EE88 802402E8 45000003 */ bc1f .L802402F8 -/* C2EE8C 802402EC 00000000 */ nop -/* C2EE90 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C2EE94 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C2EE98 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2EE9C 802402FC 8E820000 */ lw $v0, ($s4) -/* C2EEA0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2EEA4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C2EEA8 80240308 0C00A720 */ jal atan2 -/* C2EEAC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C2EEB0 80240310 4600A306 */ mov.s $f12, $f20 -/* C2EEB4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C2EEB8 80240318 46000386 */ mov.s $f14, $f0 -/* C2EEBC 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C2EEC0 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C2EEC4 80240324 46000005 */ abs.s $f0, $f0 -/* C2EEC8 80240328 4600103C */ c.lt.s $f2, $f0 -/* C2EECC 8024032C 00000000 */ nop -/* C2EED0 80240330 45030001 */ bc1tl .L80240338 -/* C2EED4 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C2EED8 80240338 8E820000 */ lw $v0, ($s4) -/* C2EEDC 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C2EEE0 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C2EEE4 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C2EEE8 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C2EEEC 8024034C 44821000 */ mtc1 $v0, $f2 -/* C2EEF0 80240350 00000000 */ nop -/* C2EEF4 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C2EEF8 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C2EEFC 8024035C 46000005 */ abs.s $f0, $f0 -/* C2EF00 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C2EF04 80240364 4620103E */ c.le.d $f2, $f0 -/* C2EF08 80240368 00000000 */ nop -/* C2EF0C 8024036C 45030001 */ bc1tl .L80240374 -/* C2EF10 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C2EF14 80240374 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C2EF18 80240378 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C2EF1C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C2EF20 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C2EF24 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C2EF28 80240388 24020007 */ addiu $v0, $zero, 7 -/* C2EF2C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C2EF30 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C2EF34 80240394 0220102D */ daddu $v0, $s1, $zero -/* C2EF38 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C2EF3C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C2EF40 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C2EF44 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C2EF48 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C2EF4C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C2EF50 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C2EF54 802403B4 03E00008 */ jr $ra -/* C2EF58 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s deleted file mode 100644 index d0ce165fca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ /dev/null @@ -1,198 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C2F1BC -/* C2F1BC 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C2F1C0 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* C2F1C4 80240624 0080902D */ daddu $s2, $a0, $zero -/* C2F1C8 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* C2F1CC 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* C2F1D0 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* C2F1D4 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* C2F1D8 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* C2F1DC 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* C2F1E0 80240640 8E510148 */ lw $s1, 0x148($s2) -/* C2F1E4 80240644 86240008 */ lh $a0, 8($s1) -/* C2F1E8 80240648 0C00EABB */ jal get_npc_unsafe -/* C2F1EC 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* C2F1F0 80240650 8E43000C */ lw $v1, 0xc($s2) -/* C2F1F4 80240654 0240202D */ daddu $a0, $s2, $zero -/* C2F1F8 80240658 8C650000 */ lw $a1, ($v1) -/* C2F1FC 8024065C 0C0B1EAF */ jal get_variable -/* C2F200 80240660 0040A82D */ daddu $s5, $v0, $zero -/* C2F204 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* C2F208 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F20C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* C2F210 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* C2F214 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F218 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* C2F21C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* C2F220 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F224 80240684 8C630024 */ lw $v1, 0x24($v1) -/* C2F228 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* C2F22C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F230 80240690 8C630028 */ lw $v1, 0x28($v1) -/* C2F234 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* C2F238 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* C2F23C 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2F240 802406A0 3C014282 */ lui $at, 0x4282 -/* C2F244 802406A4 44810000 */ mtc1 $at, $f0 -/* C2F248 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* C2F24C 802406AC 0040982D */ daddu $s3, $v0, $zero -/* C2F250 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C2F254 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* C2F258 802406B8 16000005 */ bnez $s0, .L802406D0 -/* C2F25C 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* C2F260 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2F264 802406C4 30420004 */ andi $v0, $v0, 4 -/* C2F268 802406C8 10400020 */ beqz $v0, .L8024074C -/* C2F26C 802406CC 00000000 */ nop -.L802406D0: -/* C2F270 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C2F274 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* C2F278 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* C2F27C 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* C2F280 802406E0 8EA30000 */ lw $v1, ($s5) -/* C2F284 802406E4 8C420000 */ lw $v0, ($v0) -/* C2F288 802406E8 00641824 */ and $v1, $v1, $a0 -/* C2F28C 802406EC AEA30000 */ sw $v1, ($s5) -/* C2F290 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* C2F294 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C2F298 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* C2F29C 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* C2F2A0 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* C2F2A4 80240704 34620200 */ ori $v0, $v1, 0x200 -/* C2F2A8 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* C2F2AC 8024070C 080901C7 */ j .L8024071C -/* C2F2B0 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* C2F2B4 80240714 00621024 */ and $v0, $v1, $v0 -/* C2F2B8 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* C2F2BC 8024071C AEA20000 */ sw $v0, ($s5) -/* C2F2C0 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2F2C4 80240724 30420004 */ andi $v0, $v0, 4 -/* C2F2C8 80240728 10400007 */ beqz $v0, .L80240748 -/* C2F2CC 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* C2F2D0 80240730 AE420070 */ sw $v0, 0x70($s2) -/* C2F2D4 80240734 AE400074 */ sw $zero, 0x74($s2) -/* C2F2D8 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2F2DC 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* C2F2E0 80240740 00431024 */ and $v0, $v0, $v1 -/* C2F2E4 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* C2F2E8 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* C2F2EC 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* C2F2F0 80240750 2842001E */ slti $v0, $v0, 0x1e -/* C2F2F4 80240754 10400009 */ beqz $v0, .L8024077C -/* C2F2F8 80240758 00000000 */ nop -/* C2F2FC 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* C2F300 80240760 14400006 */ bnez $v0, .L8024077C -/* C2F304 80240764 00000000 */ nop -/* C2F308 80240768 0C090082 */ jal func_80240208_C2EDA8 -/* C2F30C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* C2F310 80240770 10400002 */ beqz $v0, .L8024077C -/* C2F314 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* C2F318 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* C2F31C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* C2F320 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C2F324 80240784 10400048 */ beqz $v0, L802408A8_C2F448 -/* C2F328 80240788 00031080 */ sll $v0, $v1, 2 -/* C2F32C 8024078C 3C018024 */ lui $at, %hi(jtbl_80242618_C311B8) -/* C2F330 80240790 00220821 */ addu $at, $at, $v0 -/* C2F334 80240794 8C222618 */ lw $v0, %lo(jtbl_80242618_C311B8)($at) -/* C2F338 80240798 00400008 */ jr $v0 -/* C2F33C 8024079C 00000000 */ nop -glabel L802407A0_C2F340 -/* C2F340 802407A0 0240202D */ daddu $a0, $s2, $zero -/* C2F344 802407A4 0260282D */ daddu $a1, $s3, $zero -/* C2F348 802407A8 0C012568 */ jal func_800495A0 -/* C2F34C 802407AC 0280302D */ daddu $a2, $s4, $zero -glabel L802407B0_C2F350 -/* C2F350 802407B0 0240202D */ daddu $a0, $s2, $zero -/* C2F354 802407B4 0260282D */ daddu $a1, $s3, $zero -/* C2F358 802407B8 0C0125AE */ jal func_800496B8 -/* C2F35C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C2F360 802407C0 0809022A */ j L802408A8_C2F448 -/* C2F364 802407C4 00000000 */ nop -glabel L802407C8_C2F368 -/* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero -/* C2F36C 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C2F370 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C2F374 802407D4 0280302D */ daddu $a2, $s4, $zero -glabel L802407D8_C2F378 -/* C2F378 802407D8 0240202D */ daddu $a0, $s2, $zero -/* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero -/* C2F380 802407E0 0C012701 */ jal func_80049C04 -/* C2F384 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C2F388 802407E8 0809022A */ j L802408A8_C2F448 -/* C2F38C 802407EC 00000000 */ nop -glabel L802407F0_C2F390 -/* C2F390 802407F0 0240202D */ daddu $a0, $s2, $zero -/* C2F394 802407F4 0260282D */ daddu $a1, $s3, $zero -/* C2F398 802407F8 0C01278F */ jal func_80049E3C -/* C2F39C 802407FC 0280302D */ daddu $a2, $s4, $zero -glabel L80240800_C2F3A0 -/* C2F3A0 80240800 0240202D */ daddu $a0, $s2, $zero -/* C2F3A4 80240804 0260282D */ daddu $a1, $s3, $zero -/* C2F3A8 80240808 0C0127B3 */ jal func_80049ECC -/* C2F3AC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C2F3B0 80240810 0809022A */ j L802408A8_C2F448 -/* C2F3B4 80240814 00000000 */ nop -glabel L80240818_C2F3B8 -/* C2F3B8 80240818 0240202D */ daddu $a0, $s2, $zero -/* C2F3BC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* C2F3C0 80240820 0C0127DF */ jal func_80049F7C -/* C2F3C4 80240824 0280302D */ daddu $a2, $s4, $zero -glabel L80240828_C2F3C8 -/* C2F3C8 80240828 0240202D */ daddu $a0, $s2, $zero -/* C2F3CC 8024082C 0260282D */ daddu $a1, $s3, $zero -/* C2F3D0 80240830 0C012849 */ jal func_8004A124 -/* C2F3D4 80240834 0280302D */ daddu $a2, $s4, $zero -/* C2F3D8 80240838 0809022A */ j L802408A8_C2F448 -/* C2F3DC 8024083C 00000000 */ nop -glabel L80240840_C2F3E0 -/* C2F3E0 80240840 0240202D */ daddu $a0, $s2, $zero -/* C2F3E4 80240844 0260282D */ daddu $a1, $s3, $zero -/* C2F3E8 80240848 0C0128FA */ jal func_8004A3E8 -/* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C2F3F0 80240850 0809022A */ j L802408A8_C2F448 -/* C2F3F4 80240854 00000000 */ nop -glabel L80240858_C2F3F8 -/* C2F3F8 80240858 0C090000 */ jal dgb_02_UnkNpcAIFunc6 -/* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero -glabel L80240860_C2F400 -/* C2F400 80240860 0C09001B */ jal dgb_02_UnkNpcAIFunc7 -/* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero -/* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) -/* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C2F410 80240870 1462000D */ bne $v1, $v0, L802408A8_C2F448 -/* C2F414 80240874 00000000 */ nop -glabel L80240878_C2F418 -/* C2F418 80240878 0C090037 */ jal dgb_02_UnkNpcAIFunc8 -/* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) -/* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C2F428 80240888 14620007 */ bne $v1, $v0, L802408A8_C2F448 -/* C2F42C 8024088C 00000000 */ nop -glabel L80240890_C2F430 -/* C2F430 80240890 0C09006D */ jal dgb_02_UnkNpcAIFunc5 -/* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero -/* C2F438 80240898 0809022A */ j L802408A8_C2F448 -/* C2F43C 8024089C 00000000 */ nop -glabel L802408A0_C2F440 -/* C2F440 802408A0 0C0129CF */ jal func_8004A73C -/* C2F444 802408A4 0240202D */ daddu $a0, $s2, $zero -glabel L802408A8_C2F448 -/* C2F448 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C2F44C 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* C2F450 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* C2F454 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C2F458 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* C2F45C 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* C2F460 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* C2F464 802408C4 0000102D */ daddu $v0, $zero, $zero -/* C2F468 802408C8 03E00008 */ jr $ra -/* C2F46C 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s deleted file mode 100644 index dd88ffd921..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802408D0_C2F470.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_C2F470 -/* C2F470 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F474 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* C2F478 802408D8 0080882D */ daddu $s1, $a0, $zero -/* C2F47C 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* C2F480 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* C2F484 802408E4 8E300148 */ lw $s0, 0x148($s1) -/* C2F488 802408E8 0C00EABB */ jal get_npc_unsafe -/* C2F48C 802408EC 86040008 */ lh $a0, 8($s0) -/* C2F490 802408F0 0040202D */ daddu $a0, $v0, $zero -/* C2F494 802408F4 8482008E */ lh $v0, 0x8e($a0) -/* C2F498 802408F8 9483008E */ lhu $v1, 0x8e($a0) -/* C2F49C 802408FC 18400002 */ blez $v0, .L80240908 -/* C2F4A0 80240900 2462FFFF */ addiu $v0, $v1, -1 -/* C2F4A4 80240904 A482008E */ sh $v0, 0x8e($a0) -.L80240908: -/* C2F4A8 80240908 8482008E */ lh $v0, 0x8e($a0) -/* C2F4AC 8024090C 24030001 */ addiu $v1, $zero, 1 -/* C2F4B0 80240910 14430005 */ bne $v0, $v1, .L80240928 -/* C2F4B4 80240914 00000000 */ nop -/* C2F4B8 80240918 8E0200CC */ lw $v0, 0xcc($s0) -/* C2F4BC 8024091C 8C420030 */ lw $v0, 0x30($v0) -/* C2F4C0 80240920 08090251 */ j .L80240944 -/* C2F4C4 80240924 AC820028 */ sw $v0, 0x28($a0) -.L80240928: -/* C2F4C8 80240928 1C400006 */ bgtz $v0, .L80240944 -/* C2F4CC 8024092C 00000000 */ nop -/* C2F4D0 80240930 8E0200CC */ lw $v0, 0xcc($s0) -/* C2F4D4 80240934 8C420028 */ lw $v0, 0x28($v0) -/* C2F4D8 80240938 A480008E */ sh $zero, 0x8e($a0) -/* C2F4DC 8024093C AC820028 */ sw $v0, 0x28($a0) -/* C2F4E0 80240940 AE230070 */ sw $v1, 0x70($s1) -.L80240944: -/* C2F4E4 80240944 8FBF0018 */ lw $ra, 0x18($sp) -/* C2F4E8 80240948 8FB10014 */ lw $s1, 0x14($sp) -/* C2F4EC 8024094C 8FB00010 */ lw $s0, 0x10($sp) -/* C2F4F0 80240950 03E00008 */ jr $ra -/* C2F4F4 80240954 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s deleted file mode 100644 index 12ee6920aa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240958_C2F4F8 -/* C2F4F8 80240958 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C2F4FC 8024095C AFB40048 */ sw $s4, 0x48($sp) -/* C2F500 80240960 0080A02D */ daddu $s4, $a0, $zero -/* C2F504 80240964 AFBF004C */ sw $ra, 0x4c($sp) -/* C2F508 80240968 AFB30044 */ sw $s3, 0x44($sp) -/* C2F50C 8024096C AFB20040 */ sw $s2, 0x40($sp) -/* C2F510 80240970 AFB1003C */ sw $s1, 0x3c($sp) -/* C2F514 80240974 AFB00038 */ sw $s0, 0x38($sp) -/* C2F518 80240978 8E930148 */ lw $s3, 0x148($s4) -/* C2F51C 8024097C 00C0802D */ daddu $s0, $a2, $zero -/* C2F520 80240980 86640008 */ lh $a0, 8($s3) -/* C2F524 80240984 0C00EABB */ jal get_npc_unsafe -/* C2F528 80240988 0000902D */ daddu $s2, $zero, $zero -/* C2F52C 8024098C 0C039D59 */ jal get_player_data -/* C2F530 80240990 0040882D */ daddu $s1, $v0, $zero -/* C2F534 80240994 0200202D */ daddu $a0, $s0, $zero -/* C2F538 80240998 0260282D */ daddu $a1, $s3, $zero -/* C2F53C 8024099C 0000382D */ daddu $a3, $zero, $zero -/* C2F540 802409A0 3C0642A0 */ lui $a2, 0x42a0 -/* C2F544 802409A4 0040802D */ daddu $s0, $v0, $zero -/* C2F548 802409A8 0C01242D */ jal func_800490B4 -/* C2F54C 802409AC AFA00010 */ sw $zero, 0x10($sp) -/* C2F550 802409B0 10400022 */ beqz $v0, .L80240A3C -/* C2F554 802409B4 00000000 */ nop -/* C2F558 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C2F55C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C2F560 802409C0 804300B4 */ lb $v1, 0xb4($v0) -/* C2F564 802409C4 24020002 */ addiu $v0, $zero, 2 -/* C2F568 802409C8 10620013 */ beq $v1, $v0, .L80240A18 -/* C2F56C 802409CC 2402001A */ addiu $v0, $zero, 0x1a -/* C2F570 802409D0 10620011 */ beq $v1, $v0, .L80240A18 -/* C2F574 802409D4 24020003 */ addiu $v0, $zero, 3 -/* C2F578 802409D8 1062000F */ beq $v1, $v0, .L80240A18 -/* C2F57C 802409DC 2402000E */ addiu $v0, $zero, 0xe -/* C2F580 802409E0 1062000D */ beq $v1, $v0, .L80240A18 -/* C2F584 802409E4 24020010 */ addiu $v0, $zero, 0x10 -/* C2F588 802409E8 1062000B */ beq $v1, $v0, .L80240A18 -/* C2F58C 802409EC 2402000B */ addiu $v0, $zero, 0xb -/* C2F590 802409F0 10620009 */ beq $v1, $v0, .L80240A18 -/* C2F594 802409F4 2402000A */ addiu $v0, $zero, 0xa -/* C2F598 802409F8 10620007 */ beq $v1, $v0, .L80240A18 -/* C2F59C 802409FC 24020012 */ addiu $v0, $zero, 0x12 -/* C2F5A0 80240A00 10620005 */ beq $v1, $v0, .L80240A18 -/* C2F5A4 80240A04 24020013 */ addiu $v0, $zero, 0x13 -/* C2F5A8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 -/* C2F5AC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 -/* C2F5B0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C -/* C2F5B4 80240A14 00000000 */ nop -.L80240A18: -/* C2F5B8 80240A18 24120001 */ addiu $s2, $zero, 1 -.L80240A1C: -/* C2F5BC 80240A1C 82030012 */ lb $v1, 0x12($s0) -/* C2F5C0 80240A20 24020002 */ addiu $v0, $zero, 2 -/* C2F5C4 80240A24 14620007 */ bne $v1, $v0, .L80240A44 -/* C2F5C8 80240A28 24020001 */ addiu $v0, $zero, 1 -/* C2F5CC 80240A2C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C2F5D0 80240A30 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C2F5D4 80240A34 50430002 */ beql $v0, $v1, .L80240A40 -/* C2F5D8 80240A38 24120001 */ addiu $s2, $zero, 1 -.L80240A3C: -/* C2F5DC 80240A3C 82030012 */ lb $v1, 0x12($s0) -.L80240A40: -/* C2F5E0 80240A40 24020001 */ addiu $v0, $zero, 1 -.L80240A44: -/* C2F5E4 80240A44 14620006 */ bne $v1, $v0, .L80240A60 -/* C2F5E8 80240A48 24020003 */ addiu $v0, $zero, 3 -/* C2F5EC 80240A4C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C2F5F0 80240A50 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C2F5F4 80240A54 14400008 */ bnez $v0, .L80240A78 -/* C2F5F8 80240A58 27A40028 */ addiu $a0, $sp, 0x28 -/* C2F5FC 80240A5C 24020003 */ addiu $v0, $zero, 3 -.L80240A60: -/* C2F600 80240A60 1462001B */ bne $v1, $v0, .L80240AD0 -/* C2F604 80240A64 24020002 */ addiu $v0, $zero, 2 -/* C2F608 80240A68 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C2F60C 80240A6C 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C2F610 80240A70 14620017 */ bne $v1, $v0, .L80240AD0 -/* C2F614 80240A74 27A40028 */ addiu $a0, $sp, 0x28 -.L80240A78: -/* C2F618 80240A78 27A5002C */ addiu $a1, $sp, 0x2c -/* C2F61C 80240A7C 8E27000C */ lw $a3, 0xc($s1) -/* C2F620 80240A80 C6200038 */ lwc1 $f0, 0x38($s1) -/* C2F624 80240A84 C6220040 */ lwc1 $f2, 0x40($s1) -/* C2F628 80240A88 0000302D */ daddu $a2, $zero, $zero -/* C2F62C 80240A8C E7A00028 */ swc1 $f0, 0x28($sp) -/* C2F630 80240A90 0C00A7E7 */ jal add_vec2D_polar -/* C2F634 80240A94 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C2F638 80240A98 3C028011 */ lui $v0, %hi(wPartnerNpc) -/* C2F63C 80240A9C 8C42C930 */ lw $v0, %lo(wPartnerNpc)($v0) -/* C2F640 80240AA0 C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C2F644 80240AA4 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C2F648 80240AA8 8C460038 */ lw $a2, 0x38($v0) -/* C2F64C 80240AAC 0C00A7B5 */ jal dist2D -/* C2F650 80240AB0 8C470040 */ lw $a3, 0x40($v0) -/* C2F654 80240AB4 3C0142A0 */ lui $at, 0x42a0 -/* C2F658 80240AB8 44811000 */ mtc1 $at, $f2 -/* C2F65C 80240ABC 00000000 */ nop -/* C2F660 80240AC0 4602003E */ c.le.s $f0, $f2 -/* C2F664 80240AC4 00000000 */ nop -/* C2F668 80240AC8 45030001 */ bc1tl .L80240AD0 -/* C2F66C 80240ACC 24120001 */ addiu $s2, $zero, 1 -.L80240AD0: -/* C2F670 80240AD0 12400026 */ beqz $s2, .L80240B6C -/* C2F674 80240AD4 0220202D */ daddu $a0, $s1, $zero -/* C2F678 80240AD8 3C05B000 */ lui $a1, 0xb000 -/* C2F67C 80240ADC 34A5000E */ ori $a1, $a1, 0xe -/* C2F680 80240AE0 0C012530 */ jal func_800494C0 -/* C2F684 80240AE4 0000302D */ daddu $a2, $zero, $zero -/* C2F688 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* C2F68C 80240AEC 0220282D */ daddu $a1, $s1, $zero -/* C2F690 80240AF0 0000302D */ daddu $a2, $zero, $zero -/* C2F694 80240AF4 862200A8 */ lh $v0, 0xa8($s1) -/* C2F698 80240AF8 8E6300CC */ lw $v1, 0xcc($s3) -/* C2F69C 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* C2F6A0 80240B00 44810000 */ mtc1 $at, $f0 -/* C2F6A4 80240B04 3C014000 */ lui $at, 0x4000 -/* C2F6A8 80240B08 44811000 */ mtc1 $at, $f2 -/* C2F6AC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C2F6B0 80240B10 44812000 */ mtc1 $at, $f4 -/* C2F6B4 80240B14 44823000 */ mtc1 $v0, $f6 -/* C2F6B8 80240B18 00000000 */ nop -/* C2F6BC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 -/* C2F6C0 80240B20 44073000 */ mfc1 $a3, $f6 -/* C2F6C4 80240B24 8C63002C */ lw $v1, 0x2c($v1) -/* C2F6C8 80240B28 2402000A */ addiu $v0, $zero, 0xa -/* C2F6CC 80240B2C A622008E */ sh $v0, 0x8e($s1) -/* C2F6D0 80240B30 2402000F */ addiu $v0, $zero, 0xf -/* C2F6D4 80240B34 AE230028 */ sw $v1, 0x28($s1) -/* C2F6D8 80240B38 AFA2001C */ sw $v0, 0x1c($sp) -/* C2F6DC 80240B3C 27A20030 */ addiu $v0, $sp, 0x30 -/* C2F6E0 80240B40 E7A00010 */ swc1 $f0, 0x10($sp) -/* C2F6E4 80240B44 E7A20014 */ swc1 $f2, 0x14($sp) -/* C2F6E8 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* C2F6EC 80240B4C 0C01BFA4 */ jal fx_emote -/* C2F6F0 80240B50 AFA20020 */ sw $v0, 0x20($sp) -/* C2F6F4 80240B54 0220202D */ daddu $a0, $s1, $zero -/* C2F6F8 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C2F6FC 80240B5C 0C012530 */ jal func_800494C0 -/* C2F700 80240B60 3C060020 */ lui $a2, 0x20 -/* C2F704 80240B64 24020002 */ addiu $v0, $zero, 2 -/* C2F708 80240B68 AE820070 */ sw $v0, 0x70($s4) -.L80240B6C: -/* C2F70C 80240B6C 9622008E */ lhu $v0, 0x8e($s1) -/* C2F710 80240B70 24420001 */ addiu $v0, $v0, 1 -/* C2F714 80240B74 A622008E */ sh $v0, 0x8e($s1) -/* C2F718 80240B78 00021400 */ sll $v0, $v0, 0x10 -/* C2F71C 80240B7C 00021C03 */ sra $v1, $v0, 0x10 -/* C2F720 80240B80 2402001B */ addiu $v0, $zero, 0x1b -/* C2F724 80240B84 14620005 */ bne $v1, $v0, .L80240B9C -/* C2F728 80240B88 24020039 */ addiu $v0, $zero, 0x39 -/* C2F72C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* C2F730 80240B90 3C05B000 */ lui $a1, 0xb000 -/* C2F734 80240B94 080902EC */ j .L80240BB0 -/* C2F738 80240B98 34A5000C */ ori $a1, $a1, 0xc -.L80240B9C: -/* C2F73C 80240B9C 14620008 */ bne $v1, $v0, .L80240BC0 -/* C2F740 80240BA0 2402003B */ addiu $v0, $zero, 0x3b -/* C2F744 80240BA4 0220202D */ daddu $a0, $s1, $zero -/* C2F748 80240BA8 3C05B000 */ lui $a1, 0xb000 -/* C2F74C 80240BAC 34A5000D */ ori $a1, $a1, 0xd -.L80240BB0: -/* C2F750 80240BB0 0C012530 */ jal func_800494C0 -/* C2F754 80240BB4 0000302D */ daddu $a2, $zero, $zero -/* C2F758 80240BB8 080902FC */ j .L80240BF0 -/* C2F75C 80240BBC 00000000 */ nop -.L80240BC0: -/* C2F760 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 -/* C2F764 80240BC4 2402003C */ addiu $v0, $zero, 0x3c -/* C2F768 80240BC8 8E6200CC */ lw $v0, 0xcc($s3) -/* C2F76C 80240BCC 8C420030 */ lw $v0, 0x30($v0) -/* C2F770 80240BD0 080902FC */ j .L80240BF0 -/* C2F774 80240BD4 AE220028 */ sw $v0, 0x28($s1) -.L80240BD8: -/* C2F778 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 -/* C2F77C 80240BDC 00000000 */ nop -/* C2F780 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) -/* C2F784 80240BE4 8C420028 */ lw $v0, 0x28($v0) -/* C2F788 80240BE8 A620008E */ sh $zero, 0x8e($s1) -/* C2F78C 80240BEC AE220028 */ sw $v0, 0x28($s1) -.L80240BF0: -/* C2F790 80240BF0 8FBF004C */ lw $ra, 0x4c($sp) -/* C2F794 80240BF4 8FB40048 */ lw $s4, 0x48($sp) -/* C2F798 80240BF8 8FB30044 */ lw $s3, 0x44($sp) -/* C2F79C 80240BFC 8FB20040 */ lw $s2, 0x40($sp) -/* C2F7A0 80240C00 8FB1003C */ lw $s1, 0x3c($sp) -/* C2F7A4 80240C04 8FB00038 */ lw $s0, 0x38($sp) -/* C2F7A8 80240C08 03E00008 */ jr $ra -/* C2F7AC 80240C0C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C10_C2F7B0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C10_C2F7B0.s deleted file mode 100644 index d4b7f1daf9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C10_C2F7B0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_C2F7B0 -/* C2F7B0 80240C10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F7B4 80240C14 AFB10014 */ sw $s1, 0x14($sp) -/* C2F7B8 80240C18 0080882D */ daddu $s1, $a0, $zero -/* C2F7BC 80240C1C AFBF0018 */ sw $ra, 0x18($sp) -/* C2F7C0 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* C2F7C4 80240C24 8E300148 */ lw $s0, 0x148($s1) -/* C2F7C8 80240C28 0C00EABB */ jal get_npc_unsafe -/* C2F7CC 80240C2C 86040008 */ lh $a0, 8($s0) -/* C2F7D0 80240C30 0040182D */ daddu $v1, $v0, $zero -/* C2F7D4 80240C34 9462008E */ lhu $v0, 0x8e($v1) -/* C2F7D8 80240C38 2442FFFF */ addiu $v0, $v0, -1 -/* C2F7DC 80240C3C A462008E */ sh $v0, 0x8e($v1) -/* C2F7E0 80240C40 00021400 */ sll $v0, $v0, 0x10 -/* C2F7E4 80240C44 1C400006 */ bgtz $v0, .L80240C60 -/* C2F7E8 80240C48 24020001 */ addiu $v0, $zero, 1 -/* C2F7EC 80240C4C A462008E */ sh $v0, 0x8e($v1) -/* C2F7F0 80240C50 24020028 */ addiu $v0, $zero, 0x28 -/* C2F7F4 80240C54 AE020088 */ sw $v0, 0x88($s0) -/* C2F7F8 80240C58 24020003 */ addiu $v0, $zero, 3 -/* C2F7FC 80240C5C AE220070 */ sw $v0, 0x70($s1) -.L80240C60: -/* C2F800 80240C60 8FBF0018 */ lw $ra, 0x18($sp) -/* C2F804 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* C2F808 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* C2F80C 80240C6C 03E00008 */ jr $ra -/* C2F810 80240C70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s deleted file mode 100644 index 4d64b891cd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240C74_C2F814.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_C2F814 -/* C2F814 80240C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F818 80240C78 AFB10014 */ sw $s1, 0x14($sp) -/* C2F81C 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* C2F820 80240C80 AFBF001C */ sw $ra, 0x1c($sp) -/* C2F824 80240C84 AFB20018 */ sw $s2, 0x18($sp) -/* C2F828 80240C88 AFB00010 */ sw $s0, 0x10($sp) -/* C2F82C 80240C8C 8E320148 */ lw $s2, 0x148($s1) -/* C2F830 80240C90 0C00EABB */ jal get_npc_unsafe -/* C2F834 80240C94 86440008 */ lh $a0, 8($s2) -/* C2F838 80240C98 240400B4 */ addiu $a0, $zero, 0xb4 -/* C2F83C 80240C9C 0C00A67F */ jal rand_int -/* C2F840 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* C2F844 80240CA4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C2F848 80240CA8 44820000 */ mtc1 $v0, $f0 -/* C2F84C 80240CAC 00000000 */ nop -/* C2F850 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* C2F854 80240CB4 46006300 */ add.s $f12, $f12, $f0 -/* C2F858 80240CB8 3C0142B4 */ lui $at, 0x42b4 -/* C2F85C 80240CBC 44810000 */ mtc1 $at, $f0 -/* C2F860 80240CC0 0C00A6C9 */ jal clamp_angle -/* C2F864 80240CC4 46006301 */ sub.s $f12, $f12, $f0 -/* C2F868 80240CC8 E600000C */ swc1 $f0, 0xc($s0) -/* C2F86C 80240CCC 8E4200CC */ lw $v0, 0xcc($s2) -/* C2F870 80240CD0 8C420000 */ lw $v0, ($v0) -/* C2F874 80240CD4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C2F878 80240CD8 0C00A67F */ jal rand_int -/* C2F87C 80240CDC AE020028 */ sw $v0, 0x28($s0) -/* C2F880 80240CE0 00021FC2 */ srl $v1, $v0, 0x1f -/* C2F884 80240CE4 00431821 */ addu $v1, $v0, $v1 -/* C2F888 80240CE8 00031843 */ sra $v1, $v1, 1 -/* C2F88C 80240CEC 00031840 */ sll $v1, $v1, 1 -/* C2F890 80240CF0 00431023 */ subu $v0, $v0, $v1 -/* C2F894 80240CF4 24420002 */ addiu $v0, $v0, 2 -/* C2F898 80240CF8 AE220074 */ sw $v0, 0x74($s1) -/* C2F89C 80240CFC 24020004 */ addiu $v0, $zero, 4 -/* C2F8A0 80240D00 AE220070 */ sw $v0, 0x70($s1) -/* C2F8A4 80240D04 8FBF001C */ lw $ra, 0x1c($sp) -/* C2F8A8 80240D08 8FB20018 */ lw $s2, 0x18($sp) -/* C2F8AC 80240D0C 8FB10014 */ lw $s1, 0x14($sp) -/* C2F8B0 80240D10 8FB00010 */ lw $s0, 0x10($sp) -/* C2F8B4 80240D14 03E00008 */ jr $ra -/* C2F8B8 80240D18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s deleted file mode 100644 index 5eb9af9496..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240D1C_C2F8BC.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D1C_C2F8BC -/* C2F8BC 80240D1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C2F8C0 80240D20 AFB20020 */ sw $s2, 0x20($sp) -/* C2F8C4 80240D24 0080902D */ daddu $s2, $a0, $zero -/* C2F8C8 80240D28 AFBF0028 */ sw $ra, 0x28($sp) -/* C2F8CC 80240D2C AFB30024 */ sw $s3, 0x24($sp) -/* C2F8D0 80240D30 AFB1001C */ sw $s1, 0x1c($sp) -/* C2F8D4 80240D34 AFB00018 */ sw $s0, 0x18($sp) -/* C2F8D8 80240D38 8E510148 */ lw $s1, 0x148($s2) -/* C2F8DC 80240D3C 00A0982D */ daddu $s3, $a1, $zero -/* C2F8E0 80240D40 86240008 */ lh $a0, 8($s1) -/* C2F8E4 80240D44 0C00EABB */ jal get_npc_unsafe -/* C2F8E8 80240D48 00C0802D */ daddu $s0, $a2, $zero -/* C2F8EC 80240D4C 0200202D */ daddu $a0, $s0, $zero -/* C2F8F0 80240D50 0040802D */ daddu $s0, $v0, $zero -/* C2F8F4 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C2F8F8 80240D58 8E660024 */ lw $a2, 0x24($s3) -/* C2F8FC 80240D5C 8E670028 */ lw $a3, 0x28($s3) -/* C2F900 80240D60 0C01242D */ jal func_800490B4 -/* C2F904 80240D64 0220282D */ daddu $a1, $s1, $zero -/* C2F908 80240D68 1040000C */ beqz $v0, .L80240D9C -/* C2F90C 80240D6C 00000000 */ nop -/* C2F910 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C2F914 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C2F918 80240D78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2F91C 80240D7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2F920 80240D80 8C460028 */ lw $a2, 0x28($v0) -/* C2F924 80240D84 0C00A720 */ jal atan2 -/* C2F928 80240D88 8C470030 */ lw $a3, 0x30($v0) -/* C2F92C 80240D8C 2402000C */ addiu $v0, $zero, 0xc -/* C2F930 80240D90 E600000C */ swc1 $f0, 0xc($s0) -/* C2F934 80240D94 0809038E */ j .L80240E38 -/* C2F938 80240D98 AE420070 */ sw $v0, 0x70($s2) -.L80240D9C: -/* C2F93C 80240D9C 9602008E */ lhu $v0, 0x8e($s0) -/* C2F940 80240DA0 2442FFFF */ addiu $v0, $v0, -1 -/* C2F944 80240DA4 A602008E */ sh $v0, 0x8e($s0) -/* C2F948 80240DA8 00021400 */ sll $v0, $v0, 0x10 -/* C2F94C 80240DAC 1C400022 */ bgtz $v0, .L80240E38 -/* C2F950 80240DB0 00000000 */ nop -/* C2F954 80240DB4 8E420074 */ lw $v0, 0x74($s2) -/* C2F958 80240DB8 2442FFFF */ addiu $v0, $v0, -1 -/* C2F95C 80240DBC 18400014 */ blez $v0, .L80240E10 -/* C2F960 80240DC0 AE420074 */ sw $v0, 0x74($s2) -/* C2F964 80240DC4 C600000C */ lwc1 $f0, 0xc($s0) -/* C2F968 80240DC8 3C014334 */ lui $at, 0x4334 -/* C2F96C 80240DCC 44816000 */ mtc1 $at, $f12 -/* C2F970 80240DD0 0C00A6C9 */ jal clamp_angle -/* C2F974 80240DD4 460C0300 */ add.s $f12, $f0, $f12 -/* C2F978 80240DD8 E600000C */ swc1 $f0, 0xc($s0) -/* C2F97C 80240DDC 8E640008 */ lw $a0, 8($s3) -/* C2F980 80240DE0 000417C2 */ srl $v0, $a0, 0x1f -/* C2F984 80240DE4 00822021 */ addu $a0, $a0, $v0 -/* C2F988 80240DE8 00042043 */ sra $a0, $a0, 1 -/* C2F98C 80240DEC 0C00A67F */ jal rand_int -/* C2F990 80240DF0 24840001 */ addiu $a0, $a0, 1 -/* C2F994 80240DF4 8E630008 */ lw $v1, 8($s3) -/* C2F998 80240DF8 000327C2 */ srl $a0, $v1, 0x1f -/* C2F99C 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* C2F9A0 80240E00 00031843 */ sra $v1, $v1, 1 -/* C2F9A4 80240E04 00621821 */ addu $v1, $v1, $v0 -/* C2F9A8 80240E08 0809038E */ j .L80240E38 -/* C2F9AC 80240E0C A603008E */ sh $v1, 0x8e($s0) -.L80240E10: -/* C2F9B0 80240E10 8E250088 */ lw $a1, 0x88($s1) -/* C2F9B4 80240E14 24020028 */ addiu $v0, $zero, 0x28 -/* C2F9B8 80240E18 14A20003 */ bne $a1, $v0, .L80240E28 -/* C2F9BC 80240E1C 24020032 */ addiu $v0, $zero, 0x32 -/* C2F9C0 80240E20 0809038C */ j .L80240E30 -/* C2F9C4 80240E24 24020014 */ addiu $v0, $zero, 0x14 -.L80240E28: -/* C2F9C8 80240E28 14A20003 */ bne $a1, $v0, .L80240E38 -/* C2F9CC 80240E2C 24020019 */ addiu $v0, $zero, 0x19 -.L80240E30: -/* C2F9D0 80240E30 A602008E */ sh $v0, 0x8e($s0) -/* C2F9D4 80240E34 AE450070 */ sw $a1, 0x70($s2) -.L80240E38: -/* C2F9D8 80240E38 8FBF0028 */ lw $ra, 0x28($sp) -/* C2F9DC 80240E3C 8FB30024 */ lw $s3, 0x24($sp) -/* C2F9E0 80240E40 8FB20020 */ lw $s2, 0x20($sp) -/* C2F9E4 80240E44 8FB1001C */ lw $s1, 0x1c($sp) -/* C2F9E8 80240E48 8FB00018 */ lw $s0, 0x18($sp) -/* C2F9EC 80240E4C 03E00008 */ jr $ra -/* C2F9F0 80240E50 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s deleted file mode 100644 index 43a298fc54..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E54_C2F9F4 -/* C2F9F4 80240E54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C2F9F8 80240E58 AFB20018 */ sw $s2, 0x18($sp) -/* C2F9FC 80240E5C 0080902D */ daddu $s2, $a0, $zero -/* C2FA00 80240E60 AFBF001C */ sw $ra, 0x1c($sp) -/* C2FA04 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* C2FA08 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* C2FA0C 80240E6C 8E500148 */ lw $s0, 0x148($s2) -/* C2FA10 80240E70 86040008 */ lh $a0, 8($s0) -/* C2FA14 80240E74 0C00EABB */ jal get_npc_unsafe -/* C2FA18 80240E78 00A0882D */ daddu $s1, $a1, $zero -/* C2FA1C 80240E7C 0040182D */ daddu $v1, $v0, $zero -/* C2FA20 80240E80 9462008E */ lhu $v0, 0x8e($v1) -/* C2FA24 80240E84 2442FFFF */ addiu $v0, $v0, -1 -/* C2FA28 80240E88 A462008E */ sh $v0, 0x8e($v1) -/* C2FA2C 80240E8C 00021400 */ sll $v0, $v0, 0x10 -/* C2FA30 80240E90 1C400015 */ bgtz $v0, .L80240EE8 -/* C2FA34 80240E94 00000000 */ nop -/* C2FA38 80240E98 8E0200CC */ lw $v0, 0xcc($s0) -/* C2FA3C 80240E9C 8C420004 */ lw $v0, 4($v0) -/* C2FA40 80240EA0 AC620028 */ sw $v0, 0x28($v1) -/* C2FA44 80240EA4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C2FA48 80240EA8 8C420014 */ lw $v0, 0x14($v0) -/* C2FA4C 80240EAC 04410004 */ bgez $v0, .L80240EC0 -/* C2FA50 80240EB0 00000000 */ nop -/* C2FA54 80240EB4 C6200000 */ lwc1 $f0, ($s1) -/* C2FA58 80240EB8 080903B8 */ j .L80240EE0 -/* C2FA5C 80240EBC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EC0: -/* C2FA60 80240EC0 3C018024 */ lui $at, %hi(D_802427A8_C31348) -/* C2FA64 80240EC4 D42227A8 */ ldc1 $f2, %lo(D_802427A8_C31348)($at) -/* C2FA68 80240EC8 44820000 */ mtc1 $v0, $f0 -/* C2FA6C 80240ECC 00000000 */ nop -/* C2FA70 80240ED0 46800021 */ cvt.d.w $f0, $f0 -/* C2FA74 80240ED4 46220003 */ div.d $f0, $f0, $f2 -/* C2FA78 80240ED8 46200020 */ cvt.s.d $f0, $f0 -/* C2FA7C 80240EDC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EE0: -/* C2FA80 80240EE0 24020029 */ addiu $v0, $zero, 0x29 -/* C2FA84 80240EE4 AE420070 */ sw $v0, 0x70($s2) -.L80240EE8: -/* C2FA88 80240EE8 8FBF001C */ lw $ra, 0x1c($sp) -/* C2FA8C 80240EEC 8FB20018 */ lw $s2, 0x18($sp) -/* C2FA90 80240EF0 8FB10014 */ lw $s1, 0x14($sp) -/* C2FA94 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* C2FA98 80240EF8 03E00008 */ jr $ra -/* C2FA9C 80240EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s deleted file mode 100644 index fa417d0d26..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240F00_C2FAA0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F00_C2FAA0 -/* C2FAA0 80240F00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C2FAA4 80240F04 AFB3002C */ sw $s3, 0x2c($sp) -/* C2FAA8 80240F08 0080982D */ daddu $s3, $a0, $zero -/* C2FAAC 80240F0C AFBF0030 */ sw $ra, 0x30($sp) -/* C2FAB0 80240F10 AFB20028 */ sw $s2, 0x28($sp) -/* C2FAB4 80240F14 AFB10024 */ sw $s1, 0x24($sp) -/* C2FAB8 80240F18 AFB00020 */ sw $s0, 0x20($sp) -/* C2FABC 80240F1C 8E720148 */ lw $s2, 0x148($s3) -/* C2FAC0 80240F20 00A0882D */ daddu $s1, $a1, $zero -/* C2FAC4 80240F24 86440008 */ lh $a0, 8($s2) -/* C2FAC8 80240F28 0C00EABB */ jal get_npc_unsafe -/* C2FACC 80240F2C 00C0802D */ daddu $s0, $a2, $zero -/* C2FAD0 80240F30 0200202D */ daddu $a0, $s0, $zero -/* C2FAD4 80240F34 0240282D */ daddu $a1, $s2, $zero -/* C2FAD8 80240F38 AFA00010 */ sw $zero, 0x10($sp) -/* C2FADC 80240F3C 8E260024 */ lw $a2, 0x24($s1) -/* C2FAE0 80240F40 8E270028 */ lw $a3, 0x28($s1) -/* C2FAE4 80240F44 0C01242D */ jal func_800490B4 -/* C2FAE8 80240F48 0040802D */ daddu $s0, $v0, $zero -/* C2FAEC 80240F4C 1040000C */ beqz $v0, .L80240F80 -/* C2FAF0 80240F50 00000000 */ nop -/* C2FAF4 80240F54 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2FAF8 80240F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C2FAFC 80240F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C2FB00 80240F60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2FB04 80240F64 8C460028 */ lw $a2, 0x28($v0) -/* C2FB08 80240F68 0C00A720 */ jal atan2 -/* C2FB0C 80240F6C 8C470030 */ lw $a3, 0x30($v0) -/* C2FB10 80240F70 2402000C */ addiu $v0, $zero, 0xc -/* C2FB14 80240F74 E600000C */ swc1 $f0, 0xc($s0) -/* C2FB18 80240F78 08090417 */ j .L8024105C -/* C2FB1C 80240F7C AE620070 */ sw $v0, 0x70($s3) -.L80240F80: -/* C2FB20 80240F80 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2FB24 80240F84 8E4200D0 */ lw $v0, 0xd0($s2) -/* C2FB28 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2FB2C 80240F8C C4440000 */ lwc1 $f4, ($v0) -/* C2FB30 80240F90 46802120 */ cvt.s.w $f4, $f4 -/* C2FB34 80240F94 44062000 */ mfc1 $a2, $f4 -/* C2FB38 80240F98 C4440008 */ lwc1 $f4, 8($v0) -/* C2FB3C 80240F9C 46802120 */ cvt.s.w $f4, $f4 -/* C2FB40 80240FA0 44072000 */ mfc1 $a3, $f4 -/* C2FB44 80240FA4 0C00A7B5 */ jal dist2D -/* C2FB48 80240FA8 00000000 */ nop -/* C2FB4C 80240FAC C6020018 */ lwc1 $f2, 0x18($s0) -/* C2FB50 80240FB0 4602003E */ c.le.s $f0, $f2 -/* C2FB54 80240FB4 00000000 */ nop -/* C2FB58 80240FB8 4500000B */ bc1f .L80240FE8 -/* C2FB5C 80240FBC 00000000 */ nop -/* C2FB60 80240FC0 8E4200CC */ lw $v0, 0xcc($s2) -/* C2FB64 80240FC4 8C430000 */ lw $v1, ($v0) -/* C2FB68 80240FC8 2402000F */ addiu $v0, $zero, 0xf -/* C2FB6C 80240FCC A602008E */ sh $v0, 0x8e($s0) -/* C2FB70 80240FD0 24020032 */ addiu $v0, $zero, 0x32 -/* C2FB74 80240FD4 AE030028 */ sw $v1, 0x28($s0) -/* C2FB78 80240FD8 AE420088 */ sw $v0, 0x88($s2) -/* C2FB7C 80240FDC 24020003 */ addiu $v0, $zero, 3 -/* C2FB80 80240FE0 08090417 */ j .L8024105C -/* C2FB84 80240FE4 AE620070 */ sw $v0, 0x70($s3) -.L80240FE8: -/* C2FB88 80240FE8 8602008C */ lh $v0, 0x8c($s0) -/* C2FB8C 80240FEC 1440001B */ bnez $v0, .L8024105C -/* C2FB90 80240FF0 0200202D */ daddu $a0, $s0, $zero -/* C2FB94 80240FF4 27A60018 */ addiu $a2, $sp, 0x18 -/* C2FB98 80240FF8 3C0540A0 */ lui $a1, 0x40a0 -/* C2FB9C 80240FFC C600000C */ lwc1 $f0, 0xc($s0) -/* C2FBA0 80241000 0000382D */ daddu $a3, $zero, $zero -/* C2FBA4 80241004 E7A00018 */ swc1 $f0, 0x18($sp) -/* C2FBA8 80241008 AFA00010 */ sw $zero, 0x10($sp) -/* C2FBAC 8024100C 0C0129E1 */ jal func_8004A784 -/* C2FBB0 80241010 AFA00014 */ sw $zero, 0x14($sp) -/* C2FBB4 80241014 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C2FBB8 80241018 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C2FBBC 8024101C E600000C */ swc1 $f0, 0xc($s0) -/* C2FBC0 80241020 8E4200D0 */ lw $v0, 0xd0($s2) -/* C2FBC4 80241024 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C2FBC8 80241028 C4440000 */ lwc1 $f4, ($v0) -/* C2FBCC 8024102C 46802120 */ cvt.s.w $f4, $f4 -/* C2FBD0 80241030 44062000 */ mfc1 $a2, $f4 -/* C2FBD4 80241034 C4440008 */ lwc1 $f4, 8($v0) -/* C2FBD8 80241038 46802120 */ cvt.s.w $f4, $f4 -/* C2FBDC 8024103C 44072000 */ mfc1 $a3, $f4 -/* C2FBE0 80241040 0C00A720 */ jal atan2 -/* C2FBE4 80241044 00000000 */ nop -/* C2FBE8 80241048 8E050018 */ lw $a1, 0x18($s0) -/* C2FBEC 8024104C 44060000 */ mfc1 $a2, $f0 -/* C2FBF0 80241050 0200202D */ daddu $a0, $s0, $zero -/* C2FBF4 80241054 0C00EA95 */ jal npc_move_heading -/* C2FBF8 80241058 AC86000C */ sw $a2, 0xc($a0) -.L8024105C: -/* C2FBFC 8024105C 8FBF0030 */ lw $ra, 0x30($sp) -/* C2FC00 80241060 8FB3002C */ lw $s3, 0x2c($sp) -/* C2FC04 80241064 8FB20028 */ lw $s2, 0x28($sp) -/* C2FC08 80241068 8FB10024 */ lw $s1, 0x24($sp) -/* C2FC0C 8024106C 8FB00020 */ lw $s0, 0x20($sp) -/* C2FC10 80241070 03E00008 */ jr $ra -/* C2FC14 80241074 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s deleted file mode 100644 index c4b4345cf7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241078_C2FC18 -/* C2FC18 80241078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C2FC1C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* C2FC20 80241080 0080802D */ daddu $s0, $a0, $zero -/* C2FC24 80241084 AFBF0014 */ sw $ra, 0x14($sp) -/* C2FC28 80241088 8E020148 */ lw $v0, 0x148($s0) -/* C2FC2C 8024108C 0C00EABB */ jal get_npc_unsafe -/* C2FC30 80241090 84440008 */ lh $a0, 8($v0) -/* C2FC34 80241094 0040182D */ daddu $v1, $v0, $zero -/* C2FC38 80241098 8462008C */ lh $v0, 0x8c($v1) -/* C2FC3C 8024109C 14400009 */ bnez $v0, .L802410C4 -/* C2FC40 802410A0 00000000 */ nop -/* C2FC44 802410A4 9462008E */ lhu $v0, 0x8e($v1) -/* C2FC48 802410A8 2442FFFF */ addiu $v0, $v0, -1 -/* C2FC4C 802410AC A462008E */ sh $v0, 0x8e($v1) -/* C2FC50 802410B0 00021400 */ sll $v0, $v0, 0x10 -/* C2FC54 802410B4 1C400003 */ bgtz $v0, .L802410C4 -/* C2FC58 802410B8 00000000 */ nop -/* C2FC5C 802410BC A460008E */ sh $zero, 0x8e($v1) -/* C2FC60 802410C0 AE000070 */ sw $zero, 0x70($s0) -.L802410C4: -/* C2FC64 802410C4 8FBF0014 */ lw $ra, 0x14($sp) -/* C2FC68 802410C8 8FB00010 */ lw $s0, 0x10($sp) -/* C2FC6C 802410CC 03E00008 */ jr $ra -/* C2FC70 802410D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s deleted file mode 100644 index 76e0791319..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ /dev/null @@ -1,242 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D4_C2FC74 -/* C2FC74 802410D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C2FC78 802410D8 AFB20038 */ sw $s2, 0x38($sp) -/* C2FC7C 802410DC 0080902D */ daddu $s2, $a0, $zero -/* C2FC80 802410E0 AFBF0048 */ sw $ra, 0x48($sp) -/* C2FC84 802410E4 AFB50044 */ sw $s5, 0x44($sp) -/* C2FC88 802410E8 AFB40040 */ sw $s4, 0x40($sp) -/* C2FC8C 802410EC AFB3003C */ sw $s3, 0x3c($sp) -/* C2FC90 802410F0 AFB10034 */ sw $s1, 0x34($sp) -/* C2FC94 802410F4 AFB00030 */ sw $s0, 0x30($sp) -/* C2FC98 802410F8 8E510148 */ lw $s1, 0x148($s2) -/* C2FC9C 802410FC 86240008 */ lh $a0, 8($s1) -/* C2FCA0 80241100 0C00EABB */ jal get_npc_unsafe -/* C2FCA4 80241104 00A0802D */ daddu $s0, $a1, $zero -/* C2FCA8 80241108 8E43000C */ lw $v1, 0xc($s2) -/* C2FCAC 8024110C 0240202D */ daddu $a0, $s2, $zero -/* C2FCB0 80241110 8C650000 */ lw $a1, ($v1) -/* C2FCB4 80241114 0C0B1EAF */ jal get_variable -/* C2FCB8 80241118 0040A02D */ daddu $s4, $v0, $zero -/* C2FCBC 8024111C AFA00010 */ sw $zero, 0x10($sp) -/* C2FCC0 80241120 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCC4 80241124 8C630030 */ lw $v1, 0x30($v1) -/* C2FCC8 80241128 AFA30014 */ sw $v1, 0x14($sp) -/* C2FCCC 8024112C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCD0 80241130 8C63001C */ lw $v1, 0x1c($v1) -/* C2FCD4 80241134 AFA30018 */ sw $v1, 0x18($sp) -/* C2FCD8 80241138 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCDC 8024113C 8C630024 */ lw $v1, 0x24($v1) -/* C2FCE0 80241140 AFA3001C */ sw $v1, 0x1c($sp) -/* C2FCE4 80241144 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCE8 80241148 8C630028 */ lw $v1, 0x28($v1) -/* C2FCEC 8024114C 27B50010 */ addiu $s5, $sp, 0x10 -/* C2FCF0 80241150 AFA30020 */ sw $v1, 0x20($sp) -/* C2FCF4 80241154 8E2300D0 */ lw $v1, 0xd0($s1) -/* C2FCF8 80241158 3C014220 */ lui $at, 0x4220 -/* C2FCFC 8024115C 44810000 */ mtc1 $at, $f0 -/* C2FD00 80241160 8C63002C */ lw $v1, 0x2c($v1) -/* C2FD04 80241164 0040982D */ daddu $s3, $v0, $zero -/* C2FD08 80241168 E7A00028 */ swc1 $f0, 0x28($sp) -/* C2FD0C 8024116C A7A0002C */ sh $zero, 0x2c($sp) -/* C2FD10 80241170 16000005 */ bnez $s0, .L80241188 -/* C2FD14 80241174 AFA30024 */ sw $v1, 0x24($sp) -/* C2FD18 80241178 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2FD1C 8024117C 30420004 */ andi $v0, $v0, 4 -/* C2FD20 80241180 10400027 */ beqz $v0, .L80241220 -/* C2FD24 80241184 00000000 */ nop -.L80241188: -/* C2FD28 80241188 2402001E */ addiu $v0, $zero, 0x1e -/* C2FD2C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 -/* C2FD30 80241190 AE400070 */ sw $zero, 0x70($s2) -/* C2FD34 80241194 A682008E */ sh $v0, 0x8e($s4) -/* C2FD38 80241198 8E2300CC */ lw $v1, 0xcc($s1) -/* C2FD3C 8024119C 8E820000 */ lw $v0, ($s4) -/* C2FD40 802411A0 8C630028 */ lw $v1, 0x28($v1) -/* C2FD44 802411A4 00441024 */ and $v0, $v0, $a0 -/* C2FD48 802411A8 AE820000 */ sw $v0, ($s4) -/* C2FD4C 802411AC AE830028 */ sw $v1, 0x28($s4) -/* C2FD50 802411B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C2FD54 802411B4 AE20006C */ sw $zero, 0x6c($s1) -/* C2FD58 802411B8 8C420034 */ lw $v0, 0x34($v0) -/* C2FD5C 802411BC 14400006 */ bnez $v0, .L802411D8 -/* C2FD60 802411C0 2403FDFF */ addiu $v1, $zero, -0x201 -/* C2FD64 802411C4 8E820000 */ lw $v0, ($s4) -/* C2FD68 802411C8 2403FFF7 */ addiu $v1, $zero, -9 -/* C2FD6C 802411CC 34420200 */ ori $v0, $v0, 0x200 -/* C2FD70 802411D0 08090479 */ j .L802411E4 -/* C2FD74 802411D4 00431024 */ and $v0, $v0, $v1 -.L802411D8: -/* C2FD78 802411D8 8E820000 */ lw $v0, ($s4) -/* C2FD7C 802411DC 00431024 */ and $v0, $v0, $v1 -/* C2FD80 802411E0 34420008 */ ori $v0, $v0, 8 -.L802411E4: -/* C2FD84 802411E4 AE820000 */ sw $v0, ($s4) -/* C2FD88 802411E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2FD8C 802411EC 30420004 */ andi $v0, $v0, 4 -/* C2FD90 802411F0 10400007 */ beqz $v0, .L80241210 -/* C2FD94 802411F4 24020063 */ addiu $v0, $zero, 0x63 -/* C2FD98 802411F8 AE420070 */ sw $v0, 0x70($s2) -/* C2FD9C 802411FC 24020028 */ addiu $v0, $zero, 0x28 -/* C2FDA0 80241200 AE420074 */ sw $v0, 0x74($s2) -/* C2FDA4 80241204 8E2200CC */ lw $v0, 0xcc($s1) -/* C2FDA8 80241208 8C420000 */ lw $v0, ($v0) -/* C2FDAC 8024120C AE820028 */ sw $v0, 0x28($s4) -.L80241210: -/* C2FDB0 80241210 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2FDB4 80241214 2403FFFB */ addiu $v1, $zero, -5 -/* C2FDB8 80241218 00431024 */ and $v0, $v0, $v1 -/* C2FDBC 8024121C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241220: -/* C2FDC0 80241220 8E420070 */ lw $v0, 0x70($s2) -/* C2FDC4 80241224 2442FFF6 */ addiu $v0, $v0, -0xa -/* C2FDC8 80241228 2C420014 */ sltiu $v0, $v0, 0x14 -/* C2FDCC 8024122C 10400009 */ beqz $v0, .L80241254 -/* C2FDD0 80241230 00000000 */ nop -/* C2FDD4 80241234 8E22006C */ lw $v0, 0x6c($s1) -/* C2FDD8 80241238 14400006 */ bnez $v0, .L80241254 -/* C2FDDC 8024123C 00000000 */ nop -/* C2FDE0 80241240 0C090082 */ jal func_80240208_C2EDA8 -/* C2FDE4 80241244 0240202D */ daddu $a0, $s2, $zero -/* C2FDE8 80241248 10400002 */ beqz $v0, .L80241254 -/* C2FDEC 8024124C 2402001E */ addiu $v0, $zero, 0x1e -/* C2FDF0 80241250 AE420070 */ sw $v0, 0x70($s2) -.L80241254: -/* C2FDF4 80241254 8E430070 */ lw $v1, 0x70($s2) -/* C2FDF8 80241258 2C620064 */ sltiu $v0, $v1, 0x64 -/* C2FDFC 8024125C 10400067 */ beqz $v0, L802413FC_C2FF9C -/* C2FE00 80241260 00031080 */ sll $v0, $v1, 2 -/* C2FE04 80241264 3C018024 */ lui $at, %hi(jtbl_802427B0_C31350) -/* C2FE08 80241268 00220821 */ addu $at, $at, $v0 -/* C2FE0C 8024126C 8C2227B0 */ lw $v0, %lo(jtbl_802427B0_C31350)($at) -/* C2FE10 80241270 00400008 */ jr $v0 -/* C2FE14 80241274 00000000 */ nop -glabel L80241278_C2FE18 -/* C2FE18 80241278 0240202D */ daddu $a0, $s2, $zero -/* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* C2FE20 80241280 0C090234 */ jal func_802408D0_C2F470 -/* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero -/* C2FE28 80241288 080904FF */ j L802413FC_C2FF9C -/* C2FE2C 8024128C 00000000 */ nop -glabel L80241290_C2FE30 -/* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero -/* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero -/* C2FE38 80241298 0C090256 */ jal func_80240958_C2F4F8 -/* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero -/* C2FE40 802412A0 080904FF */ j L802413FC_C2FF9C -/* C2FE44 802412A4 00000000 */ nop -glabel L802412A8_C2FE48 -/* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero -/* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* C2FE50 802412B0 0C090304 */ jal func_80240C10_C2F7B0 -/* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* C2FE58 802412B8 080904FF */ j L802413FC_C2FF9C -/* C2FE5C 802412BC 00000000 */ nop -glabel L802412C0_C2FE60 -/* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero -/* C2FE68 802412C8 0C09031D */ jal func_80240C74_C2F814 -/* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* C2FE70 802412D0 080904FF */ j L802413FC_C2FF9C -/* C2FE74 802412D4 00000000 */ nop -glabel L802412D8_C2FE78 -/* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero -/* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* C2FE80 802412E0 0C090347 */ jal func_80240D1C_C2F8BC -/* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* C2FE88 802412E8 080904FF */ j L802413FC_C2FF9C -/* C2FE8C 802412EC 00000000 */ nop -glabel L802412F0_C2FE90 -/* C2FE90 802412F0 0240202D */ daddu $a0, $s2, $zero -/* C2FE94 802412F4 0260282D */ daddu $a1, $s3, $zero -/* C2FE98 802412F8 0C0127DF */ jal func_80049F7C -/* C2FE9C 802412FC 02A0302D */ daddu $a2, $s5, $zero -/* C2FEA0 80241300 8E430070 */ lw $v1, 0x70($s2) -/* C2FEA4 80241304 2402000D */ addiu $v0, $zero, 0xd -/* C2FEA8 80241308 1462003C */ bne $v1, $v0, L802413FC_C2FF9C -/* C2FEAC 8024130C 00000000 */ nop -glabel L80241310_C2FEB0 -/* C2FEB0 80241310 0240202D */ daddu $a0, $s2, $zero -/* C2FEB4 80241314 0260282D */ daddu $a1, $s3, $zero -/* C2FEB8 80241318 0C012849 */ jal func_8004A124 -/* C2FEBC 8024131C 02A0302D */ daddu $a2, $s5, $zero -/* C2FEC0 80241320 080904FF */ j L802413FC_C2FF9C -/* C2FEC4 80241324 00000000 */ nop -glabel L80241328_C2FEC8 -/* C2FEC8 80241328 0240202D */ daddu $a0, $s2, $zero -/* C2FECC 8024132C 0260282D */ daddu $a1, $s3, $zero -/* C2FED0 80241330 0C0128FA */ jal func_8004A3E8 -/* C2FED4 80241334 02A0302D */ daddu $a2, $s5, $zero -/* C2FED8 80241338 2402000F */ addiu $v0, $zero, 0xf -/* C2FEDC 8024133C A682008E */ sh $v0, 0x8e($s4) -/* C2FEE0 80241340 24020028 */ addiu $v0, $zero, 0x28 -/* C2FEE4 80241344 AE220088 */ sw $v0, 0x88($s1) -/* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 -/* C2FEEC 8024134C 080904FF */ j L802413FC_C2FF9C -/* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) -glabel L80241354_C2FEF4 -/* C2FEF4 80241354 0C090000 */ jal dgb_02_UnkNpcAIFunc6 -/* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero -/* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) -/* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f -/* C2FF04 80241364 14620025 */ bne $v1, $v0, L802413FC_C2FF9C -/* C2FF08 80241368 00000000 */ nop -glabel L8024136C_C2FF0C -/* C2FF0C 8024136C 0C09001B */ jal dgb_02_UnkNpcAIFunc7 -/* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero -/* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) -/* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 -/* C2FF1C 8024137C 1462001F */ bne $v1, $v0, L802413FC_C2FF9C -/* C2FF20 80241380 00000000 */ nop -glabel L80241384_C2FF24 -/* C2FF24 80241384 0C090037 */ jal dgb_02_UnkNpcAIFunc8 -/* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero -/* C2FF2C 8024138C 080904FF */ j L802413FC_C2FF9C -/* C2FF30 80241390 00000000 */ nop -glabel L80241394_C2FF34 -/* C2FF34 80241394 0C09006D */ jal dgb_02_UnkNpcAIFunc5 -/* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero -/* C2FF3C 8024139C 080904FF */ j L802413FC_C2FF9C -/* C2FF40 802413A0 00000000 */ nop -glabel L802413A4_C2FF44 -/* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero -/* C2FF48 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C2FF4C 802413AC 0C090395 */ jal func_80240E54_C2F9F4 -/* C2FF50 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) -/* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 -/* C2FF5C 802413BC 1462000F */ bne $v1, $v0, L802413FC_C2FF9C -/* C2FF60 802413C0 00000000 */ nop -glabel L802413C4_C2FF64 -/* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero -/* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero -/* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00_C2FAA0 -/* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero -/* C2FF74 802413D4 080904FF */ j L802413FC_C2FF9C -/* C2FF78 802413D8 00000000 */ nop -glabel L802413DC_C2FF7C -/* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero -/* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C2FF84 802413E4 0C09041E */ jal func_80241078_C2FC18 -/* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero -/* C2FF8C 802413EC 080904FF */ j L802413FC_C2FF9C -/* C2FF90 802413F0 00000000 */ nop -glabel L802413F4_C2FF94 -/* C2FF94 802413F4 0C0129CF */ jal func_8004A73C -/* C2FF98 802413F8 0240202D */ daddu $a0, $s2, $zero -glabel L802413FC_C2FF9C -/* C2FF9C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C2FFA0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C2FFA4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C2FFA8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C2FFAC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C2FFB0 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C2FFB4 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C2FFB8 80241418 0000102D */ daddu $v0, $zero, $zero -/* C2FFBC 8024141C 03E00008 */ jr $ra -/* C2FFC0 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C2FFC4 80241424 00000000 */ nop -/* C2FFC8 80241428 00000000 */ nop -/* C2FFCC 8024142C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s deleted file mode 100644 index 6f76c6dd0f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/update_starpoints_display_C2EF5C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C2EF5C -/* C2EF5C 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C2EF60 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C2EF64 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C2EF68 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C2EF6C 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C2EF70 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C2EF74 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C2EF78 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C2EF7C 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C2EF80 802403E0 86240008 */ lh $a0, 8($s1) -/* C2EF84 802403E4 0C00EABB */ jal get_npc_unsafe -/* C2EF88 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C2EF8C 802403EC 16000005 */ bnez $s0, .L80240404 -/* C2EF90 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C2EF94 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C2EF98 802403F8 30420004 */ andi $v0, $v0, 4 -/* C2EF9C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C2EFA0 80240400 00000000 */ nop -.L80240404: -/* C2EFA4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C2EFA8 80240408 8E420000 */ lw $v0, ($s2) -/* C2EFAC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C2EFB0 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C2EFB4 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C2EFB8 80240418 AE420000 */ sw $v0, ($s2) -/* C2EFBC 8024041C 8E220000 */ lw $v0, ($s1) -/* C2EFC0 80240420 3C01C47A */ lui $at, 0xc47a -/* C2EFC4 80240424 44810000 */ mtc1 $at, $f0 -/* C2EFC8 80240428 00431025 */ or $v0, $v0, $v1 -/* C2EFCC 8024042C AE220000 */ sw $v0, ($s1) -/* C2EFD0 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C2EFD4 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C2EFD8 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C2EFDC 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C2EFE0 80240440 30620004 */ andi $v0, $v1, 4 -/* C2EFE4 80240444 10400003 */ beqz $v0, .L80240454 -/* C2EFE8 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C2EFEC 8024044C 00621024 */ and $v0, $v1, $v0 -/* C2EFF0 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C2EFF4 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C2EFF8 80240458 12600005 */ beqz $s3, .L80240470 -/* C2EFFC 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C2F000 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C2F004 80240464 00000000 */ nop -/* C2F008 80240468 0809017E */ j .L802405F8 -/* C2F00C 8024046C 00000000 */ nop -.L80240470: -/* C2F010 80240470 86240008 */ lh $a0, 8($s1) -/* C2F014 80240474 0C00FB3A */ jal get_enemy -/* C2F018 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C2F01C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C2F020 80240480 0C00EABB */ jal get_npc_unsafe -/* C2F024 80240484 86040008 */ lh $a0, 8($s0) -/* C2F028 80240488 24030001 */ addiu $v1, $zero, 1 -/* C2F02C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C2F030 80240490 A2230007 */ sb $v1, 7($s1) -/* C2F034 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C2F038 80240498 24020003 */ addiu $v0, $zero, 3 -/* C2F03C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C2F040 802404A0 00000000 */ nop -/* C2F044 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C2F048 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C2F04C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C2F050 802404B0 0C012530 */ jal func_800494C0 -/* C2F054 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C2F058 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C2F05C 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C2F060 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C2F064 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C2F068 802404C8 3C014387 */ lui $at, 0x4387 -/* C2F06C 802404CC 44810000 */ mtc1 $at, $f0 -/* C2F070 802404D0 44064000 */ mfc1 $a2, $f8 -/* C2F074 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C2F078 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C2F07C 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C2F080 802404E0 44070000 */ mfc1 $a3, $f0 -/* C2F084 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C2F088 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C2F08C 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C2F090 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C2F094 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C2F098 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C2F09C 802404FC 44024000 */ mfc1 $v0, $f8 -/* C2F0A0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C2F0A4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C2F0A8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C2F0AC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C2F0B0 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C2F0B4 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C2F0B8 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C2F0BC 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C2F0C0 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C2F0C4 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C2F0C8 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C2F0CC 8024052C 44024000 */ mfc1 $v0, $f8 -/* C2F0D0 80240530 00000000 */ nop -/* C2F0D4 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C2F0D8 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C2F0DC 8024053C 44024000 */ mfc1 $v0, $f8 -/* C2F0E0 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C2F0E4 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C2F0E8 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C2F0EC 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C2F0F0 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C2F0F4 80240554 0C00A720 */ jal atan2 -/* C2F0F8 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C2F0FC 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C2F100 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C2F104 80240564 8E220000 */ lw $v0, ($s1) -/* C2F108 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C2F10C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C2F110 80240570 AE220000 */ sw $v0, ($s1) -/* C2F114 80240574 24020001 */ addiu $v0, $zero, 1 -/* C2F118 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C2F11C 8024057C 0809017E */ j .L802405F8 -/* C2F120 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C2F124 80240584 86240008 */ lh $a0, 8($s1) -/* C2F128 80240588 0C00FB3A */ jal get_enemy -/* C2F12C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C2F130 80240590 0040802D */ daddu $s0, $v0, $zero -/* C2F134 80240594 0C00EABB */ jal get_npc_unsafe -/* C2F138 80240598 86040008 */ lh $a0, 8($s0) -/* C2F13C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C2F140 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C2F144 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C2F148 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C2F14C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C2F150 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C2F154 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C2F158 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C2F15C 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C2F160 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C2F164 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C2F168 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C2F16C 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C2F170 802405D0 8E230000 */ lw $v1, ($s1) -/* C2F174 802405D4 3C01C47A */ lui $at, 0xc47a -/* C2F178 802405D8 44810000 */ mtc1 $at, $f0 -/* C2F17C 802405DC 00621825 */ or $v1, $v1, $v0 -/* C2F180 802405E0 AE230000 */ sw $v1, ($s1) -/* C2F184 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C2F188 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C2F18C 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C2F190 802405F0 A2330007 */ sb $s3, 7($s1) -/* C2F194 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C2F198 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C2F19C 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C2F1A0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C2F1A4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C2F1A8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C2F1AC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C2F1B0 80240610 0000102D */ daddu $v0, $zero, $zero -/* C2F1B4 80240614 03E00008 */ jr $ra -/* C2F1B8 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s deleted file mode 100644 index e7100bfdfd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_80240000_C314E0.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C314E0 -/* C314E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C314E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C314E8 80240008 0080802D */ daddu $s0, $a0, $zero -/* C314EC 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* C314F0 80240010 8E02000C */ lw $v0, 0xc($s0) -/* C314F4 80240014 0C0B1EAF */ jal get_variable -/* C314F8 80240018 8C450000 */ lw $a1, ($v0) -/* C314FC 8024001C 0040302D */ daddu $a2, $v0, $zero -/* C31500 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) -/* C31504 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) -/* C31508 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* C3150C 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* C31510 80240030 10A60004 */ beq $a1, $a2, .L80240044 -/* C31514 80240034 24020014 */ addiu $v0, $zero, 0x14 -/* C31518 80240038 808300B4 */ lb $v1, 0xb4($a0) -/* C3151C 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* C31520 80240040 00000000 */ nop -.L80240044: -/* C31524 80240044 8C820014 */ lw $v0, 0x14($a0) -/* C31528 80240048 3C03FFFF */ lui $v1, 0xffff -/* C3152C 8024004C 00431024 */ and $v0, $v0, $v1 -/* C31530 80240050 10400005 */ beqz $v0, .L80240068 -/* C31534 80240054 00000000 */ nop -.L80240058: -/* C31538 80240058 0C039769 */ jal set_action_state -/* C3153C 8024005C 0000202D */ daddu $a0, $zero, $zero -/* C31540 80240060 0809002A */ j .L802400A8 -/* C31544 80240064 AE000084 */ sw $zero, 0x84($s0) -.L80240068: -/* C31548 80240068 54A6000F */ bnel $a1, $a2, .L802400A8 -/* C3154C 8024006C AE000084 */ sw $zero, 0x84($s0) -/* C31550 80240070 808300B4 */ lb $v1, 0xb4($a0) -/* C31554 80240074 24020014 */ addiu $v0, $zero, 0x14 -/* C31558 80240078 10620005 */ beq $v1, $v0, .L80240090 -/* C3155C 8024007C 24020001 */ addiu $v0, $zero, 1 -/* C31560 80240080 10620003 */ beq $v1, $v0, .L80240090 -/* C31564 80240084 24020002 */ addiu $v0, $zero, 2 -/* C31568 80240088 54620008 */ bnel $v1, $v0, .L802400AC -/* C3156C 8024008C AE000084 */ sw $zero, 0x84($s0) -.L80240090: -/* C31570 80240090 8C820004 */ lw $v0, 4($a0) -/* C31574 80240094 30420001 */ andi $v0, $v0, 1 -/* C31578 80240098 54400003 */ bnel $v0, $zero, .L802400A8 -/* C3157C 8024009C AE000084 */ sw $zero, 0x84($s0) -/* C31580 802400A0 24020001 */ addiu $v0, $zero, 1 -/* C31584 802400A4 AE020084 */ sw $v0, 0x84($s0) -.L802400A8: -/* C31588 802400A8 24020002 */ addiu $v0, $zero, 2 -.L802400AC: -/* C3158C 802400AC 8FBF0014 */ lw $ra, 0x14($sp) -/* C31590 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* C31594 802400B4 03E00008 */ jr $ra -/* C31598 802400B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s deleted file mode 100644 index 7ed26a7a1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802400BC_C3159C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_C3159C -/* C3159C 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C315A0 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* C315A4 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* C315A8 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* C315AC 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C315B0 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C315B4 802400D4 14400005 */ bnez $v0, .L802400EC -/* C315B8 802400D8 00000000 */ nop -/* C315BC 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* C315C0 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* C315C4 802400E4 0809003E */ j .L802400F8 -/* C315C8 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* C315CC 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* C315D0 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* C315D4 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* C315D8 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* C315DC 802400FC 0000202D */ daddu $a0, $zero, $zero -/* C315E0 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* C315E4 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* C315E8 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* C315EC 8024010C 3C014120 */ lui $at, 0x4120 -/* C315F0 80240110 44811000 */ mtc1 $at, $f2 -/* C315F4 80240114 3C014220 */ lui $at, 0x4220 -/* C315F8 80240118 44813000 */ mtc1 $at, $f6 -/* C315FC 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* C31600 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* C31604 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* C31608 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* C3160C 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* C31610 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* C31614 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* C31618 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C3161C 8024013C 0C0372DF */ jal func_800DCB7C -/* C31620 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* C31624 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C31628 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C3162C 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* C31630 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* C31634 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* C31638 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* C3163C 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* C31640 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* C31644 80240164 24020002 */ addiu $v0, $zero, 2 -/* C31648 80240168 03E00008 */ jr $ra -/* C3164C 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s deleted file mode 100644 index 97843d0470..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240458_C31938 -/* C31938 80240458 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3193C 8024045C AFBF0024 */ sw $ra, 0x24($sp) -/* C31940 80240460 AFB40020 */ sw $s4, 0x20($sp) -/* C31944 80240464 AFB3001C */ sw $s3, 0x1c($sp) -/* C31948 80240468 AFB20018 */ sw $s2, 0x18($sp) -/* C3194C 8024046C AFB10014 */ sw $s1, 0x14($sp) -/* C31950 80240470 AFB00010 */ sw $s0, 0x10($sp) -/* C31954 80240474 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C31958 80240478 8C900148 */ lw $s0, 0x148($a0) -/* C3195C 8024047C 86040008 */ lh $a0, 8($s0) -/* C31960 80240480 0C00EABB */ jal get_npc_unsafe -/* C31964 80240484 24110001 */ addiu $s1, $zero, 1 -/* C31968 80240488 86040008 */ lh $a0, 8($s0) -/* C3196C 8024048C 0040802D */ daddu $s0, $v0, $zero -/* C31970 80240490 3C05800B */ lui $a1, %hi(gCameras) -/* C31974 80240494 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C31978 80240498 3C03800A */ lui $v1, %hi(D_8009A634) -/* C3197C 8024049C 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C31980 802404A0 00912021 */ addu $a0, $a0, $s1 -/* C31984 802404A4 00031080 */ sll $v0, $v1, 2 -/* C31988 802404A8 00431021 */ addu $v0, $v0, $v1 -/* C3198C 802404AC 00021080 */ sll $v0, $v0, 2 -/* C31990 802404B0 00431023 */ subu $v0, $v0, $v1 -/* C31994 802404B4 000218C0 */ sll $v1, $v0, 3 -/* C31998 802404B8 00431021 */ addu $v0, $v0, $v1 -/* C3199C 802404BC 000210C0 */ sll $v0, $v0, 3 -/* C319A0 802404C0 0C00FB3A */ jal get_enemy -/* C319A4 802404C4 00459021 */ addu $s2, $v0, $a1 -/* C319A8 802404C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C319AC 802404CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C319B0 802404D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C319B4 802404D4 8E830000 */ lw $v1, ($s4) -/* C319B8 802404D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C319BC 802404DC 8C660028 */ lw $a2, 0x28($v1) -/* C319C0 802404E0 8C670030 */ lw $a3, 0x30($v1) -/* C319C4 802404E4 0C00A7B5 */ jal dist2D -/* C319C8 802404E8 0040982D */ daddu $s3, $v0, $zero -/* C319CC 802404EC C6620074 */ lwc1 $f2, 0x74($s3) -/* C319D0 802404F0 468010A0 */ cvt.s.w $f2, $f2 -/* C319D4 802404F4 4600103C */ c.lt.s $f2, $f0 -/* C319D8 802404F8 00000000 */ nop -/* C319DC 802404FC 45030001 */ bc1tl .L80240504 -/* C319E0 80240500 0000882D */ daddu $s1, $zero, $zero -.L80240504: -/* C319E4 80240504 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C319E8 80240508 C60E000C */ lwc1 $f14, 0xc($s0) -/* C319EC 8024050C 3C014387 */ lui $at, 0x4387 -/* C319F0 80240510 4481A000 */ mtc1 $at, $f20 -/* C319F4 80240514 0C00A70A */ jal get_clamped_angle_diff -/* C319F8 80240518 00000000 */ nop -/* C319FC 8024051C 0C00A6C9 */ jal clamp_angle -/* C31A00 80240520 46000306 */ mov.s $f12, $f0 -/* C31A04 80240524 3C018024 */ lui $at, %hi(D_802449F0_C35ED0) -/* C31A08 80240528 D42249F0 */ ldc1 $f2, %lo(D_802449F0_C35ED0)($at) -/* C31A0C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* C31A10 80240530 4622003C */ c.lt.d $f0, $f2 -/* C31A14 80240534 00000000 */ nop -/* C31A18 80240538 45000003 */ bc1f .L80240548 -/* C31A1C 8024053C 00000000 */ nop -/* C31A20 80240540 3C0142B4 */ lui $at, 0x42b4 -/* C31A24 80240544 4481A000 */ mtc1 $at, $f20 -.L80240548: -/* C31A28 80240548 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C31A2C 8024054C 8E820000 */ lw $v0, ($s4) -/* C31A30 80240550 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C31A34 80240554 8C460028 */ lw $a2, 0x28($v0) -/* C31A38 80240558 0C00A720 */ jal atan2 -/* C31A3C 8024055C 8C470030 */ lw $a3, 0x30($v0) -/* C31A40 80240560 4600A306 */ mov.s $f12, $f20 -/* C31A44 80240564 0C00A70A */ jal get_clamped_angle_diff -/* C31A48 80240568 46000386 */ mov.s $f14, $f0 -/* C31A4C 8024056C C6620078 */ lwc1 $f2, 0x78($s3) -/* C31A50 80240570 468010A0 */ cvt.s.w $f2, $f2 -/* C31A54 80240574 46000005 */ abs.s $f0, $f0 -/* C31A58 80240578 4600103C */ c.lt.s $f2, $f0 -/* C31A5C 8024057C 00000000 */ nop -/* C31A60 80240580 45030001 */ bc1tl .L80240588 -/* C31A64 80240584 0000882D */ daddu $s1, $zero, $zero -.L80240588: -/* C31A68 80240588 8E820000 */ lw $v0, ($s4) -/* C31A6C 8024058C C600003C */ lwc1 $f0, 0x3c($s0) -/* C31A70 80240590 C442002C */ lwc1 $f2, 0x2c($v0) -/* C31A74 80240594 860200A8 */ lh $v0, 0xa8($s0) -/* C31A78 80240598 46020001 */ sub.s $f0, $f0, $f2 -/* C31A7C 8024059C 44821000 */ mtc1 $v0, $f2 -/* C31A80 802405A0 00000000 */ nop -/* C31A84 802405A4 468010A1 */ cvt.d.w $f2, $f2 -/* C31A88 802405A8 46221080 */ add.d $f2, $f2, $f2 -/* C31A8C 802405AC 46000005 */ abs.s $f0, $f0 -/* C31A90 802405B0 46000021 */ cvt.d.s $f0, $f0 -/* C31A94 802405B4 4620103E */ c.le.d $f2, $f0 -/* C31A98 802405B8 00000000 */ nop -/* C31A9C 802405BC 45030001 */ bc1tl .L802405C4 -/* C31AA0 802405C0 0000882D */ daddu $s1, $zero, $zero -.L802405C4: -/* C31AA4 802405C4 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C31AA8 802405C8 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C31AAC 802405CC 24020009 */ addiu $v0, $zero, 9 -/* C31AB0 802405D0 50620001 */ beql $v1, $v0, .L802405D8 -/* C31AB4 802405D4 0000882D */ daddu $s1, $zero, $zero -.L802405D8: -/* C31AB8 802405D8 24020007 */ addiu $v0, $zero, 7 -/* C31ABC 802405DC 50620001 */ beql $v1, $v0, .L802405E4 -/* C31AC0 802405E0 0000882D */ daddu $s1, $zero, $zero -.L802405E4: -/* C31AC4 802405E4 0220102D */ daddu $v0, $s1, $zero -/* C31AC8 802405E8 8FBF0024 */ lw $ra, 0x24($sp) -/* C31ACC 802405EC 8FB40020 */ lw $s4, 0x20($sp) -/* C31AD0 802405F0 8FB3001C */ lw $s3, 0x1c($sp) -/* C31AD4 802405F4 8FB20018 */ lw $s2, 0x18($sp) -/* C31AD8 802405F8 8FB10014 */ lw $s1, 0x14($sp) -/* C31ADC 802405FC 8FB00010 */ lw $s0, 0x10($sp) -/* C31AE0 80240600 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C31AE4 80240604 03E00008 */ jr $ra -/* C31AE8 80240608 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s deleted file mode 100644 index f2e2472c28..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024060C_C31AEC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_C31AEC -/* C31AEC 8024060C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C31AF0 80240610 AFB40028 */ sw $s4, 0x28($sp) -/* C31AF4 80240614 0080A02D */ daddu $s4, $a0, $zero -/* C31AF8 80240618 AFBF002C */ sw $ra, 0x2c($sp) -/* C31AFC 8024061C AFB30024 */ sw $s3, 0x24($sp) -/* C31B00 80240620 AFB20020 */ sw $s2, 0x20($sp) -/* C31B04 80240624 AFB1001C */ sw $s1, 0x1c($sp) -/* C31B08 80240628 AFB00018 */ sw $s0, 0x18($sp) -/* C31B0C 8024062C 8E910148 */ lw $s1, 0x148($s4) -/* C31B10 80240630 86240008 */ lh $a0, 8($s1) -/* C31B14 80240634 0C00EABB */ jal get_npc_unsafe -/* C31B18 80240638 00A0802D */ daddu $s0, $a1, $zero -/* C31B1C 8024063C 16000005 */ bnez $s0, .L80240654 -/* C31B20 80240640 0040902D */ daddu $s2, $v0, $zero -/* C31B24 80240644 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31B28 80240648 30420004 */ andi $v0, $v0, 4 -/* C31B2C 8024064C 10400015 */ beqz $v0, .L802406A4 -/* C31B30 80240650 00000000 */ nop -.L80240654: -/* C31B34 80240654 AE800070 */ sw $zero, 0x70($s4) -/* C31B38 80240658 8E420000 */ lw $v0, ($s2) -/* C31B3C 8024065C 3C031F30 */ lui $v1, 0x1f30 -/* C31B40 80240660 A640008E */ sh $zero, 0x8e($s2) -/* C31B44 80240664 34420102 */ ori $v0, $v0, 0x102 -/* C31B48 80240668 AE420000 */ sw $v0, ($s2) -/* C31B4C 8024066C 8E220000 */ lw $v0, ($s1) -/* C31B50 80240670 3C01C47A */ lui $at, 0xc47a -/* C31B54 80240674 44810000 */ mtc1 $at, $f0 -/* C31B58 80240678 00431025 */ or $v0, $v0, $v1 -/* C31B5C 8024067C AE220000 */ sw $v0, ($s1) -/* C31B60 80240680 AE400038 */ sw $zero, 0x38($s2) -/* C31B64 80240684 E640003C */ swc1 $f0, 0x3c($s2) -/* C31B68 80240688 AE400040 */ sw $zero, 0x40($s2) -/* C31B6C 8024068C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C31B70 80240690 30620004 */ andi $v0, $v1, 4 -/* C31B74 80240694 10400003 */ beqz $v0, .L802406A4 -/* C31B78 80240698 2402FFFB */ addiu $v0, $zero, -5 -/* C31B7C 8024069C 00621024 */ and $v0, $v1, $v0 -/* C31B80 802406A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802406A4: -/* C31B84 802406A4 8E930070 */ lw $s3, 0x70($s4) -/* C31B88 802406A8 12600005 */ beqz $s3, .L802406C0 -/* C31B8C 802406AC 24020001 */ addiu $v0, $zero, 1 -/* C31B90 802406B0 12620048 */ beq $s3, $v0, .L802407D4 -/* C31B94 802406B4 00000000 */ nop -/* C31B98 802406B8 08090212 */ j .L80240848 -/* C31B9C 802406BC 00000000 */ nop -.L802406C0: -/* C31BA0 802406C0 86240008 */ lh $a0, 8($s1) -/* C31BA4 802406C4 0C00FB3A */ jal get_enemy -/* C31BA8 802406C8 2484FFFF */ addiu $a0, $a0, -1 -/* C31BAC 802406CC 0040802D */ daddu $s0, $v0, $zero -/* C31BB0 802406D0 0C00EABB */ jal get_npc_unsafe -/* C31BB4 802406D4 86040008 */ lh $a0, 8($s0) -/* C31BB8 802406D8 24030001 */ addiu $v1, $zero, 1 -/* C31BBC 802406DC 0040982D */ daddu $s3, $v0, $zero -/* C31BC0 802406E0 A2230007 */ sb $v1, 7($s1) -/* C31BC4 802406E4 8E03006C */ lw $v1, 0x6c($s0) -/* C31BC8 802406E8 24020003 */ addiu $v0, $zero, 3 -/* C31BCC 802406EC 14620056 */ bne $v1, $v0, .L80240848 -/* C31BD0 802406F0 00000000 */ nop -/* C31BD4 802406F4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C31BD8 802406F8 10A00003 */ beqz $a1, .L80240708 -/* C31BDC 802406FC 0260202D */ daddu $a0, $s3, $zero -/* C31BE0 80240700 0C012530 */ jal func_800494C0 -/* C31BE4 80240704 0000302D */ daddu $a2, $zero, $zero -.L80240708: -/* C31BE8 80240708 27A40010 */ addiu $a0, $sp, 0x10 -/* C31BEC 8024070C C6280070 */ lwc1 $f8, 0x70($s1) -/* C31BF0 80240710 46804220 */ cvt.s.w $f8, $f8 -/* C31BF4 80240714 C6620034 */ lwc1 $f2, 0x34($s3) -/* C31BF8 80240718 3C014387 */ lui $at, 0x4387 -/* C31BFC 8024071C 44810000 */ mtc1 $at, $f0 -/* C31C00 80240720 44064000 */ mfc1 $a2, $f8 -/* C31C04 80240724 46020001 */ sub.s $f0, $f0, $f2 -/* C31C08 80240728 C6660038 */ lwc1 $f6, 0x38($s3) -/* C31C0C 8024072C C6640040 */ lwc1 $f4, 0x40($s3) -/* C31C10 80240730 44070000 */ mfc1 $a3, $f0 -/* C31C14 80240734 27A50014 */ addiu $a1, $sp, 0x14 -/* C31C18 80240738 E7A60010 */ swc1 $f6, 0x10($sp) -/* C31C1C 8024073C 0C00A7E7 */ jal add_vec2D_polar -/* C31C20 80240740 E7A40014 */ swc1 $f4, 0x14($sp) -/* C31C24 80240744 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C31C28 80240748 4600020D */ trunc.w.s $f8, $f0 -/* C31C2C 8024074C 44024000 */ mfc1 $v0, $f8 -/* C31C30 80240750 E6400038 */ swc1 $f0, 0x38($s2) -/* C31C34 80240754 A6220010 */ sh $v0, 0x10($s1) -/* C31C38 80240758 C660003C */ lwc1 $f0, 0x3c($s3) -/* C31C3C 8024075C C622006C */ lwc1 $f2, 0x6c($s1) -/* C31C40 80240760 468010A0 */ cvt.s.w $f2, $f2 -/* C31C44 80240764 46020000 */ add.s $f0, $f0, $f2 -/* C31C48 80240768 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C31C4C 8024076C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C31C50 80240770 E640003C */ swc1 $f0, 0x3c($s2) -/* C31C54 80240774 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C31C58 80240778 4600020D */ trunc.w.s $f8, $f0 -/* C31C5C 8024077C 44024000 */ mfc1 $v0, $f8 -/* C31C60 80240780 00000000 */ nop -/* C31C64 80240784 A6220012 */ sh $v0, 0x12($s1) -/* C31C68 80240788 4600120D */ trunc.w.s $f8, $f2 -/* C31C6C 8024078C 44024000 */ mfc1 $v0, $f8 -/* C31C70 80240790 E6420040 */ swc1 $f2, 0x40($s2) -/* C31C74 80240794 A6220014 */ sh $v0, 0x14($s1) -/* C31C78 80240798 8C660028 */ lw $a2, 0x28($v1) -/* C31C7C 8024079C 8C670030 */ lw $a3, 0x30($v1) -/* C31C80 802407A0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C31C84 802407A4 0C00A720 */ jal atan2 -/* C31C88 802407A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C31C8C 802407AC 3C03E0EF */ lui $v1, 0xe0ef -/* C31C90 802407B0 E640000C */ swc1 $f0, 0xc($s2) -/* C31C94 802407B4 8E220000 */ lw $v0, ($s1) -/* C31C98 802407B8 3463FFFF */ ori $v1, $v1, 0xffff -/* C31C9C 802407BC 00431024 */ and $v0, $v0, $v1 -/* C31CA0 802407C0 AE220000 */ sw $v0, ($s1) -/* C31CA4 802407C4 24020001 */ addiu $v0, $zero, 1 -/* C31CA8 802407C8 A640008E */ sh $zero, 0x8e($s2) -/* C31CAC 802407CC 08090212 */ j .L80240848 -/* C31CB0 802407D0 AE820070 */ sw $v0, 0x70($s4) -.L802407D4: -/* C31CB4 802407D4 86240008 */ lh $a0, 8($s1) -/* C31CB8 802407D8 0C00FB3A */ jal get_enemy -/* C31CBC 802407DC 2484FFFF */ addiu $a0, $a0, -1 -/* C31CC0 802407E0 0040802D */ daddu $s0, $v0, $zero -/* C31CC4 802407E4 0C00EABB */ jal get_npc_unsafe -/* C31CC8 802407E8 86040008 */ lh $a0, 8($s0) -/* C31CCC 802407EC 9642008E */ lhu $v0, 0x8e($s2) -/* C31CD0 802407F0 24420001 */ addiu $v0, $v0, 1 -/* C31CD4 802407F4 A642008E */ sh $v0, 0x8e($s2) -/* C31CD8 802407F8 00021400 */ sll $v0, $v0, 0x10 -/* C31CDC 802407FC 8E23007C */ lw $v1, 0x7c($s1) -/* C31CE0 80240800 00021403 */ sra $v0, $v0, 0x10 -/* C31CE4 80240804 0043102A */ slt $v0, $v0, $v1 -/* C31CE8 80240808 50400001 */ beql $v0, $zero, .L80240810 -/* C31CEC 8024080C A2200007 */ sb $zero, 7($s1) -.L80240810: -/* C31CF0 80240810 8E03006C */ lw $v1, 0x6c($s0) -/* C31CF4 80240814 24020004 */ addiu $v0, $zero, 4 -/* C31CF8 80240818 1462000B */ bne $v1, $v0, .L80240848 -/* C31CFC 8024081C 3C021F10 */ lui $v0, 0x1f10 -/* C31D00 80240820 8E230000 */ lw $v1, ($s1) -/* C31D04 80240824 3C01C47A */ lui $at, 0xc47a -/* C31D08 80240828 44810000 */ mtc1 $at, $f0 -/* C31D0C 8024082C 00621825 */ or $v1, $v1, $v0 -/* C31D10 80240830 AE230000 */ sw $v1, ($s1) -/* C31D14 80240834 AE400038 */ sw $zero, 0x38($s2) -/* C31D18 80240838 E640003C */ swc1 $f0, 0x3c($s2) -/* C31D1C 8024083C AE400040 */ sw $zero, 0x40($s2) -/* C31D20 80240840 A2330007 */ sb $s3, 7($s1) -/* C31D24 80240844 AE800070 */ sw $zero, 0x70($s4) -.L80240848: -/* C31D28 80240848 8FBF002C */ lw $ra, 0x2c($sp) -/* C31D2C 8024084C 8FB40028 */ lw $s4, 0x28($sp) -/* C31D30 80240850 8FB30024 */ lw $s3, 0x24($sp) -/* C31D34 80240854 8FB20020 */ lw $s2, 0x20($sp) -/* C31D38 80240858 8FB1001C */ lw $s1, 0x1c($sp) -/* C31D3C 8024085C 8FB00018 */ lw $s0, 0x18($sp) -/* C31D40 80240860 0000102D */ daddu $v0, $zero, $zero -/* C31D44 80240864 03E00008 */ jr $ra -/* C31D48 80240868 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s deleted file mode 100644 index e33a36dd73..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ /dev/null @@ -1,198 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C_C31D4C -/* C31D4C 8024086C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C31D50 80240870 AFB20038 */ sw $s2, 0x38($sp) -/* C31D54 80240874 0080902D */ daddu $s2, $a0, $zero -/* C31D58 80240878 AFBF0048 */ sw $ra, 0x48($sp) -/* C31D5C 8024087C AFB50044 */ sw $s5, 0x44($sp) -/* C31D60 80240880 AFB40040 */ sw $s4, 0x40($sp) -/* C31D64 80240884 AFB3003C */ sw $s3, 0x3c($sp) -/* C31D68 80240888 AFB10034 */ sw $s1, 0x34($sp) -/* C31D6C 8024088C AFB00030 */ sw $s0, 0x30($sp) -/* C31D70 80240890 8E510148 */ lw $s1, 0x148($s2) -/* C31D74 80240894 86240008 */ lh $a0, 8($s1) -/* C31D78 80240898 0C00EABB */ jal get_npc_unsafe -/* C31D7C 8024089C 00A0802D */ daddu $s0, $a1, $zero -/* C31D80 802408A0 8E43000C */ lw $v1, 0xc($s2) -/* C31D84 802408A4 0240202D */ daddu $a0, $s2, $zero -/* C31D88 802408A8 8C650000 */ lw $a1, ($v1) -/* C31D8C 802408AC 0C0B1EAF */ jal get_variable -/* C31D90 802408B0 0040A82D */ daddu $s5, $v0, $zero -/* C31D94 802408B4 AFA00010 */ sw $zero, 0x10($sp) -/* C31D98 802408B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31D9C 802408BC 8C630030 */ lw $v1, 0x30($v1) -/* C31DA0 802408C0 AFA30014 */ sw $v1, 0x14($sp) -/* C31DA4 802408C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DA8 802408C8 8C63001C */ lw $v1, 0x1c($v1) -/* C31DAC 802408CC AFA30018 */ sw $v1, 0x18($sp) -/* C31DB0 802408D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DB4 802408D4 8C630024 */ lw $v1, 0x24($v1) -/* C31DB8 802408D8 AFA3001C */ sw $v1, 0x1c($sp) -/* C31DBC 802408DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DC0 802408E0 8C630028 */ lw $v1, 0x28($v1) -/* C31DC4 802408E4 27B40010 */ addiu $s4, $sp, 0x10 -/* C31DC8 802408E8 AFA30020 */ sw $v1, 0x20($sp) -/* C31DCC 802408EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C31DD0 802408F0 3C014282 */ lui $at, 0x4282 -/* C31DD4 802408F4 44810000 */ mtc1 $at, $f0 -/* C31DD8 802408F8 8C63002C */ lw $v1, 0x2c($v1) -/* C31DDC 802408FC 0040982D */ daddu $s3, $v0, $zero -/* C31DE0 80240900 E7A00028 */ swc1 $f0, 0x28($sp) -/* C31DE4 80240904 A7A0002C */ sh $zero, 0x2c($sp) -/* C31DE8 80240908 16000005 */ bnez $s0, .L80240920 -/* C31DEC 8024090C AFA30024 */ sw $v1, 0x24($sp) -/* C31DF0 80240910 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31DF4 80240914 30420004 */ andi $v0, $v0, 4 -/* C31DF8 80240918 10400020 */ beqz $v0, .L8024099C -/* C31DFC 8024091C 00000000 */ nop -.L80240920: -/* C31E00 80240920 2404F7FF */ addiu $a0, $zero, -0x801 -/* C31E04 80240924 AE400070 */ sw $zero, 0x70($s2) -/* C31E08 80240928 A6A0008E */ sh $zero, 0x8e($s5) -/* C31E0C 8024092C 8E2200CC */ lw $v0, 0xcc($s1) -/* C31E10 80240930 8EA30000 */ lw $v1, ($s5) -/* C31E14 80240934 8C420000 */ lw $v0, ($v0) -/* C31E18 80240938 00641824 */ and $v1, $v1, $a0 -/* C31E1C 8024093C AEA30000 */ sw $v1, ($s5) -/* C31E20 80240940 AEA20028 */ sw $v0, 0x28($s5) -/* C31E24 80240944 8E2200D0 */ lw $v0, 0xd0($s1) -/* C31E28 80240948 8C420034 */ lw $v0, 0x34($v0) -/* C31E2C 8024094C 54400005 */ bnel $v0, $zero, .L80240964 -/* C31E30 80240950 2402FDFF */ addiu $v0, $zero, -0x201 -/* C31E34 80240954 34620200 */ ori $v0, $v1, 0x200 -/* C31E38 80240958 2403FFF7 */ addiu $v1, $zero, -9 -/* C31E3C 8024095C 0809025B */ j .L8024096C -/* C31E40 80240960 00431024 */ and $v0, $v0, $v1 -.L80240964: -/* C31E44 80240964 00621024 */ and $v0, $v1, $v0 -/* C31E48 80240968 34420008 */ ori $v0, $v0, 8 -.L8024096C: -/* C31E4C 8024096C AEA20000 */ sw $v0, ($s5) -/* C31E50 80240970 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31E54 80240974 30420004 */ andi $v0, $v0, 4 -/* C31E58 80240978 10400007 */ beqz $v0, .L80240998 -/* C31E5C 8024097C 24020063 */ addiu $v0, $zero, 0x63 -/* C31E60 80240980 AE420070 */ sw $v0, 0x70($s2) -/* C31E64 80240984 AE400074 */ sw $zero, 0x74($s2) -/* C31E68 80240988 8E2200B0 */ lw $v0, 0xb0($s1) -/* C31E6C 8024098C 2403FFFB */ addiu $v1, $zero, -5 -/* C31E70 80240990 00431024 */ and $v0, $v0, $v1 -/* C31E74 80240994 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240998: -/* C31E78 80240998 AE20006C */ sw $zero, 0x6c($s1) -.L8024099C: -/* C31E7C 8024099C 8E420070 */ lw $v0, 0x70($s2) -/* C31E80 802409A0 2842001E */ slti $v0, $v0, 0x1e -/* C31E84 802409A4 10400009 */ beqz $v0, .L802409CC -/* C31E88 802409A8 00000000 */ nop -/* C31E8C 802409AC 8E22006C */ lw $v0, 0x6c($s1) -/* C31E90 802409B0 14400006 */ bnez $v0, .L802409CC -/* C31E94 802409B4 00000000 */ nop -/* C31E98 802409B8 0C090116 */ jal func_80240458_C31938 -/* C31E9C 802409BC 0240202D */ daddu $a0, $s2, $zero -/* C31EA0 802409C0 10400002 */ beqz $v0, .L802409CC -/* C31EA4 802409C4 2402001E */ addiu $v0, $zero, 0x1e -/* C31EA8 802409C8 AE420070 */ sw $v0, 0x70($s2) -.L802409CC: -/* C31EAC 802409CC 8E430070 */ lw $v1, 0x70($s2) -/* C31EB0 802409D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* C31EB4 802409D4 10400048 */ beqz $v0, L80240AF8_C31FD8 -/* C31EB8 802409D8 00031080 */ sll $v0, $v1, 2 -/* C31EBC 802409DC 3C018024 */ lui $at, %hi(jtbl_802449F8_C35ED8) -/* C31EC0 802409E0 00220821 */ addu $at, $at, $v0 -/* C31EC4 802409E4 8C2249F8 */ lw $v0, %lo(jtbl_802449F8_C35ED8)($at) -/* C31EC8 802409E8 00400008 */ jr $v0 -/* C31ECC 802409EC 00000000 */ nop -glabel L802409F0_C31ED0 -/* C31ED0 802409F0 0240202D */ daddu $a0, $s2, $zero -/* C31ED4 802409F4 0260282D */ daddu $a1, $s3, $zero -/* C31ED8 802409F8 0C012568 */ jal func_800495A0 -/* C31EDC 802409FC 0280302D */ daddu $a2, $s4, $zero -glabel L80240A00_C31EE0 -/* C31EE0 80240A00 0240202D */ daddu $a0, $s2, $zero -/* C31EE4 80240A04 0260282D */ daddu $a1, $s3, $zero -/* C31EE8 80240A08 0C0125AE */ jal func_800496B8 -/* C31EEC 80240A0C 0280302D */ daddu $a2, $s4, $zero -/* C31EF0 80240A10 080902BE */ j L80240AF8_C31FD8 -/* C31EF4 80240A14 00000000 */ nop -glabel L80240A18_C31EF8 -/* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero -/* C31EFC 80240A1C 0260282D */ daddu $a1, $s3, $zero -/* C31F00 80240A20 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C31F04 80240A24 0280302D */ daddu $a2, $s4, $zero -glabel L80240A28_C31F08 -/* C31F08 80240A28 0240202D */ daddu $a0, $s2, $zero -/* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero -/* C31F10 80240A30 0C012701 */ jal func_80049C04 -/* C31F14 80240A34 0280302D */ daddu $a2, $s4, $zero -/* C31F18 80240A38 080902BE */ j L80240AF8_C31FD8 -/* C31F1C 80240A3C 00000000 */ nop -glabel L80240A40_C31F20 -/* C31F20 80240A40 0240202D */ daddu $a0, $s2, $zero -/* C31F24 80240A44 0260282D */ daddu $a1, $s3, $zero -/* C31F28 80240A48 0C01278F */ jal func_80049E3C -/* C31F2C 80240A4C 0280302D */ daddu $a2, $s4, $zero -glabel L80240A50_C31F30 -/* C31F30 80240A50 0240202D */ daddu $a0, $s2, $zero -/* C31F34 80240A54 0260282D */ daddu $a1, $s3, $zero -/* C31F38 80240A58 0C0127B3 */ jal func_80049ECC -/* C31F3C 80240A5C 0280302D */ daddu $a2, $s4, $zero -/* C31F40 80240A60 080902BE */ j L80240AF8_C31FD8 -/* C31F44 80240A64 00000000 */ nop -glabel L80240A68_C31F48 -/* C31F48 80240A68 0240202D */ daddu $a0, $s2, $zero -/* C31F4C 80240A6C 0260282D */ daddu $a1, $s3, $zero -/* C31F50 80240A70 0C0127DF */ jal func_80049F7C -/* C31F54 80240A74 0280302D */ daddu $a2, $s4, $zero -glabel L80240A78_C31F58 -/* C31F58 80240A78 0240202D */ daddu $a0, $s2, $zero -/* C31F5C 80240A7C 0260282D */ daddu $a1, $s3, $zero -/* C31F60 80240A80 0C012849 */ jal func_8004A124 -/* C31F64 80240A84 0280302D */ daddu $a2, $s4, $zero -/* C31F68 80240A88 080902BE */ j L80240AF8_C31FD8 -/* C31F6C 80240A8C 00000000 */ nop -glabel L80240A90_C31F70 -/* C31F70 80240A90 0240202D */ daddu $a0, $s2, $zero -/* C31F74 80240A94 0260282D */ daddu $a1, $s3, $zero -/* C31F78 80240A98 0C0128FA */ jal func_8004A3E8 -/* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero -/* C31F80 80240AA0 080902BE */ j L80240AF8_C31FD8 -/* C31F84 80240AA4 00000000 */ nop -glabel L80240AA8_C31F88 -/* C31F88 80240AA8 0C090094 */ jal dgb_03_UnkNpcAIFunc6 -/* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero -glabel L80240AB0_C31F90 -/* C31F90 80240AB0 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 -/* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero -/* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) -/* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 -/* C31FA0 80240AC0 1462000D */ bne $v1, $v0, L80240AF8_C31FD8 -/* C31FA4 80240AC4 00000000 */ nop -glabel L80240AC8_C31FA8 -/* C31FA8 80240AC8 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 -/* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero -/* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) -/* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 -/* C31FB8 80240AD8 14620007 */ bne $v1, $v0, L80240AF8_C31FD8 -/* C31FBC 80240ADC 00000000 */ nop -glabel L80240AE0_C31FC0 -/* C31FC0 80240AE0 0C090101 */ jal dgb_03_UnkNpcAIFunc5 -/* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero -/* C31FC8 80240AE8 080902BE */ j L80240AF8_C31FD8 -/* C31FCC 80240AEC 00000000 */ nop -glabel L80240AF0_C31FD0 -/* C31FD0 80240AF0 0C0129CF */ jal func_8004A73C -/* C31FD4 80240AF4 0240202D */ daddu $a0, $s2, $zero -glabel L80240AF8_C31FD8 -/* C31FD8 80240AF8 8FBF0048 */ lw $ra, 0x48($sp) -/* C31FDC 80240AFC 8FB50044 */ lw $s5, 0x44($sp) -/* C31FE0 80240B00 8FB40040 */ lw $s4, 0x40($sp) -/* C31FE4 80240B04 8FB3003C */ lw $s3, 0x3c($sp) -/* C31FE8 80240B08 8FB20038 */ lw $s2, 0x38($sp) -/* C31FEC 80240B0C 8FB10034 */ lw $s1, 0x34($sp) -/* C31FF0 80240B10 8FB00030 */ lw $s0, 0x30($sp) -/* C31FF4 80240B14 0000102D */ daddu $v0, $zero, $zero -/* C31FF8 80240B18 03E00008 */ jr $ra -/* C31FFC 80240B1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s deleted file mode 100644 index cede9bab3b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20_C32000 -/* C32000 80240B20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C32004 80240B24 AFB50024 */ sw $s5, 0x24($sp) -/* C32008 80240B28 0080A82D */ daddu $s5, $a0, $zero -/* C3200C 80240B2C AFBF002C */ sw $ra, 0x2c($sp) -/* C32010 80240B30 AFB60028 */ sw $s6, 0x28($sp) -/* C32014 80240B34 AFB40020 */ sw $s4, 0x20($sp) -/* C32018 80240B38 AFB3001C */ sw $s3, 0x1c($sp) -/* C3201C 80240B3C AFB20018 */ sw $s2, 0x18($sp) -/* C32020 80240B40 AFB10014 */ sw $s1, 0x14($sp) -/* C32024 80240B44 AFB00010 */ sw $s0, 0x10($sp) -/* C32028 80240B48 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C3202C 80240B4C F7B60038 */ sdc1 $f22, 0x38($sp) -/* C32030 80240B50 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C32034 80240B54 8EB30148 */ lw $s3, 0x148($s5) -/* C32038 80240B58 86640008 */ lh $a0, 8($s3) -/* C3203C 80240B5C 0C00EABB */ jal get_npc_unsafe -/* C32040 80240B60 00A0B02D */ daddu $s6, $a1, $zero -/* C32044 80240B64 0040A02D */ daddu $s4, $v0, $zero -/* C32048 80240B68 AEA00074 */ sw $zero, 0x74($s5) -/* C3204C 80240B6C C6980038 */ lwc1 $f24, 0x38($s4) -/* C32050 80240B70 C6960040 */ lwc1 $f22, 0x40($s4) -/* C32054 80240B74 0000902D */ daddu $s2, $zero, $zero -/* C32058 80240B78 AEA00078 */ sw $zero, 0x78($s5) -/* C3205C 80240B7C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C32060 80240B80 8C620000 */ lw $v0, ($v1) -/* C32064 80240B84 3C0146FF */ lui $at, 0x46ff -/* C32068 80240B88 3421FE00 */ ori $at, $at, 0xfe00 -/* C3206C 80240B8C 4481A000 */ mtc1 $at, $f20 -/* C32070 80240B90 18400018 */ blez $v0, .L80240BF4 -/* C32074 80240B94 0240802D */ daddu $s0, $s2, $zero -/* C32078 80240B98 0240882D */ daddu $s1, $s2, $zero -.L80240B9C: -/* C3207C 80240B9C 02231021 */ addu $v0, $s1, $v1 -/* C32080 80240BA0 4600C306 */ mov.s $f12, $f24 -/* C32084 80240BA4 C4440004 */ lwc1 $f4, 4($v0) -/* C32088 80240BA8 46802120 */ cvt.s.w $f4, $f4 -/* C3208C 80240BAC 44062000 */ mfc1 $a2, $f4 -/* C32090 80240BB0 C444000C */ lwc1 $f4, 0xc($v0) -/* C32094 80240BB4 46802120 */ cvt.s.w $f4, $f4 -/* C32098 80240BB8 44072000 */ mfc1 $a3, $f4 -/* C3209C 80240BBC 0C00A7B5 */ jal dist2D -/* C320A0 80240BC0 4600B386 */ mov.s $f14, $f22 -/* C320A4 80240BC4 4614003C */ c.lt.s $f0, $f20 -/* C320A8 80240BC8 00000000 */ nop -/* C320AC 80240BCC 45000003 */ bc1f .L80240BDC -/* C320B0 80240BD0 2631000C */ addiu $s1, $s1, 0xc -/* C320B4 80240BD4 46000506 */ mov.s $f20, $f0 -/* C320B8 80240BD8 AEB20078 */ sw $s2, 0x78($s5) -.L80240BDC: -/* C320BC 80240BDC 8E6300D0 */ lw $v1, 0xd0($s3) -/* C320C0 80240BE0 26100001 */ addiu $s0, $s0, 1 -/* C320C4 80240BE4 8C620000 */ lw $v0, ($v1) -/* C320C8 80240BE8 0202102A */ slt $v0, $s0, $v0 -/* C320CC 80240BEC 1440FFEB */ bnez $v0, .L80240B9C -/* C320D0 80240BF0 26520001 */ addiu $s2, $s2, 1 -.L80240BF4: -/* C320D4 80240BF4 8E6200CC */ lw $v0, 0xcc($s3) -/* C320D8 80240BF8 8C420004 */ lw $v0, 4($v0) -/* C320DC 80240BFC AE820028 */ sw $v0, 0x28($s4) -/* C320E0 80240C00 8E6200D0 */ lw $v0, 0xd0($s3) -/* C320E4 80240C04 8C42007C */ lw $v0, 0x7c($v0) -/* C320E8 80240C08 04410004 */ bgez $v0, .L80240C1C -/* C320EC 80240C0C 00000000 */ nop -/* C320F0 80240C10 C6C00000 */ lwc1 $f0, ($s6) -/* C320F4 80240C14 0809030F */ j .L80240C3C -/* C320F8 80240C18 E6800018 */ swc1 $f0, 0x18($s4) -.L80240C1C: -/* C320FC 80240C1C 3C018024 */ lui $at, %hi(D_80244B88_C36068) -/* C32100 80240C20 D4224B88 */ ldc1 $f2, %lo(D_80244B88_C36068)($at) -/* C32104 80240C24 44820000 */ mtc1 $v0, $f0 -/* C32108 80240C28 00000000 */ nop -/* C3210C 80240C2C 46800021 */ cvt.d.w $f0, $f0 -/* C32110 80240C30 46220003 */ div.d $f0, $f0, $f2 -/* C32114 80240C34 46200020 */ cvt.s.d $f0, $f0 -/* C32118 80240C38 E6800018 */ swc1 $f0, 0x18($s4) -.L80240C3C: -/* C3211C 80240C3C 24020001 */ addiu $v0, $zero, 1 -/* C32120 80240C40 AEA20070 */ sw $v0, 0x70($s5) -/* C32124 80240C44 8FBF002C */ lw $ra, 0x2c($sp) -/* C32128 80240C48 8FB60028 */ lw $s6, 0x28($sp) -/* C3212C 80240C4C 8FB50024 */ lw $s5, 0x24($sp) -/* C32130 80240C50 8FB40020 */ lw $s4, 0x20($sp) -/* C32134 80240C54 8FB3001C */ lw $s3, 0x1c($sp) -/* C32138 80240C58 8FB20018 */ lw $s2, 0x18($sp) -/* C3213C 80240C5C 8FB10014 */ lw $s1, 0x14($sp) -/* C32140 80240C60 8FB00010 */ lw $s0, 0x10($sp) -/* C32144 80240C64 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C32148 80240C68 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C3214C 80240C6C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C32150 80240C70 03E00008 */ jr $ra -/* C32154 80240C74 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s deleted file mode 100644 index 05eae73459..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240C78_C32158.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78_C32158 -/* C32158 80240C78 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C3215C 80240C7C AFB20038 */ sw $s2, 0x38($sp) -/* C32160 80240C80 0080902D */ daddu $s2, $a0, $zero -/* C32164 80240C84 AFBF0044 */ sw $ra, 0x44($sp) -/* C32168 80240C88 AFB40040 */ sw $s4, 0x40($sp) -/* C3216C 80240C8C AFB3003C */ sw $s3, 0x3c($sp) -/* C32170 80240C90 AFB10034 */ sw $s1, 0x34($sp) -/* C32174 80240C94 AFB00030 */ sw $s0, 0x30($sp) -/* C32178 80240C98 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C3217C 80240C9C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C32180 80240CA0 8E510148 */ lw $s1, 0x148($s2) -/* C32184 80240CA4 00A0982D */ daddu $s3, $a1, $zero -/* C32188 80240CA8 86240008 */ lh $a0, 8($s1) -/* C3218C 80240CAC 0C00EABB */ jal get_npc_unsafe -/* C32190 80240CB0 00C0A02D */ daddu $s4, $a2, $zero -/* C32194 80240CB4 8E630014 */ lw $v1, 0x14($s3) -/* C32198 80240CB8 04600030 */ bltz $v1, .L80240D7C -/* C3219C 80240CBC 0040802D */ daddu $s0, $v0, $zero -/* C321A0 80240CC0 8E420074 */ lw $v0, 0x74($s2) -/* C321A4 80240CC4 1C40002C */ bgtz $v0, .L80240D78 -/* C321A8 80240CC8 2442FFFF */ addiu $v0, $v0, -1 -/* C321AC 80240CCC 0280202D */ daddu $a0, $s4, $zero -/* C321B0 80240CD0 AE430074 */ sw $v1, 0x74($s2) -/* C321B4 80240CD4 AFA00010 */ sw $zero, 0x10($sp) -/* C321B8 80240CD8 8E66000C */ lw $a2, 0xc($s3) -/* C321BC 80240CDC 8E670010 */ lw $a3, 0x10($s3) -/* C321C0 80240CE0 0C01242D */ jal func_800490B4 -/* C321C4 80240CE4 0220282D */ daddu $a1, $s1, $zero -/* C321C8 80240CE8 10400021 */ beqz $v0, .L80240D70 -/* C321CC 80240CEC 0000202D */ daddu $a0, $zero, $zero -/* C321D0 80240CF0 0200282D */ daddu $a1, $s0, $zero -/* C321D4 80240CF4 0000302D */ daddu $a2, $zero, $zero -/* C321D8 80240CF8 860300A8 */ lh $v1, 0xa8($s0) -/* C321DC 80240CFC 3C013F80 */ lui $at, 0x3f80 -/* C321E0 80240D00 44810000 */ mtc1 $at, $f0 -/* C321E4 80240D04 3C014000 */ lui $at, 0x4000 -/* C321E8 80240D08 44811000 */ mtc1 $at, $f2 -/* C321EC 80240D0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C321F0 80240D10 44812000 */ mtc1 $at, $f4 -/* C321F4 80240D14 2402000F */ addiu $v0, $zero, 0xf -/* C321F8 80240D18 AFA2001C */ sw $v0, 0x1c($sp) -/* C321FC 80240D1C 44833000 */ mtc1 $v1, $f6 -/* C32200 80240D20 00000000 */ nop -/* C32204 80240D24 468031A0 */ cvt.s.w $f6, $f6 -/* C32208 80240D28 44073000 */ mfc1 $a3, $f6 -/* C3220C 80240D2C 27A20028 */ addiu $v0, $sp, 0x28 -/* C32210 80240D30 AFA20020 */ sw $v0, 0x20($sp) -/* C32214 80240D34 E7A00010 */ swc1 $f0, 0x10($sp) -/* C32218 80240D38 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3221C 80240D3C 0C01BFA4 */ jal fx_emote -/* C32220 80240D40 E7A40018 */ swc1 $f4, 0x18($sp) -/* C32224 80240D44 0200202D */ daddu $a0, $s0, $zero -/* C32228 80240D48 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3222C 80240D4C 0C012530 */ jal func_800494C0 -/* C32230 80240D50 3C060020 */ lui $a2, 0x20 -/* C32234 80240D54 8E220018 */ lw $v0, 0x18($s1) -/* C32238 80240D58 9442002A */ lhu $v0, 0x2a($v0) -/* C3223C 80240D5C 30420001 */ andi $v0, $v0, 1 -/* C32240 80240D60 14400064 */ bnez $v0, .L80240EF4 -/* C32244 80240D64 2402000A */ addiu $v0, $zero, 0xa -/* C32248 80240D68 080903BD */ j .L80240EF4 -/* C3224C 80240D6C 2402000C */ addiu $v0, $zero, 0xc -.L80240D70: -/* C32250 80240D70 8E420074 */ lw $v0, 0x74($s2) -/* C32254 80240D74 2442FFFF */ addiu $v0, $v0, -1 -.L80240D78: -/* C32258 80240D78 AE420074 */ sw $v0, 0x74($s2) -.L80240D7C: -/* C3225C 80240D7C 8602008C */ lh $v0, 0x8c($s0) -/* C32260 80240D80 1440005D */ bnez $v0, .L80240EF8 -/* C32264 80240D84 00000000 */ nop -/* C32268 80240D88 C6000018 */ lwc1 $f0, 0x18($s0) -/* C3226C 80240D8C 3C014010 */ lui $at, 0x4010 -/* C32270 80240D90 44811800 */ mtc1 $at, $f3 -/* C32274 80240D94 44801000 */ mtc1 $zero, $f2 -/* C32278 80240D98 46000021 */ cvt.d.s $f0, $f0 -/* C3227C 80240D9C 4622003C */ c.lt.d $f0, $f2 -/* C32280 80240DA0 00000000 */ nop -/* C32284 80240DA4 45000003 */ bc1f .L80240DB4 -/* C32288 80240DA8 0200202D */ daddu $a0, $s0, $zero -/* C3228C 80240DAC 0809036E */ j .L80240DB8 -/* C32290 80240DB0 0000282D */ daddu $a1, $zero, $zero -.L80240DB4: -/* C32294 80240DB4 24050001 */ addiu $a1, $zero, 1 -.L80240DB8: -/* C32298 80240DB8 0C00F598 */ jal func_8003D660 -/* C3229C 80240DBC 00000000 */ nop -/* C322A0 80240DC0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C322A4 80240DC4 8E430078 */ lw $v1, 0x78($s2) -/* C322A8 80240DC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C322AC 80240DCC 00031040 */ sll $v0, $v1, 1 -/* C322B0 80240DD0 00431021 */ addu $v0, $v0, $v1 -/* C322B4 80240DD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C322B8 80240DD8 00021080 */ sll $v0, $v0, 2 -/* C322BC 80240DDC 00431021 */ addu $v0, $v0, $v1 -/* C322C0 80240DE0 C4560004 */ lwc1 $f22, 4($v0) -/* C322C4 80240DE4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C322C8 80240DE8 C454000C */ lwc1 $f20, 0xc($v0) -/* C322CC 80240DEC 4680A520 */ cvt.s.w $f20, $f20 -/* C322D0 80240DF0 4406B000 */ mfc1 $a2, $f22 -/* C322D4 80240DF4 4407A000 */ mfc1 $a3, $f20 -/* C322D8 80240DF8 0C00A720 */ jal atan2 -/* C322DC 80240DFC 00000000 */ nop -/* C322E0 80240E00 8E050018 */ lw $a1, 0x18($s0) -/* C322E4 80240E04 44060000 */ mfc1 $a2, $f0 -/* C322E8 80240E08 0200202D */ daddu $a0, $s0, $zero -/* C322EC 80240E0C 0C00EA95 */ jal npc_move_heading -/* C322F0 80240E10 AE06000C */ sw $a2, 0xc($s0) -/* C322F4 80240E14 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C322F8 80240E18 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C322FC 80240E1C 4406B000 */ mfc1 $a2, $f22 -/* C32300 80240E20 4407A000 */ mfc1 $a3, $f20 -/* C32304 80240E24 0C00A7B5 */ jal dist2D -/* C32308 80240E28 00000000 */ nop -/* C3230C 80240E2C C6020018 */ lwc1 $f2, 0x18($s0) -/* C32310 80240E30 4602003E */ c.le.s $f0, $f2 -/* C32314 80240E34 00000000 */ nop -/* C32318 80240E38 4500002F */ bc1f .L80240EF8 -/* C3231C 80240E3C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C32320 80240E40 24020002 */ addiu $v0, $zero, 2 -/* C32324 80240E44 0C00A67F */ jal rand_int -/* C32328 80240E48 AE420070 */ sw $v0, 0x70($s2) -/* C3232C 80240E4C 3C035555 */ lui $v1, 0x5555 -/* C32330 80240E50 34635556 */ ori $v1, $v1, 0x5556 -/* C32334 80240E54 00430018 */ mult $v0, $v1 -/* C32338 80240E58 000227C3 */ sra $a0, $v0, 0x1f -/* C3233C 80240E5C 00004010 */ mfhi $t0 -/* C32340 80240E60 01042023 */ subu $a0, $t0, $a0 -/* C32344 80240E64 00041840 */ sll $v1, $a0, 1 -/* C32348 80240E68 00641821 */ addu $v1, $v1, $a0 -/* C3234C 80240E6C 00431023 */ subu $v0, $v0, $v1 -/* C32350 80240E70 24430002 */ addiu $v1, $v0, 2 -/* C32354 80240E74 AE430074 */ sw $v1, 0x74($s2) -/* C32358 80240E78 8E62002C */ lw $v0, 0x2c($s3) -/* C3235C 80240E7C 18400009 */ blez $v0, .L80240EA4 -/* C32360 80240E80 24020004 */ addiu $v0, $zero, 4 -/* C32364 80240E84 8E620004 */ lw $v0, 4($s3) -/* C32368 80240E88 18400006 */ blez $v0, .L80240EA4 -/* C3236C 80240E8C 24020004 */ addiu $v0, $zero, 4 -/* C32370 80240E90 8E620008 */ lw $v0, 8($s3) -/* C32374 80240E94 18400003 */ blez $v0, .L80240EA4 -/* C32378 80240E98 24020004 */ addiu $v0, $zero, 4 -/* C3237C 80240E9C 14600002 */ bnez $v1, .L80240EA8 -/* C32380 80240EA0 00000000 */ nop -.L80240EA4: -/* C32384 80240EA4 AE420070 */ sw $v0, 0x70($s2) -.L80240EA8: -/* C32388 80240EA8 0C00A67F */ jal rand_int -/* C3238C 80240EAC 24042710 */ addiu $a0, $zero, 0x2710 -/* C32390 80240EB0 3C0351EB */ lui $v1, 0x51eb -/* C32394 80240EB4 3463851F */ ori $v1, $v1, 0x851f -/* C32398 80240EB8 00430018 */ mult $v0, $v1 -/* C3239C 80240EBC 00021FC3 */ sra $v1, $v0, 0x1f -/* C323A0 80240EC0 00004010 */ mfhi $t0 -/* C323A4 80240EC4 00082143 */ sra $a0, $t0, 5 -/* C323A8 80240EC8 00832023 */ subu $a0, $a0, $v1 -/* C323AC 80240ECC 00041840 */ sll $v1, $a0, 1 -/* C323B0 80240ED0 00641821 */ addu $v1, $v1, $a0 -/* C323B4 80240ED4 000318C0 */ sll $v1, $v1, 3 -/* C323B8 80240ED8 00641821 */ addu $v1, $v1, $a0 -/* C323BC 80240EDC 00031880 */ sll $v1, $v1, 2 -/* C323C0 80240EE0 8E640004 */ lw $a0, 4($s3) -/* C323C4 80240EE4 00431023 */ subu $v0, $v0, $v1 -/* C323C8 80240EE8 0044102A */ slt $v0, $v0, $a0 -/* C323CC 80240EEC 10400002 */ beqz $v0, .L80240EF8 -/* C323D0 80240EF0 24020004 */ addiu $v0, $zero, 4 -.L80240EF4: -/* C323D4 80240EF4 AE420070 */ sw $v0, 0x70($s2) -.L80240EF8: -/* C323D8 80240EF8 8FBF0044 */ lw $ra, 0x44($sp) -/* C323DC 80240EFC 8FB40040 */ lw $s4, 0x40($sp) -/* C323E0 80240F00 8FB3003C */ lw $s3, 0x3c($sp) -/* C323E4 80240F04 8FB20038 */ lw $s2, 0x38($sp) -/* C323E8 80240F08 8FB10034 */ lw $s1, 0x34($sp) -/* C323EC 80240F0C 8FB00030 */ lw $s0, 0x30($sp) -/* C323F0 80240F10 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C323F4 80240F14 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C323F8 80240F18 03E00008 */ jr $ra -/* C323FC 80240F1C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s deleted file mode 100644 index f8fe043b81..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240FE0_C324C0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0_C324C0 -/* C324C0 80240FE0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C324C4 80240FE4 AFB40040 */ sw $s4, 0x40($sp) -/* C324C8 80240FE8 0080A02D */ daddu $s4, $a0, $zero -/* C324CC 80240FEC AFBF0044 */ sw $ra, 0x44($sp) -/* C324D0 80240FF0 AFB3003C */ sw $s3, 0x3c($sp) -/* C324D4 80240FF4 AFB20038 */ sw $s2, 0x38($sp) -/* C324D8 80240FF8 AFB10034 */ sw $s1, 0x34($sp) -/* C324DC 80240FFC AFB00030 */ sw $s0, 0x30($sp) -/* C324E0 80241000 8E910148 */ lw $s1, 0x148($s4) -/* C324E4 80241004 00A0902D */ daddu $s2, $a1, $zero -/* C324E8 80241008 86240008 */ lh $a0, 8($s1) -/* C324EC 8024100C 0C00EABB */ jal get_npc_unsafe -/* C324F0 80241010 00C0982D */ daddu $s3, $a2, $zero -/* C324F4 80241014 8E430014 */ lw $v1, 0x14($s2) -/* C324F8 80241018 04600031 */ bltz $v1, .L802410E0 -/* C324FC 8024101C 0040802D */ daddu $s0, $v0, $zero -/* C32500 80241020 0260202D */ daddu $a0, $s3, $zero -/* C32504 80241024 AFA00010 */ sw $zero, 0x10($sp) -/* C32508 80241028 8E460024 */ lw $a2, 0x24($s2) -/* C3250C 8024102C 8E470028 */ lw $a3, 0x28($s2) -/* C32510 80241030 0C01242D */ jal func_800490B4 -/* C32514 80241034 0220282D */ daddu $a1, $s1, $zero -/* C32518 80241038 10400029 */ beqz $v0, .L802410E0 -/* C3251C 8024103C 0000202D */ daddu $a0, $zero, $zero -/* C32520 80241040 0200282D */ daddu $a1, $s0, $zero -/* C32524 80241044 0000302D */ daddu $a2, $zero, $zero -/* C32528 80241048 860300A8 */ lh $v1, 0xa8($s0) -/* C3252C 8024104C 3C013F80 */ lui $at, 0x3f80 -/* C32530 80241050 44810000 */ mtc1 $at, $f0 -/* C32534 80241054 3C014000 */ lui $at, 0x4000 -/* C32538 80241058 44811000 */ mtc1 $at, $f2 -/* C3253C 8024105C 3C01C1A0 */ lui $at, 0xc1a0 -/* C32540 80241060 44812000 */ mtc1 $at, $f4 -/* C32544 80241064 2402000F */ addiu $v0, $zero, 0xf -/* C32548 80241068 AFA2001C */ sw $v0, 0x1c($sp) -/* C3254C 8024106C 44833000 */ mtc1 $v1, $f6 -/* C32550 80241070 00000000 */ nop -/* C32554 80241074 468031A0 */ cvt.s.w $f6, $f6 -/* C32558 80241078 44073000 */ mfc1 $a3, $f6 -/* C3255C 8024107C 27A20028 */ addiu $v0, $sp, 0x28 -/* C32560 80241080 AFA20020 */ sw $v0, 0x20($sp) -/* C32564 80241084 E7A00010 */ swc1 $f0, 0x10($sp) -/* C32568 80241088 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3256C 8024108C 0C01BFA4 */ jal fx_emote -/* C32570 80241090 E7A40018 */ swc1 $f4, 0x18($sp) -/* C32574 80241094 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C32578 80241098 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3257C 8024109C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C32580 802410A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C32584 802410A4 8C460028 */ lw $a2, 0x28($v0) -/* C32588 802410A8 0C00A720 */ jal atan2 -/* C3258C 802410AC 8C470030 */ lw $a3, 0x30($v0) -/* C32590 802410B0 0200202D */ daddu $a0, $s0, $zero -/* C32594 802410B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C32598 802410B8 3C060020 */ lui $a2, 0x20 -/* C3259C 802410BC 0C012530 */ jal func_800494C0 -/* C325A0 802410C0 E480000C */ swc1 $f0, 0xc($a0) -/* C325A4 802410C4 8E220018 */ lw $v0, 0x18($s1) -/* C325A8 802410C8 9442002A */ lhu $v0, 0x2a($v0) -/* C325AC 802410CC 30420001 */ andi $v0, $v0, 1 -/* C325B0 802410D0 14400029 */ bnez $v0, .L80241178 -/* C325B4 802410D4 2402000A */ addiu $v0, $zero, 0xa -/* C325B8 802410D8 0809045E */ j .L80241178 -/* C325BC 802410DC 2402000C */ addiu $v0, $zero, 0xc -.L802410E0: -/* C325C0 802410E0 8602008C */ lh $v0, 0x8c($s0) -/* C325C4 802410E4 14400025 */ bnez $v0, .L8024117C -/* C325C8 802410E8 00000000 */ nop -/* C325CC 802410EC 9602008E */ lhu $v0, 0x8e($s0) -/* C325D0 802410F0 2442FFFF */ addiu $v0, $v0, -1 -/* C325D4 802410F4 A602008E */ sh $v0, 0x8e($s0) -/* C325D8 802410F8 00021400 */ sll $v0, $v0, 0x10 -/* C325DC 802410FC 1440001F */ bnez $v0, .L8024117C -/* C325E0 80241100 00000000 */ nop -/* C325E4 80241104 8E820074 */ lw $v0, 0x74($s4) -/* C325E8 80241108 2442FFFF */ addiu $v0, $v0, -1 -/* C325EC 8024110C 10400019 */ beqz $v0, .L80241174 -/* C325F0 80241110 AE820074 */ sw $v0, 0x74($s4) -/* C325F4 80241114 8E220018 */ lw $v0, 0x18($s1) -/* C325F8 80241118 9442002A */ lhu $v0, 0x2a($v0) -/* C325FC 8024111C 30420010 */ andi $v0, $v0, 0x10 -/* C32600 80241120 14400007 */ bnez $v0, .L80241140 -/* C32604 80241124 00000000 */ nop -/* C32608 80241128 C600000C */ lwc1 $f0, 0xc($s0) -/* C3260C 8024112C 3C014334 */ lui $at, 0x4334 -/* C32610 80241130 44816000 */ mtc1 $at, $f12 -/* C32614 80241134 0C00A6C9 */ jal clamp_angle -/* C32618 80241138 460C0300 */ add.s $f12, $f0, $f12 -/* C3261C 8024113C E600000C */ swc1 $f0, 0xc($s0) -.L80241140: -/* C32620 80241140 8E440008 */ lw $a0, 8($s2) -/* C32624 80241144 000417C2 */ srl $v0, $a0, 0x1f -/* C32628 80241148 00822021 */ addu $a0, $a0, $v0 -/* C3262C 8024114C 00042043 */ sra $a0, $a0, 1 -/* C32630 80241150 0C00A67F */ jal rand_int -/* C32634 80241154 24840001 */ addiu $a0, $a0, 1 -/* C32638 80241158 8E430008 */ lw $v1, 8($s2) -/* C3263C 8024115C 000327C2 */ srl $a0, $v1, 0x1f -/* C32640 80241160 00641821 */ addu $v1, $v1, $a0 -/* C32644 80241164 00031843 */ sra $v1, $v1, 1 -/* C32648 80241168 00621821 */ addu $v1, $v1, $v0 -/* C3264C 8024116C 0809045F */ j .L8024117C -/* C32650 80241170 A603008E */ sh $v1, 0x8e($s0) -.L80241174: -/* C32654 80241174 24020004 */ addiu $v0, $zero, 4 -.L80241178: -/* C32658 80241178 AE820070 */ sw $v0, 0x70($s4) -.L8024117C: -/* C3265C 8024117C 8FBF0044 */ lw $ra, 0x44($sp) -/* C32660 80241180 8FB40040 */ lw $s4, 0x40($sp) -/* C32664 80241184 8FB3003C */ lw $s3, 0x3c($sp) -/* C32668 80241188 8FB20038 */ lw $s2, 0x38($sp) -/* C3266C 8024118C 8FB10034 */ lw $s1, 0x34($sp) -/* C32670 80241190 8FB00030 */ lw $s0, 0x30($sp) -/* C32674 80241194 03E00008 */ jr $ra -/* C32678 80241198 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s deleted file mode 100644 index a339db991a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024119C_C3267C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024119C_C3267C -/* C3267C 8024119C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32680 802411A0 AFB10014 */ sw $s1, 0x14($sp) -/* C32684 802411A4 0080882D */ daddu $s1, $a0, $zero -/* C32688 802411A8 AFBF001C */ sw $ra, 0x1c($sp) -/* C3268C 802411AC AFB20018 */ sw $s2, 0x18($sp) -/* C32690 802411B0 AFB00010 */ sw $s0, 0x10($sp) -/* C32694 802411B4 8E300148 */ lw $s0, 0x148($s1) -/* C32698 802411B8 86040008 */ lh $a0, 8($s0) -/* C3269C 802411BC 0C00EABB */ jal get_npc_unsafe -/* C326A0 802411C0 00A0902D */ daddu $s2, $a1, $zero -/* C326A4 802411C4 8E230078 */ lw $v1, 0x78($s1) -/* C326A8 802411C8 24630001 */ addiu $v1, $v1, 1 -/* C326AC 802411CC AE230078 */ sw $v1, 0x78($s1) -/* C326B0 802411D0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C326B4 802411D4 8C840000 */ lw $a0, ($a0) -/* C326B8 802411D8 0064182A */ slt $v1, $v1, $a0 -/* C326BC 802411DC 14600002 */ bnez $v1, .L802411E8 -/* C326C0 802411E0 0040282D */ daddu $a1, $v0, $zero -/* C326C4 802411E4 AE200078 */ sw $zero, 0x78($s1) -.L802411E8: -/* C326C8 802411E8 8E0200CC */ lw $v0, 0xcc($s0) -/* C326CC 802411EC 8C420004 */ lw $v0, 4($v0) -/* C326D0 802411F0 ACA20028 */ sw $v0, 0x28($a1) -/* C326D4 802411F4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C326D8 802411F8 8C42007C */ lw $v0, 0x7c($v0) -/* C326DC 802411FC 04410004 */ bgez $v0, .L80241210 -/* C326E0 80241200 00000000 */ nop -/* C326E4 80241204 C6400000 */ lwc1 $f0, ($s2) -/* C326E8 80241208 0809048C */ j .L80241230 -/* C326EC 8024120C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241210: -/* C326F0 80241210 3C018024 */ lui $at, %hi(D_80244B90_C36070) -/* C326F4 80241214 D4224B90 */ ldc1 $f2, %lo(D_80244B90_C36070)($at) -/* C326F8 80241218 44820000 */ mtc1 $v0, $f0 -/* C326FC 8024121C 00000000 */ nop -/* C32700 80241220 46800021 */ cvt.d.w $f0, $f0 -/* C32704 80241224 46220003 */ div.d $f0, $f0, $f2 -/* C32708 80241228 46200020 */ cvt.s.d $f0, $f0 -/* C3270C 8024122C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241230: -/* C32710 80241230 24020001 */ addiu $v0, $zero, 1 -/* C32714 80241234 AE220070 */ sw $v0, 0x70($s1) -/* C32718 80241238 8FBF001C */ lw $ra, 0x1c($sp) -/* C3271C 8024123C 8FB20018 */ lw $s2, 0x18($sp) -/* C32720 80241240 8FB10014 */ lw $s1, 0x14($sp) -/* C32724 80241244 8FB00010 */ lw $s0, 0x10($sp) -/* C32728 80241248 03E00008 */ jr $ra -/* C3272C 8024124C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s deleted file mode 100644 index cdfac14b19..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024146C_C3294C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024146C_C3294C -/* C3294C 8024146C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C32950 80241470 AFB3003C */ sw $s3, 0x3c($sp) -/* C32954 80241474 0080982D */ daddu $s3, $a0, $zero -/* C32958 80241478 AFBF0040 */ sw $ra, 0x40($sp) -/* C3295C 8024147C AFB20038 */ sw $s2, 0x38($sp) -/* C32960 80241480 AFB10034 */ sw $s1, 0x34($sp) -/* C32964 80241484 AFB00030 */ sw $s0, 0x30($sp) -/* C32968 80241488 8E720148 */ lw $s2, 0x148($s3) -/* C3296C 8024148C 00A0882D */ daddu $s1, $a1, $zero -/* C32970 80241490 86440008 */ lh $a0, 8($s2) -/* C32974 80241494 0C00EABB */ jal get_npc_unsafe -/* C32978 80241498 00C0802D */ daddu $s0, $a2, $zero -/* C3297C 8024149C 0200202D */ daddu $a0, $s0, $zero -/* C32980 802414A0 0240282D */ daddu $a1, $s2, $zero -/* C32984 802414A4 24030001 */ addiu $v1, $zero, 1 -/* C32988 802414A8 AFA30010 */ sw $v1, 0x10($sp) -/* C3298C 802414AC 8E260024 */ lw $a2, 0x24($s1) -/* C32990 802414B0 8E270028 */ lw $a3, 0x28($s1) -/* C32994 802414B4 0C01242D */ jal func_800490B4 -/* C32998 802414B8 0040802D */ daddu $s0, $v0, $zero -/* C3299C 802414BC 1440001E */ bnez $v0, .L80241538 -/* C329A0 802414C0 0200202D */ daddu $a0, $s0, $zero -/* C329A4 802414C4 24040002 */ addiu $a0, $zero, 2 -/* C329A8 802414C8 0200282D */ daddu $a1, $s0, $zero -/* C329AC 802414CC 0000302D */ daddu $a2, $zero, $zero -/* C329B0 802414D0 860300A8 */ lh $v1, 0xa8($s0) -/* C329B4 802414D4 3C013F80 */ lui $at, 0x3f80 -/* C329B8 802414D8 44810000 */ mtc1 $at, $f0 -/* C329BC 802414DC 3C014000 */ lui $at, 0x4000 -/* C329C0 802414E0 44811000 */ mtc1 $at, $f2 -/* C329C4 802414E4 3C01C1A0 */ lui $at, 0xc1a0 -/* C329C8 802414E8 44812000 */ mtc1 $at, $f4 -/* C329CC 802414EC 2402000F */ addiu $v0, $zero, 0xf -/* C329D0 802414F0 AFA2001C */ sw $v0, 0x1c($sp) -/* C329D4 802414F4 44833000 */ mtc1 $v1, $f6 -/* C329D8 802414F8 00000000 */ nop -/* C329DC 802414FC 468031A0 */ cvt.s.w $f6, $f6 -/* C329E0 80241500 44073000 */ mfc1 $a3, $f6 -/* C329E4 80241504 27A20028 */ addiu $v0, $sp, 0x28 -/* C329E8 80241508 AFA20020 */ sw $v0, 0x20($sp) -/* C329EC 8024150C E7A00010 */ swc1 $f0, 0x10($sp) -/* C329F0 80241510 E7A20014 */ swc1 $f2, 0x14($sp) -/* C329F4 80241514 0C01BFA4 */ jal fx_emote -/* C329F8 80241518 E7A40018 */ swc1 $f4, 0x18($sp) -/* C329FC 8024151C 8E4200CC */ lw $v0, 0xcc($s2) -/* C32A00 80241520 8C430000 */ lw $v1, ($v0) -/* C32A04 80241524 24020019 */ addiu $v0, $zero, 0x19 -/* C32A08 80241528 A602008E */ sh $v0, 0x8e($s0) -/* C32A0C 8024152C 2402000E */ addiu $v0, $zero, 0xe -/* C32A10 80241530 0809055B */ j .L8024156C -/* C32A14 80241534 AE030028 */ sw $v1, 0x28($s0) -.L80241538: -/* C32A18 80241538 0C00F598 */ jal func_8003D660 -/* C32A1C 8024153C 24050001 */ addiu $a1, $zero, 1 -/* C32A20 80241540 8E050018 */ lw $a1, 0x18($s0) -/* C32A24 80241544 8E06000C */ lw $a2, 0xc($s0) -/* C32A28 80241548 0C00EA95 */ jal npc_move_heading -/* C32A2C 8024154C 0200202D */ daddu $a0, $s0, $zero -/* C32A30 80241550 8602008E */ lh $v0, 0x8e($s0) -/* C32A34 80241554 9603008E */ lhu $v1, 0x8e($s0) -/* C32A38 80241558 18400003 */ blez $v0, .L80241568 -/* C32A3C 8024155C 2462FFFF */ addiu $v0, $v1, -1 -/* C32A40 80241560 0809055C */ j .L80241570 -/* C32A44 80241564 A602008E */ sh $v0, 0x8e($s0) -.L80241568: -/* C32A48 80241568 2402000C */ addiu $v0, $zero, 0xc -.L8024156C: -/* C32A4C 8024156C AE620070 */ sw $v0, 0x70($s3) -.L80241570: -/* C32A50 80241570 8FBF0040 */ lw $ra, 0x40($sp) -/* C32A54 80241574 8FB3003C */ lw $s3, 0x3c($sp) -/* C32A58 80241578 8FB20038 */ lw $s2, 0x38($sp) -/* C32A5C 8024157C 8FB10034 */ lw $s1, 0x34($sp) -/* C32A60 80241580 8FB00030 */ lw $s0, 0x30($sp) -/* C32A64 80241584 03E00008 */ jr $ra -/* C32A68 80241588 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s deleted file mode 100644 index a4fe8b8d7b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802415F4_C32AD4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F4_C32AD4 -/* C32AD4 802415F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32AD8 802415F8 AFB10014 */ sw $s1, 0x14($sp) -/* C32ADC 802415FC 0080882D */ daddu $s1, $a0, $zero -/* C32AE0 80241600 AFBF001C */ sw $ra, 0x1c($sp) -/* C32AE4 80241604 AFB20018 */ sw $s2, 0x18($sp) -/* C32AE8 80241608 AFB00010 */ sw $s0, 0x10($sp) -/* C32AEC 8024160C 8E300148 */ lw $s0, 0x148($s1) -/* C32AF0 80241610 86040008 */ lh $a0, 8($s0) -/* C32AF4 80241614 0C00EABB */ jal get_npc_unsafe -/* C32AF8 80241618 00A0902D */ daddu $s2, $a1, $zero -/* C32AFC 8024161C 8E0300D0 */ lw $v1, 0xd0($s0) -/* C32B00 80241620 8E240078 */ lw $a0, 0x78($s1) -/* C32B04 80241624 8C630000 */ lw $v1, ($v1) -/* C32B08 80241628 0083182A */ slt $v1, $a0, $v1 -/* C32B0C 8024162C 10600013 */ beqz $v1, .L8024167C -/* C32B10 80241630 0040302D */ daddu $a2, $v0, $zero -/* C32B14 80241634 00041040 */ sll $v0, $a0, 1 -/* C32B18 80241638 00441021 */ addu $v0, $v0, $a0 -/* C32B1C 8024163C 00022880 */ sll $a1, $v0, 2 -.L80241640: -/* C32B20 80241640 8E0300D0 */ lw $v1, 0xd0($s0) -/* C32B24 80241644 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C32B28 80241648 00A31021 */ addu $v0, $a1, $v1 -/* C32B2C 8024164C C4400008 */ lwc1 $f0, 8($v0) -/* C32B30 80241650 46800020 */ cvt.s.w $f0, $f0 -/* C32B34 80241654 4602003E */ c.le.s $f0, $f2 -/* C32B38 80241658 00000000 */ nop -/* C32B3C 8024165C 45020003 */ bc1fl .L8024166C -/* C32B40 80241660 24840001 */ addiu $a0, $a0, 1 -/* C32B44 80241664 0809059F */ j .L8024167C -/* C32B48 80241668 AE240078 */ sw $a0, 0x78($s1) -.L8024166C: -/* C32B4C 8024166C 8C620000 */ lw $v0, ($v1) -/* C32B50 80241670 0082102A */ slt $v0, $a0, $v0 -/* C32B54 80241674 1440FFF2 */ bnez $v0, .L80241640 -/* C32B58 80241678 24A5000C */ addiu $a1, $a1, 0xc -.L8024167C: -/* C32B5C 8024167C C6400000 */ lwc1 $f0, ($s2) -/* C32B60 80241680 E4C00018 */ swc1 $f0, 0x18($a2) -/* C32B64 80241684 8E0200CC */ lw $v0, 0xcc($s0) -/* C32B68 80241688 8C420004 */ lw $v0, 4($v0) -/* C32B6C 8024168C ACC20028 */ sw $v0, 0x28($a2) -/* C32B70 80241690 24020001 */ addiu $v0, $zero, 1 -/* C32B74 80241694 AE200074 */ sw $zero, 0x74($s1) -/* C32B78 80241698 AE220070 */ sw $v0, 0x70($s1) -/* C32B7C 8024169C 8FBF001C */ lw $ra, 0x1c($sp) -/* C32B80 802416A0 8FB20018 */ lw $s2, 0x18($sp) -/* C32B84 802416A4 8FB10014 */ lw $s1, 0x14($sp) -/* C32B88 802416A8 8FB00010 */ lw $s0, 0x10($sp) -/* C32B8C 802416AC 03E00008 */ jr $ra -/* C32B90 802416B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s deleted file mode 100644 index 9bdd9cebb3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ /dev/null @@ -1,214 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416B4_C32B94 -/* C32B94 802416B4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C32B98 802416B8 AFB40058 */ sw $s4, 0x58($sp) -/* C32B9C 802416BC 0080A02D */ daddu $s4, $a0, $zero -/* C32BA0 802416C0 AFBF0060 */ sw $ra, 0x60($sp) -/* C32BA4 802416C4 AFB5005C */ sw $s5, 0x5c($sp) -/* C32BA8 802416C8 AFB30054 */ sw $s3, 0x54($sp) -/* C32BAC 802416CC AFB20050 */ sw $s2, 0x50($sp) -/* C32BB0 802416D0 AFB1004C */ sw $s1, 0x4c($sp) -/* C32BB4 802416D4 AFB00048 */ sw $s0, 0x48($sp) -/* C32BB8 802416D8 8E910148 */ lw $s1, 0x148($s4) -/* C32BBC 802416DC 86240008 */ lh $a0, 8($s1) -/* C32BC0 802416E0 0C00EABB */ jal get_npc_unsafe -/* C32BC4 802416E4 00A0802D */ daddu $s0, $a1, $zero -/* C32BC8 802416E8 8E83000C */ lw $v1, 0xc($s4) -/* C32BCC 802416EC 0280202D */ daddu $a0, $s4, $zero -/* C32BD0 802416F0 8C650000 */ lw $a1, ($v1) -/* C32BD4 802416F4 0C0B1EAF */ jal get_variable -/* C32BD8 802416F8 0040902D */ daddu $s2, $v0, $zero -/* C32BDC 802416FC AFA00018 */ sw $zero, 0x18($sp) -/* C32BE0 80241700 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32BE4 80241704 8C630094 */ lw $v1, 0x94($v1) -/* C32BE8 80241708 AFA3001C */ sw $v1, 0x1c($sp) -/* C32BEC 8024170C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32BF0 80241710 8C630080 */ lw $v1, 0x80($v1) -/* C32BF4 80241714 AFA30020 */ sw $v1, 0x20($sp) -/* C32BF8 80241718 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32BFC 8024171C 8C630088 */ lw $v1, 0x88($v1) -/* C32C00 80241720 AFA30024 */ sw $v1, 0x24($sp) -/* C32C04 80241724 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32C08 80241728 8C63008C */ lw $v1, 0x8c($v1) -/* C32C0C 8024172C 27B50018 */ addiu $s5, $sp, 0x18 -/* C32C10 80241730 AFA30028 */ sw $v1, 0x28($sp) -/* C32C14 80241734 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32C18 80241738 3C014282 */ lui $at, 0x4282 -/* C32C1C 8024173C 44810000 */ mtc1 $at, $f0 -/* C32C20 80241740 8C630090 */ lw $v1, 0x90($v1) -/* C32C24 80241744 0040982D */ daddu $s3, $v0, $zero -/* C32C28 80241748 E7A00030 */ swc1 $f0, 0x30($sp) -/* C32C2C 8024174C A7A00034 */ sh $zero, 0x34($sp) -/* C32C30 80241750 16000005 */ bnez $s0, .L80241768 -/* C32C34 80241754 AFA3002C */ sw $v1, 0x2c($sp) -/* C32C38 80241758 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32C3C 8024175C 30420004 */ andi $v0, $v0, 4 -/* C32C40 80241760 10400044 */ beqz $v0, .L80241874 -/* C32C44 80241764 00000000 */ nop -.L80241768: -/* C32C48 80241768 2404F7FF */ addiu $a0, $zero, -0x801 -/* C32C4C 8024176C AE800070 */ sw $zero, 0x70($s4) -/* C32C50 80241770 A640008E */ sh $zero, 0x8e($s2) -/* C32C54 80241774 8E2200CC */ lw $v0, 0xcc($s1) -/* C32C58 80241778 8E430000 */ lw $v1, ($s2) -/* C32C5C 8024177C 8C420000 */ lw $v0, ($v0) -/* C32C60 80241780 00641824 */ and $v1, $v1, $a0 -/* C32C64 80241784 AE430000 */ sw $v1, ($s2) -/* C32C68 80241788 AE420028 */ sw $v0, 0x28($s2) -/* C32C6C 8024178C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C32C70 80241790 8C420098 */ lw $v0, 0x98($v0) -/* C32C74 80241794 54400005 */ bnel $v0, $zero, .L802417AC -/* C32C78 80241798 2402FDFF */ addiu $v0, $zero, -0x201 -/* C32C7C 8024179C 34620200 */ ori $v0, $v1, 0x200 -/* C32C80 802417A0 2403FFF7 */ addiu $v1, $zero, -9 -/* C32C84 802417A4 080905ED */ j .L802417B4 -/* C32C88 802417A8 00431024 */ and $v0, $v0, $v1 -.L802417AC: -/* C32C8C 802417AC 00621024 */ and $v0, $v1, $v0 -/* C32C90 802417B0 34420008 */ ori $v0, $v0, 8 -.L802417B4: -/* C32C94 802417B4 AE420000 */ sw $v0, ($s2) -/* C32C98 802417B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32C9C 802417BC 30420004 */ andi $v0, $v0, 4 -/* C32CA0 802417C0 10400008 */ beqz $v0, .L802417E4 -/* C32CA4 802417C4 24020063 */ addiu $v0, $zero, 0x63 -/* C32CA8 802417C8 AE820070 */ sw $v0, 0x70($s4) -/* C32CAC 802417CC AE800074 */ sw $zero, 0x74($s4) -/* C32CB0 802417D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32CB4 802417D4 2403FFFB */ addiu $v1, $zero, -5 -/* C32CB8 802417D8 00431024 */ and $v0, $v0, $v1 -/* C32CBC 802417DC 08090604 */ j .L80241810 -/* C32CC0 802417E0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802417E4: -/* C32CC4 802417E4 8E220000 */ lw $v0, ($s1) -/* C32CC8 802417E8 3C034000 */ lui $v1, 0x4000 -/* C32CCC 802417EC 00431024 */ and $v0, $v0, $v1 -/* C32CD0 802417F0 10400007 */ beqz $v0, .L80241810 -/* C32CD4 802417F4 3C03BFFF */ lui $v1, 0xbfff -/* C32CD8 802417F8 2402000C */ addiu $v0, $zero, 0xc -/* C32CDC 802417FC AE820070 */ sw $v0, 0x70($s4) -/* C32CE0 80241800 8E220000 */ lw $v0, ($s1) -/* C32CE4 80241804 3463FFFF */ ori $v1, $v1, 0xffff -/* C32CE8 80241808 00431024 */ and $v0, $v0, $v1 -/* C32CEC 8024180C AE220000 */ sw $v0, ($s1) -.L80241810: -/* C32CF0 80241810 27A50038 */ addiu $a1, $sp, 0x38 -/* C32CF4 80241814 27A6003C */ addiu $a2, $sp, 0x3c -/* C32CF8 80241818 C6400038 */ lwc1 $f0, 0x38($s2) -/* C32CFC 8024181C 864200A8 */ lh $v0, 0xa8($s2) -/* C32D00 80241820 3C0142C8 */ lui $at, 0x42c8 -/* C32D04 80241824 44812000 */ mtc1 $at, $f4 -/* C32D08 80241828 44823000 */ mtc1 $v0, $f6 -/* C32D0C 8024182C 00000000 */ nop -/* C32D10 80241830 468031A0 */ cvt.s.w $f6, $f6 -/* C32D14 80241834 27A20044 */ addiu $v0, $sp, 0x44 -/* C32D18 80241838 E7A00038 */ swc1 $f0, 0x38($sp) -/* C32D1C 8024183C C640003C */ lwc1 $f0, 0x3c($s2) -/* C32D20 80241840 C6420040 */ lwc1 $f2, 0x40($s2) -/* C32D24 80241844 46060000 */ add.s $f0, $f0, $f6 -/* C32D28 80241848 E7A40044 */ swc1 $f4, 0x44($sp) -/* C32D2C 8024184C E7A20040 */ swc1 $f2, 0x40($sp) -/* C32D30 80241850 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C32D34 80241854 AFA20010 */ sw $v0, 0x10($sp) -/* C32D38 80241858 8E440080 */ lw $a0, 0x80($s2) -/* C32D3C 8024185C 0C0372DF */ jal func_800DCB7C -/* C32D40 80241860 27A70040 */ addiu $a3, $sp, 0x40 -/* C32D44 80241864 10400003 */ beqz $v0, .L80241874 -/* C32D48 80241868 00000000 */ nop -/* C32D4C 8024186C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C32D50 80241870 E640003C */ swc1 $f0, 0x3c($s2) -.L80241874: -/* C32D54 80241874 8E830070 */ lw $v1, 0x70($s4) -/* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 -/* C32D5C 8024187C 10400042 */ beqz $v0, L80241988_C32E68 -/* C32D60 80241880 00031080 */ sll $v0, $v1, 2 -/* C32D64 80241884 3C018024 */ lui $at, %hi(jtbl_80244B98_C36078) -/* C32D68 80241888 00220821 */ addu $at, $at, $v0 -/* C32D6C 8024188C 8C224B98 */ lw $v0, %lo(jtbl_80244B98_C36078)($at) -/* C32D70 80241890 00400008 */ jr $v0 -/* C32D74 80241894 00000000 */ nop -glabel L80241898_C32D78 -/* C32D78 80241898 0280202D */ daddu $a0, $s4, $zero -/* C32D7C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* C32D80 802418A0 0C0902C8 */ jal func_80240B20_C32000 -/* C32D84 802418A4 02A0302D */ daddu $a2, $s5, $zero -glabel L802418A8_C32D88 -/* C32D88 802418A8 0280202D */ daddu $a0, $s4, $zero -/* C32D8C 802418AC 0260282D */ daddu $a1, $s3, $zero -/* C32D90 802418B0 0C09031E */ jal func_80240C78_C32158 -/* C32D94 802418B4 02A0302D */ daddu $a2, $s5, $zero -/* C32D98 802418B8 08090662 */ j L80241988_C32E68 -/* C32D9C 802418BC 00000000 */ nop -glabel L802418C0_C32DA0 -/* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero -/* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero -/* C32DA8 802418C8 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 -/* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero -glabel L802418D0_C32DB0 -/* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero -/* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero -/* C32DB8 802418D8 0C0903F8 */ jal func_80240FE0_C324C0 -/* C32DBC 802418DC 02A0302D */ daddu $a2, $s5, $zero -/* C32DC0 802418E0 08090662 */ j L80241988_C32E68 -/* C32DC4 802418E4 00000000 */ nop -glabel L802418E8_C32DC8 -/* C32DC8 802418E8 0280202D */ daddu $a0, $s4, $zero -/* C32DCC 802418EC 0260282D */ daddu $a1, $s3, $zero -/* C32DD0 802418F0 0C090467 */ jal func_8024119C_C3267C -/* C32DD4 802418F4 02A0302D */ daddu $a2, $s5, $zero -/* C32DD8 802418F8 08090662 */ j L80241988_C32E68 -/* C32DDC 802418FC 00000000 */ nop -glabel L80241900_C32DE0 -/* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero -/* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero -/* C32DE8 80241908 0C090494 */ jal dgb_03_NpcJumpFunc2 -/* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero -glabel L80241910_C32DF0 -/* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero -/* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero -/* C32DF8 80241918 0C0904B1 */ jal dgb_03_NpcJumpFunc -/* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero -/* C32E00 80241920 08090662 */ j L80241988_C32E68 -/* C32E04 80241924 00000000 */ nop -glabel L80241928_C32E08 -/* C32E08 80241928 0280202D */ daddu $a0, $s4, $zero -/* C32E0C 8024192C 0260282D */ daddu $a1, $s3, $zero -/* C32E10 80241930 0C0904CF */ jal dgb_03_UnkNpcAIFunc13 -/* C32E14 80241934 02A0302D */ daddu $a2, $s5, $zero -glabel L80241938_C32E18 -/* C32E18 80241938 0280202D */ daddu $a0, $s4, $zero -/* C32E1C 8024193C 0260282D */ daddu $a1, $s3, $zero -/* C32E20 80241940 0C09051B */ jal func_8024146C_C3294C -/* C32E24 80241944 02A0302D */ daddu $a2, $s5, $zero -/* C32E28 80241948 08090662 */ j L80241988_C32E68 -/* C32E2C 8024194C 00000000 */ nop -glabel L80241950_C32E30 -/* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero -/* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero -/* C32E38 80241958 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc -/* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero -/* C32E40 80241960 08090662 */ j L80241988_C32E68 -/* C32E44 80241964 00000000 */ nop -glabel L80241968_C32E48 -/* C32E48 80241968 0280202D */ daddu $a0, $s4, $zero -/* C32E4C 8024196C 0260282D */ daddu $a1, $s3, $zero -/* C32E50 80241970 0C09057D */ jal func_802415F4_C32AD4 -/* C32E54 80241974 02A0302D */ daddu $a2, $s5, $zero -/* C32E58 80241978 08090662 */ j L80241988_C32E68 -/* C32E5C 8024197C 00000000 */ nop -glabel L80241980_C32E60 -/* C32E60 80241980 0C0129CF */ jal func_8004A73C -/* C32E64 80241984 0280202D */ daddu $a0, $s4, $zero -glabel L80241988_C32E68 -/* C32E68 80241988 8FBF0060 */ lw $ra, 0x60($sp) -/* C32E6C 8024198C 8FB5005C */ lw $s5, 0x5c($sp) -/* C32E70 80241990 8FB40058 */ lw $s4, 0x58($sp) -/* C32E74 80241994 8FB30054 */ lw $s3, 0x54($sp) -/* C32E78 80241998 8FB20050 */ lw $s2, 0x50($sp) -/* C32E7C 8024199C 8FB1004C */ lw $s1, 0x4c($sp) -/* C32E80 802419A0 8FB00048 */ lw $s0, 0x48($sp) -/* C32E84 802419A4 0000102D */ daddu $v0, $zero, $zero -/* C32E88 802419A8 03E00008 */ jr $ra -/* C32E8C 802419AC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s deleted file mode 100644 index 921c6cf443..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ /dev/null @@ -1,205 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419B0_C32E90 -/* C32E90 802419B0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C32E94 802419B4 AFB20038 */ sw $s2, 0x38($sp) -/* C32E98 802419B8 0080902D */ daddu $s2, $a0, $zero -/* C32E9C 802419BC AFBF0048 */ sw $ra, 0x48($sp) -/* C32EA0 802419C0 AFB50044 */ sw $s5, 0x44($sp) -/* C32EA4 802419C4 AFB40040 */ sw $s4, 0x40($sp) -/* C32EA8 802419C8 AFB3003C */ sw $s3, 0x3c($sp) -/* C32EAC 802419CC AFB10034 */ sw $s1, 0x34($sp) -/* C32EB0 802419D0 AFB00030 */ sw $s0, 0x30($sp) -/* C32EB4 802419D4 8E510148 */ lw $s1, 0x148($s2) -/* C32EB8 802419D8 86240008 */ lh $a0, 8($s1) -/* C32EBC 802419DC 0C00EABB */ jal get_npc_unsafe -/* C32EC0 802419E0 00A0802D */ daddu $s0, $a1, $zero -/* C32EC4 802419E4 8E43000C */ lw $v1, 0xc($s2) -/* C32EC8 802419E8 0240202D */ daddu $a0, $s2, $zero -/* C32ECC 802419EC 8C650000 */ lw $a1, ($v1) -/* C32ED0 802419F0 0C0B1EAF */ jal get_variable -/* C32ED4 802419F4 0040A82D */ daddu $s5, $v0, $zero -/* C32ED8 802419F8 AFA00010 */ sw $zero, 0x10($sp) -/* C32EDC 802419FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32EE0 80241A00 8C630094 */ lw $v1, 0x94($v1) -/* C32EE4 80241A04 AFA30014 */ sw $v1, 0x14($sp) -/* C32EE8 80241A08 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32EEC 80241A0C 8C630080 */ lw $v1, 0x80($v1) -/* C32EF0 80241A10 AFA30018 */ sw $v1, 0x18($sp) -/* C32EF4 80241A14 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32EF8 80241A18 8C630088 */ lw $v1, 0x88($v1) -/* C32EFC 80241A1C AFA3001C */ sw $v1, 0x1c($sp) -/* C32F00 80241A20 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32F04 80241A24 8C63008C */ lw $v1, 0x8c($v1) -/* C32F08 80241A28 27B40010 */ addiu $s4, $sp, 0x10 -/* C32F0C 80241A2C AFA30020 */ sw $v1, 0x20($sp) -/* C32F10 80241A30 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32F14 80241A34 3C014282 */ lui $at, 0x4282 -/* C32F18 80241A38 44810000 */ mtc1 $at, $f0 -/* C32F1C 80241A3C 8C630090 */ lw $v1, 0x90($v1) -/* C32F20 80241A40 0040982D */ daddu $s3, $v0, $zero -/* C32F24 80241A44 E7A00028 */ swc1 $f0, 0x28($sp) -/* C32F28 80241A48 A7A0002C */ sh $zero, 0x2c($sp) -/* C32F2C 80241A4C 16000005 */ bnez $s0, .L80241A64 -/* C32F30 80241A50 AFA30024 */ sw $v1, 0x24($sp) -/* C32F34 80241A54 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32F38 80241A58 30420004 */ andi $v0, $v0, 4 -/* C32F3C 80241A5C 10400020 */ beqz $v0, .L80241AE0 -/* C32F40 80241A60 00000000 */ nop -.L80241A64: -/* C32F44 80241A64 2404F7FF */ addiu $a0, $zero, -0x801 -/* C32F48 80241A68 AE400070 */ sw $zero, 0x70($s2) -/* C32F4C 80241A6C A6A0008E */ sh $zero, 0x8e($s5) -/* C32F50 80241A70 8E2200CC */ lw $v0, 0xcc($s1) -/* C32F54 80241A74 8EA30000 */ lw $v1, ($s5) -/* C32F58 80241A78 8C420000 */ lw $v0, ($v0) -/* C32F5C 80241A7C 00641824 */ and $v1, $v1, $a0 -/* C32F60 80241A80 AEA30000 */ sw $v1, ($s5) -/* C32F64 80241A84 AEA20028 */ sw $v0, 0x28($s5) -/* C32F68 80241A88 8E2200D0 */ lw $v0, 0xd0($s1) -/* C32F6C 80241A8C 8C420098 */ lw $v0, 0x98($v0) -/* C32F70 80241A90 54400005 */ bnel $v0, $zero, .L80241AA8 -/* C32F74 80241A94 2402FDFF */ addiu $v0, $zero, -0x201 -/* C32F78 80241A98 34620200 */ ori $v0, $v1, 0x200 -/* C32F7C 80241A9C 2403FFF7 */ addiu $v1, $zero, -9 -/* C32F80 80241AA0 080906AC */ j .L80241AB0 -/* C32F84 80241AA4 00431024 */ and $v0, $v0, $v1 -.L80241AA8: -/* C32F88 80241AA8 00621024 */ and $v0, $v1, $v0 -/* C32F8C 80241AAC 34420008 */ ori $v0, $v0, 8 -.L80241AB0: -/* C32F90 80241AB0 AEA20000 */ sw $v0, ($s5) -/* C32F94 80241AB4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32F98 80241AB8 30420004 */ andi $v0, $v0, 4 -/* C32F9C 80241ABC 10400007 */ beqz $v0, .L80241ADC -/* C32FA0 80241AC0 24020063 */ addiu $v0, $zero, 0x63 -/* C32FA4 80241AC4 AE420070 */ sw $v0, 0x70($s2) -/* C32FA8 80241AC8 AE400074 */ sw $zero, 0x74($s2) -/* C32FAC 80241ACC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32FB0 80241AD0 2403FFFB */ addiu $v1, $zero, -5 -/* C32FB4 80241AD4 00431024 */ and $v0, $v0, $v1 -/* C32FB8 80241AD8 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241ADC: -/* C32FBC 80241ADC AE20006C */ sw $zero, 0x6c($s1) -.L80241AE0: -/* C32FC0 80241AE0 8E420070 */ lw $v0, 0x70($s2) -/* C32FC4 80241AE4 2842001E */ slti $v0, $v0, 0x1e -/* C32FC8 80241AE8 10400009 */ beqz $v0, .L80241B10 -/* C32FCC 80241AEC 00000000 */ nop -/* C32FD0 80241AF0 8E22006C */ lw $v0, 0x6c($s1) -/* C32FD4 80241AF4 14400006 */ bnez $v0, .L80241B10 -/* C32FD8 80241AF8 00000000 */ nop -/* C32FDC 80241AFC 0C090116 */ jal func_80240458_C31938 -/* C32FE0 80241B00 0240202D */ daddu $a0, $s2, $zero -/* C32FE4 80241B04 10400002 */ beqz $v0, .L80241B10 -/* C32FE8 80241B08 2402001E */ addiu $v0, $zero, 0x1e -/* C32FEC 80241B0C AE420070 */ sw $v0, 0x70($s2) -.L80241B10: -/* C32FF0 80241B10 8E430070 */ lw $v1, 0x70($s2) -/* C32FF4 80241B14 2C620064 */ sltiu $v0, $v1, 0x64 -/* C32FF8 80241B18 1040004E */ beqz $v0, L80241C54_C33134 -/* C32FFC 80241B1C 00031080 */ sll $v0, $v1, 2 -/* C33000 80241B20 3C018024 */ lui $at, %hi(jtbl_80244D28_C36208) -/* C33004 80241B24 00220821 */ addu $at, $at, $v0 -/* C33008 80241B28 8C224D28 */ lw $v0, %lo(jtbl_80244D28_C36208)($at) -/* C3300C 80241B2C 00400008 */ jr $v0 -/* C33010 80241B30 00000000 */ nop -glabel L80241B34_C33014 -/* C33014 80241B34 0240202D */ daddu $a0, $s2, $zero -/* C33018 80241B38 0260282D */ daddu $a1, $s3, $zero -/* C3301C 80241B3C 0C0902C8 */ jal func_80240B20_C32000 -/* C33020 80241B40 0280302D */ daddu $a2, $s4, $zero -glabel L80241B44_C33024 -/* C33024 80241B44 0240202D */ daddu $a0, $s2, $zero -/* C33028 80241B48 0260282D */ daddu $a1, $s3, $zero -/* C3302C 80241B4C 0C09031E */ jal func_80240C78_C32158 -/* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero -/* C33034 80241B54 08090715 */ j L80241C54_C33134 -/* C33038 80241B58 00000000 */ nop -glabel L80241B5C_C3303C -/* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero -/* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero -/* C33044 80241B64 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 -/* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero -glabel L80241B6C_C3304C -/* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero -/* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero -/* C33054 80241B74 0C0903F8 */ jal func_80240FE0_C324C0 -/* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero -/* C3305C 80241B7C 08090715 */ j L80241C54_C33134 -/* C33060 80241B80 00000000 */ nop -glabel L80241B84_C33064 -/* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero -/* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero -/* C3306C 80241B8C 0C090467 */ jal func_8024119C_C3267C -/* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero -/* C33074 80241B94 08090715 */ j L80241C54_C33134 -/* C33078 80241B98 00000000 */ nop -glabel L80241B9C_C3307C -/* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero -/* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero -/* C33084 80241BA4 0C090494 */ jal dgb_03_NpcJumpFunc2 -/* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero -glabel L80241BAC_C3308C -/* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero -/* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero -/* C33094 80241BB4 0C0904B1 */ jal dgb_03_NpcJumpFunc -/* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero -/* C3309C 80241BBC 08090715 */ j L80241C54_C33134 -/* C330A0 80241BC0 00000000 */ nop -glabel L80241BC4_C330A4 -/* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero -/* C330A8 80241BC8 0260282D */ daddu $a1, $s3, $zero -/* C330AC 80241BCC 0C0904CF */ jal dgb_03_UnkNpcAIFunc13 -/* C330B0 80241BD0 0280302D */ daddu $a2, $s4, $zero -glabel L80241BD4_C330B4 -/* C330B4 80241BD4 0240202D */ daddu $a0, $s2, $zero -/* C330B8 80241BD8 0260282D */ daddu $a1, $s3, $zero -/* C330BC 80241BDC 0C09051B */ jal func_8024146C_C3294C -/* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero -/* C330C4 80241BE4 08090715 */ j L80241C54_C33134 -/* C330C8 80241BE8 00000000 */ nop -glabel L80241BEC_C330CC -/* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero -/* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero -/* C330D4 80241BF4 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc -/* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero -/* C330DC 80241BFC 08090715 */ j L80241C54_C33134 -/* C330E0 80241C00 00000000 */ nop -glabel L80241C04_C330E4 -/* C330E4 80241C04 0C090094 */ jal dgb_03_UnkNpcAIFunc6 -/* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero -glabel L80241C0C_C330EC -/* C330EC 80241C0C 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 -/* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero -/* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) -/* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 -/* C330FC 80241C1C 1462000D */ bne $v1, $v0, L80241C54_C33134 -/* C33100 80241C20 00000000 */ nop -glabel L80241C24_C33104 -/* C33104 80241C24 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 -/* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero -/* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) -/* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 -/* C33114 80241C34 14620007 */ bne $v1, $v0, L80241C54_C33134 -/* C33118 80241C38 00000000 */ nop -glabel L80241C3C_C3311C -/* C3311C 80241C3C 0C090101 */ jal dgb_03_UnkNpcAIFunc5 -/* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero -/* C33124 80241C44 08090715 */ j L80241C54_C33134 -/* C33128 80241C48 00000000 */ nop -glabel L80241C4C_C3312C -/* C3312C 80241C4C 0C0129CF */ jal func_8004A73C -/* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero -glabel L80241C54_C33134 -/* C33134 80241C54 8FBF0048 */ lw $ra, 0x48($sp) -/* C33138 80241C58 8FB50044 */ lw $s5, 0x44($sp) -/* C3313C 80241C5C 8FB40040 */ lw $s4, 0x40($sp) -/* C33140 80241C60 8FB3003C */ lw $s3, 0x3c($sp) -/* C33144 80241C64 8FB20038 */ lw $s2, 0x38($sp) -/* C33148 80241C68 8FB10034 */ lw $s1, 0x34($sp) -/* C3314C 80241C6C 8FB00030 */ lw $s0, 0x30($sp) -/* C33150 80241C70 0000102D */ daddu $v0, $zero, $zero -/* C33154 80241C74 03E00008 */ jr $ra -/* C33158 80241C78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s deleted file mode 100644 index 615f129235..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C7C_C3315C -/* C3315C 80241C7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C33160 80241C80 AFB10014 */ sw $s1, 0x14($sp) -/* C33164 80241C84 0080882D */ daddu $s1, $a0, $zero -/* C33168 80241C88 AFBF0018 */ sw $ra, 0x18($sp) -/* C3316C 80241C8C AFB00010 */ sw $s0, 0x10($sp) -/* C33170 80241C90 8E300148 */ lw $s0, 0x148($s1) -/* C33174 80241C94 0C00EABB */ jal get_npc_unsafe -/* C33178 80241C98 86040008 */ lh $a0, 8($s0) -/* C3317C 80241C9C 0040202D */ daddu $a0, $v0, $zero -/* C33180 80241CA0 8482008E */ lh $v0, 0x8e($a0) -/* C33184 80241CA4 9483008E */ lhu $v1, 0x8e($a0) -/* C33188 80241CA8 18400002 */ blez $v0, .L80241CB4 -/* C3318C 80241CAC 2462FFFF */ addiu $v0, $v1, -1 -/* C33190 80241CB0 A482008E */ sh $v0, 0x8e($a0) -.L80241CB4: -/* C33194 80241CB4 8482008E */ lh $v0, 0x8e($a0) -/* C33198 80241CB8 24030001 */ addiu $v1, $zero, 1 -/* C3319C 80241CBC 14430005 */ bne $v0, $v1, .L80241CD4 -/* C331A0 80241CC0 00000000 */ nop -/* C331A4 80241CC4 8E0200CC */ lw $v0, 0xcc($s0) -/* C331A8 80241CC8 8C420030 */ lw $v0, 0x30($v0) -/* C331AC 80241CCC 0809073C */ j .L80241CF0 -/* C331B0 80241CD0 AC820028 */ sw $v0, 0x28($a0) -.L80241CD4: -/* C331B4 80241CD4 1C400006 */ bgtz $v0, .L80241CF0 -/* C331B8 80241CD8 00000000 */ nop -/* C331BC 80241CDC 8E0200CC */ lw $v0, 0xcc($s0) -/* C331C0 80241CE0 8C420028 */ lw $v0, 0x28($v0) -/* C331C4 80241CE4 A480008E */ sh $zero, 0x8e($a0) -/* C331C8 80241CE8 AC820028 */ sw $v0, 0x28($a0) -/* C331CC 80241CEC AE230070 */ sw $v1, 0x70($s1) -.L80241CF0: -/* C331D0 80241CF0 8FBF0018 */ lw $ra, 0x18($sp) -/* C331D4 80241CF4 8FB10014 */ lw $s1, 0x14($sp) -/* C331D8 80241CF8 8FB00010 */ lw $s0, 0x10($sp) -/* C331DC 80241CFC 03E00008 */ jr $ra -/* C331E0 80241D00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s deleted file mode 100644 index 7df1e9f9c1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D04_C331E4 -/* C331E4 80241D04 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C331E8 80241D08 AFB40048 */ sw $s4, 0x48($sp) -/* C331EC 80241D0C 0080A02D */ daddu $s4, $a0, $zero -/* C331F0 80241D10 AFBF004C */ sw $ra, 0x4c($sp) -/* C331F4 80241D14 AFB30044 */ sw $s3, 0x44($sp) -/* C331F8 80241D18 AFB20040 */ sw $s2, 0x40($sp) -/* C331FC 80241D1C AFB1003C */ sw $s1, 0x3c($sp) -/* C33200 80241D20 AFB00038 */ sw $s0, 0x38($sp) -/* C33204 80241D24 8E930148 */ lw $s3, 0x148($s4) -/* C33208 80241D28 00C0802D */ daddu $s0, $a2, $zero -/* C3320C 80241D2C 86640008 */ lh $a0, 8($s3) -/* C33210 80241D30 0C00EABB */ jal get_npc_unsafe -/* C33214 80241D34 0000902D */ daddu $s2, $zero, $zero -/* C33218 80241D38 0C039D59 */ jal get_player_data -/* C3321C 80241D3C 0040882D */ daddu $s1, $v0, $zero -/* C33220 80241D40 0200202D */ daddu $a0, $s0, $zero -/* C33224 80241D44 0260282D */ daddu $a1, $s3, $zero -/* C33228 80241D48 0000382D */ daddu $a3, $zero, $zero -/* C3322C 80241D4C 3C0642A0 */ lui $a2, 0x42a0 -/* C33230 80241D50 0040802D */ daddu $s0, $v0, $zero -/* C33234 80241D54 0C01242D */ jal func_800490B4 -/* C33238 80241D58 AFA00010 */ sw $zero, 0x10($sp) -/* C3323C 80241D5C 10400022 */ beqz $v0, .L80241DE8 -/* C33240 80241D60 00000000 */ nop -/* C33244 80241D64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C33248 80241D68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3324C 80241D6C 804300B4 */ lb $v1, 0xb4($v0) -/* C33250 80241D70 24020002 */ addiu $v0, $zero, 2 -/* C33254 80241D74 10620013 */ beq $v1, $v0, .L80241DC4 -/* C33258 80241D78 2402001A */ addiu $v0, $zero, 0x1a -/* C3325C 80241D7C 10620011 */ beq $v1, $v0, .L80241DC4 -/* C33260 80241D80 24020003 */ addiu $v0, $zero, 3 -/* C33264 80241D84 1062000F */ beq $v1, $v0, .L80241DC4 -/* C33268 80241D88 2402000E */ addiu $v0, $zero, 0xe -/* C3326C 80241D8C 1062000D */ beq $v1, $v0, .L80241DC4 -/* C33270 80241D90 24020010 */ addiu $v0, $zero, 0x10 -/* C33274 80241D94 1062000B */ beq $v1, $v0, .L80241DC4 -/* C33278 80241D98 2402000B */ addiu $v0, $zero, 0xb -/* C3327C 80241D9C 10620009 */ beq $v1, $v0, .L80241DC4 -/* C33280 80241DA0 2402000A */ addiu $v0, $zero, 0xa -/* C33284 80241DA4 10620007 */ beq $v1, $v0, .L80241DC4 -/* C33288 80241DA8 24020012 */ addiu $v0, $zero, 0x12 -/* C3328C 80241DAC 10620005 */ beq $v1, $v0, .L80241DC4 -/* C33290 80241DB0 24020013 */ addiu $v0, $zero, 0x13 -/* C33294 80241DB4 10620003 */ beq $v1, $v0, .L80241DC4 -/* C33298 80241DB8 24020025 */ addiu $v0, $zero, 0x25 -/* C3329C 80241DBC 14620002 */ bne $v1, $v0, .L80241DC8 -/* C332A0 80241DC0 00000000 */ nop -.L80241DC4: -/* C332A4 80241DC4 24120001 */ addiu $s2, $zero, 1 -.L80241DC8: -/* C332A8 80241DC8 82030012 */ lb $v1, 0x12($s0) -/* C332AC 80241DCC 24020002 */ addiu $v0, $zero, 2 -/* C332B0 80241DD0 14620007 */ bne $v1, $v0, .L80241DF0 -/* C332B4 80241DD4 24020001 */ addiu $v0, $zero, 1 -/* C332B8 80241DD8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C332BC 80241DDC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C332C0 80241DE0 50430002 */ beql $v0, $v1, .L80241DEC -/* C332C4 80241DE4 24120001 */ addiu $s2, $zero, 1 -.L80241DE8: -/* C332C8 80241DE8 82030012 */ lb $v1, 0x12($s0) -.L80241DEC: -/* C332CC 80241DEC 24020001 */ addiu $v0, $zero, 1 -.L80241DF0: -/* C332D0 80241DF0 14620006 */ bne $v1, $v0, .L80241E0C -/* C332D4 80241DF4 24020003 */ addiu $v0, $zero, 3 -/* C332D8 80241DF8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C332DC 80241DFC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C332E0 80241E00 14400008 */ bnez $v0, .L80241E24 -/* C332E4 80241E04 27A40028 */ addiu $a0, $sp, 0x28 -/* C332E8 80241E08 24020003 */ addiu $v0, $zero, 3 -.L80241E0C: -/* C332EC 80241E0C 1462001B */ bne $v1, $v0, .L80241E7C -/* C332F0 80241E10 24020002 */ addiu $v0, $zero, 2 -/* C332F4 80241E14 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C332F8 80241E18 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C332FC 80241E1C 14620017 */ bne $v1, $v0, .L80241E7C -/* C33300 80241E20 27A40028 */ addiu $a0, $sp, 0x28 -.L80241E24: -/* C33304 80241E24 27A5002C */ addiu $a1, $sp, 0x2c -/* C33308 80241E28 8E27000C */ lw $a3, 0xc($s1) -/* C3330C 80241E2C C6200038 */ lwc1 $f0, 0x38($s1) -/* C33310 80241E30 C6220040 */ lwc1 $f2, 0x40($s1) -/* C33314 80241E34 0000302D */ daddu $a2, $zero, $zero -/* C33318 80241E38 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3331C 80241E3C 0C00A7E7 */ jal add_vec2D_polar -/* C33320 80241E40 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C33324 80241E44 3C028011 */ lui $v0, %hi(wPartnerNpc) -/* C33328 80241E48 8C42C930 */ lw $v0, %lo(wPartnerNpc)($v0) -/* C3332C 80241E4C C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C33330 80241E50 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C33334 80241E54 8C460038 */ lw $a2, 0x38($v0) -/* C33338 80241E58 0C00A7B5 */ jal dist2D -/* C3333C 80241E5C 8C470040 */ lw $a3, 0x40($v0) -/* C33340 80241E60 3C0142A0 */ lui $at, 0x42a0 -/* C33344 80241E64 44811000 */ mtc1 $at, $f2 -/* C33348 80241E68 00000000 */ nop -/* C3334C 80241E6C 4602003E */ c.le.s $f0, $f2 -/* C33350 80241E70 00000000 */ nop -/* C33354 80241E74 45030001 */ bc1tl .L80241E7C -/* C33358 80241E78 24120001 */ addiu $s2, $zero, 1 -.L80241E7C: -/* C3335C 80241E7C 12400026 */ beqz $s2, .L80241F18 -/* C33360 80241E80 0220202D */ daddu $a0, $s1, $zero -/* C33364 80241E84 3C05B000 */ lui $a1, 0xb000 -/* C33368 80241E88 34A5000E */ ori $a1, $a1, 0xe -/* C3336C 80241E8C 0C012530 */ jal func_800494C0 -/* C33370 80241E90 0000302D */ daddu $a2, $zero, $zero -/* C33374 80241E94 0000202D */ daddu $a0, $zero, $zero -/* C33378 80241E98 0220282D */ daddu $a1, $s1, $zero -/* C3337C 80241E9C 0000302D */ daddu $a2, $zero, $zero -/* C33380 80241EA0 862200A8 */ lh $v0, 0xa8($s1) -/* C33384 80241EA4 8E6300CC */ lw $v1, 0xcc($s3) -/* C33388 80241EA8 3C013F80 */ lui $at, 0x3f80 -/* C3338C 80241EAC 44810000 */ mtc1 $at, $f0 -/* C33390 80241EB0 3C014000 */ lui $at, 0x4000 -/* C33394 80241EB4 44811000 */ mtc1 $at, $f2 -/* C33398 80241EB8 3C01C1A0 */ lui $at, 0xc1a0 -/* C3339C 80241EBC 44812000 */ mtc1 $at, $f4 -/* C333A0 80241EC0 44823000 */ mtc1 $v0, $f6 -/* C333A4 80241EC4 00000000 */ nop -/* C333A8 80241EC8 468031A0 */ cvt.s.w $f6, $f6 -/* C333AC 80241ECC 44073000 */ mfc1 $a3, $f6 -/* C333B0 80241ED0 8C63002C */ lw $v1, 0x2c($v1) -/* C333B4 80241ED4 2402000A */ addiu $v0, $zero, 0xa -/* C333B8 80241ED8 A622008E */ sh $v0, 0x8e($s1) -/* C333BC 80241EDC 2402000F */ addiu $v0, $zero, 0xf -/* C333C0 80241EE0 AE230028 */ sw $v1, 0x28($s1) -/* C333C4 80241EE4 AFA2001C */ sw $v0, 0x1c($sp) -/* C333C8 80241EE8 27A20030 */ addiu $v0, $sp, 0x30 -/* C333CC 80241EEC E7A00010 */ swc1 $f0, 0x10($sp) -/* C333D0 80241EF0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C333D4 80241EF4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C333D8 80241EF8 0C01BFA4 */ jal fx_emote -/* C333DC 80241EFC AFA20020 */ sw $v0, 0x20($sp) -/* C333E0 80241F00 0220202D */ daddu $a0, $s1, $zero -/* C333E4 80241F04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C333E8 80241F08 0C012530 */ jal func_800494C0 -/* C333EC 80241F0C 3C060020 */ lui $a2, 0x20 -/* C333F0 80241F10 24020002 */ addiu $v0, $zero, 2 -/* C333F4 80241F14 AE820070 */ sw $v0, 0x70($s4) -.L80241F18: -/* C333F8 80241F18 9622008E */ lhu $v0, 0x8e($s1) -/* C333FC 80241F1C 24420001 */ addiu $v0, $v0, 1 -/* C33400 80241F20 A622008E */ sh $v0, 0x8e($s1) -/* C33404 80241F24 00021400 */ sll $v0, $v0, 0x10 -/* C33408 80241F28 00021C03 */ sra $v1, $v0, 0x10 -/* C3340C 80241F2C 2402001B */ addiu $v0, $zero, 0x1b -/* C33410 80241F30 14620005 */ bne $v1, $v0, .L80241F48 -/* C33414 80241F34 24020039 */ addiu $v0, $zero, 0x39 -/* C33418 80241F38 0220202D */ daddu $a0, $s1, $zero -/* C3341C 80241F3C 3C05B000 */ lui $a1, 0xb000 -/* C33420 80241F40 080907D7 */ j .L80241F5C -/* C33424 80241F44 34A5000C */ ori $a1, $a1, 0xc -.L80241F48: -/* C33428 80241F48 14620008 */ bne $v1, $v0, .L80241F6C -/* C3342C 80241F4C 2402003B */ addiu $v0, $zero, 0x3b -/* C33430 80241F50 0220202D */ daddu $a0, $s1, $zero -/* C33434 80241F54 3C05B000 */ lui $a1, 0xb000 -/* C33438 80241F58 34A5000D */ ori $a1, $a1, 0xd -.L80241F5C: -/* C3343C 80241F5C 0C012530 */ jal func_800494C0 -/* C33440 80241F60 0000302D */ daddu $a2, $zero, $zero -/* C33444 80241F64 080907E7 */ j .L80241F9C -/* C33448 80241F68 00000000 */ nop -.L80241F6C: -/* C3344C 80241F6C 14620005 */ bne $v1, $v0, .L80241F84 -/* C33450 80241F70 2402003C */ addiu $v0, $zero, 0x3c -/* C33454 80241F74 8E6200CC */ lw $v0, 0xcc($s3) -/* C33458 80241F78 8C420030 */ lw $v0, 0x30($v0) -/* C3345C 80241F7C 080907E7 */ j .L80241F9C -/* C33460 80241F80 AE220028 */ sw $v0, 0x28($s1) -.L80241F84: -/* C33464 80241F84 14620005 */ bne $v1, $v0, .L80241F9C -/* C33468 80241F88 00000000 */ nop -/* C3346C 80241F8C 8E6200CC */ lw $v0, 0xcc($s3) -/* C33470 80241F90 8C420028 */ lw $v0, 0x28($v0) -/* C33474 80241F94 A620008E */ sh $zero, 0x8e($s1) -/* C33478 80241F98 AE220028 */ sw $v0, 0x28($s1) -.L80241F9C: -/* C3347C 80241F9C 8FBF004C */ lw $ra, 0x4c($sp) -/* C33480 80241FA0 8FB40048 */ lw $s4, 0x48($sp) -/* C33484 80241FA4 8FB30044 */ lw $s3, 0x44($sp) -/* C33488 80241FA8 8FB20040 */ lw $s2, 0x40($sp) -/* C3348C 80241FAC 8FB1003C */ lw $s1, 0x3c($sp) -/* C33490 80241FB0 8FB00038 */ lw $s0, 0x38($sp) -/* C33494 80241FB4 03E00008 */ jr $ra -/* C33498 80241FB8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241FBC_C3349C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241FBC_C3349C.s deleted file mode 100644 index 626e4ba600..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241FBC_C3349C.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FBC_C3349C -/* C3349C 80241FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C334A0 80241FC0 AFB10014 */ sw $s1, 0x14($sp) -/* C334A4 80241FC4 0080882D */ daddu $s1, $a0, $zero -/* C334A8 80241FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* C334AC 80241FCC AFB00010 */ sw $s0, 0x10($sp) -/* C334B0 80241FD0 8E300148 */ lw $s0, 0x148($s1) -/* C334B4 80241FD4 0C00EABB */ jal get_npc_unsafe -/* C334B8 80241FD8 86040008 */ lh $a0, 8($s0) -/* C334BC 80241FDC 0040182D */ daddu $v1, $v0, $zero -/* C334C0 80241FE0 9462008E */ lhu $v0, 0x8e($v1) -/* C334C4 80241FE4 2442FFFF */ addiu $v0, $v0, -1 -/* C334C8 80241FE8 A462008E */ sh $v0, 0x8e($v1) -/* C334CC 80241FEC 00021400 */ sll $v0, $v0, 0x10 -/* C334D0 80241FF0 1C400006 */ bgtz $v0, .L8024200C -/* C334D4 80241FF4 24020001 */ addiu $v0, $zero, 1 -/* C334D8 80241FF8 A462008E */ sh $v0, 0x8e($v1) -/* C334DC 80241FFC 24020028 */ addiu $v0, $zero, 0x28 -/* C334E0 80242000 AE020088 */ sw $v0, 0x88($s0) -/* C334E4 80242004 24020003 */ addiu $v0, $zero, 3 -/* C334E8 80242008 AE220070 */ sw $v0, 0x70($s1) -.L8024200C: -/* C334EC 8024200C 8FBF0018 */ lw $ra, 0x18($sp) -/* C334F0 80242010 8FB10014 */ lw $s1, 0x14($sp) -/* C334F4 80242014 8FB00010 */ lw $s0, 0x10($sp) -/* C334F8 80242018 03E00008 */ jr $ra -/* C334FC 8024201C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s deleted file mode 100644 index 1b55f46c17..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242020_C33500 -/* C33500 80242020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C33504 80242024 AFB10014 */ sw $s1, 0x14($sp) -/* C33508 80242028 0080882D */ daddu $s1, $a0, $zero -/* C3350C 8024202C AFBF001C */ sw $ra, 0x1c($sp) -/* C33510 80242030 AFB20018 */ sw $s2, 0x18($sp) -/* C33514 80242034 AFB00010 */ sw $s0, 0x10($sp) -/* C33518 80242038 8E320148 */ lw $s2, 0x148($s1) -/* C3351C 8024203C 0C00EABB */ jal get_npc_unsafe -/* C33520 80242040 86440008 */ lh $a0, 8($s2) -/* C33524 80242044 240400B4 */ addiu $a0, $zero, 0xb4 -/* C33528 80242048 0C00A67F */ jal rand_int -/* C3352C 8024204C 0040802D */ daddu $s0, $v0, $zero -/* C33530 80242050 C60C000C */ lwc1 $f12, 0xc($s0) -/* C33534 80242054 44820000 */ mtc1 $v0, $f0 -/* C33538 80242058 00000000 */ nop -/* C3353C 8024205C 46800020 */ cvt.s.w $f0, $f0 -/* C33540 80242060 46006300 */ add.s $f12, $f12, $f0 -/* C33544 80242064 3C0142B4 */ lui $at, 0x42b4 -/* C33548 80242068 44810000 */ mtc1 $at, $f0 -/* C3354C 8024206C 0C00A6C9 */ jal clamp_angle -/* C33550 80242070 46006301 */ sub.s $f12, $f12, $f0 -/* C33554 80242074 E600000C */ swc1 $f0, 0xc($s0) -/* C33558 80242078 8E4200CC */ lw $v0, 0xcc($s2) -/* C3355C 8024207C 8C420000 */ lw $v0, ($v0) -/* C33560 80242080 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C33564 80242084 0C00A67F */ jal rand_int -/* C33568 80242088 AE020028 */ sw $v0, 0x28($s0) -/* C3356C 8024208C 00021FC2 */ srl $v1, $v0, 0x1f -/* C33570 80242090 00431821 */ addu $v1, $v0, $v1 -/* C33574 80242094 00031843 */ sra $v1, $v1, 1 -/* C33578 80242098 00031840 */ sll $v1, $v1, 1 -/* C3357C 8024209C 00431023 */ subu $v0, $v0, $v1 -/* C33580 802420A0 24420002 */ addiu $v0, $v0, 2 -/* C33584 802420A4 AE220074 */ sw $v0, 0x74($s1) -/* C33588 802420A8 24020004 */ addiu $v0, $zero, 4 -/* C3358C 802420AC AE220070 */ sw $v0, 0x70($s1) -/* C33590 802420B0 8FBF001C */ lw $ra, 0x1c($sp) -/* C33594 802420B4 8FB20018 */ lw $s2, 0x18($sp) -/* C33598 802420B8 8FB10014 */ lw $s1, 0x14($sp) -/* C3359C 802420BC 8FB00010 */ lw $s0, 0x10($sp) -/* C335A0 802420C0 03E00008 */ jr $ra -/* C335A4 802420C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s deleted file mode 100644 index 0c92dc4535..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420C8_C335A8 -/* C335A8 802420C8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C335AC 802420CC AFB20020 */ sw $s2, 0x20($sp) -/* C335B0 802420D0 0080902D */ daddu $s2, $a0, $zero -/* C335B4 802420D4 AFBF0028 */ sw $ra, 0x28($sp) -/* C335B8 802420D8 AFB30024 */ sw $s3, 0x24($sp) -/* C335BC 802420DC AFB1001C */ sw $s1, 0x1c($sp) -/* C335C0 802420E0 AFB00018 */ sw $s0, 0x18($sp) -/* C335C4 802420E4 8E510148 */ lw $s1, 0x148($s2) -/* C335C8 802420E8 00A0982D */ daddu $s3, $a1, $zero -/* C335CC 802420EC 86240008 */ lh $a0, 8($s1) -/* C335D0 802420F0 0C00EABB */ jal get_npc_unsafe -/* C335D4 802420F4 00C0802D */ daddu $s0, $a2, $zero -/* C335D8 802420F8 0200202D */ daddu $a0, $s0, $zero -/* C335DC 802420FC 0040802D */ daddu $s0, $v0, $zero -/* C335E0 80242100 AFA00010 */ sw $zero, 0x10($sp) -/* C335E4 80242104 8E660024 */ lw $a2, 0x24($s3) -/* C335E8 80242108 8E670028 */ lw $a3, 0x28($s3) -/* C335EC 8024210C 0C01242D */ jal func_800490B4 -/* C335F0 80242110 0220282D */ daddu $a1, $s1, $zero -/* C335F4 80242114 1040000C */ beqz $v0, .L80242148 -/* C335F8 80242118 00000000 */ nop -/* C335FC 8024211C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C33600 80242120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C33604 80242124 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C33608 80242128 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3360C 8024212C 8C460028 */ lw $a2, 0x28($v0) -/* C33610 80242130 0C00A720 */ jal atan2 -/* C33614 80242134 8C470030 */ lw $a3, 0x30($v0) -/* C33618 80242138 2402000C */ addiu $v0, $zero, 0xc -/* C3361C 8024213C E600000C */ swc1 $f0, 0xc($s0) -/* C33620 80242140 08090879 */ j .L802421E4 -/* C33624 80242144 AE420070 */ sw $v0, 0x70($s2) -.L80242148: -/* C33628 80242148 9602008E */ lhu $v0, 0x8e($s0) -/* C3362C 8024214C 2442FFFF */ addiu $v0, $v0, -1 -/* C33630 80242150 A602008E */ sh $v0, 0x8e($s0) -/* C33634 80242154 00021400 */ sll $v0, $v0, 0x10 -/* C33638 80242158 1C400022 */ bgtz $v0, .L802421E4 -/* C3363C 8024215C 00000000 */ nop -/* C33640 80242160 8E420074 */ lw $v0, 0x74($s2) -/* C33644 80242164 2442FFFF */ addiu $v0, $v0, -1 -/* C33648 80242168 18400014 */ blez $v0, .L802421BC -/* C3364C 8024216C AE420074 */ sw $v0, 0x74($s2) -/* C33650 80242170 C600000C */ lwc1 $f0, 0xc($s0) -/* C33654 80242174 3C014334 */ lui $at, 0x4334 -/* C33658 80242178 44816000 */ mtc1 $at, $f12 -/* C3365C 8024217C 0C00A6C9 */ jal clamp_angle -/* C33660 80242180 460C0300 */ add.s $f12, $f0, $f12 -/* C33664 80242184 E600000C */ swc1 $f0, 0xc($s0) -/* C33668 80242188 8E640008 */ lw $a0, 8($s3) -/* C3366C 8024218C 000417C2 */ srl $v0, $a0, 0x1f -/* C33670 80242190 00822021 */ addu $a0, $a0, $v0 -/* C33674 80242194 00042043 */ sra $a0, $a0, 1 -/* C33678 80242198 0C00A67F */ jal rand_int -/* C3367C 8024219C 24840001 */ addiu $a0, $a0, 1 -/* C33680 802421A0 8E630008 */ lw $v1, 8($s3) -/* C33684 802421A4 000327C2 */ srl $a0, $v1, 0x1f -/* C33688 802421A8 00641821 */ addu $v1, $v1, $a0 -/* C3368C 802421AC 00031843 */ sra $v1, $v1, 1 -/* C33690 802421B0 00621821 */ addu $v1, $v1, $v0 -/* C33694 802421B4 08090879 */ j .L802421E4 -/* C33698 802421B8 A603008E */ sh $v1, 0x8e($s0) -.L802421BC: -/* C3369C 802421BC 8E250088 */ lw $a1, 0x88($s1) -/* C336A0 802421C0 24020028 */ addiu $v0, $zero, 0x28 -/* C336A4 802421C4 14A20003 */ bne $a1, $v0, .L802421D4 -/* C336A8 802421C8 24020032 */ addiu $v0, $zero, 0x32 -/* C336AC 802421CC 08090877 */ j .L802421DC -/* C336B0 802421D0 24020014 */ addiu $v0, $zero, 0x14 -.L802421D4: -/* C336B4 802421D4 14A20003 */ bne $a1, $v0, .L802421E4 -/* C336B8 802421D8 24020019 */ addiu $v0, $zero, 0x19 -.L802421DC: -/* C336BC 802421DC A602008E */ sh $v0, 0x8e($s0) -/* C336C0 802421E0 AE450070 */ sw $a1, 0x70($s2) -.L802421E4: -/* C336C4 802421E4 8FBF0028 */ lw $ra, 0x28($sp) -/* C336C8 802421E8 8FB30024 */ lw $s3, 0x24($sp) -/* C336CC 802421EC 8FB20020 */ lw $s2, 0x20($sp) -/* C336D0 802421F0 8FB1001C */ lw $s1, 0x1c($sp) -/* C336D4 802421F4 8FB00018 */ lw $s0, 0x18($sp) -/* C336D8 802421F8 03E00008 */ jr $ra -/* C336DC 802421FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s deleted file mode 100644 index ac8c7b9307..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242200_C336E0 -/* C336E0 80242200 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C336E4 80242204 AFB20018 */ sw $s2, 0x18($sp) -/* C336E8 80242208 0080902D */ daddu $s2, $a0, $zero -/* C336EC 8024220C AFBF001C */ sw $ra, 0x1c($sp) -/* C336F0 80242210 AFB10014 */ sw $s1, 0x14($sp) -/* C336F4 80242214 AFB00010 */ sw $s0, 0x10($sp) -/* C336F8 80242218 8E500148 */ lw $s0, 0x148($s2) -/* C336FC 8024221C 86040008 */ lh $a0, 8($s0) -/* C33700 80242220 0C00EABB */ jal get_npc_unsafe -/* C33704 80242224 00A0882D */ daddu $s1, $a1, $zero -/* C33708 80242228 0040182D */ daddu $v1, $v0, $zero -/* C3370C 8024222C 9462008E */ lhu $v0, 0x8e($v1) -/* C33710 80242230 2442FFFF */ addiu $v0, $v0, -1 -/* C33714 80242234 A462008E */ sh $v0, 0x8e($v1) -/* C33718 80242238 00021400 */ sll $v0, $v0, 0x10 -/* C3371C 8024223C 1C400015 */ bgtz $v0, .L80242294 -/* C33720 80242240 00000000 */ nop -/* C33724 80242244 8E0200CC */ lw $v0, 0xcc($s0) -/* C33728 80242248 8C420004 */ lw $v0, 4($v0) -/* C3372C 8024224C AC620028 */ sw $v0, 0x28($v1) -/* C33730 80242250 8E0200D0 */ lw $v0, 0xd0($s0) -/* C33734 80242254 8C420014 */ lw $v0, 0x14($v0) -/* C33738 80242258 04410004 */ bgez $v0, .L8024226C -/* C3373C 8024225C 00000000 */ nop -/* C33740 80242260 C6200000 */ lwc1 $f0, ($s1) -/* C33744 80242264 080908A3 */ j .L8024228C -/* C33748 80242268 E4600018 */ swc1 $f0, 0x18($v1) -.L8024226C: -/* C3374C 8024226C 3C018024 */ lui $at, %hi(D_80244EB8_C36398) -/* C33750 80242270 D4224EB8 */ ldc1 $f2, %lo(D_80244EB8_C36398)($at) -/* C33754 80242274 44820000 */ mtc1 $v0, $f0 -/* C33758 80242278 00000000 */ nop -/* C3375C 8024227C 46800021 */ cvt.d.w $f0, $f0 -/* C33760 80242280 46220003 */ div.d $f0, $f0, $f2 -/* C33764 80242284 46200020 */ cvt.s.d $f0, $f0 -/* C33768 80242288 E4600018 */ swc1 $f0, 0x18($v1) -.L8024228C: -/* C3376C 8024228C 24020029 */ addiu $v0, $zero, 0x29 -/* C33770 80242290 AE420070 */ sw $v0, 0x70($s2) -.L80242294: -/* C33774 80242294 8FBF001C */ lw $ra, 0x1c($sp) -/* C33778 80242298 8FB20018 */ lw $s2, 0x18($sp) -/* C3377C 8024229C 8FB10014 */ lw $s1, 0x14($sp) -/* C33780 802422A0 8FB00010 */ lw $s0, 0x10($sp) -/* C33784 802422A4 03E00008 */ jr $ra -/* C33788 802422A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s deleted file mode 100644 index fc6de42625..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422AC_C3378C -/* C3378C 802422AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C33790 802422B0 AFB3002C */ sw $s3, 0x2c($sp) -/* C33794 802422B4 0080982D */ daddu $s3, $a0, $zero -/* C33798 802422B8 AFBF0030 */ sw $ra, 0x30($sp) -/* C3379C 802422BC AFB20028 */ sw $s2, 0x28($sp) -/* C337A0 802422C0 AFB10024 */ sw $s1, 0x24($sp) -/* C337A4 802422C4 AFB00020 */ sw $s0, 0x20($sp) -/* C337A8 802422C8 8E720148 */ lw $s2, 0x148($s3) -/* C337AC 802422CC 00A0882D */ daddu $s1, $a1, $zero -/* C337B0 802422D0 86440008 */ lh $a0, 8($s2) -/* C337B4 802422D4 0C00EABB */ jal get_npc_unsafe -/* C337B8 802422D8 00C0802D */ daddu $s0, $a2, $zero -/* C337BC 802422DC 0200202D */ daddu $a0, $s0, $zero -/* C337C0 802422E0 0240282D */ daddu $a1, $s2, $zero -/* C337C4 802422E4 AFA00010 */ sw $zero, 0x10($sp) -/* C337C8 802422E8 8E260024 */ lw $a2, 0x24($s1) -/* C337CC 802422EC 8E270028 */ lw $a3, 0x28($s1) -/* C337D0 802422F0 0C01242D */ jal func_800490B4 -/* C337D4 802422F4 0040802D */ daddu $s0, $v0, $zero -/* C337D8 802422F8 1040000C */ beqz $v0, .L8024232C -/* C337DC 802422FC 00000000 */ nop -/* C337E0 80242300 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C337E4 80242304 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C337E8 80242308 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C337EC 8024230C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C337F0 80242310 8C460028 */ lw $a2, 0x28($v0) -/* C337F4 80242314 0C00A720 */ jal atan2 -/* C337F8 80242318 8C470030 */ lw $a3, 0x30($v0) -/* C337FC 8024231C 2402000C */ addiu $v0, $zero, 0xc -/* C33800 80242320 E600000C */ swc1 $f0, 0xc($s0) -/* C33804 80242324 08090902 */ j .L80242408 -/* C33808 80242328 AE620070 */ sw $v0, 0x70($s3) -.L8024232C: -/* C3380C 8024232C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C33810 80242330 8E4200D0 */ lw $v0, 0xd0($s2) -/* C33814 80242334 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C33818 80242338 C4440000 */ lwc1 $f4, ($v0) -/* C3381C 8024233C 46802120 */ cvt.s.w $f4, $f4 -/* C33820 80242340 44062000 */ mfc1 $a2, $f4 -/* C33824 80242344 C4440008 */ lwc1 $f4, 8($v0) -/* C33828 80242348 46802120 */ cvt.s.w $f4, $f4 -/* C3382C 8024234C 44072000 */ mfc1 $a3, $f4 -/* C33830 80242350 0C00A7B5 */ jal dist2D -/* C33834 80242354 00000000 */ nop -/* C33838 80242358 C6020018 */ lwc1 $f2, 0x18($s0) -/* C3383C 8024235C 4602003E */ c.le.s $f0, $f2 -/* C33840 80242360 00000000 */ nop -/* C33844 80242364 4500000B */ bc1f .L80242394 -/* C33848 80242368 00000000 */ nop -/* C3384C 8024236C 8E4200CC */ lw $v0, 0xcc($s2) -/* C33850 80242370 8C430000 */ lw $v1, ($v0) -/* C33854 80242374 2402000F */ addiu $v0, $zero, 0xf -/* C33858 80242378 A602008E */ sh $v0, 0x8e($s0) -/* C3385C 8024237C 24020032 */ addiu $v0, $zero, 0x32 -/* C33860 80242380 AE030028 */ sw $v1, 0x28($s0) -/* C33864 80242384 AE420088 */ sw $v0, 0x88($s2) -/* C33868 80242388 24020003 */ addiu $v0, $zero, 3 -/* C3386C 8024238C 08090902 */ j .L80242408 -/* C33870 80242390 AE620070 */ sw $v0, 0x70($s3) -.L80242394: -/* C33874 80242394 8602008C */ lh $v0, 0x8c($s0) -/* C33878 80242398 1440001B */ bnez $v0, .L80242408 -/* C3387C 8024239C 0200202D */ daddu $a0, $s0, $zero -/* C33880 802423A0 27A60018 */ addiu $a2, $sp, 0x18 -/* C33884 802423A4 3C0540A0 */ lui $a1, 0x40a0 -/* C33888 802423A8 C600000C */ lwc1 $f0, 0xc($s0) -/* C3388C 802423AC 0000382D */ daddu $a3, $zero, $zero -/* C33890 802423B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C33894 802423B4 AFA00010 */ sw $zero, 0x10($sp) -/* C33898 802423B8 0C0129E1 */ jal func_8004A784 -/* C3389C 802423BC AFA00014 */ sw $zero, 0x14($sp) -/* C338A0 802423C0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C338A4 802423C4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C338A8 802423C8 E600000C */ swc1 $f0, 0xc($s0) -/* C338AC 802423CC 8E4200D0 */ lw $v0, 0xd0($s2) -/* C338B0 802423D0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C338B4 802423D4 C4440000 */ lwc1 $f4, ($v0) -/* C338B8 802423D8 46802120 */ cvt.s.w $f4, $f4 -/* C338BC 802423DC 44062000 */ mfc1 $a2, $f4 -/* C338C0 802423E0 C4440008 */ lwc1 $f4, 8($v0) -/* C338C4 802423E4 46802120 */ cvt.s.w $f4, $f4 -/* C338C8 802423E8 44072000 */ mfc1 $a3, $f4 -/* C338CC 802423EC 0C00A720 */ jal atan2 -/* C338D0 802423F0 00000000 */ nop -/* C338D4 802423F4 8E050018 */ lw $a1, 0x18($s0) -/* C338D8 802423F8 44060000 */ mfc1 $a2, $f0 -/* C338DC 802423FC 0200202D */ daddu $a0, $s0, $zero -/* C338E0 80242400 0C00EA95 */ jal npc_move_heading -/* C338E4 80242404 AC86000C */ sw $a2, 0xc($a0) -.L80242408: -/* C338E8 80242408 8FBF0030 */ lw $ra, 0x30($sp) -/* C338EC 8024240C 8FB3002C */ lw $s3, 0x2c($sp) -/* C338F0 80242410 8FB20028 */ lw $s2, 0x28($sp) -/* C338F4 80242414 8FB10024 */ lw $s1, 0x24($sp) -/* C338F8 80242418 8FB00020 */ lw $s0, 0x20($sp) -/* C338FC 8024241C 03E00008 */ jr $ra -/* C33900 80242420 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s deleted file mode 100644 index 198cb8c21a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242424_C33904.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242424_C33904 -/* C33904 80242424 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C33908 80242428 AFB00010 */ sw $s0, 0x10($sp) -/* C3390C 8024242C 0080802D */ daddu $s0, $a0, $zero -/* C33910 80242430 AFBF0014 */ sw $ra, 0x14($sp) -/* C33914 80242434 8E020148 */ lw $v0, 0x148($s0) -/* C33918 80242438 0C00EABB */ jal get_npc_unsafe -/* C3391C 8024243C 84440008 */ lh $a0, 8($v0) -/* C33920 80242440 0040182D */ daddu $v1, $v0, $zero -/* C33924 80242444 8462008C */ lh $v0, 0x8c($v1) -/* C33928 80242448 14400009 */ bnez $v0, .L80242470 -/* C3392C 8024244C 00000000 */ nop -/* C33930 80242450 9462008E */ lhu $v0, 0x8e($v1) -/* C33934 80242454 2442FFFF */ addiu $v0, $v0, -1 -/* C33938 80242458 A462008E */ sh $v0, 0x8e($v1) -/* C3393C 8024245C 00021400 */ sll $v0, $v0, 0x10 -/* C33940 80242460 1C400003 */ bgtz $v0, .L80242470 -/* C33944 80242464 00000000 */ nop -/* C33948 80242468 A460008E */ sh $zero, 0x8e($v1) -/* C3394C 8024246C AE000070 */ sw $zero, 0x70($s0) -.L80242470: -/* C33950 80242470 8FBF0014 */ lw $ra, 0x14($sp) -/* C33954 80242474 8FB00010 */ lw $s0, 0x10($sp) -/* C33958 80242478 03E00008 */ jr $ra -/* C3395C 8024247C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s deleted file mode 100644 index bd1d07c121..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242480_C33960 -/* C33960 80242480 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C33964 80242484 AFB20038 */ sw $s2, 0x38($sp) -/* C33968 80242488 0080902D */ daddu $s2, $a0, $zero -/* C3396C 8024248C AFBF0048 */ sw $ra, 0x48($sp) -/* C33970 80242490 AFB50044 */ sw $s5, 0x44($sp) -/* C33974 80242494 AFB40040 */ sw $s4, 0x40($sp) -/* C33978 80242498 AFB3003C */ sw $s3, 0x3c($sp) -/* C3397C 8024249C AFB10034 */ sw $s1, 0x34($sp) -/* C33980 802424A0 AFB00030 */ sw $s0, 0x30($sp) -/* C33984 802424A4 8E510148 */ lw $s1, 0x148($s2) -/* C33988 802424A8 86240008 */ lh $a0, 8($s1) -/* C3398C 802424AC 0C00EABB */ jal get_npc_unsafe -/* C33990 802424B0 00A0802D */ daddu $s0, $a1, $zero -/* C33994 802424B4 8E43000C */ lw $v1, 0xc($s2) -/* C33998 802424B8 0240202D */ daddu $a0, $s2, $zero -/* C3399C 802424BC 8C650000 */ lw $a1, ($v1) -/* C339A0 802424C0 0C0B1EAF */ jal get_variable -/* C339A4 802424C4 0040A02D */ daddu $s4, $v0, $zero -/* C339A8 802424C8 AFA00010 */ sw $zero, 0x10($sp) -/* C339AC 802424CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339B0 802424D0 8C630030 */ lw $v1, 0x30($v1) -/* C339B4 802424D4 AFA30014 */ sw $v1, 0x14($sp) -/* C339B8 802424D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339BC 802424DC 8C63001C */ lw $v1, 0x1c($v1) -/* C339C0 802424E0 AFA30018 */ sw $v1, 0x18($sp) -/* C339C4 802424E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339C8 802424E8 8C630024 */ lw $v1, 0x24($v1) -/* C339CC 802424EC AFA3001C */ sw $v1, 0x1c($sp) -/* C339D0 802424F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339D4 802424F4 8C630028 */ lw $v1, 0x28($v1) -/* C339D8 802424F8 27B50010 */ addiu $s5, $sp, 0x10 -/* C339DC 802424FC AFA30020 */ sw $v1, 0x20($sp) -/* C339E0 80242500 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339E4 80242504 3C014220 */ lui $at, 0x4220 -/* C339E8 80242508 44810000 */ mtc1 $at, $f0 -/* C339EC 8024250C 8C63002C */ lw $v1, 0x2c($v1) -/* C339F0 80242510 0040982D */ daddu $s3, $v0, $zero -/* C339F4 80242514 E7A00028 */ swc1 $f0, 0x28($sp) -/* C339F8 80242518 A7A0002C */ sh $zero, 0x2c($sp) -/* C339FC 8024251C 16000005 */ bnez $s0, .L80242534 -/* C33A00 80242520 AFA30024 */ sw $v1, 0x24($sp) -/* C33A04 80242524 8E2200B0 */ lw $v0, 0xb0($s1) -/* C33A08 80242528 30420004 */ andi $v0, $v0, 4 -/* C33A0C 8024252C 10400027 */ beqz $v0, .L802425CC -/* C33A10 80242530 00000000 */ nop -.L80242534: -/* C33A14 80242534 2402001E */ addiu $v0, $zero, 0x1e -/* C33A18 80242538 2404F7FF */ addiu $a0, $zero, -0x801 -/* C33A1C 8024253C AE400070 */ sw $zero, 0x70($s2) -/* C33A20 80242540 A682008E */ sh $v0, 0x8e($s4) -/* C33A24 80242544 8E2300CC */ lw $v1, 0xcc($s1) -/* C33A28 80242548 8E820000 */ lw $v0, ($s4) -/* C33A2C 8024254C 8C630028 */ lw $v1, 0x28($v1) -/* C33A30 80242550 00441024 */ and $v0, $v0, $a0 -/* C33A34 80242554 AE820000 */ sw $v0, ($s4) -/* C33A38 80242558 AE830028 */ sw $v1, 0x28($s4) -/* C33A3C 8024255C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C33A40 80242560 AE20006C */ sw $zero, 0x6c($s1) -/* C33A44 80242564 8C420034 */ lw $v0, 0x34($v0) -/* C33A48 80242568 14400006 */ bnez $v0, .L80242584 -/* C33A4C 8024256C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C33A50 80242570 8E820000 */ lw $v0, ($s4) -/* C33A54 80242574 2403FFF7 */ addiu $v1, $zero, -9 -/* C33A58 80242578 34420200 */ ori $v0, $v0, 0x200 -/* C33A5C 8024257C 08090964 */ j .L80242590 -/* C33A60 80242580 00431024 */ and $v0, $v0, $v1 -.L80242584: -/* C33A64 80242584 8E820000 */ lw $v0, ($s4) -/* C33A68 80242588 00431024 */ and $v0, $v0, $v1 -/* C33A6C 8024258C 34420008 */ ori $v0, $v0, 8 -.L80242590: -/* C33A70 80242590 AE820000 */ sw $v0, ($s4) -/* C33A74 80242594 8E2200B0 */ lw $v0, 0xb0($s1) -/* C33A78 80242598 30420004 */ andi $v0, $v0, 4 -/* C33A7C 8024259C 10400007 */ beqz $v0, .L802425BC -/* C33A80 802425A0 24020063 */ addiu $v0, $zero, 0x63 -/* C33A84 802425A4 AE420070 */ sw $v0, 0x70($s2) -/* C33A88 802425A8 24020028 */ addiu $v0, $zero, 0x28 -/* C33A8C 802425AC AE420074 */ sw $v0, 0x74($s2) -/* C33A90 802425B0 8E2200CC */ lw $v0, 0xcc($s1) -/* C33A94 802425B4 8C420000 */ lw $v0, ($v0) -/* C33A98 802425B8 AE820028 */ sw $v0, 0x28($s4) -.L802425BC: -/* C33A9C 802425BC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C33AA0 802425C0 2403FFFB */ addiu $v1, $zero, -5 -/* C33AA4 802425C4 00431024 */ and $v0, $v0, $v1 -/* C33AA8 802425C8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802425CC: -/* C33AAC 802425CC 8E420070 */ lw $v0, 0x70($s2) -/* C33AB0 802425D0 2442FFF6 */ addiu $v0, $v0, -0xa -/* C33AB4 802425D4 2C420014 */ sltiu $v0, $v0, 0x14 -/* C33AB8 802425D8 10400009 */ beqz $v0, .L80242600 -/* C33ABC 802425DC 00000000 */ nop -/* C33AC0 802425E0 8E22006C */ lw $v0, 0x6c($s1) -/* C33AC4 802425E4 14400006 */ bnez $v0, .L80242600 -/* C33AC8 802425E8 00000000 */ nop -/* C33ACC 802425EC 0C090116 */ jal func_80240458_C31938 -/* C33AD0 802425F0 0240202D */ daddu $a0, $s2, $zero -/* C33AD4 802425F4 10400002 */ beqz $v0, .L80242600 -/* C33AD8 802425F8 2402001E */ addiu $v0, $zero, 0x1e -/* C33ADC 802425FC AE420070 */ sw $v0, 0x70($s2) -.L80242600: -/* C33AE0 80242600 8E430070 */ lw $v1, 0x70($s2) -/* C33AE4 80242604 2C620064 */ sltiu $v0, $v1, 0x64 -/* C33AE8 80242608 10400067 */ beqz $v0, L802427A8_C33C88 -/* C33AEC 8024260C 00031080 */ sll $v0, $v1, 2 -/* C33AF0 80242610 3C018024 */ lui $at, %hi(jtbl_80244EC0_C363A0) -/* C33AF4 80242614 00220821 */ addu $at, $at, $v0 -/* C33AF8 80242618 8C224EC0 */ lw $v0, %lo(jtbl_80244EC0_C363A0)($at) -/* C33AFC 8024261C 00400008 */ jr $v0 -/* C33B00 80242620 00000000 */ nop -glabel L80242624_C33B04 -/* C33B04 80242624 0240202D */ daddu $a0, $s2, $zero -/* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero -/* C33B0C 8024262C 0C09071F */ jal func_80241C7C_C3315C -/* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero -/* C33B14 80242634 080909EA */ j L802427A8_C33C88 -/* C33B18 80242638 00000000 */ nop -glabel L8024263C_C33B1C -/* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero -/* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero -/* C33B24 80242644 0C090741 */ jal func_80241D04_C331E4 -/* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero -/* C33B2C 8024264C 080909EA */ j L802427A8_C33C88 -/* C33B30 80242650 00000000 */ nop -glabel L80242654_C33B34 -/* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero -/* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero -/* C33B3C 8024265C 0C0907EF */ jal func_80241FBC_C3349C -/* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero -/* C33B44 80242664 080909EA */ j L802427A8_C33C88 -/* C33B48 80242668 00000000 */ nop -glabel L8024266C_C33B4C -/* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero -/* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero -/* C33B54 80242674 0C090808 */ jal func_80242020_C33500 -/* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero -/* C33B5C 8024267C 080909EA */ j L802427A8_C33C88 -/* C33B60 80242680 00000000 */ nop -glabel L80242684_C33B64 -/* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero -/* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero -/* C33B6C 8024268C 0C090832 */ jal func_802420C8_C335A8 -/* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero -/* C33B74 80242694 080909EA */ j L802427A8_C33C88 -/* C33B78 80242698 00000000 */ nop -glabel L8024269C_C33B7C -/* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero -/* C33B80 802426A0 0260282D */ daddu $a1, $s3, $zero -/* C33B84 802426A4 0C0127DF */ jal func_80049F7C -/* C33B88 802426A8 02A0302D */ daddu $a2, $s5, $zero -/* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) -/* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd -/* C33B94 802426B4 1462003C */ bne $v1, $v0, L802427A8_C33C88 -/* C33B98 802426B8 00000000 */ nop -glabel L802426BC_C33B9C -/* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero -/* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero -/* C33BA4 802426C4 0C012849 */ jal func_8004A124 -/* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero -/* C33BAC 802426CC 080909EA */ j L802427A8_C33C88 -/* C33BB0 802426D0 00000000 */ nop -glabel L802426D4_C33BB4 -/* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero -/* C33BB8 802426D8 0260282D */ daddu $a1, $s3, $zero -/* C33BBC 802426DC 0C0128FA */ jal func_8004A3E8 -/* C33BC0 802426E0 02A0302D */ daddu $a2, $s5, $zero -/* C33BC4 802426E4 2402000F */ addiu $v0, $zero, 0xf -/* C33BC8 802426E8 A682008E */ sh $v0, 0x8e($s4) -/* C33BCC 802426EC 24020028 */ addiu $v0, $zero, 0x28 -/* C33BD0 802426F0 AE220088 */ sw $v0, 0x88($s1) -/* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 -/* C33BD8 802426F8 080909EA */ j L802427A8_C33C88 -/* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) -glabel L80242700_C33BE0 -/* C33BE0 80242700 0C090094 */ jal dgb_03_UnkNpcAIFunc6 -/* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero -/* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) -/* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f -/* C33BF0 80242710 14620025 */ bne $v1, $v0, L802427A8_C33C88 -/* C33BF4 80242714 00000000 */ nop -glabel L80242718_C33BF8 -/* C33BF8 80242718 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 -/* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero -/* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) -/* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 -/* C33C08 80242728 1462001F */ bne $v1, $v0, L802427A8_C33C88 -/* C33C0C 8024272C 00000000 */ nop -glabel L80242730_C33C10 -/* C33C10 80242730 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 -/* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero -/* C33C18 80242738 080909EA */ j L802427A8_C33C88 -/* C33C1C 8024273C 00000000 */ nop -glabel L80242740_C33C20 -/* C33C20 80242740 0C090101 */ jal dgb_03_UnkNpcAIFunc5 -/* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero -/* C33C28 80242748 080909EA */ j L802427A8_C33C88 -/* C33C2C 8024274C 00000000 */ nop -glabel L80242750_C33C30 -/* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero -/* C33C34 80242754 0260282D */ daddu $a1, $s3, $zero -/* C33C38 80242758 0C090880 */ jal func_80242200_C336E0 -/* C33C3C 8024275C 02A0302D */ daddu $a2, $s5, $zero -/* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) -/* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 -/* C33C48 80242768 1462000F */ bne $v1, $v0, L802427A8_C33C88 -/* C33C4C 8024276C 00000000 */ nop -glabel L80242770_C33C50 -/* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero -/* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero -/* C33C58 80242778 0C0908AB */ jal func_802422AC_C3378C -/* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero -/* C33C60 80242780 080909EA */ j L802427A8_C33C88 -/* C33C64 80242784 00000000 */ nop -glabel L80242788_C33C68 -/* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero -/* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero -/* C33C70 80242790 0C090909 */ jal func_80242424_C33904 -/* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero -/* C33C78 80242798 080909EA */ j L802427A8_C33C88 -/* C33C7C 8024279C 00000000 */ nop -glabel L802427A0_C33C80 -/* C33C80 802427A0 0C0129CF */ jal func_8004A73C -/* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero -glabel L802427A8_C33C88 -/* C33C88 802427A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C33C8C 802427AC 8FB50044 */ lw $s5, 0x44($sp) -/* C33C90 802427B0 8FB40040 */ lw $s4, 0x40($sp) -/* C33C94 802427B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C33C98 802427B8 8FB20038 */ lw $s2, 0x38($sp) -/* C33C9C 802427BC 8FB10034 */ lw $s1, 0x34($sp) -/* C33CA0 802427C0 8FB00030 */ lw $s0, 0x30($sp) -/* C33CA4 802427C4 0000102D */ daddu $v0, $zero, $zero -/* C33CA8 802427C8 03E00008 */ jr $ra -/* C33CAC 802427CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802401B0_C366E0.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s rename to ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802401B0_C366E0.s index 5689c7ee0a..e81e3b2ab2 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802401B0_C366E0.s @@ -1,6 +1,14 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata +glabel D_802443F8_C3A928 +.double 0.09 + +glabel D_80244400_C3A930 +.double 0.09 + +.section .text glabel func_802401B0_C366E0 /* C366E0 802401B0 27BDFF80 */ addiu $sp, $sp, -0x80 /* C366E4 802401B4 AFB3004C */ sw $s3, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802424A4_C389D4.s similarity index 97% rename from ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s rename to ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802424A4_C389D4.s index f986deb7e4..eb184873c2 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424A4_C389D4.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_802424A4_C389D4.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802424A4_C389D4 +glabel dgb_04_func_802424A4_C389D4 /* C389D4 802424A4 3C028011 */ lui $v0, %hi(gPlayerData) /* C389D8 802424A8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* C389DC 802424AC 000420C0 */ sll $a0, $a0, 3 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s similarity index 93% rename from ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s rename to ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s index 403e0c2a47..47cb142943 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/dgb_04_func_8024259C_C38ACC.s @@ -22,12 +22,12 @@ glabel func_8024259C_C38ACC /* C38B10 802425E0 0040982D */ daddu $s3, $v0, $zero /* C38B14 802425E4 0000B02D */ daddu $s6, $zero, $zero /* C38B18 802425E8 02C0902D */ daddu $s2, $s6, $zero -/* C38B1C 802425EC 3C148024 */ lui $s4, %hi(D_80243D38_C3A268) -/* C38B20 802425F0 26943D38 */ addiu $s4, $s4, %lo(D_80243D38_C3A268) +/* C38B1C 802425EC 3C148024 */ lui $s4, %hi(dgb_04_D_80243D38_C3A268) +/* C38B20 802425F0 26943D38 */ addiu $s4, $s4, %lo(dgb_04_D_80243D38_C3A268) /* C38B24 802425F4 0260882D */ daddu $s1, $s3, $zero /* C38B28 802425F8 8EA200B4 */ lw $v0, 0xb4($s5) -/* C38B2C 802425FC 3C038024 */ lui $v1, %hi(D_80243D30_C3A260) -/* C38B30 80242600 24633D30 */ addiu $v1, $v1, %lo(D_80243D30_C3A260) +/* C38B2C 802425FC 3C038024 */ lui $v1, %hi(dgb_04_D_80243D30_C3A260) +/* C38B30 80242600 24633D30 */ addiu $v1, $v1, %lo(dgb_04_D_80243D30_C3A260) /* C38B34 80242604 AEB30078 */ sw $s3, 0x78($s5) /* C38B38 80242608 00021027 */ nor $v0, $zero, $v0 /* C38B3C 8024260C 0002BFC2 */ srl $s7, $v0, 0x1f @@ -49,7 +49,7 @@ glabel func_8024259C_C38ACC /* C38B78 80242648 AE300108 */ sw $s0, 0x108($s1) /* C38B7C 8024264C 8C420000 */ lw $v0, ($v0) /* C38B80 80242650 02E0282D */ daddu $a1, $s7, $zero -/* C38B84 80242654 0C090929 */ jal func_802424A4_C389D4 +/* C38B84 80242654 0C090929 */ jal dgb_04_func_802424A4_C389D4 /* C38B88 80242658 AE220084 */ sw $v0, 0x84($s1) /* C38B8C 8024265C 0040202D */ daddu $a0, $v0, $zero /* C38B90 80242660 04800011 */ bltz $a0, .L802426A8 @@ -61,8 +61,8 @@ glabel func_8024259C_C38ACC /* C38BA8 80242678 24020001 */ addiu $v0, $zero, 1 /* C38BAC 8024267C AE22018C */ sw $v0, 0x18c($s1) /* C38BB0 80242680 00041080 */ sll $v0, $a0, 2 -/* C38BB4 80242684 3C068024 */ lui $a2, %hi(D_80243D48_C3A278) -/* C38BB8 80242688 24C63D48 */ addiu $a2, $a2, %lo(D_80243D48_C3A278) +/* C38BB4 80242684 3C068024 */ lui $a2, %hi(dgb_04_D_80243D48_C3A278) +/* C38BB8 80242688 24C63D48 */ addiu $a2, $a2, %lo(dgb_04_D_80243D48_C3A278) /* C38BBC 8024268C AE230000 */ sw $v1, ($s1) /* C38BC0 80242690 001218C0 */ sll $v1, $s2, 3 /* C38BC4 80242694 00431021 */ addu $v0, $v0, $v1 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s deleted file mode 100644 index aac6974aa9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C36530 -/* C36530 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C36534 80240004 AFB3002C */ sw $s3, 0x2c($sp) -/* C36538 80240008 0080982D */ daddu $s3, $a0, $zero -/* C3653C 8024000C AFBF0030 */ sw $ra, 0x30($sp) -/* C36540 80240010 AFB20028 */ sw $s2, 0x28($sp) -/* C36544 80240014 AFB10024 */ sw $s1, 0x24($sp) -/* C36548 80240018 AFB00020 */ sw $s0, 0x20($sp) -/* C3654C 8024001C 8E710148 */ lw $s1, 0x148($s3) -/* C36550 80240020 86240008 */ lh $a0, 8($s1) -/* C36554 80240024 0C00EABB */ jal get_npc_unsafe -/* C36558 80240028 00A0902D */ daddu $s2, $a1, $zero -/* C3655C 8024002C 8E440004 */ lw $a0, 4($s2) -/* C36560 80240030 0040802D */ daddu $s0, $v0, $zero -/* C36564 80240034 00041FC2 */ srl $v1, $a0, 0x1f -/* C36568 80240038 00832021 */ addu $a0, $a0, $v1 -/* C3656C 8024003C 00042043 */ sra $a0, $a0, 1 -/* C36570 80240040 0C00A67F */ jal rand_int -/* C36574 80240044 24840001 */ addiu $a0, $a0, 1 -/* C36578 80240048 8E430004 */ lw $v1, 4($s2) -/* C3657C 8024004C 000327C2 */ srl $a0, $v1, 0x1f -/* C36580 80240050 00641821 */ addu $v1, $v1, $a0 -/* C36584 80240054 00031843 */ sra $v1, $v1, 1 -/* C36588 80240058 00621821 */ addu $v1, $v1, $v0 -/* C3658C 8024005C A603008E */ sh $v1, 0x8e($s0) -/* C36590 80240060 8E2300D0 */ lw $v1, 0xd0($s1) -/* C36594 80240064 C6000040 */ lwc1 $f0, 0x40($s0) -/* C36598 80240068 C4640000 */ lwc1 $f4, ($v1) -/* C3659C 8024006C 46802120 */ cvt.s.w $f4, $f4 -/* C365A0 80240070 C4620008 */ lwc1 $f2, 8($v1) -/* C365A4 80240074 468010A0 */ cvt.s.w $f2, $f2 -/* C365A8 80240078 E7A00010 */ swc1 $f0, 0x10($sp) -/* C365AC 8024007C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C365B0 80240080 44061000 */ mfc1 $a2, $f2 -/* C365B4 80240084 C440000C */ lwc1 $f0, 0xc($v0) -/* C365B8 80240088 46800020 */ cvt.s.w $f0, $f0 -/* C365BC 8024008C E7A00014 */ swc1 $f0, 0x14($sp) -/* C365C0 80240090 8E2200D0 */ lw $v0, 0xd0($s1) -/* C365C4 80240094 44052000 */ mfc1 $a1, $f4 -/* C365C8 80240098 C4400010 */ lwc1 $f0, 0x10($v0) -/* C365CC 8024009C 46800020 */ cvt.s.w $f0, $f0 -/* C365D0 802400A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C365D4 802400A4 8C640018 */ lw $a0, 0x18($v1) -/* C365D8 802400A8 0C0123F5 */ jal is_point_within_region -/* C365DC 802400AC 8E070038 */ lw $a3, 0x38($s0) -/* C365E0 802400B0 1040000E */ beqz $v0, .L802400EC -/* C365E4 802400B4 00000000 */ nop -/* C365E8 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C365EC 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C365F0 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C365F4 802400C4 C4460000 */ lwc1 $f6, ($v0) -/* C365F8 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* C365FC 802400CC 44063000 */ mfc1 $a2, $f6 -/* C36600 802400D0 C4460008 */ lwc1 $f6, 8($v0) -/* C36604 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* C36608 802400D8 44073000 */ mfc1 $a3, $f6 -/* C3660C 802400DC 0C00A720 */ jal atan2 -/* C36610 802400E0 00000000 */ nop -/* C36614 802400E4 08090047 */ j .L8024011C -/* C36618 802400E8 E600000C */ swc1 $f0, 0xc($s0) -.L802400EC: -/* C3661C 802400EC 0C00A67F */ jal rand_int -/* C36620 802400F0 2404003C */ addiu $a0, $zero, 0x3c -/* C36624 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C36628 802400F8 44820000 */ mtc1 $v0, $f0 -/* C3662C 802400FC 00000000 */ nop -/* C36630 80240100 46800020 */ cvt.s.w $f0, $f0 -/* C36634 80240104 46006300 */ add.s $f12, $f12, $f0 -/* C36638 80240108 3C0141F0 */ lui $at, 0x41f0 -/* C3663C 8024010C 44810000 */ mtc1 $at, $f0 -/* C36640 80240110 0C00A6C9 */ jal clamp_angle -/* C36644 80240114 46006301 */ sub.s $f12, $f12, $f0 -/* C36648 80240118 E600000C */ swc1 $f0, 0xc($s0) -.L8024011C: -/* C3664C 8024011C 8E2200CC */ lw $v0, 0xcc($s1) -/* C36650 80240120 8C420004 */ lw $v0, 4($v0) -/* C36654 80240124 AE020028 */ sw $v0, 0x28($s0) -/* C36658 80240128 AE600074 */ sw $zero, 0x74($s3) -/* C3665C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C36660 80240130 8C420014 */ lw $v0, 0x14($v0) -/* C36664 80240134 04410004 */ bgez $v0, .L80240148 -/* C36668 80240138 00000000 */ nop -/* C3666C 8024013C C6400000 */ lwc1 $f0, ($s2) -/* C36670 80240140 0809005A */ j .L80240168 -/* C36674 80240144 E6000018 */ swc1 $f0, 0x18($s0) -.L80240148: -/* C36678 80240148 3C018024 */ lui $at, %hi(D_802443F0_C3A920) -/* C3667C 8024014C D42243F0 */ ldc1 $f2, %lo(D_802443F0_C3A920)($at) -/* C36680 80240150 44820000 */ mtc1 $v0, $f0 -/* C36684 80240154 00000000 */ nop -/* C36688 80240158 46800021 */ cvt.d.w $f0, $f0 -/* C3668C 8024015C 46220003 */ div.d $f0, $f0, $f2 -/* C36690 80240160 46200020 */ cvt.s.d $f0, $f0 -/* C36694 80240164 E6000018 */ swc1 $f0, 0x18($s0) -.L80240168: -/* C36698 80240168 C600003C */ lwc1 $f0, 0x3c($s0) -/* C3669C 8024016C 3C014059 */ lui $at, 0x4059 -/* C366A0 80240170 44811800 */ mtc1 $at, $f3 -/* C366A4 80240174 44801000 */ mtc1 $zero, $f2 -/* C366A8 80240178 46000021 */ cvt.d.s $f0, $f0 -/* C366AC 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* C366B0 80240180 00000000 */ nop -/* C366B4 80240184 24020001 */ addiu $v0, $zero, 1 -/* C366B8 80240188 4620018D */ trunc.w.d $f6, $f0 -/* C366BC 8024018C E626007C */ swc1 $f6, 0x7c($s1) -/* C366C0 80240190 AE620070 */ sw $v0, 0x70($s3) -/* C366C4 80240194 8FBF0030 */ lw $ra, 0x30($sp) -/* C366C8 80240198 8FB3002C */ lw $s3, 0x2c($sp) -/* C366CC 8024019C 8FB20028 */ lw $s2, 0x28($sp) -/* C366D0 802401A0 8FB10024 */ lw $s1, 0x24($sp) -/* C366D4 802401A4 8FB00020 */ lw $s0, 0x20($sp) -/* C366D8 802401A8 03E00008 */ jr $ra -/* C366DC 802401AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s deleted file mode 100644 index 44f2b7289e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240898_C36DC8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_C36DC8 -/* C36DC8 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C36DCC 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* C36DD0 802408A0 0080982D */ daddu $s3, $a0, $zero -/* C36DD4 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* C36DD8 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* C36DDC 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* C36DE0 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* C36DE4 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* C36DE8 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C36DEC 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* C36DF0 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C36DF4 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C36DF8 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* C36DFC 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* C36E00 802408D0 86240008 */ lh $a0, 8($s1) -/* C36E04 802408D4 0C00EABB */ jal get_npc_unsafe -/* C36E08 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* C36E0C 802408DC 0040802D */ daddu $s0, $v0, $zero -/* C36E10 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C36E14 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* C36E18 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* C36E1C 802408EC 3C014059 */ lui $at, 0x4059 -/* C36E20 802408F0 44811800 */ mtc1 $at, $f3 -/* C36E24 802408F4 44801000 */ mtc1 $zero, $f2 -/* C36E28 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* C36E2C 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* C36E30 80240900 46220003 */ div.d $f0, $f0, $f2 -/* C36E34 80240904 46200620 */ cvt.s.d $f24, $f0 -/* C36E38 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* C36E3C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* C36E40 80240910 46000021 */ cvt.d.s $f0, $f0 -/* C36E44 80240914 46220003 */ div.d $f0, $f0, $f2 -/* C36E48 80240918 46200020 */ cvt.s.d $f0, $f0 -/* C36E4C 8024091C 18400003 */ blez $v0, .L8024092C -/* C36E50 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* C36E54 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* C36E58 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* C36E5C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* C36E60 80240930 18400034 */ blez $v0, .L80240A04 -/* C36E64 80240934 00000000 */ nop -/* C36E68 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C36E6C 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* C36E70 80240940 44820000 */ mtc1 $v0, $f0 -/* C36E74 80240944 00000000 */ nop -/* C36E78 80240948 46800020 */ cvt.s.w $f0, $f0 -/* C36E7C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* C36E80 80240950 46220003 */ div.d $f0, $f0, $f2 -/* C36E84 80240954 0C00A8BB */ jal sin_deg -/* C36E88 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* C36E8C 8024095C 8E020000 */ lw $v0, ($s0) -/* C36E90 80240960 30420008 */ andi $v0, $v0, 8 -/* C36E94 80240964 10400003 */ beqz $v0, .L80240974 -/* C36E98 80240968 46000506 */ mov.s $f20, $f0 -/* C36E9C 8024096C 0809026D */ j .L802409B4 -/* C36EA0 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* C36EA4 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* C36EA8 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* C36EAC 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* C36EB0 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* C36EB4 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* C36EB8 80240988 3C01447A */ lui $at, 0x447a -/* C36EBC 8024098C 44813000 */ mtc1 $at, $f6 -/* C36EC0 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* C36EC4 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* C36EC8 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C36ECC 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* C36ED0 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C36ED4 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* C36ED8 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* C36EDC 802409AC 0C0372DF */ jal func_800DCB7C -/* C36EE0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* C36EE4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* C36EE8 802409B8 00000000 */ nop -/* C36EEC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* C36EF0 802409C0 00000000 */ nop -/* C36EF4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C36EF8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* C36EFC 802409CC 08090278 */ j .L802409E0 -/* C36F00 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* C36F04 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* C36F08 802409D8 00000000 */ nop -/* C36F0C 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* C36F10 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* C36F14 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* C36F18 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* C36F1C 802409EC 44826000 */ mtc1 $v0, $f12 -/* C36F20 802409F0 00000000 */ nop -/* C36F24 802409F4 0C00A6C9 */ jal clamp_angle -/* C36F28 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* C36F2C 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* C36F30 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* C36F34 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* C36F38 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* C36F3C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* C36F40 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* C36F44 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* C36F48 80240A18 44821000 */ mtc1 $v0, $f2 -/* C36F4C 80240A1C 00000000 */ nop -/* C36F50 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* C36F54 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C36F58 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C36F5C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* C36F60 80240A30 3C014024 */ lui $at, 0x4024 -/* C36F64 80240A34 44812800 */ mtc1 $at, $f5 -/* C36F68 80240A38 44802000 */ mtc1 $zero, $f4 -/* C36F6C 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* C36F70 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* C36F74 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* C36F78 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* C36F7C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* C36F80 80240A50 00000000 */ nop -/* C36F84 80240A54 4500002E */ bc1f .L80240B10 -/* C36F88 80240A58 0280202D */ daddu $a0, $s4, $zero -/* C36F8C 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* C36F90 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* C36F94 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* C36F98 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* C36F9C 80240A6C 0C01242D */ jal func_800490B4 -/* C36FA0 80240A70 0220282D */ daddu $a1, $s1, $zero -/* C36FA4 80240A74 10400026 */ beqz $v0, .L80240B10 -/* C36FA8 80240A78 0000202D */ daddu $a0, $zero, $zero -/* C36FAC 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* C36FB0 80240A80 0000302D */ daddu $a2, $zero, $zero -/* C36FB4 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* C36FB8 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* C36FBC 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* C36FC0 80240A90 44810000 */ mtc1 $at, $f0 -/* C36FC4 80240A94 3C014000 */ lui $at, 0x4000 -/* C36FC8 80240A98 44811000 */ mtc1 $at, $f2 -/* C36FCC 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* C36FD0 80240AA0 44812000 */ mtc1 $at, $f4 -/* C36FD4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* C36FD8 80240AA8 00000000 */ nop -/* C36FDC 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* C36FE0 80240AB0 44074000 */ mfc1 $a3, $f8 -/* C36FE4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* C36FE8 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* C36FEC 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* C36FF0 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C36FF4 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C36FF8 80240AC8 0C01BFA4 */ jal fx_emote -/* C36FFC 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* C37000 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* C37004 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C37008 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C3700C 80240ADC 3C060020 */ lui $a2, 0x20 -/* C37010 80240AE0 0C012530 */ jal func_800494C0 -/* C37014 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* C37018 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* C3701C 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* C37020 80240AF0 30420001 */ andi $v0, $v0, 1 -/* C37024 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* C37028 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* C3702C 80240AFC 080902EB */ j .L80240BAC -/* C37030 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* C37034 80240B04 080902EB */ j .L80240BAC -/* C37038 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* C3703C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* C37040 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* C37044 80240B14 14400025 */ bnez $v0, .L80240BAC -/* C37048 80240B18 00000000 */ nop -/* C3704C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* C37050 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* C37054 80240B24 00000000 */ nop -/* C37058 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* C3705C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* C37060 80240B30 1840001D */ blez $v0, .L80240BA8 -/* C37064 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* C37068 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* C3706C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* C37070 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* C37074 80240B44 14400007 */ bnez $v0, .L80240B64 -/* C37078 80240B48 00000000 */ nop -/* C3707C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* C37080 80240B50 3C014334 */ lui $at, 0x4334 -/* C37084 80240B54 44816000 */ mtc1 $at, $f12 -/* C37088 80240B58 0C00A6C9 */ jal clamp_angle -/* C3708C 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* C37090 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* C37094 80240B64 0C00A67F */ jal rand_int -/* C37098 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C3709C 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* C370A0 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C370A4 80240B74 00430018 */ mult $v0, $v1 -/* C370A8 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* C370AC 80240B7C 00004010 */ mfhi $t0 -/* C370B0 80240B80 00082043 */ sra $a0, $t0, 1 -/* C370B4 80240B84 00832023 */ subu $a0, $a0, $v1 -/* C370B8 80240B88 00041840 */ sll $v1, $a0, 1 -/* C370BC 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* C370C0 80240B90 00031880 */ sll $v1, $v1, 2 -/* C370C4 80240B94 00641823 */ subu $v1, $v1, $a0 -/* C370C8 80240B98 00431023 */ subu $v0, $v0, $v1 -/* C370CC 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* C370D0 80240BA0 080902EB */ j .L80240BAC -/* C370D4 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* C370D8 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* C370DC 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* C370E0 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* C370E4 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* C370E8 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* C370EC 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* C370F0 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* C370F4 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C370F8 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C370FC 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* C37100 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C37104 80240BD4 03E00008 */ jr $ra -/* C37108 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s deleted file mode 100644 index fecc977f6a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54_C37184 -/* C37184 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C37188 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* C3718C 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* C37190 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* C37194 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* C37198 80240C68 0C00EABB */ jal get_npc_unsafe -/* C3719C 80240C6C 84440008 */ lh $a0, 8($v0) -/* C371A0 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* C371A4 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* C371A8 80240C78 24640001 */ addiu $a0, $v1, 1 -/* C371AC 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* C371B0 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* C371B4 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* C371B8 80240C88 3C018024 */ lui $at, %hi(D_80243560_C39A90) -/* C371BC 80240C8C 00230821 */ addu $at, $at, $v1 -/* C371C0 80240C90 C4223560 */ lwc1 $f2, %lo(D_80243560_C39A90)($at) -/* C371C4 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* C371C8 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* C371CC 80240C9C 28630005 */ slti $v1, $v1, 5 -/* C371D0 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* C371D4 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* C371D8 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* C371DC 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* C371E0 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* C371E4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* C371E8 80240CB8 03E00008 */ jr $ra -/* C371EC 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s deleted file mode 100644 index f7daf15c39..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240E58_C37388.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_C37388 -/* C37388 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3738C 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* C37390 80240E60 0080902D */ daddu $s2, $a0, $zero -/* C37394 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* C37398 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* C3739C 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* C373A0 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* C373A4 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C373A8 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C373AC 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* C373B0 80240E80 86240008 */ lh $a0, 8($s1) -/* C373B4 80240E84 0C00EABB */ jal get_npc_unsafe -/* C373B8 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* C373BC 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* C373C0 80240E90 0200202D */ daddu $a0, $s0, $zero -/* C373C4 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* C373C8 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* C373CC 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* C373D0 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C373D4 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* C373D8 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* C373DC 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* C373E0 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* C373E4 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* C373E8 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* C373EC 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* C373F0 80240EC0 3C014059 */ lui $at, 0x4059 -/* C373F4 80240EC4 44812800 */ mtc1 $at, $f5 -/* C373F8 80240EC8 44802000 */ mtc1 $zero, $f4 -/* C373FC 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* C37400 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* C37404 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* C37408 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* C3740C 80240EDC 0C00EA95 */ jal npc_move_heading -/* C37410 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* C37414 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* C37418 80240EE8 44801000 */ mtc1 $zero, $f2 -/* C3741C 80240EEC 44801800 */ mtc1 $zero, $f3 -/* C37420 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* C37424 80240EF4 4620103E */ c.le.d $f2, $f0 -/* C37428 80240EF8 00000000 */ nop -/* C3742C 80240EFC 45000030 */ bc1f .L80240FC0 -/* C37430 80240F00 00000000 */ nop -/* C37434 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* C37438 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* C3743C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* C37440 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* C37444 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* C37448 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* C3744C 80240F1C A2200007 */ sb $zero, 7($s1) -/* C37450 80240F20 8E020000 */ lw $v0, ($s0) -/* C37454 80240F24 30420008 */ andi $v0, $v0, 8 -/* C37458 80240F28 14400011 */ bnez $v0, .L80240F70 -/* C3745C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* C37460 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* C37464 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* C37468 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* C3746C 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* C37470 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* C37474 80240F44 3C01447A */ lui $at, 0x447a -/* C37478 80240F48 44813000 */ mtc1 $at, $f6 -/* C3747C 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* C37480 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* C37484 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C37488 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* C3748C 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* C37490 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* C37494 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* C37498 80240F68 0C0372DF */ jal func_800DCB7C -/* C3749C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* C374A0 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* C374A4 80240F74 00000000 */ nop -/* C374A8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C374AC 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* C374B0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* C374B4 80240F84 4600103E */ c.le.s $f2, $f0 -/* C374B8 80240F88 00000000 */ nop -/* C374BC 80240F8C 4500008D */ bc1f .L802411C4 -/* C374C0 80240F90 00000000 */ nop -/* C374C4 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* C374C8 80240F98 08090471 */ j .L802411C4 -/* C374CC 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* C374D0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C374D4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* C374D8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* C374DC 80240FAC 00000000 */ nop -/* C374E0 80240FB0 45030084 */ bc1tl .L802411C4 -/* C374E4 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* C374E8 80240FB8 08090471 */ j .L802411C4 -/* C374EC 80240FBC 00000000 */ nop -.L80240FC0: -/* C374F0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* C374F4 80240FC4 00000000 */ nop -/* C374F8 80240FC8 4500007E */ bc1f .L802411C4 -/* C374FC 80240FCC 00000000 */ nop -/* C37500 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* C37504 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* C37508 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* C3750C 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* C37510 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* C37514 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* C37518 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* C3751C 80240FEC 14400026 */ bnez $v0, .L80241088 -/* C37520 80240FF0 00000000 */ nop -/* C37524 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37528 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3752C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37530 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C37534 80241004 A600008E */ sh $zero, 0x8e($s0) -/* C37538 80241008 8C460028 */ lw $a2, 0x28($v0) -/* C3753C 8024100C 0C00A720 */ jal atan2 -/* C37540 80241010 8C470030 */ lw $a3, 0x30($v0) -/* C37544 80241014 46000506 */ mov.s $f20, $f0 -/* C37548 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3754C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* C37550 80241020 4600A386 */ mov.s $f14, $f20 -/* C37554 80241024 46000086 */ mov.s $f2, $f0 -/* C37558 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* C3755C 8024102C 46001005 */ abs.s $f0, $f2 -/* C37560 80241030 44822000 */ mtc1 $v0, $f4 -/* C37564 80241034 00000000 */ nop -/* C37568 80241038 46802120 */ cvt.s.w $f4, $f4 -/* C3756C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* C37570 80241040 00000000 */ nop -/* C37574 80241044 4500000D */ bc1f .L8024107C -/* C37578 80241048 00000000 */ nop -/* C3757C 8024104C 44800000 */ mtc1 $zero, $f0 -/* C37580 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* C37584 80241054 4600103C */ c.lt.s $f2, $f0 -/* C37588 80241058 00000000 */ nop -/* C3758C 8024105C 45000006 */ bc1f .L80241078 -/* C37590 80241060 00021023 */ negu $v0, $v0 -/* C37594 80241064 44820000 */ mtc1 $v0, $f0 -/* C37598 80241068 00000000 */ nop -/* C3759C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* C375A0 80241070 0809041F */ j .L8024107C -/* C375A4 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* C375A8 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* C375AC 8024107C 0C00A6C9 */ jal clamp_angle -/* C375B0 80241080 4600A306 */ mov.s $f12, $f20 -/* C375B4 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* C375B8 80241088 8E020000 */ lw $v0, ($s0) -/* C375BC 8024108C 30420008 */ andi $v0, $v0, 8 -/* C375C0 80241090 1040000A */ beqz $v0, .L802410BC -/* C375C4 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* C375C8 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* C375CC 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* C375D0 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* C375D4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* C375D8 802410A8 00000000 */ nop -/* C375DC 802410AC 45020045 */ bc1fl .L802411C4 -/* C375E0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* C375E4 802410B4 08090470 */ j .L802411C0 -/* C375E8 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* C375EC 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* C375F0 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* C375F4 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C375F8 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* C375FC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* C37600 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C37604 802410D4 44821000 */ mtc1 $v0, $f2 -/* C37608 802410D8 00000000 */ nop -/* C3760C 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* C37610 802410E0 46000005 */ abs.s $f0, $f0 -/* C37614 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* C37618 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* C3761C 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* C37620 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* C37624 802410F4 3C014024 */ lui $at, 0x4024 -/* C37628 802410F8 44811800 */ mtc1 $at, $f3 -/* C3762C 802410FC 44801000 */ mtc1 $zero, $f2 -/* C37630 80241100 46000021 */ cvt.d.s $f0, $f0 -/* C37634 80241104 46220000 */ add.d $f0, $f0, $f2 -/* C37638 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* C3763C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C37640 80241110 46200020 */ cvt.s.d $f0, $f0 -/* C37644 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* C37648 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* C3764C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* C37650 80241120 0C0372DF */ jal func_800DCB7C -/* C37654 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* C37658 80241128 10400015 */ beqz $v0, .L80241180 -/* C3765C 8024112C 00000000 */ nop -/* C37660 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* C37664 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* C37668 80241138 44820000 */ mtc1 $v0, $f0 -/* C3766C 8024113C 00000000 */ nop -/* C37670 80241140 46800020 */ cvt.s.w $f0, $f0 -/* C37674 80241144 46002085 */ abs.s $f2, $f4 -/* C37678 80241148 46020000 */ add.s $f0, $f0, $f2 -/* C3767C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C37680 80241150 4600103E */ c.le.s $f2, $f0 -/* C37684 80241154 00000000 */ nop -/* C37688 80241158 45000005 */ bc1f .L80241170 -/* C3768C 8024115C 00000000 */ nop -/* C37690 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C37694 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* C37698 80241168 08090471 */ j .L802411C4 -/* C3769C 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* C376A0 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* C376A4 80241174 46040000 */ add.s $f0, $f0, $f4 -/* C376A8 80241178 08090471 */ j .L802411C4 -/* C376AC 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* C376B0 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* C376B4 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* C376B8 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* C376BC 8024118C 44820000 */ mtc1 $v0, $f0 -/* C376C0 80241190 00000000 */ nop -/* C376C4 80241194 46800020 */ cvt.s.w $f0, $f0 -/* C376C8 80241198 46001080 */ add.s $f2, $f2, $f0 -/* C376CC 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* C376D0 802411A0 46002005 */ abs.s $f0, $f4 -/* C376D4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* C376D8 802411A8 00000000 */ nop -/* C376DC 802411AC 45020005 */ bc1fl .L802411C4 -/* C376E0 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* C376E4 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* C376E8 802411B8 08090471 */ j .L802411C4 -/* C376EC 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* C376F0 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* C376F4 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* C376F8 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* C376FC 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* C37700 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* C37704 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* C37708 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C3770C 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* C37710 802411E0 03E00008 */ jr $ra -/* C37714 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s deleted file mode 100644 index f68e6f193b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802411E8_C37718.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_C37718 -/* C37718 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C3771C 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* C37720 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* C37724 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* C37728 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* C3772C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* C37730 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* C37734 80241204 AE200070 */ sw $zero, 0x70($s1) -/* C37738 80241208 8C830000 */ lw $v1, ($a0) -/* C3773C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C37740 80241210 A480008E */ sh $zero, 0x8e($a0) -/* C37744 80241214 00621824 */ and $v1, $v1, $v0 -/* C37748 80241218 34650800 */ ori $a1, $v1, 0x800 -/* C3774C 8024121C AC850000 */ sw $a1, ($a0) -/* C37750 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* C37754 80241224 8C420034 */ lw $v0, 0x34($v0) -/* C37758 80241228 10400003 */ beqz $v0, .L80241238 -/* C3775C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* C37760 80241230 08090490 */ j .L80241240 -/* C37764 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* C37768 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* C3776C 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* C37770 80241240 AC820000 */ sw $v0, ($a0) -/* C37774 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* C37778 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* C3777C 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* C37780 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* C37784 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* C37788 80241258 3C01447A */ lui $at, 0x447a -/* C3778C 8024125C 44813000 */ mtc1 $at, $f6 -/* C37790 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* C37794 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* C37798 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C3779C 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* C377A0 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* C377A4 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* C377A8 80241278 8C840080 */ lw $a0, 0x80($a0) -/* C377AC 8024127C 0C0372DF */ jal func_800DCB7C -/* C377B0 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* C377B4 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C377B8 80241288 3C014059 */ lui $at, 0x4059 -/* C377BC 8024128C 44812800 */ mtc1 $at, $f5 -/* C377C0 80241290 44802000 */ mtc1 $zero, $f4 -/* C377C4 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* C377C8 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* C377CC 8024129C 00000000 */ nop -/* C377D0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C377D4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* C377D8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* C377DC 802412AC 00000000 */ nop -/* C377E0 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* C377E4 802412B4 44812800 */ mtc1 $at, $f5 -/* C377E8 802412B8 44802000 */ mtc1 $zero, $f4 -/* C377EC 802412BC 00000000 */ nop -/* C377F0 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* C377F4 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* C377F8 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* C377FC 802412CC AE000090 */ sw $zero, 0x90($s0) -/* C37800 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* C37804 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* C37808 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* C3780C 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* C37810 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* C37814 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* C37818 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* C3781C 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* C37820 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* C37824 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* C37828 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* C3782C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* C37830 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* C37834 80241304 03E00008 */ jr $ra -/* C37838 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s deleted file mode 100644 index 09ba32bef8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_C3783C -/* C3783C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C37840 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* C37844 80241314 0080A02D */ daddu $s4, $a0, $zero -/* C37848 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* C3784C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* C37850 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* C37854 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* C37858 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* C3785C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* C37860 80241330 8E920148 */ lw $s2, 0x148($s4) -/* C37864 80241334 86440008 */ lh $a0, 8($s2) -/* C37868 80241338 8E90000C */ lw $s0, 0xc($s4) -/* C3786C 8024133C 0C00EABB */ jal get_npc_unsafe -/* C37870 80241340 00A0882D */ daddu $s1, $a1, $zero -/* C37874 80241344 0280202D */ daddu $a0, $s4, $zero -/* C37878 80241348 8E050000 */ lw $a1, ($s0) -/* C3787C 8024134C 0C0B1EAF */ jal get_variable -/* C37880 80241350 0040A82D */ daddu $s5, $v0, $zero -/* C37884 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* C37888 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* C3788C 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* C37890 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* C37894 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* C37898 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* C3789C 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* C378A0 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* C378A4 80241374 8C630024 */ lw $v1, 0x24($v1) -/* C378A8 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* C378AC 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C378B0 80241380 8C630028 */ lw $v1, 0x28($v1) -/* C378B4 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* C378B8 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* C378BC 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C378C0 80241390 3C0142F0 */ lui $at, 0x42f0 -/* C378C4 80241394 44810000 */ mtc1 $at, $f0 -/* C378C8 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* C378CC 8024139C 0040802D */ daddu $s0, $v0, $zero -/* C378D0 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C378D4 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* C378D8 802413A8 12200006 */ beqz $s1, .L802413C4 -/* C378DC 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* C378E0 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* C378E4 802413B4 0240282D */ daddu $a1, $s2, $zero -/* C378E8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* C378EC 802413BC 0C09047A */ jal func_802411E8_C37718 -/* C378F0 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* C378F4 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* C378F8 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* C378FC 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* C37900 802413D0 30620004 */ andi $v0, $v1, 4 -/* C37904 802413D4 10400007 */ beqz $v0, .L802413F4 -/* C37908 802413D8 00000000 */ nop -/* C3790C 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* C37910 802413E0 1440003C */ bnez $v0, .L802414D4 -/* C37914 802413E4 0000102D */ daddu $v0, $zero, $zero -/* C37918 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* C3791C 802413EC 00621024 */ and $v0, $v1, $v0 -/* C37920 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* C37924 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* C37928 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* C3792C 802413FC 10400034 */ beqz $v0, L802414D0_C37A00 -/* C37930 80241400 00031080 */ sll $v0, $v1, 2 -/* C37934 80241404 3C018024 */ lui $at, %hi(jtbl_80244408_C3A938) -/* C37938 80241408 00220821 */ addu $at, $at, $v0 -/* C3793C 8024140C 8C224408 */ lw $v0, %lo(jtbl_80244408_C3A938)($at) -/* C37940 80241410 00400008 */ jr $v0 -/* C37944 80241414 00000000 */ nop -glabel L80241418_C37948 -/* C37948 80241418 0280202D */ daddu $a0, $s4, $zero -/* C3794C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* C37950 80241420 0C090000 */ jal func_80240000_C36530 -/* C37954 80241424 0260302D */ daddu $a2, $s3, $zero -glabel L80241428_C37958 -/* C37958 80241428 0280202D */ daddu $a0, $s4, $zero -/* C3795C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* C37960 80241430 0C09006C */ jal func_802401B0_C366E0 -/* C37964 80241434 0260302D */ daddu $a2, $s3, $zero -/* C37968 80241438 08090535 */ j .L802414D4 -/* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero -glabel L80241440_C37970 -/* C37970 80241440 0280202D */ daddu $a0, $s4, $zero -/* C37974 80241444 0200282D */ daddu $a1, $s0, $zero -/* C37978 80241448 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 -/* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero -glabel L80241450_C37980 -/* C37980 80241450 0280202D */ daddu $a0, $s4, $zero -/* C37984 80241454 0200282D */ daddu $a1, $s0, $zero -/* C37988 80241458 0C090226 */ jal func_80240898_C36DC8 -/* C3798C 8024145C 0260302D */ daddu $a2, $s3, $zero -/* C37990 80241460 08090535 */ j .L802414D4 -/* C37994 80241464 0000102D */ daddu $v0, $zero, $zero -glabel L80241468_C37998 -/* C37998 80241468 0280202D */ daddu $a0, $s4, $zero -/* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* C379A0 80241470 0C0902F7 */ jal dgb_04_UnkNpcAIFunc2 -/* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero -glabel L80241478_C379A8 -/* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero -/* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero -/* C379B0 80241480 0C090315 */ jal func_80240C54_C37184 -/* C379B4 80241484 0260302D */ daddu $a2, $s3, $zero -/* C379B8 80241488 08090535 */ j .L802414D4 -/* C379BC 8024148C 0000102D */ daddu $v0, $zero, $zero -glabel L80241490_C379C0 -/* C379C0 80241490 0280202D */ daddu $a0, $s4, $zero -/* C379C4 80241494 0200282D */ daddu $a1, $s0, $zero -/* C379C8 80241498 0C090330 */ jal dgb_04_UnkNpcAIFunc14 -/* C379CC 8024149C 0260302D */ daddu $a2, $s3, $zero -/* C379D0 802414A0 08090535 */ j .L802414D4 -/* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero -glabel L802414A8_C379D8 -/* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero -/* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal dgb_04_UnkNpcAIFunc3 -/* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero -/* C379E8 802414B8 08090535 */ j .L802414D4 -/* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero -glabel L802414C0_C379F0 -/* C379F0 802414C0 0280202D */ daddu $a0, $s4, $zero -/* C379F4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* C379F8 802414C8 0C090396 */ jal func_80240E58_C37388 -/* C379FC 802414CC 0260302D */ daddu $a2, $s3, $zero -glabel L802414D0_C37A00 -/* C37A00 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* C37A04 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* C37A08 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* C37A0C 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* C37A10 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* C37A14 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* C37A18 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* C37A1C 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* C37A20 802414F0 03E00008 */ jr $ra -/* C37A24 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s deleted file mode 100644 index 5726af57d6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802414F8_C37A28.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F8_C37A28 -/* C37A28 802414F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C37A2C 802414FC AFB3001C */ sw $s3, 0x1c($sp) -/* C37A30 80241500 0080982D */ daddu $s3, $a0, $zero -/* C37A34 80241504 AFBF0020 */ sw $ra, 0x20($sp) -/* C37A38 80241508 AFB20018 */ sw $s2, 0x18($sp) -/* C37A3C 8024150C AFB10014 */ sw $s1, 0x14($sp) -/* C37A40 80241510 AFB00010 */ sw $s0, 0x10($sp) -/* C37A44 80241514 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C37A48 80241518 8E720148 */ lw $s2, 0x148($s3) -/* C37A4C 8024151C 86440008 */ lh $a0, 8($s2) -/* C37A50 80241520 0C00EABB */ jal get_npc_unsafe -/* C37A54 80241524 00A0882D */ daddu $s1, $a1, $zero -/* C37A58 80241528 0040802D */ daddu $s0, $v0, $zero -/* C37A5C 8024152C 9602008E */ lhu $v0, 0x8e($s0) -/* C37A60 80241530 2442FFFF */ addiu $v0, $v0, -1 -/* C37A64 80241534 A602008E */ sh $v0, 0x8e($s0) -/* C37A68 80241538 00021400 */ sll $v0, $v0, 0x10 -/* C37A6C 8024153C 1C40003C */ bgtz $v0, .L80241630 -/* C37A70 80241540 3C03FFDF */ lui $v1, 0xffdf -/* C37A74 80241544 8E020000 */ lw $v0, ($s0) -/* C37A78 80241548 3463FFFF */ ori $v1, $v1, 0xffff -/* C37A7C 8024154C 00431024 */ and $v0, $v0, $v1 -/* C37A80 80241550 AE020000 */ sw $v0, ($s0) -/* C37A84 80241554 8E240020 */ lw $a0, 0x20($s1) -/* C37A88 80241558 000417C2 */ srl $v0, $a0, 0x1f -/* C37A8C 8024155C 00822021 */ addu $a0, $a0, $v0 -/* C37A90 80241560 00042043 */ sra $a0, $a0, 1 -/* C37A94 80241564 0C00A67F */ jal rand_int -/* C37A98 80241568 24840001 */ addiu $a0, $a0, 1 -/* C37A9C 8024156C 8E230020 */ lw $v1, 0x20($s1) -/* C37AA0 80241570 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37AA4 80241574 000327C2 */ srl $a0, $v1, 0x1f -/* C37AA8 80241578 00641821 */ addu $v1, $v1, $a0 -/* C37AAC 8024157C 00031843 */ sra $v1, $v1, 1 -/* C37AB0 80241580 00621821 */ addu $v1, $v1, $v0 -/* C37AB4 80241584 A603008E */ sh $v1, 0x8e($s0) -/* C37AB8 80241588 8E4200CC */ lw $v0, 0xcc($s2) -/* C37ABC 8024158C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C37AC0 80241590 8C420020 */ lw $v0, 0x20($v0) -/* C37AC4 80241594 AE020028 */ sw $v0, 0x28($s0) -/* C37AC8 80241598 C6200018 */ lwc1 $f0, 0x18($s1) -/* C37ACC 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37AD0 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C37AD4 802415A4 E6000018 */ swc1 $f0, 0x18($s0) -/* C37AD8 802415A8 8C460028 */ lw $a2, 0x28($v0) -/* C37ADC 802415AC 0C00A720 */ jal atan2 -/* C37AE0 802415B0 8C470030 */ lw $a3, 0x30($v0) -/* C37AE4 802415B4 46000506 */ mov.s $f20, $f0 -/* C37AE8 802415B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C37AEC 802415BC 0C00A70A */ jal get_clamped_angle_diff -/* C37AF0 802415C0 4600A386 */ mov.s $f14, $f20 -/* C37AF4 802415C4 46000086 */ mov.s $f2, $f0 -/* C37AF8 802415C8 8E22001C */ lw $v0, 0x1c($s1) -/* C37AFC 802415CC 46001005 */ abs.s $f0, $f2 -/* C37B00 802415D0 44822000 */ mtc1 $v0, $f4 -/* C37B04 802415D4 00000000 */ nop -/* C37B08 802415D8 46802120 */ cvt.s.w $f4, $f4 -/* C37B0C 802415DC 4600203C */ c.lt.s $f4, $f0 -/* C37B10 802415E0 00000000 */ nop -/* C37B14 802415E4 4500000D */ bc1f .L8024161C -/* C37B18 802415E8 00000000 */ nop -/* C37B1C 802415EC 44800000 */ mtc1 $zero, $f0 -/* C37B20 802415F0 C614000C */ lwc1 $f20, 0xc($s0) -/* C37B24 802415F4 4600103C */ c.lt.s $f2, $f0 -/* C37B28 802415F8 00000000 */ nop -/* C37B2C 802415FC 45000006 */ bc1f .L80241618 -/* C37B30 80241600 00021023 */ negu $v0, $v0 -/* C37B34 80241604 44820000 */ mtc1 $v0, $f0 -/* C37B38 80241608 00000000 */ nop -/* C37B3C 8024160C 46800020 */ cvt.s.w $f0, $f0 -/* C37B40 80241610 08090587 */ j .L8024161C -/* C37B44 80241614 4600A500 */ add.s $f20, $f20, $f0 -.L80241618: -/* C37B48 80241618 4604A500 */ add.s $f20, $f20, $f4 -.L8024161C: -/* C37B4C 8024161C 0C00A6C9 */ jal clamp_angle -/* C37B50 80241620 4600A306 */ mov.s $f12, $f20 -/* C37B54 80241624 2402000D */ addiu $v0, $zero, 0xd -/* C37B58 80241628 E600000C */ swc1 $f0, 0xc($s0) -/* C37B5C 8024162C AE620070 */ sw $v0, 0x70($s3) -.L80241630: -/* C37B60 80241630 8FBF0020 */ lw $ra, 0x20($sp) -/* C37B64 80241634 8FB3001C */ lw $s3, 0x1c($sp) -/* C37B68 80241638 8FB20018 */ lw $s2, 0x18($sp) -/* C37B6C 8024163C 8FB10014 */ lw $s1, 0x14($sp) -/* C37B70 80241640 8FB00010 */ lw $s0, 0x10($sp) -/* C37B74 80241644 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C37B78 80241648 03E00008 */ jr $ra -/* C37B7C 8024164C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s deleted file mode 100644 index 47b96ce5b1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241650_C37B80.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_C37B80 -/* C37B80 80241650 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C37B84 80241654 AFB30024 */ sw $s3, 0x24($sp) -/* C37B88 80241658 0080982D */ daddu $s3, $a0, $zero -/* C37B8C 8024165C AFBF0028 */ sw $ra, 0x28($sp) -/* C37B90 80241660 AFB20020 */ sw $s2, 0x20($sp) -/* C37B94 80241664 AFB1001C */ sw $s1, 0x1c($sp) -/* C37B98 80241668 AFB00018 */ sw $s0, 0x18($sp) -/* C37B9C 8024166C 8E700148 */ lw $s0, 0x148($s3) -/* C37BA0 80241670 00A0902D */ daddu $s2, $a1, $zero -/* C37BA4 80241674 86040008 */ lh $a0, 8($s0) -/* C37BA8 80241678 0C00EABB */ jal get_npc_unsafe -/* C37BAC 8024167C 00C0882D */ daddu $s1, $a2, $zero -/* C37BB0 80241680 0220202D */ daddu $a0, $s1, $zero -/* C37BB4 80241684 0200282D */ daddu $a1, $s0, $zero -/* C37BB8 80241688 24030001 */ addiu $v1, $zero, 1 -/* C37BBC 8024168C AFA30010 */ sw $v1, 0x10($sp) -/* C37BC0 80241690 8E460024 */ lw $a2, 0x24($s2) -/* C37BC4 80241694 8E470028 */ lw $a3, 0x28($s2) -/* C37BC8 80241698 0C01242D */ jal func_800490B4 -/* C37BCC 8024169C 0040802D */ daddu $s0, $v0, $zero -/* C37BD0 802416A0 10400024 */ beqz $v0, .L80241734 -/* C37BD4 802416A4 24020010 */ addiu $v0, $zero, 0x10 -/* C37BD8 802416A8 8E050018 */ lw $a1, 0x18($s0) -/* C37BDC 802416AC 8E06000C */ lw $a2, 0xc($s0) -/* C37BE0 802416B0 0C00EA95 */ jal npc_move_heading -/* C37BE4 802416B4 0200202D */ daddu $a0, $s0, $zero -/* C37BE8 802416B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C37BEC 802416BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C37BF0 802416C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C37BF4 802416C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C37BF8 802416C8 8C460028 */ lw $a2, 0x28($v0) -/* C37BFC 802416CC 0C00A7B5 */ jal dist2D -/* C37C00 802416D0 8C470030 */ lw $a3, 0x30($v0) -/* C37C04 802416D4 C6020018 */ lwc1 $f2, 0x18($s0) -/* C37C08 802416D8 3C014004 */ lui $at, 0x4004 -/* C37C0C 802416DC 44812800 */ mtc1 $at, $f5 -/* C37C10 802416E0 44802000 */ mtc1 $zero, $f4 -/* C37C14 802416E4 460010A1 */ cvt.d.s $f2, $f2 -/* C37C18 802416E8 46241082 */ mul.d $f2, $f2, $f4 -/* C37C1C 802416EC 00000000 */ nop -/* C37C20 802416F0 46000021 */ cvt.d.s $f0, $f0 -/* C37C24 802416F4 4622003E */ c.le.d $f0, $f2 -/* C37C28 802416F8 00000000 */ nop -/* C37C2C 802416FC 45000003 */ bc1f .L8024170C -/* C37C30 80241700 2402000E */ addiu $v0, $zero, 0xe -/* C37C34 80241704 080905CD */ j .L80241734 -/* C37C38 80241708 A600008E */ sh $zero, 0x8e($s0) -.L8024170C: -/* C37C3C 8024170C 9602008E */ lhu $v0, 0x8e($s0) -/* C37C40 80241710 2442FFFF */ addiu $v0, $v0, -1 -/* C37C44 80241714 A602008E */ sh $v0, 0x8e($s0) -/* C37C48 80241718 00021400 */ sll $v0, $v0, 0x10 -/* C37C4C 8024171C 1C400006 */ bgtz $v0, .L80241738 -/* C37C50 80241720 3C030020 */ lui $v1, 0x20 -/* C37C54 80241724 8E020000 */ lw $v0, ($s0) -/* C37C58 80241728 00431025 */ or $v0, $v0, $v1 -/* C37C5C 8024172C AE020000 */ sw $v0, ($s0) -/* C37C60 80241730 2402000C */ addiu $v0, $zero, 0xc -.L80241734: -/* C37C64 80241734 AE620070 */ sw $v0, 0x70($s3) -.L80241738: -/* C37C68 80241738 8FBF0028 */ lw $ra, 0x28($sp) -/* C37C6C 8024173C 8FB30024 */ lw $s3, 0x24($sp) -/* C37C70 80241740 8FB20020 */ lw $s2, 0x20($sp) -/* C37C74 80241744 8FB1001C */ lw $s1, 0x1c($sp) -/* C37C78 80241748 8FB00018 */ lw $s0, 0x18($sp) -/* C37C7C 8024174C 03E00008 */ jr $ra -/* C37C80 80241750 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s deleted file mode 100644 index fb841822f6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241754_C37C84.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241754_C37C84 -/* C37C84 80241754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C37C88 80241758 AFB20020 */ sw $s2, 0x20($sp) -/* C37C8C 8024175C 0080902D */ daddu $s2, $a0, $zero -/* C37C90 80241760 AFBF0024 */ sw $ra, 0x24($sp) -/* C37C94 80241764 AFB1001C */ sw $s1, 0x1c($sp) -/* C37C98 80241768 AFB00018 */ sw $s0, 0x18($sp) -/* C37C9C 8024176C 8E500148 */ lw $s0, 0x148($s2) -/* C37CA0 80241770 0C00EABB */ jal get_npc_unsafe -/* C37CA4 80241774 86040008 */ lh $a0, 8($s0) -/* C37CA8 80241778 0040882D */ daddu $s1, $v0, $zero -/* C37CAC 8024177C 8E02006C */ lw $v0, 0x6c($s0) -/* C37CB0 80241780 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C37CB4 80241784 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C37CB8 80241788 34420100 */ ori $v0, $v0, 0x100 -/* C37CBC 8024178C AE02006C */ sw $v0, 0x6c($s0) -/* C37CC0 80241790 C4600028 */ lwc1 $f0, 0x28($v1) -/* C37CC4 80241794 E6200038 */ swc1 $f0, 0x38($s1) -/* C37CC8 80241798 C4600030 */ lwc1 $f0, 0x30($v1) -/* C37CCC 8024179C E6200040 */ swc1 $f0, 0x40($s1) -/* C37CD0 802417A0 8E03006C */ lw $v1, 0x6c($s0) -/* C37CD4 802417A4 30621000 */ andi $v0, $v1, 0x1000 -/* C37CD8 802417A8 14400003 */ bnez $v0, .L802417B8 -/* C37CDC 802417AC 3C048000 */ lui $a0, 0x8000 -/* C37CE0 802417B0 34621000 */ ori $v0, $v1, 0x1000 -/* C37CE4 802417B4 AE02006C */ sw $v0, 0x6c($s0) -.L802417B8: -/* C37CE8 802417B8 C6200040 */ lwc1 $f0, 0x40($s1) -/* C37CEC 802417BC 34840011 */ ori $a0, $a0, 0x11 -/* C37CF0 802417C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C37CF4 802417C4 8E260038 */ lw $a2, 0x38($s1) -/* C37CF8 802417C8 8E27003C */ lw $a3, 0x3c($s1) -/* C37CFC 802417CC 0C052757 */ jal sfx_play_sound_at_position -/* C37D00 802417D0 24050002 */ addiu $a1, $zero, 2 -/* C37D04 802417D4 2402000F */ addiu $v0, $zero, 0xf -/* C37D08 802417D8 A620008E */ sh $zero, 0x8e($s1) -/* C37D0C 802417DC AE420070 */ sw $v0, 0x70($s2) -/* C37D10 802417E0 8FBF0024 */ lw $ra, 0x24($sp) -/* C37D14 802417E4 8FB20020 */ lw $s2, 0x20($sp) -/* C37D18 802417E8 8FB1001C */ lw $s1, 0x1c($sp) -/* C37D1C 802417EC 8FB00018 */ lw $s0, 0x18($sp) -/* C37D20 802417F0 03E00008 */ jr $ra -/* C37D24 802417F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s deleted file mode 100644 index f6b32451d6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417F8_C37D28 -/* C37D28 802417F8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C37D2C 802417FC AFB40040 */ sw $s4, 0x40($sp) -/* C37D30 80241800 0080A02D */ daddu $s4, $a0, $zero -/* C37D34 80241804 AFBF0044 */ sw $ra, 0x44($sp) -/* C37D38 80241808 AFB3003C */ sw $s3, 0x3c($sp) -/* C37D3C 8024180C AFB20038 */ sw $s2, 0x38($sp) -/* C37D40 80241810 AFB10034 */ sw $s1, 0x34($sp) -/* C37D44 80241814 AFB00030 */ sw $s0, 0x30($sp) -/* C37D48 80241818 8E930148 */ lw $s3, 0x148($s4) -/* C37D4C 8024181C 00A0802D */ daddu $s0, $a1, $zero -/* C37D50 80241820 86640008 */ lh $a0, 8($s3) -/* C37D54 80241824 0C00EABB */ jal get_npc_unsafe -/* C37D58 80241828 00C0882D */ daddu $s1, $a2, $zero -/* C37D5C 8024182C 3C048000 */ lui $a0, 0x8000 -/* C37D60 80241830 0040902D */ daddu $s2, $v0, $zero -/* C37D64 80241834 C6400040 */ lwc1 $f0, 0x40($s2) -/* C37D68 80241838 34840011 */ ori $a0, $a0, 0x11 -/* C37D6C 8024183C E7A00010 */ swc1 $f0, 0x10($sp) -/* C37D70 80241840 8E460038 */ lw $a2, 0x38($s2) -/* C37D74 80241844 8E47003C */ lw $a3, 0x3c($s2) -/* C37D78 80241848 0C05267B */ jal sfx_adjust_env_sound_pos -/* C37D7C 8024184C 24050002 */ addiu $a1, $zero, 2 -/* C37D80 80241850 0220202D */ daddu $a0, $s1, $zero -/* C37D84 80241854 24020001 */ addiu $v0, $zero, 1 -/* C37D88 80241858 AFA20010 */ sw $v0, 0x10($sp) -/* C37D8C 8024185C 8E060024 */ lw $a2, 0x24($s0) -/* C37D90 80241860 8E070028 */ lw $a3, 0x28($s0) -/* C37D94 80241864 0C01242D */ jal func_800490B4 -/* C37D98 80241868 0260282D */ daddu $a1, $s3, $zero -/* C37D9C 8024186C 1440000B */ bnez $v0, .L8024189C -/* C37DA0 80241870 3C04FFDF */ lui $a0, 0xffdf -/* C37DA4 80241874 8E62006C */ lw $v0, 0x6c($s3) -/* C37DA8 80241878 2403FEFF */ addiu $v1, $zero, -0x101 -/* C37DAC 8024187C 00431024 */ and $v0, $v0, $v1 -/* C37DB0 80241880 AE62006C */ sw $v0, 0x6c($s3) -/* C37DB4 80241884 8E420000 */ lw $v0, ($s2) -/* C37DB8 80241888 3484FFFF */ ori $a0, $a0, 0xffff -/* C37DBC 8024188C AE400048 */ sw $zero, 0x48($s2) -/* C37DC0 80241890 00441024 */ and $v0, $v0, $a0 -/* C37DC4 80241894 0809069B */ j .L80241A6C -/* C37DC8 80241898 AE420000 */ sw $v0, ($s2) -.L8024189C: -/* C37DCC 8024189C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C37DD0 802418A0 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C37DD4 802418A4 C6440048 */ lwc1 $f4, 0x48($s2) -/* C37DD8 802418A8 3C0141C8 */ lui $at, 0x41c8 -/* C37DDC 802418AC 44810000 */ mtc1 $at, $f0 -/* C37DE0 802418B0 8E020000 */ lw $v0, ($s0) -/* C37DE4 802418B4 46002100 */ add.s $f4, $f4, $f0 -/* C37DE8 802418B8 C4420028 */ lwc1 $f2, 0x28($v0) -/* C37DEC 802418BC 3C014000 */ lui $at, 0x4000 -/* C37DF0 802418C0 44810000 */ mtc1 $at, $f0 -/* C37DF4 802418C4 E6420038 */ swc1 $f2, 0x38($s2) -/* C37DF8 802418C8 C4420030 */ lwc1 $f2, 0x30($v0) -/* C37DFC 802418CC 46001080 */ add.s $f2, $f2, $f0 -/* C37E00 802418D0 3C018024 */ lui $at, %hi(D_80244448_C3A978) -/* C37E04 802418D4 D4264448 */ ldc1 $f6, %lo(D_80244448_C3A978)($at) -/* C37E08 802418D8 46002021 */ cvt.d.s $f0, $f4 -/* C37E0C 802418DC 4620303C */ c.lt.d $f6, $f0 -/* C37E10 802418E0 E6440048 */ swc1 $f4, 0x48($s2) -/* C37E14 802418E4 45000004 */ bc1f .L802418F8 -/* C37E18 802418E8 E6420040 */ swc1 $f2, 0x40($s2) -/* C37E1C 802418EC 46260001 */ sub.d $f0, $f0, $f6 -/* C37E20 802418F0 46200020 */ cvt.s.d $f0, $f0 -/* C37E24 802418F4 E6400048 */ swc1 $f0, 0x48($s2) -.L802418F8: -/* C37E28 802418F8 3C02B60B */ lui $v0, 0xb60b -/* C37E2C 802418FC C6400048 */ lwc1 $f0, 0x48($s2) -/* C37E30 80241900 344260B7 */ ori $v0, $v0, 0x60b7 -/* C37E34 80241904 4600020D */ trunc.w.s $f8, $f0 -/* C37E38 80241908 44044000 */ mfc1 $a0, $f8 -/* C37E3C 8024190C 00000000 */ nop -/* C37E40 80241910 00820018 */ mult $a0, $v0 -/* C37E44 80241914 00041FC3 */ sra $v1, $a0, 0x1f -/* C37E48 80241918 00004010 */ mfhi $t0 -/* C37E4C 8024191C 01041021 */ addu $v0, $t0, $a0 -/* C37E50 80241920 000211C3 */ sra $v0, $v0, 7 -/* C37E54 80241924 00431023 */ subu $v0, $v0, $v1 -/* C37E58 80241928 00021840 */ sll $v1, $v0, 1 -/* C37E5C 8024192C 00621821 */ addu $v1, $v1, $v0 -/* C37E60 80241930 00031100 */ sll $v0, $v1, 4 -/* C37E64 80241934 00431023 */ subu $v0, $v0, $v1 -/* C37E68 80241938 00021080 */ sll $v0, $v0, 2 -/* C37E6C 8024193C 00822023 */ subu $a0, $a0, $v0 -/* C37E70 80241940 00042400 */ sll $a0, $a0, 0x10 -/* C37E74 80241944 0C00A4F5 */ jal cosine -/* C37E78 80241948 00042403 */ sra $a0, $a0, 0x10 -/* C37E7C 8024194C 3C014260 */ lui $at, 0x4260 -/* C37E80 80241950 44811000 */ mtc1 $at, $f2 -/* C37E84 80241954 00000000 */ nop -/* C37E88 80241958 46020002 */ mul.s $f0, $f0, $f2 -/* C37E8C 8024195C 00000000 */ nop -/* C37E90 80241960 24050006 */ addiu $a1, $zero, 6 -/* C37E94 80241964 3C01437F */ lui $at, 0x437f -/* C37E98 80241968 44811000 */ mtc1 $at, $f2 -/* C37E9C 8024196C 240200FF */ addiu $v0, $zero, 0xff -/* C37EA0 80241970 46001081 */ sub.s $f2, $f2, $f0 -/* C37EA4 80241974 AFA20014 */ sw $v0, 0x14($sp) -/* C37EA8 80241978 AFA00018 */ sw $zero, 0x18($sp) -/* C37EAC 8024197C 4600120D */ trunc.w.s $f8, $f2 -/* C37EB0 80241980 44064000 */ mfc1 $a2, $f8 -/* C37EB4 80241984 00000000 */ nop -/* C37EB8 80241988 AFA60010 */ sw $a2, 0x10($sp) -/* C37EBC 8024198C 8E440024 */ lw $a0, 0x24($s2) -/* C37EC0 80241990 0C0B7A25 */ jal func_802DE894 -/* C37EC4 80241994 00C0382D */ daddu $a3, $a2, $zero -/* C37EC8 80241998 27A50020 */ addiu $a1, $sp, 0x20 -/* C37ECC 8024199C 27A60024 */ addiu $a2, $sp, 0x24 -/* C37ED0 802419A0 8E020000 */ lw $v0, ($s0) -/* C37ED4 802419A4 3C01447A */ lui $at, 0x447a -/* C37ED8 802419A8 44810000 */ mtc1 $at, $f0 -/* C37EDC 802419AC C4420028 */ lwc1 $f2, 0x28($v0) -/* C37EE0 802419B0 C444002C */ lwc1 $f4, 0x2c($v0) -/* C37EE4 802419B4 C4460030 */ lwc1 $f6, 0x30($v0) -/* C37EE8 802419B8 27A2002C */ addiu $v0, $sp, 0x2c -/* C37EEC 802419BC E7A0002C */ swc1 $f0, 0x2c($sp) -/* C37EF0 802419C0 E7A20020 */ swc1 $f2, 0x20($sp) -/* C37EF4 802419C4 E7A40024 */ swc1 $f4, 0x24($sp) -/* C37EF8 802419C8 E7A60028 */ swc1 $f6, 0x28($sp) -/* C37EFC 802419CC AFA20010 */ sw $v0, 0x10($sp) -/* C37F00 802419D0 8E440080 */ lw $a0, 0x80($s2) -/* C37F04 802419D4 0C0372DF */ jal func_800DCB7C -/* C37F08 802419D8 27A70028 */ addiu $a3, $sp, 0x28 -/* C37F0C 802419DC C644003C */ lwc1 $f4, 0x3c($s2) -/* C37F10 802419E0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C37F14 802419E4 46002001 */ sub.s $f0, $f4, $f0 -/* C37F18 802419E8 3C014038 */ lui $at, 0x4038 -/* C37F1C 802419EC 44811800 */ mtc1 $at, $f3 -/* C37F20 802419F0 44801000 */ mtc1 $zero, $f2 -/* C37F24 802419F4 46000005 */ abs.s $f0, $f0 -/* C37F28 802419F8 46000021 */ cvt.d.s $f0, $f0 -/* C37F2C 802419FC 4620103C */ c.lt.d $f2, $f0 -/* C37F30 80241A00 00000000 */ nop -/* C37F34 80241A04 45000008 */ bc1f .L80241A28 -/* C37F38 80241A08 3C03FFDF */ lui $v1, 0xffdf -/* C37F3C 80241A0C 3C018024 */ lui $at, %hi(D_80244450_C3A980) -/* C37F40 80241A10 D4224450 */ ldc1 $f2, %lo(D_80244450_C3A980)($at) -/* C37F44 80241A14 46002021 */ cvt.d.s $f0, $f4 -/* C37F48 80241A18 46220001 */ sub.d $f0, $f0, $f2 -/* C37F4C 80241A1C 46200020 */ cvt.s.d $f0, $f0 -/* C37F50 80241A20 0809069D */ j .L80241A74 -/* C37F54 80241A24 E640003C */ swc1 $f0, 0x3c($s2) -.L80241A28: -/* C37F58 80241A28 8E420000 */ lw $v0, ($s2) -/* C37F5C 80241A2C 3463FFFF */ ori $v1, $v1, 0xffff -/* C37F60 80241A30 AE400048 */ sw $zero, 0x48($s2) -/* C37F64 80241A34 00431024 */ and $v0, $v0, $v1 -/* C37F68 80241A38 AE420000 */ sw $v0, ($s2) -/* C37F6C 80241A3C 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C37F70 80241A40 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C37F74 80241A44 24020009 */ addiu $v0, $zero, 9 -/* C37F78 80241A48 10620009 */ beq $v1, $v0, .L80241A70 -/* C37F7C 80241A4C 24020010 */ addiu $v0, $zero, 0x10 -/* C37F80 80241A50 0C03805E */ jal disable_player_input -/* C37F84 80241A54 00000000 */ nop -/* C37F88 80241A58 0C03BD8A */ jal func_800EF628 -/* C37F8C 80241A5C 00000000 */ nop -/* C37F90 80241A60 24020014 */ addiu $v0, $zero, 0x14 -/* C37F94 80241A64 0809069C */ j .L80241A70 -/* C37F98 80241A68 A640008E */ sh $zero, 0x8e($s2) -.L80241A6C: -/* C37F9C 80241A6C 24020010 */ addiu $v0, $zero, 0x10 -.L80241A70: -/* C37FA0 80241A70 AE820070 */ sw $v0, 0x70($s4) -.L80241A74: -/* C37FA4 80241A74 8FBF0044 */ lw $ra, 0x44($sp) -/* C37FA8 80241A78 8FB40040 */ lw $s4, 0x40($sp) -/* C37FAC 80241A7C 8FB3003C */ lw $s3, 0x3c($sp) -/* C37FB0 80241A80 8FB20038 */ lw $s2, 0x38($sp) -/* C37FB4 80241A84 8FB10034 */ lw $s1, 0x34($sp) -/* C37FB8 80241A88 8FB00030 */ lw $s0, 0x30($sp) -/* C37FBC 80241A8C 03E00008 */ jr $ra -/* C37FC0 80241A90 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s deleted file mode 100644 index df55624514..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A94_C37FC4 -/* C37FC4 80241A94 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C37FC8 80241A98 AFB20028 */ sw $s2, 0x28($sp) -/* C37FCC 80241A9C 0080902D */ daddu $s2, $a0, $zero -/* C37FD0 80241AA0 AFBF002C */ sw $ra, 0x2c($sp) -/* C37FD4 80241AA4 AFB10024 */ sw $s1, 0x24($sp) -/* C37FD8 80241AA8 AFB00020 */ sw $s0, 0x20($sp) -/* C37FDC 80241AAC 8E500148 */ lw $s0, 0x148($s2) -/* C37FE0 80241AB0 0C00EABB */ jal get_npc_unsafe -/* C37FE4 80241AB4 86040008 */ lh $a0, 8($s0) -/* C37FE8 80241AB8 2404FEFF */ addiu $a0, $zero, -0x101 -/* C37FEC 80241ABC 0040882D */ daddu $s1, $v0, $zero -/* C37FF0 80241AC0 0000282D */ daddu $a1, $zero, $zero -/* C37FF4 80241AC4 8E03006C */ lw $v1, 0x6c($s0) -/* C37FF8 80241AC8 00A0302D */ daddu $a2, $a1, $zero -/* C37FFC 80241ACC 00641824 */ and $v1, $v1, $a0 -/* C38000 80241AD0 AE03006C */ sw $v1, 0x6c($s0) -/* C38004 80241AD4 AFA00010 */ sw $zero, 0x10($sp) -/* C38008 80241AD8 AFA00014 */ sw $zero, 0x14($sp) -/* C3800C 80241ADC AFA00018 */ sw $zero, 0x18($sp) -/* C38010 80241AE0 8E240024 */ lw $a0, 0x24($s1) -/* C38014 80241AE4 0C0B7A25 */ jal func_802DE894 -/* C38018 80241AE8 00A0382D */ daddu $a3, $a1, $zero -/* C3801C 80241AEC 8E02006C */ lw $v0, 0x6c($s0) -/* C38020 80241AF0 30421000 */ andi $v0, $v0, 0x1000 -/* C38024 80241AF4 10400008 */ beqz $v0, .L80241B18 -/* C38028 80241AF8 00000000 */ nop -/* C3802C 80241AFC 3C048000 */ lui $a0, 0x8000 -/* C38030 80241B00 0C05271B */ jal sfx_stop_sound -/* C38034 80241B04 34840011 */ ori $a0, $a0, 0x11 -/* C38038 80241B08 8E02006C */ lw $v0, 0x6c($s0) -/* C3803C 80241B0C 2403EFFF */ addiu $v1, $zero, -0x1001 -/* C38040 80241B10 00431024 */ and $v0, $v0, $v1 -/* C38044 80241B14 AE02006C */ sw $v0, 0x6c($s0) -.L80241B18: -/* C38048 80241B18 8E0200CC */ lw $v0, 0xcc($s0) -/* C3804C 80241B1C 8C430024 */ lw $v1, 0x24($v0) -/* C38050 80241B20 24020014 */ addiu $v0, $zero, 0x14 -/* C38054 80241B24 A622008E */ sh $v0, 0x8e($s1) -/* C38058 80241B28 24020011 */ addiu $v0, $zero, 0x11 -/* C3805C 80241B2C AE230028 */ sw $v1, 0x28($s1) -/* C38060 80241B30 AE420070 */ sw $v0, 0x70($s2) -/* C38064 80241B34 8FBF002C */ lw $ra, 0x2c($sp) -/* C38068 80241B38 8FB20028 */ lw $s2, 0x28($sp) -/* C3806C 80241B3C 8FB10024 */ lw $s1, 0x24($sp) -/* C38070 80241B40 8FB00020 */ lw $s0, 0x20($sp) -/* C38074 80241B44 03E00008 */ jr $ra -/* C38078 80241B48 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s deleted file mode 100644 index 5a1cb0e92f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B4C_C3807C -/* C3807C 80241B4C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C38080 80241B50 AFB20048 */ sw $s2, 0x48($sp) -/* C38084 80241B54 0080902D */ daddu $s2, $a0, $zero -/* C38088 80241B58 AFBF004C */ sw $ra, 0x4c($sp) -/* C3808C 80241B5C AFB10044 */ sw $s1, 0x44($sp) -/* C38090 80241B60 AFB00040 */ sw $s0, 0x40($sp) -/* C38094 80241B64 F7B40050 */ sdc1 $f20, 0x50($sp) -/* C38098 80241B68 8E500148 */ lw $s0, 0x148($s2) -/* C3809C 80241B6C 0C00EABB */ jal get_npc_unsafe -/* C380A0 80241B70 86040008 */ lh $a0, 8($s0) -/* C380A4 80241B74 27A50028 */ addiu $a1, $sp, 0x28 -/* C380A8 80241B78 0040882D */ daddu $s1, $v0, $zero -/* C380AC 80241B7C 27A6002C */ addiu $a2, $sp, 0x2c -/* C380B0 80241B80 27A70030 */ addiu $a3, $sp, 0x30 -/* C380B4 80241B84 C620003C */ lwc1 $f0, 0x3c($s1) -/* C380B8 80241B88 3C014004 */ lui $at, 0x4004 -/* C380BC 80241B8C 44811800 */ mtc1 $at, $f3 -/* C380C0 80241B90 44801000 */ mtc1 $zero, $f2 -/* C380C4 80241B94 C6260038 */ lwc1 $f6, 0x38($s1) -/* C380C8 80241B98 46000021 */ cvt.d.s $f0, $f0 -/* C380CC 80241B9C 46220000 */ add.d $f0, $f0, $f2 -/* C380D0 80241BA0 3C01447A */ lui $at, 0x447a -/* C380D4 80241BA4 44812000 */ mtc1 $at, $f4 -/* C380D8 80241BA8 C6020078 */ lwc1 $f2, 0x78($s0) -/* C380DC 80241BAC 468010A0 */ cvt.s.w $f2, $f2 -/* C380E0 80241BB0 46200020 */ cvt.s.d $f0, $f0 -/* C380E4 80241BB4 E620003C */ swc1 $f0, 0x3c($s1) -/* C380E8 80241BB8 46000206 */ mov.s $f8, $f0 -/* C380EC 80241BBC C6200040 */ lwc1 $f0, 0x40($s1) -/* C380F0 80241BC0 27A20034 */ addiu $v0, $sp, 0x34 -/* C380F4 80241BC4 E7A00030 */ swc1 $f0, 0x30($sp) -/* C380F8 80241BC8 3C014059 */ lui $at, 0x4059 -/* C380FC 80241BCC 44810800 */ mtc1 $at, $f1 -/* C38100 80241BD0 44800000 */ mtc1 $zero, $f0 -/* C38104 80241BD4 460010A1 */ cvt.d.s $f2, $f2 -/* C38108 80241BD8 E7A60028 */ swc1 $f6, 0x28($sp) -/* C3810C 80241BDC E7A40034 */ swc1 $f4, 0x34($sp) -/* C38110 80241BE0 E7A8002C */ swc1 $f8, 0x2c($sp) -/* C38114 80241BE4 AFA20010 */ sw $v0, 0x10($sp) -/* C38118 80241BE8 8E240080 */ lw $a0, 0x80($s1) -/* C3811C 80241BEC 46201083 */ div.d $f2, $f2, $f0 -/* C38120 80241BF0 0C0372DF */ jal func_800DCB7C -/* C38124 80241BF4 46201520 */ cvt.s.d $f20, $f2 -/* C38128 80241BF8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C3812C 80241BFC 46140000 */ add.s $f0, $f0, $f20 -/* C38130 80241C00 C622003C */ lwc1 $f2, 0x3c($s1) -/* C38134 80241C04 4600103C */ c.lt.s $f2, $f0 -/* C38138 80241C08 00000000 */ nop -/* C3813C 80241C0C 45010028 */ bc1t .L80241CB0 -/* C38140 80241C10 00000000 */ nop -/* C38144 80241C14 8E0200D0 */ lw $v0, 0xd0($s0) -/* C38148 80241C18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C3814C 80241C1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C38150 80241C20 C44A0000 */ lwc1 $f10, ($v0) -/* C38154 80241C24 468052A0 */ cvt.s.w $f10, $f10 -/* C38158 80241C28 44065000 */ mfc1 $a2, $f10 -/* C3815C 80241C2C C44A0008 */ lwc1 $f10, 8($v0) -/* C38160 80241C30 468052A0 */ cvt.s.w $f10, $f10 -/* C38164 80241C34 44075000 */ mfc1 $a3, $f10 -/* C38168 80241C38 0C00A720 */ jal atan2 -/* C3816C 80241C3C 2410000A */ addiu $s0, $zero, 0xa -/* C38170 80241C40 24040002 */ addiu $a0, $zero, 2 -/* C38174 80241C44 0220282D */ daddu $a1, $s1, $zero -/* C38178 80241C48 0000302D */ daddu $a2, $zero, $zero -/* C3817C 80241C4C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* C38180 80241C50 862200A8 */ lh $v0, 0xa8($s1) -/* C38184 80241C54 E620000C */ swc1 $f0, 0xc($s1) -/* C38188 80241C58 3C013F80 */ lui $at, 0x3f80 -/* C3818C 80241C5C 44810000 */ mtc1 $at, $f0 -/* C38190 80241C60 3C014000 */ lui $at, 0x4000 -/* C38194 80241C64 44812000 */ mtc1 $at, $f4 -/* C38198 80241C68 3C01C1A0 */ lui $at, 0xc1a0 -/* C3819C 80241C6C 44813000 */ mtc1 $at, $f6 -/* C381A0 80241C70 44825000 */ mtc1 $v0, $f10 -/* C381A4 80241C74 00000000 */ nop -/* C381A8 80241C78 468052A0 */ cvt.s.w $f10, $f10 -/* C381AC 80241C7C 46141080 */ add.s $f2, $f2, $f20 -/* C381B0 80241C80 44075000 */ mfc1 $a3, $f10 -/* C381B4 80241C84 27A20038 */ addiu $v0, $sp, 0x38 -/* C381B8 80241C88 E622003C */ swc1 $f2, 0x3c($s1) -/* C381BC 80241C8C E7A00010 */ swc1 $f0, 0x10($sp) -/* C381C0 80241C90 E7A40014 */ swc1 $f4, 0x14($sp) -/* C381C4 80241C94 E7A60018 */ swc1 $f6, 0x18($sp) -/* C381C8 80241C98 AFB0001C */ sw $s0, 0x1c($sp) -/* C381CC 80241C9C 0C01BFA4 */ jal fx_emote -/* C381D0 80241CA0 AFA20020 */ sw $v0, 0x20($sp) -/* C381D4 80241CA4 24020012 */ addiu $v0, $zero, 0x12 -/* C381D8 80241CA8 A630008E */ sh $s0, 0x8e($s1) -/* C381DC 80241CAC AE420070 */ sw $v0, 0x70($s2) -.L80241CB0: -/* C381E0 80241CB0 8FBF004C */ lw $ra, 0x4c($sp) -/* C381E4 80241CB4 8FB20048 */ lw $s2, 0x48($sp) -/* C381E8 80241CB8 8FB10044 */ lw $s1, 0x44($sp) -/* C381EC 80241CBC 8FB00040 */ lw $s0, 0x40($sp) -/* C381F0 80241CC0 D7B40050 */ ldc1 $f20, 0x50($sp) -/* C381F4 80241CC4 03E00008 */ jr $ra -/* C381F8 80241CC8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241CCC_C381FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241CCC_C381FC.s deleted file mode 100644 index 1791e7a9f5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241CCC_C381FC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CCC_C381FC -/* C381FC 80241CCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38200 80241CD0 AFB00010 */ sw $s0, 0x10($sp) -/* C38204 80241CD4 0080802D */ daddu $s0, $a0, $zero -/* C38208 80241CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* C3820C 80241CDC 8E020148 */ lw $v0, 0x148($s0) -/* C38210 80241CE0 0C00EABB */ jal get_npc_unsafe -/* C38214 80241CE4 84440008 */ lh $a0, 8($v0) -/* C38218 80241CE8 9443008E */ lhu $v1, 0x8e($v0) -/* C3821C 80241CEC 2463FFFF */ addiu $v1, $v1, -1 -/* C38220 80241CF0 A443008E */ sh $v1, 0x8e($v0) -/* C38224 80241CF4 00031C00 */ sll $v1, $v1, 0x10 -/* C38228 80241CF8 1C600002 */ bgtz $v1, .L80241D04 -/* C3822C 80241CFC 2402001E */ addiu $v0, $zero, 0x1e -/* C38230 80241D00 AE020070 */ sw $v0, 0x70($s0) -.L80241D04: -/* C38234 80241D04 8FBF0014 */ lw $ra, 0x14($sp) -/* C38238 80241D08 8FB00010 */ lw $s0, 0x10($sp) -/* C3823C 80241D0C 03E00008 */ jr $ra -/* C38240 80241D10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s deleted file mode 100644 index 0f7c036268..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D14_C38244 -/* C38244 80241D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38248 80241D18 AFB00010 */ sw $s0, 0x10($sp) -/* C3824C 80241D1C 0080802D */ daddu $s0, $a0, $zero -/* C38250 80241D20 AFBF0014 */ sw $ra, 0x14($sp) -/* C38254 80241D24 8E020148 */ lw $v0, 0x148($s0) -/* C38258 80241D28 0C00EABB */ jal get_npc_unsafe -/* C3825C 80241D2C 84440008 */ lh $a0, 8($v0) -/* C38260 80241D30 0040202D */ daddu $a0, $v0, $zero -/* C38264 80241D34 9482008E */ lhu $v0, 0x8e($a0) -/* C38268 80241D38 24420001 */ addiu $v0, $v0, 1 -/* C3826C 80241D3C A482008E */ sh $v0, 0x8e($a0) -/* C38270 80241D40 00021400 */ sll $v0, $v0, 0x10 -/* C38274 80241D44 00021403 */ sra $v0, $v0, 0x10 -/* C38278 80241D48 28420003 */ slti $v0, $v0, 3 -/* C3827C 80241D4C 1440000D */ bnez $v0, .L80241D84 -/* C38280 80241D50 24020009 */ addiu $v0, $zero, 9 -/* C38284 80241D54 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C38288 80241D58 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C3828C 80241D5C 10620003 */ beq $v1, $v0, .L80241D6C -/* C38290 80241D60 24020064 */ addiu $v0, $zero, 0x64 -/* C38294 80241D64 08090760 */ j .L80241D80 -/* C38298 80241D68 A480008E */ sh $zero, 0x8e($a0) -.L80241D6C: -/* C3829C 80241D6C 0C038069 */ jal enable_player_input -/* C382A0 80241D70 00000000 */ nop -/* C382A4 80241D74 0C03BD80 */ jal func_800EF600 -/* C382A8 80241D78 00000000 */ nop -/* C382AC 80241D7C 24020010 */ addiu $v0, $zero, 0x10 -.L80241D80: -/* C382B0 80241D80 AE020070 */ sw $v0, 0x70($s0) -.L80241D84: -/* C382B4 80241D84 8FBF0014 */ lw $ra, 0x14($sp) -/* C382B8 80241D88 8FB00010 */ lw $s0, 0x10($sp) -/* C382BC 80241D8C 03E00008 */ jr $ra -/* C382C0 80241D90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s deleted file mode 100644 index 792eba34c5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D94_C382C4 -/* C382C4 80241D94 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C382C8 80241D98 AFB20018 */ sw $s2, 0x18($sp) -/* C382CC 80241D9C 0080902D */ daddu $s2, $a0, $zero -/* C382D0 80241DA0 AFBF001C */ sw $ra, 0x1c($sp) -/* C382D4 80241DA4 AFB10014 */ sw $s1, 0x14($sp) -/* C382D8 80241DA8 AFB00010 */ sw $s0, 0x10($sp) -/* C382DC 80241DAC 8E500148 */ lw $s0, 0x148($s2) -/* C382E0 80241DB0 86040008 */ lh $a0, 8($s0) -/* C382E4 80241DB4 0C00EABB */ jal get_npc_unsafe -/* C382E8 80241DB8 00A0882D */ daddu $s1, $a1, $zero -/* C382EC 80241DBC 3C05FFDF */ lui $a1, 0xffdf -/* C382F0 80241DC0 8E03006C */ lw $v1, 0x6c($s0) -/* C382F4 80241DC4 2404FEFF */ addiu $a0, $zero, -0x101 -/* C382F8 80241DC8 00641824 */ and $v1, $v1, $a0 -/* C382FC 80241DCC AE03006C */ sw $v1, 0x6c($s0) -/* C38300 80241DD0 8C430000 */ lw $v1, ($v0) -/* C38304 80241DD4 34A5FFFF */ ori $a1, $a1, 0xffff -/* C38308 80241DD8 00651824 */ and $v1, $v1, $a1 -/* C3830C 80241DDC AC430000 */ sw $v1, ($v0) -/* C38310 80241DE0 C6200000 */ lwc1 $f0, ($s1) -/* C38314 80241DE4 46000021 */ cvt.d.s $f0, $f0 -/* C38318 80241DE8 46200000 */ add.d $f0, $f0, $f0 -/* C3831C 80241DEC 46200020 */ cvt.s.d $f0, $f0 -/* C38320 80241DF0 E4400018 */ swc1 $f0, 0x18($v0) -/* C38324 80241DF4 AE000074 */ sw $zero, 0x74($s0) -/* C38328 80241DF8 C440003C */ lwc1 $f0, 0x3c($v0) -/* C3832C 80241DFC 3C014059 */ lui $at, 0x4059 -/* C38330 80241E00 44811800 */ mtc1 $at, $f3 -/* C38334 80241E04 44801000 */ mtc1 $zero, $f2 -/* C38338 80241E08 46000021 */ cvt.d.s $f0, $f0 -/* C3833C 80241E0C 46220002 */ mul.d $f0, $f0, $f2 -/* C38340 80241E10 00000000 */ nop -/* C38344 80241E14 2402001E */ addiu $v0, $zero, 0x1e -/* C38348 80241E18 4620010D */ trunc.w.d $f4, $f0 -/* C3834C 80241E1C E604007C */ swc1 $f4, 0x7c($s0) -/* C38350 80241E20 AE420074 */ sw $v0, 0x74($s2) -/* C38354 80241E24 8FBF001C */ lw $ra, 0x1c($sp) -/* C38358 80241E28 8FB20018 */ lw $s2, 0x18($sp) -/* C3835C 80241E2C 8FB10014 */ lw $s1, 0x14($sp) -/* C38360 80241E30 8FB00010 */ lw $s0, 0x10($sp) -/* C38364 80241E34 03E00008 */ jr $ra -/* C38368 80241E38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s deleted file mode 100644 index 09c2c7ee24..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E3C_C3836C -/* C3836C 80241E3C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C38370 80241E40 AFB20048 */ sw $s2, 0x48($sp) -/* C38374 80241E44 0080902D */ daddu $s2, $a0, $zero -/* C38378 80241E48 AFBF0054 */ sw $ra, 0x54($sp) -/* C3837C 80241E4C AFB40050 */ sw $s4, 0x50($sp) -/* C38380 80241E50 AFB3004C */ sw $s3, 0x4c($sp) -/* C38384 80241E54 AFB10044 */ sw $s1, 0x44($sp) -/* C38388 80241E58 AFB00040 */ sw $s0, 0x40($sp) -/* C3838C 80241E5C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C38390 80241E60 F7B80068 */ sdc1 $f24, 0x68($sp) -/* C38394 80241E64 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C38398 80241E68 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C3839C 80241E6C 8E500148 */ lw $s0, 0x148($s2) -/* C383A0 80241E70 00A0982D */ daddu $s3, $a1, $zero -/* C383A4 80241E74 86040008 */ lh $a0, 8($s0) -/* C383A8 80241E78 0C00EABB */ jal get_npc_unsafe -/* C383AC 80241E7C 00C0A02D */ daddu $s4, $a2, $zero -/* C383B0 80241E80 0040882D */ daddu $s1, $v0, $zero -/* C383B4 80241E84 C6200038 */ lwc1 $f0, 0x38($s1) -/* C383B8 80241E88 C622003C */ lwc1 $f2, 0x3c($s1) -/* C383BC 80241E8C C6240040 */ lwc1 $f4, 0x40($s1) -/* C383C0 80241E90 3C01447A */ lui $at, 0x447a -/* C383C4 80241E94 44813000 */ mtc1 $at, $f6 -/* C383C8 80241E98 C60C0074 */ lwc1 $f12, 0x74($s0) -/* C383CC 80241E9C 46806320 */ cvt.s.w $f12, $f12 -/* C383D0 80241EA0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C383D4 80241EA4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C383D8 80241EA8 E7A40030 */ swc1 $f4, 0x30($sp) -/* C383DC 80241EAC E7A60034 */ swc1 $f6, 0x34($sp) -/* C383E0 80241EB0 C6000078 */ lwc1 $f0, 0x78($s0) -/* C383E4 80241EB4 46800020 */ cvt.s.w $f0, $f0 -/* C383E8 80241EB8 46000021 */ cvt.d.s $f0, $f0 -/* C383EC 80241EBC C6020088 */ lwc1 $f2, 0x88($s0) -/* C383F0 80241EC0 468010A0 */ cvt.s.w $f2, $f2 -/* C383F4 80241EC4 3C014059 */ lui $at, 0x4059 -/* C383F8 80241EC8 44812800 */ mtc1 $at, $f5 -/* C383FC 80241ECC 44802000 */ mtc1 $zero, $f4 -/* C38400 80241ED0 460010A1 */ cvt.d.s $f2, $f2 -/* C38404 80241ED4 46240003 */ div.d $f0, $f0, $f4 -/* C38408 80241ED8 462006A0 */ cvt.s.d $f26, $f0 -/* C3840C 80241EDC 46241083 */ div.d $f2, $f2, $f4 -/* C38410 80241EE0 462010A0 */ cvt.s.d $f2, $f2 -/* C38414 80241EE4 C6000070 */ lwc1 $f0, 0x70($s0) -/* C38418 80241EE8 46800020 */ cvt.s.w $f0, $f0 -/* C3841C 80241EEC 46000021 */ cvt.d.s $f0, $f0 -/* C38420 80241EF0 46240003 */ div.d $f0, $f0, $f4 -/* C38424 80241EF4 462005A0 */ cvt.s.d $f22, $f0 -/* C38428 80241EF8 0C00A8BB */ jal sin_deg -/* C3842C 80241EFC 4602D600 */ add.s $f24, $f26, $f2 -/* C38430 80241F00 27A50028 */ addiu $a1, $sp, 0x28 -/* C38434 80241F04 27A6002C */ addiu $a2, $sp, 0x2c -/* C38438 80241F08 27A70030 */ addiu $a3, $sp, 0x30 -/* C3843C 80241F0C 27A20034 */ addiu $v0, $sp, 0x34 -/* C38440 80241F10 AFA20010 */ sw $v0, 0x10($sp) -/* C38444 80241F14 8E240080 */ lw $a0, 0x80($s1) -/* C38448 80241F18 0C0372DF */ jal func_800DCB7C -/* C3844C 80241F1C 46000506 */ mov.s $f20, $f0 -/* C38450 80241F20 10400007 */ beqz $v0, .L80241F40 -/* C38454 80241F24 00000000 */ nop -/* C38458 80241F28 4616A082 */ mul.s $f2, $f20, $f22 -/* C3845C 80241F2C 00000000 */ nop -/* C38460 80241F30 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C38464 80241F34 461A0000 */ add.s $f0, $f0, $f26 -/* C38468 80241F38 080907D3 */ j .L80241F4C -/* C3846C 80241F3C 46020000 */ add.s $f0, $f0, $f2 -.L80241F40: -/* C38470 80241F40 4616A002 */ mul.s $f0, $f20, $f22 -/* C38474 80241F44 00000000 */ nop -/* C38478 80241F48 4600C000 */ add.s $f0, $f24, $f0 -.L80241F4C: -/* C3847C 80241F4C E620003C */ swc1 $f0, 0x3c($s1) -/* C38480 80241F50 8E020074 */ lw $v0, 0x74($s0) -/* C38484 80241F54 2442000C */ addiu $v0, $v0, 0xc -/* C38488 80241F58 44826000 */ mtc1 $v0, $f12 -/* C3848C 80241F5C 00000000 */ nop -/* C38490 80241F60 0C00A6C9 */ jal clamp_angle -/* C38494 80241F64 46806320 */ cvt.s.w $f12, $f12 -/* C38498 80241F68 4600020D */ trunc.w.s $f8, $f0 -/* C3849C 80241F6C E6080074 */ swc1 $f8, 0x74($s0) -/* C384A0 80241F70 8E420074 */ lw $v0, 0x74($s2) -/* C384A4 80241F74 1C400037 */ bgtz $v0, .L80242054 -/* C384A8 80241F78 2442FFFF */ addiu $v0, $v0, -1 -/* C384AC 80241F7C 8E620014 */ lw $v0, 0x14($s3) -/* C384B0 80241F80 AE420074 */ sw $v0, 0x74($s2) -/* C384B4 80241F84 C662000C */ lwc1 $f2, 0xc($s3) -/* C384B8 80241F88 3C013FE0 */ lui $at, 0x3fe0 -/* C384BC 80241F8C 44812800 */ mtc1 $at, $f5 -/* C384C0 80241F90 44802000 */ mtc1 $zero, $f4 -/* C384C4 80241F94 460010A1 */ cvt.d.s $f2, $f2 -/* C384C8 80241F98 46241082 */ mul.d $f2, $f2, $f4 -/* C384CC 80241F9C 00000000 */ nop -/* C384D0 80241FA0 C6600010 */ lwc1 $f0, 0x10($s3) -/* C384D4 80241FA4 46000021 */ cvt.d.s $f0, $f0 -/* C384D8 80241FA8 46240002 */ mul.d $f0, $f0, $f4 -/* C384DC 80241FAC 00000000 */ nop -/* C384E0 80241FB0 0280202D */ daddu $a0, $s4, $zero -/* C384E4 80241FB4 462010A0 */ cvt.s.d $f2, $f2 -/* C384E8 80241FB8 46200020 */ cvt.s.d $f0, $f0 -/* C384EC 80241FBC 44061000 */ mfc1 $a2, $f2 -/* C384F0 80241FC0 44070000 */ mfc1 $a3, $f0 -/* C384F4 80241FC4 0200282D */ daddu $a1, $s0, $zero -/* C384F8 80241FC8 0C01242D */ jal func_800490B4 -/* C384FC 80241FCC AFA00010 */ sw $zero, 0x10($sp) -/* C38500 80241FD0 1040001E */ beqz $v0, .L8024204C -/* C38504 80241FD4 0000202D */ daddu $a0, $zero, $zero -/* C38508 80241FD8 0220282D */ daddu $a1, $s1, $zero -/* C3850C 80241FDC 0000302D */ daddu $a2, $zero, $zero -/* C38510 80241FE0 2410000C */ addiu $s0, $zero, 0xc -/* C38514 80241FE4 862300A8 */ lh $v1, 0xa8($s1) -/* C38518 80241FE8 3C013F80 */ lui $at, 0x3f80 -/* C3851C 80241FEC 44810000 */ mtc1 $at, $f0 -/* C38520 80241FF0 3C014000 */ lui $at, 0x4000 -/* C38524 80241FF4 44811000 */ mtc1 $at, $f2 -/* C38528 80241FF8 3C01C1A0 */ lui $at, 0xc1a0 -/* C3852C 80241FFC 44812000 */ mtc1 $at, $f4 -/* C38530 80242000 44834000 */ mtc1 $v1, $f8 -/* C38534 80242004 00000000 */ nop -/* C38538 80242008 46804220 */ cvt.s.w $f8, $f8 -/* C3853C 8024200C 44074000 */ mfc1 $a3, $f8 -/* C38540 80242010 27A20038 */ addiu $v0, $sp, 0x38 -/* C38544 80242014 AFB0001C */ sw $s0, 0x1c($sp) -/* C38548 80242018 AFA20020 */ sw $v0, 0x20($sp) -/* C3854C 8024201C E7A00010 */ swc1 $f0, 0x10($sp) -/* C38550 80242020 E7A20014 */ swc1 $f2, 0x14($sp) -/* C38554 80242024 0C01BFA4 */ jal fx_emote -/* C38558 80242028 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3855C 8024202C 0220202D */ daddu $a0, $s1, $zero -/* C38560 80242030 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C38564 80242034 0C012530 */ jal func_800494C0 -/* C38568 80242038 3C060020 */ lui $a2, 0x20 -/* C3856C 8024203C C620003C */ lwc1 $f0, 0x3c($s1) -/* C38570 80242040 E6200064 */ swc1 $f0, 0x64($s1) -/* C38574 80242044 08090849 */ j .L80242124 -/* C38578 80242048 AE500070 */ sw $s0, 0x70($s2) -.L8024204C: -/* C3857C 8024204C 8E420074 */ lw $v0, 0x74($s2) -/* C38580 80242050 2442FFFF */ addiu $v0, $v0, -1 -.L80242054: -/* C38584 80242054 AE420074 */ sw $v0, 0x74($s2) -/* C38588 80242058 8622008C */ lh $v0, 0x8c($s1) -/* C3858C 8024205C 14400031 */ bnez $v0, .L80242124 -/* C38590 80242060 00000000 */ nop -/* C38594 80242064 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C38598 80242068 8E0200D0 */ lw $v0, 0xd0($s0) -/* C3859C 8024206C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C385A0 80242070 C4480000 */ lwc1 $f8, ($v0) -/* C385A4 80242074 46804220 */ cvt.s.w $f8, $f8 -/* C385A8 80242078 44064000 */ mfc1 $a2, $f8 -/* C385AC 8024207C C4480008 */ lwc1 $f8, 8($v0) -/* C385B0 80242080 46804220 */ cvt.s.w $f8, $f8 -/* C385B4 80242084 44074000 */ mfc1 $a3, $f8 -/* C385B8 80242088 0C00A720 */ jal atan2 -/* C385BC 8024208C 00000000 */ nop -/* C385C0 80242090 8E250018 */ lw $a1, 0x18($s1) -/* C385C4 80242094 44060000 */ mfc1 $a2, $f0 -/* C385C8 80242098 0220202D */ daddu $a0, $s1, $zero -/* C385CC 8024209C 0C00EA95 */ jal npc_move_heading -/* C385D0 802420A0 AE26000C */ sw $a2, 0xc($s1) -/* C385D4 802420A4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C385D8 802420A8 8E0200D0 */ lw $v0, 0xd0($s0) -/* C385DC 802420AC C62E0040 */ lwc1 $f14, 0x40($s1) -/* C385E0 802420B0 C4480000 */ lwc1 $f8, ($v0) -/* C385E4 802420B4 46804220 */ cvt.s.w $f8, $f8 -/* C385E8 802420B8 44064000 */ mfc1 $a2, $f8 -/* C385EC 802420BC C4480008 */ lwc1 $f8, 8($v0) -/* C385F0 802420C0 46804220 */ cvt.s.w $f8, $f8 -/* C385F4 802420C4 44074000 */ mfc1 $a3, $f8 -/* C385F8 802420C8 0C00A7B5 */ jal dist2D -/* C385FC 802420CC 00000000 */ nop -/* C38600 802420D0 C6220018 */ lwc1 $f2, 0x18($s1) -/* C38604 802420D4 46021080 */ add.s $f2, $f2, $f2 -/* C38608 802420D8 4602003E */ c.le.s $f0, $f2 -/* C3860C 802420DC 00000000 */ nop -/* C38610 802420E0 45000010 */ bc1f .L80242124 -/* C38614 802420E4 E7A00034 */ swc1 $f0, 0x34($sp) -/* C38618 802420E8 0C00A67F */ jal rand_int -/* C3861C 802420EC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C38620 802420F0 3C035555 */ lui $v1, 0x5555 -/* C38624 802420F4 34635556 */ ori $v1, $v1, 0x5556 -/* C38628 802420F8 00430018 */ mult $v0, $v1 -/* C3862C 802420FC 24030002 */ addiu $v1, $zero, 2 -/* C38630 80242100 000227C3 */ sra $a0, $v0, 0x1f -/* C38634 80242104 AE430070 */ sw $v1, 0x70($s2) -/* C38638 80242108 00004010 */ mfhi $t0 -/* C3863C 8024210C 01042023 */ subu $a0, $t0, $a0 -/* C38640 80242110 00041840 */ sll $v1, $a0, 1 -/* C38644 80242114 00641821 */ addu $v1, $v1, $a0 -/* C38648 80242118 00431023 */ subu $v0, $v0, $v1 -/* C3864C 8024211C 24420002 */ addiu $v0, $v0, 2 -/* C38650 80242120 AE420074 */ sw $v0, 0x74($s2) -.L80242124: -/* C38654 80242124 8FBF0054 */ lw $ra, 0x54($sp) -/* C38658 80242128 8FB40050 */ lw $s4, 0x50($sp) -/* C3865C 8024212C 8FB3004C */ lw $s3, 0x4c($sp) -/* C38660 80242130 8FB20048 */ lw $s2, 0x48($sp) -/* C38664 80242134 8FB10044 */ lw $s1, 0x44($sp) -/* C38668 80242138 8FB00040 */ lw $s0, 0x40($sp) -/* C3866C 8024213C D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C38670 80242140 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C38674 80242144 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C38678 80242148 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C3867C 8024214C 03E00008 */ jr $ra -/* C38680 80242150 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s deleted file mode 100644 index 654668e5a0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s +++ /dev/null @@ -1,180 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242154_C38684 -/* C38684 80242154 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C38688 80242158 AFB40050 */ sw $s4, 0x50($sp) -/* C3868C 8024215C 0080A02D */ daddu $s4, $a0, $zero -/* C38690 80242160 AFBF0058 */ sw $ra, 0x58($sp) -/* C38694 80242164 AFB50054 */ sw $s5, 0x54($sp) -/* C38698 80242168 AFB3004C */ sw $s3, 0x4c($sp) -/* C3869C 8024216C AFB20048 */ sw $s2, 0x48($sp) -/* C386A0 80242170 AFB10044 */ sw $s1, 0x44($sp) -/* C386A4 80242174 AFB00040 */ sw $s0, 0x40($sp) -/* C386A8 80242178 8E920148 */ lw $s2, 0x148($s4) -/* C386AC 8024217C 86440008 */ lh $a0, 8($s2) -/* C386B0 80242180 0C00EABB */ jal get_npc_unsafe -/* C386B4 80242184 00A0802D */ daddu $s0, $a1, $zero -/* C386B8 80242188 8E83000C */ lw $v1, 0xc($s4) -/* C386BC 8024218C 0280202D */ daddu $a0, $s4, $zero -/* C386C0 80242190 8C650000 */ lw $a1, ($v1) -/* C386C4 80242194 0C0B1EAF */ jal get_variable -/* C386C8 80242198 0040A82D */ daddu $s5, $v0, $zero -/* C386CC 8024219C AFA00020 */ sw $zero, 0x20($sp) -/* C386D0 802421A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386D4 802421A4 8C630030 */ lw $v1, 0x30($v1) -/* C386D8 802421A8 AFA30024 */ sw $v1, 0x24($sp) -/* C386DC 802421AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386E0 802421B0 8C63001C */ lw $v1, 0x1c($v1) -/* C386E4 802421B4 AFA30028 */ sw $v1, 0x28($sp) -/* C386E8 802421B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386EC 802421BC 8C630024 */ lw $v1, 0x24($v1) -/* C386F0 802421C0 AFA3002C */ sw $v1, 0x2c($sp) -/* C386F4 802421C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386F8 802421C8 8C630028 */ lw $v1, 0x28($v1) -/* C386FC 802421CC 27B30020 */ addiu $s3, $sp, 0x20 -/* C38700 802421D0 AFA30030 */ sw $v1, 0x30($sp) -/* C38704 802421D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C38708 802421D8 3C0142FA */ lui $at, 0x42fa -/* C3870C 802421DC 44810000 */ mtc1 $at, $f0 -/* C38710 802421E0 8C63002C */ lw $v1, 0x2c($v1) -/* C38714 802421E4 0040882D */ daddu $s1, $v0, $zero -/* C38718 802421E8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C3871C 802421EC A7A0003C */ sh $zero, 0x3c($sp) -/* C38720 802421F0 12000007 */ beqz $s0, .L80242210 -/* C38724 802421F4 AFA30034 */ sw $v1, 0x34($sp) -/* C38728 802421F8 AE800070 */ sw $zero, 0x70($s4) -/* C3872C 802421FC 02A0202D */ daddu $a0, $s5, $zero -/* C38730 80242200 0240282D */ daddu $a1, $s2, $zero -/* C38734 80242204 0280302D */ daddu $a2, $s4, $zero -/* C38738 80242208 0C09047A */ jal func_802411E8_C37718 -/* C3873C 8024220C 0220382D */ daddu $a3, $s1, $zero -.L80242210: -/* C38740 80242210 8E830070 */ lw $v1, 0x70($s4) -/* C38744 80242214 2C620020 */ sltiu $v0, $v1, 0x20 -/* C38748 80242218 10400060 */ beqz $v0, L8024239C_C388CC -/* C3874C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C38750 80242220 3C018024 */ lui $at, %hi(jtbl_80244458_C3A988) -/* C38754 80242224 00220821 */ addu $at, $at, $v0 -/* C38758 80242228 8C224458 */ lw $v0, %lo(jtbl_80244458_C3A988)($at) -/* C3875C 8024222C 00400008 */ jr $v0 -/* C38760 80242230 00000000 */ nop -glabel L80242234_C38764 -/* C38764 80242234 0280202D */ daddu $a0, $s4, $zero -/* C38768 80242238 0220282D */ daddu $a1, $s1, $zero -/* C3876C 8024223C 0C090000 */ jal func_80240000_C36530 -/* C38770 80242240 0260302D */ daddu $a2, $s3, $zero -/* C38774 80242244 0000282D */ daddu $a1, $zero, $zero -/* C38778 80242248 00A0302D */ daddu $a2, $a1, $zero -/* C3877C 8024224C AFA00010 */ sw $zero, 0x10($sp) -/* C38780 80242250 AFA00014 */ sw $zero, 0x14($sp) -/* C38784 80242254 AFA00018 */ sw $zero, 0x18($sp) -/* C38788 80242258 8EA40024 */ lw $a0, 0x24($s5) -/* C3878C 8024225C 0C0B7A25 */ jal func_802DE894 -/* C38790 80242260 00A0382D */ daddu $a3, $a1, $zero -glabel L80242264_C38794 -/* C38794 80242264 0280202D */ daddu $a0, $s4, $zero -/* C38798 80242268 0220282D */ daddu $a1, $s1, $zero -/* C3879C 8024226C 0C09006C */ jal func_802401B0_C366E0 -/* C387A0 80242270 0260302D */ daddu $a2, $s3, $zero -/* C387A4 80242274 080908A7 */ j .L8024229C -/* C387A8 80242278 00000000 */ nop -glabel L8024227C_C387AC -/* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero -/* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero -/* C387B4 80242284 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 -/* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero -glabel L8024228C_C387BC -/* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero -/* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero -/* C387C4 80242294 0C090226 */ jal func_80240898_C36DC8 -/* C387C8 80242298 0260302D */ daddu $a2, $s3, $zero -.L8024229C: -/* C387CC 8024229C 8E830070 */ lw $v1, 0x70($s4) -/* C387D0 802422A0 2402000C */ addiu $v0, $zero, 0xc -/* C387D4 802422A4 1462003D */ bne $v1, $v0, L8024239C_C388CC -/* C387D8 802422A8 24020006 */ addiu $v0, $zero, 6 -/* C387DC 802422AC 080908E7 */ j L8024239C_C388CC -/* C387E0 802422B0 A6A2008E */ sh $v0, 0x8e($s5) -glabel L802422B4_C387E4 -/* C387E4 802422B4 0280202D */ daddu $a0, $s4, $zero -/* C387E8 802422B8 0220282D */ daddu $a1, $s1, $zero -/* C387EC 802422BC 0C09053E */ jal func_802414F8_C37A28 -/* C387F0 802422C0 0260302D */ daddu $a2, $s3, $zero -/* C387F4 802422C4 8E830070 */ lw $v1, 0x70($s4) -/* C387F8 802422C8 2402000D */ addiu $v0, $zero, 0xd -/* C387FC 802422CC 14620033 */ bne $v1, $v0, L8024239C_C388CC -/* C38800 802422D0 00000000 */ nop -glabel L802422D4_C38804 -/* C38804 802422D4 0280202D */ daddu $a0, $s4, $zero -/* C38808 802422D8 0220282D */ daddu $a1, $s1, $zero -/* C3880C 802422DC 0C090594 */ jal func_80241650_C37B80 -/* C38810 802422E0 0260302D */ daddu $a2, $s3, $zero -/* C38814 802422E4 080908E7 */ j L8024239C_C388CC -/* C38818 802422E8 00000000 */ nop -glabel L802422EC_C3881C -/* C3881C 802422EC 0280202D */ daddu $a0, $s4, $zero -/* C38820 802422F0 0220282D */ daddu $a1, $s1, $zero -/* C38824 802422F4 0C0905D5 */ jal func_80241754_C37C84 -/* C38828 802422F8 0260302D */ daddu $a2, $s3, $zero -/* C3882C 802422FC 8E830070 */ lw $v1, 0x70($s4) -/* C38830 80242300 2402000F */ addiu $v0, $zero, 0xf -/* C38834 80242304 14620025 */ bne $v1, $v0, L8024239C_C388CC -/* C38838 80242308 00000000 */ nop -glabel L8024230C_C3883C -/* C3883C 8024230C 0280202D */ daddu $a0, $s4, $zero -/* C38840 80242310 0220282D */ daddu $a1, $s1, $zero -/* C38844 80242314 0C0905FE */ jal func_802417F8_C37D28 -/* C38848 80242318 0260302D */ daddu $a2, $s3, $zero -/* C3884C 8024231C 080908E7 */ j L8024239C_C388CC -/* C38850 80242320 00000000 */ nop -glabel L80242324_C38854 -/* C38854 80242324 0280202D */ daddu $a0, $s4, $zero -/* C38858 80242328 0220282D */ daddu $a1, $s1, $zero -/* C3885C 8024232C 0C0906A5 */ jal func_80241A94_C37FC4 -/* C38860 80242330 0260302D */ daddu $a2, $s3, $zero -glabel L80242334_C38864 -/* C38864 80242334 0280202D */ daddu $a0, $s4, $zero -/* C38868 80242338 0220282D */ daddu $a1, $s1, $zero -/* C3886C 8024233C 0C0906D3 */ jal func_80241B4C_C3807C -/* C38870 80242340 0260302D */ daddu $a2, $s3, $zero -/* C38874 80242344 080908E7 */ j L8024239C_C388CC -/* C38878 80242348 00000000 */ nop -glabel L8024234C_C3887C -/* C3887C 8024234C 0280202D */ daddu $a0, $s4, $zero -/* C38880 80242350 0220282D */ daddu $a1, $s1, $zero -/* C38884 80242354 0C090733 */ jal func_80241CCC_C381FC -/* C38888 80242358 0260302D */ daddu $a2, $s3, $zero -/* C3888C 8024235C 080908E7 */ j L8024239C_C388CC -/* C38890 80242360 00000000 */ nop -glabel L80242364_C38894 -/* C38894 80242364 0280202D */ daddu $a0, $s4, $zero -/* C38898 80242368 0220282D */ daddu $a1, $s1, $zero -/* C3889C 8024236C 0C090745 */ jal func_80241D14_C38244 -/* C388A0 80242370 0260302D */ daddu $a2, $s3, $zero -/* C388A4 80242374 080908E7 */ j L8024239C_C388CC -/* C388A8 80242378 00000000 */ nop -glabel L8024237C_C388AC -/* C388AC 8024237C 0280202D */ daddu $a0, $s4, $zero -/* C388B0 80242380 0220282D */ daddu $a1, $s1, $zero -/* C388B4 80242384 0C090765 */ jal func_80241D94_C382C4 -/* C388B8 80242388 0260302D */ daddu $a2, $s3, $zero -glabel L8024238C_C388BC -/* C388BC 8024238C 0280202D */ daddu $a0, $s4, $zero -/* C388C0 80242390 0220282D */ daddu $a1, $s1, $zero -/* C388C4 80242394 0C09078F */ jal func_80241E3C_C3836C -/* C388C8 80242398 0260302D */ daddu $a2, $s3, $zero -glabel L8024239C_C388CC -/* C388CC 8024239C 8E820070 */ lw $v0, 0x70($s4) -/* C388D0 802423A0 8FBF0058 */ lw $ra, 0x58($sp) -/* C388D4 802423A4 8FB50054 */ lw $s5, 0x54($sp) -/* C388D8 802423A8 8FB40050 */ lw $s4, 0x50($sp) -/* C388DC 802423AC 8FB3004C */ lw $s3, 0x4c($sp) -/* C388E0 802423B0 8FB20048 */ lw $s2, 0x48($sp) -/* C388E4 802423B4 8FB10044 */ lw $s1, 0x44($sp) -/* C388E8 802423B8 8FB00040 */ lw $s0, 0x40($sp) -/* C388EC 802423BC 38420064 */ xori $v0, $v0, 0x64 -/* C388F0 802423C0 2C420001 */ sltiu $v0, $v0, 1 -/* C388F4 802423C4 00021040 */ sll $v0, $v0, 1 -/* C388F8 802423C8 03E00008 */ jr $ra -/* C388FC 802423CC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s deleted file mode 100644 index 33fafaa772..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423EC_C3891C -/* C3891C 802423EC 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* C38920 802423F0 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* C38924 802423F4 8C430000 */ lw $v1, ($v0) -/* C38928 802423F8 2404FFBF */ addiu $a0, $zero, -0x41 -/* C3892C 802423FC 00641824 */ and $v1, $v1, $a0 -/* C38930 80242400 AC430000 */ sw $v1, ($v0) -/* C38934 80242404 03E00008 */ jr $ra -/* C38938 80242408 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024240C_C3893C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024240C_C3893C.s deleted file mode 100644 index 44238febd6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024240C_C3893C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024240C_C3893C -/* C3893C 8024240C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38940 80242410 AFBF0010 */ sw $ra, 0x10($sp) -/* C38944 80242414 8C82000C */ lw $v0, 0xc($a0) -/* C38948 80242418 0C0B1EAF */ jal get_variable -/* C3894C 8024241C 8C450000 */ lw $a1, ($v0) -/* C38950 80242420 0C0B95A4 */ jal func_802E5690 -/* C38954 80242424 0040202D */ daddu $a0, $v0, $zero -/* C38958 80242428 8FBF0010 */ lw $ra, 0x10($sp) -/* C3895C 8024242C 24020002 */ addiu $v0, $zero, 2 -/* C38960 80242430 03E00008 */ jr $ra -/* C38964 80242434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242438_C38968.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242438_C38968.s deleted file mode 100644 index 60cd4b4daf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242438_C38968.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242438_C38968 -/* C38968 80242438 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3896C 8024243C AFB00010 */ sw $s0, 0x10($sp) -/* C38970 80242440 0080802D */ daddu $s0, $a0, $zero -/* C38974 80242444 AFBF0018 */ sw $ra, 0x18($sp) -/* C38978 80242448 AFB10014 */ sw $s1, 0x14($sp) -/* C3897C 8024244C 8E11000C */ lw $s1, 0xc($s0) -/* C38980 80242450 8E250000 */ lw $a1, ($s1) -/* C38984 80242454 0C0B1EAF */ jal get_variable -/* C38988 80242458 26310004 */ addiu $s1, $s1, 4 -/* C3898C 8024245C 0200202D */ daddu $a0, $s0, $zero -/* C38990 80242460 3C038011 */ lui $v1, %hi(gPlayerData) -/* C38994 80242464 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* C38998 80242468 000210C0 */ sll $v0, $v0, 3 -/* C3899C 8024246C 00431021 */ addu $v0, $v0, $v1 -/* C389A0 80242470 90460015 */ lbu $a2, 0x15($v0) -/* C389A4 80242474 8E250000 */ lw $a1, ($s1) -/* C389A8 80242478 24C60001 */ addiu $a2, $a2, 1 -/* C389AC 8024247C A0460015 */ sb $a2, 0x15($v0) -/* C389B0 80242480 00063600 */ sll $a2, $a2, 0x18 -/* C389B4 80242484 0C0B2026 */ jal set_variable -/* C389B8 80242488 00063603 */ sra $a2, $a2, 0x18 -/* C389BC 8024248C 8FBF0018 */ lw $ra, 0x18($sp) -/* C389C0 80242490 8FB10014 */ lw $s1, 0x14($sp) -/* C389C4 80242494 8FB00010 */ lw $s0, 0x10($sp) -/* C389C8 80242498 24020002 */ addiu $v0, $zero, 2 -/* C389CC 8024249C 03E00008 */ jr $ra -/* C389D0 802424A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s deleted file mode 100644 index 6a5639e28f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424F0_C38A20 -/* C38A20 802424F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C38A24 802424F4 AFB3001C */ sw $s3, 0x1c($sp) -/* C38A28 802424F8 0080982D */ daddu $s3, $a0, $zero -/* C38A2C 802424FC AFB00010 */ sw $s0, 0x10($sp) -/* C38A30 80242500 24100001 */ addiu $s0, $zero, 1 -/* C38A34 80242504 AFB40020 */ sw $s4, 0x20($sp) -/* C38A38 80242508 2414FFFF */ addiu $s4, $zero, -1 -/* C38A3C 8024250C AFB50024 */ sw $s5, 0x24($sp) -/* C38A40 80242510 0200A82D */ daddu $s5, $s0, $zero -/* C38A44 80242514 AFB10014 */ sw $s1, 0x14($sp) -/* C38A48 80242518 3C118011 */ lui $s1, %hi(gPlayerData+0x8) -/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) -/* C38A50 80242520 AFBF0028 */ sw $ra, 0x28($sp) -/* C38A54 80242524 AFB20018 */ sw $s2, 0x18($sp) -/* C38A58 80242528 8E6200B4 */ lw $v0, 0xb4($s3) -/* C38A5C 8024252C 0280182D */ daddu $v1, $s4, $zero -/* C38A60 80242530 AE630084 */ sw $v1, 0x84($s3) -/* C38A64 80242534 00021027 */ nor $v0, $zero, $v0 -/* C38A68 80242538 000217C2 */ srl $v0, $v0, 0x1f -/* C38A6C 8024253C 00029400 */ sll $s2, $v0, 0x10 -.L80242540: -/* C38A70 80242540 92220014 */ lbu $v0, 0x14($s1) -/* C38A74 80242544 50400008 */ beql $v0, $zero, .L80242568 -/* C38A78 80242548 26100001 */ addiu $s0, $s0, 1 -/* C38A7C 8024254C 0200202D */ daddu $a0, $s0, $zero -/* C38A80 80242550 0C090929 */ jal func_802424A4_C389D4 -/* C38A84 80242554 00122C03 */ sra $a1, $s2, 0x10 -/* C38A88 80242558 10540003 */ beq $v0, $s4, .L80242568 -/* C38A8C 8024255C 26100001 */ addiu $s0, $s0, 1 -/* C38A90 80242560 0809095D */ j .L80242574 -/* C38A94 80242564 AE750084 */ sw $s5, 0x84($s3) -.L80242568: -/* C38A98 80242568 2A02000C */ slti $v0, $s0, 0xc -/* C38A9C 8024256C 1440FFF4 */ bnez $v0, .L80242540 -/* C38AA0 80242570 26310008 */ addiu $s1, $s1, 8 -.L80242574: -/* C38AA4 80242574 8FBF0028 */ lw $ra, 0x28($sp) -/* C38AA8 80242578 8FB50024 */ lw $s5, 0x24($sp) -/* C38AAC 8024257C 8FB40020 */ lw $s4, 0x20($sp) -/* C38AB0 80242580 8FB3001C */ lw $s3, 0x1c($sp) -/* C38AB4 80242584 8FB20018 */ lw $s2, 0x18($sp) -/* C38AB8 80242588 8FB10014 */ lw $s1, 0x14($sp) -/* C38ABC 8024258C 8FB00010 */ lw $s0, 0x10($sp) -/* C38AC0 80242590 24020002 */ addiu $v0, $zero, 2 -/* C38AC4 80242594 03E00008 */ jr $ra -/* C38AC8 80242598 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802427EC_C38D1C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802427EC_C38D1C.s deleted file mode 100644 index 786852bb66..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802427EC_C38D1C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427EC_C38D1C -/* C38D1C 802427EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38D20 802427F0 AFBF0010 */ sw $ra, 0x10($sp) -/* C38D24 802427F4 8C82000C */ lw $v0, 0xc($a0) -/* C38D28 802427F8 0C0B1EAF */ jal get_variable -/* C38D2C 802427FC 8C450000 */ lw $a1, ($v0) -/* C38D30 80242800 0C03AC5A */ jal func_800EB168 -/* C38D34 80242804 0040202D */ daddu $a0, $v0, $zero -/* C38D38 80242808 8FBF0010 */ lw $ra, 0x10($sp) -/* C38D3C 8024280C 24020002 */ addiu $v0, $zero, 2 -/* C38D40 80242810 03E00008 */ jr $ra -/* C38D44 80242814 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s deleted file mode 100644 index 37cadd81dc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242818_C38D48 -/* C38D48 80242818 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* C38D4C 8024281C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* C38D50 80242820 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38D54 80242824 AFBF0010 */ sw $ra, 0x10($sp) -/* C38D58 80242828 00021100 */ sll $v0, $v0, 4 -/* C38D5C 8024282C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* C38D60 80242830 00822021 */ addu $a0, $a0, $v0 -/* C38D64 80242834 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* C38D68 80242838 0C0496CF */ jal set_message_string -/* C38D6C 8024283C 0000282D */ daddu $a1, $zero, $zero -/* C38D70 80242840 8FBF0010 */ lw $ra, 0x10($sp) -/* C38D74 80242844 24020002 */ addiu $v0, $zero, 2 -/* C38D78 80242848 03E00008 */ jr $ra -/* C38D7C 8024284C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242850_C38D80.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242850_C38D80.s deleted file mode 100644 index e95e4f2f8d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242850_C38D80.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242850_C38D80 -/* C38D80 80242850 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C38D84 80242854 AFB1001C */ sw $s1, 0x1c($sp) -/* C38D88 80242858 0080882D */ daddu $s1, $a0, $zero -/* C38D8C 8024285C AFBF0020 */ sw $ra, 0x20($sp) -/* C38D90 80242860 AFB00018 */ sw $s0, 0x18($sp) -/* C38D94 80242864 8E30000C */ lw $s0, 0xc($s1) -/* C38D98 80242868 8E050000 */ lw $a1, ($s0) -/* C38D9C 8024286C 0C0B1EAF */ jal get_variable -/* C38DA0 80242870 26100004 */ addiu $s0, $s0, 4 -/* C38DA4 80242874 0C04417A */ jal get_entity_by_index -/* C38DA8 80242878 0040202D */ daddu $a0, $v0, $zero -/* C38DAC 8024287C 8E100000 */ lw $s0, ($s0) -/* C38DB0 80242880 C444004C */ lwc1 $f4, 0x4c($v0) -/* C38DB4 80242884 3C014148 */ lui $at, 0x4148 -/* C38DB8 80242888 44810000 */ mtc1 $at, $f0 -/* C38DBC 8024288C 3C013F33 */ lui $at, 0x3f33 -/* C38DC0 80242890 34213333 */ ori $at, $at, 0x3333 -/* C38DC4 80242894 44811000 */ mtc1 $at, $f2 -/* C38DC8 80242898 AFA00014 */ sw $zero, 0x14($sp) -/* C38DCC 8024289C 46002100 */ add.s $f4, $f4, $f0 -/* C38DD0 802428A0 E7A20010 */ swc1 $f2, 0x10($sp) -/* C38DD4 802428A4 8C450048 */ lw $a1, 0x48($v0) -/* C38DD8 802428A8 8C470050 */ lw $a3, 0x50($v0) -/* C38DDC 802428AC 44062000 */ mfc1 $a2, $f4 -/* C38DE0 802428B0 0C01C5D4 */ jal func_80071750 -/* C38DE4 802428B4 0000202D */ daddu $a0, $zero, $zero -/* C38DE8 802428B8 0220202D */ daddu $a0, $s1, $zero -/* C38DEC 802428BC 0200282D */ daddu $a1, $s0, $zero -/* C38DF0 802428C0 0C0B2026 */ jal set_variable -/* C38DF4 802428C4 0040302D */ daddu $a2, $v0, $zero -/* C38DF8 802428C8 8FBF0020 */ lw $ra, 0x20($sp) -/* C38DFC 802428CC 8FB1001C */ lw $s1, 0x1c($sp) -/* C38E00 802428D0 8FB00018 */ lw $s0, 0x18($sp) -/* C38E04 802428D4 24020002 */ addiu $v0, $zero, 2 -/* C38E08 802428D8 03E00008 */ jr $ra -/* C38E0C 802428DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s deleted file mode 100644 index 2e81a7d94e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428E0_C38E10 -/* C38E10 802428E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38E14 802428E4 AFBF0010 */ sw $ra, 0x10($sp) -/* C38E18 802428E8 8C82000C */ lw $v0, 0xc($a0) -/* C38E1C 802428EC 0C0B1EAF */ jal get_variable -/* C38E20 802428F0 8C450000 */ lw $a1, ($v0) -/* C38E24 802428F4 0040202D */ daddu $a0, $v0, $zero -/* C38E28 802428F8 8C830000 */ lw $v1, ($a0) -/* C38E2C 802428FC 34630010 */ ori $v1, $v1, 0x10 -/* C38E30 80242900 AC830000 */ sw $v1, ($a0) -/* C38E34 80242904 8FBF0010 */ lw $ra, 0x10($sp) -/* C38E38 80242908 24020002 */ addiu $v0, $zero, 2 -/* C38E3C 8024290C 03E00008 */ jr $ra -/* C38E40 80242910 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s deleted file mode 100644 index aa314c67c0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242914_C38E44 -/* C38E44 80242914 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C38E48 80242918 AFBF0018 */ sw $ra, 0x18($sp) -/* C38E4C 8024291C 8C82000C */ lw $v0, 0xc($a0) -/* C38E50 80242920 0C0B1EAF */ jal get_variable -/* C38E54 80242924 8C450000 */ lw $a1, ($v0) -/* C38E58 80242928 0C04417A */ jal get_entity_by_index -/* C38E5C 8024292C 0040202D */ daddu $a0, $v0, $zero -/* C38E60 80242930 3C013F80 */ lui $at, 0x3f80 -/* C38E64 80242934 44810000 */ mtc1 $at, $f0 -/* C38E68 80242938 C442004C */ lwc1 $f2, 0x4c($v0) -/* C38E6C 8024293C E7A00010 */ swc1 $f0, 0x10($sp) -/* C38E70 80242940 3C014148 */ lui $at, 0x4148 -/* C38E74 80242944 44810000 */ mtc1 $at, $f0 -/* C38E78 80242948 2403004B */ addiu $v1, $zero, 0x4b -/* C38E7C 8024294C AFA30014 */ sw $v1, 0x14($sp) -/* C38E80 80242950 46001080 */ add.s $f2, $f2, $f0 -/* C38E84 80242954 8C450048 */ lw $a1, 0x48($v0) -/* C38E88 80242958 8C470050 */ lw $a3, 0x50($v0) -/* C38E8C 8024295C 44061000 */ mfc1 $a2, $f2 -/* C38E90 80242960 0C01C2EC */ jal func_80070BB0 -/* C38E94 80242964 24040004 */ addiu $a0, $zero, 4 -/* C38E98 80242968 8FBF0018 */ lw $ra, 0x18($sp) -/* C38E9C 8024296C 24020002 */ addiu $v0, $zero, 2 -/* C38EA0 80242970 03E00008 */ jr $ra -/* C38EA4 80242974 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s deleted file mode 100644 index b580e63b28..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242978_C38EA8 -/* C38EA8 80242978 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C38EAC 8024297C AFBF0018 */ sw $ra, 0x18($sp) -/* C38EB0 80242980 0C00EAD2 */ jal get_npc_safe -/* C38EB4 80242984 2404FFFC */ addiu $a0, $zero, -4 -/* C38EB8 80242988 C444003C */ lwc1 $f4, 0x3c($v0) -/* C38EBC 8024298C 3C014148 */ lui $at, 0x4148 -/* C38EC0 80242990 44811000 */ mtc1 $at, $f2 -/* C38EC4 80242994 3C013F80 */ lui $at, 0x3f80 -/* C38EC8 80242998 44810000 */ mtc1 $at, $f0 -/* C38ECC 8024299C 2403001E */ addiu $v1, $zero, 0x1e -/* C38ED0 802429A0 AFA30014 */ sw $v1, 0x14($sp) -/* C38ED4 802429A4 46022100 */ add.s $f4, $f4, $f2 -/* C38ED8 802429A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C38EDC 802429AC 8C450038 */ lw $a1, 0x38($v0) -/* C38EE0 802429B0 8C470040 */ lw $a3, 0x40($v0) -/* C38EE4 802429B4 44062000 */ mfc1 $a2, $f4 -/* C38EE8 802429B8 0C01C2EC */ jal func_80070BB0 -/* C38EEC 802429BC 24040009 */ addiu $a0, $zero, 9 -/* C38EF0 802429C0 8FBF0018 */ lw $ra, 0x18($sp) -/* C38EF4 802429C4 24020002 */ addiu $v0, $zero, 2 -/* C38EF8 802429C8 03E00008 */ jr $ra -/* C38EFC 802429CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s deleted file mode 100644 index 95e67e027e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429D0_C38F00 -/* C38F00 802429D0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C38F04 802429D4 AFB60040 */ sw $s6, 0x40($sp) -/* C38F08 802429D8 0080B02D */ daddu $s6, $a0, $zero -/* C38F0C 802429DC AFB00028 */ sw $s0, 0x28($sp) -/* C38F10 802429E0 00A0802D */ daddu $s0, $a1, $zero -/* C38F14 802429E4 AFBF0044 */ sw $ra, 0x44($sp) -/* C38F18 802429E8 AFB5003C */ sw $s5, 0x3c($sp) -/* C38F1C 802429EC AFB40038 */ sw $s4, 0x38($sp) -/* C38F20 802429F0 AFB30034 */ sw $s3, 0x34($sp) -/* C38F24 802429F4 AFB20030 */ sw $s2, 0x30($sp) -/* C38F28 802429F8 AFB1002C */ sw $s1, 0x2c($sp) -/* C38F2C 802429FC F7B80058 */ sdc1 $f24, 0x58($sp) -/* C38F30 80242A00 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C38F34 80242A04 F7B40048 */ sdc1 $f20, 0x48($sp) -/* C38F38 80242A08 8ED3000C */ lw $s3, 0xc($s6) -/* C38F3C 80242A0C 0C00EAD2 */ jal get_npc_safe -/* C38F40 80242A10 2404FFFC */ addiu $a0, $zero, -4 -/* C38F44 80242A14 27A50018 */ addiu $a1, $sp, 0x18 -/* C38F48 80242A18 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C38F4C 80242A1C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C38F50 80242A20 27A6001C */ addiu $a2, $sp, 0x1c -/* C38F54 80242A24 00041880 */ sll $v1, $a0, 2 -/* C38F58 80242A28 00641821 */ addu $v1, $v1, $a0 -/* C38F5C 80242A2C 00031880 */ sll $v1, $v1, 2 -/* C38F60 80242A30 00641823 */ subu $v1, $v1, $a0 -/* C38F64 80242A34 000320C0 */ sll $a0, $v1, 3 -/* C38F68 80242A38 00641821 */ addu $v1, $v1, $a0 -/* C38F6C 80242A3C 000318C0 */ sll $v1, $v1, 3 -/* C38F70 80242A40 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* C38F74 80242A44 00230821 */ addu $at, $at, $v1 -/* C38F78 80242A48 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* C38F7C 80242A4C 0C00A88D */ jal sin_cos_deg -/* C38F80 80242A50 0040A82D */ daddu $s5, $v0, $zero -/* C38F84 80242A54 1200005D */ beqz $s0, .L80242BCC -/* C38F88 80242A58 00000000 */ nop -/* C38F8C 80242A5C 0C00AB0A */ jal general_heap_malloc -/* C38F90 80242A60 24040068 */ addiu $a0, $zero, 0x68 -/* C38F94 80242A64 0040902D */ daddu $s2, $v0, $zero -/* C38F98 80242A68 02C0202D */ daddu $a0, $s6, $zero -/* C38F9C 80242A6C 0000882D */ daddu $s1, $zero, $zero -/* C38FA0 80242A70 2414FFFF */ addiu $s4, $zero, -1 -/* C38FA4 80242A74 AED20060 */ sw $s2, 0x60($s6) -/* C38FA8 80242A78 8E650000 */ lw $a1, ($s3) -/* C38FAC 80242A7C 3C014148 */ lui $at, 0x4148 -/* C38FB0 80242A80 4481C000 */ mtc1 $at, $f24 -/* C38FB4 80242A84 3C013F80 */ lui $at, 0x3f80 -/* C38FB8 80242A88 4481B000 */ mtc1 $at, $f22 -/* C38FBC 80242A8C 4480A000 */ mtc1 $zero, $f20 -/* C38FC0 80242A90 0C0B1EAF */ jal get_variable -/* C38FC4 80242A94 0240802D */ daddu $s0, $s2, $zero -/* C38FC8 80242A98 0C04417A */ jal get_entity_by_index -/* C38FCC 80242A9C 0040202D */ daddu $a0, $v0, $zero -/* C38FD0 80242AA0 AE42005C */ sw $v0, 0x5c($s2) -.L80242AA4: -/* C38FD4 80242AA4 8E42005C */ lw $v0, 0x5c($s2) -/* C38FD8 80242AA8 C440004C */ lwc1 $f0, 0x4c($v0) -/* C38FDC 80242AAC 0000202D */ daddu $a0, $zero, $zero -/* C38FE0 80242AB0 E7B60010 */ swc1 $f22, 0x10($sp) -/* C38FE4 80242AB4 AFB40014 */ sw $s4, 0x14($sp) -/* C38FE8 80242AB8 46180000 */ add.s $f0, $f0, $f24 -/* C38FEC 80242ABC 8C450048 */ lw $a1, 0x48($v0) -/* C38FF0 80242AC0 8C470050 */ lw $a3, 0x50($v0) -/* C38FF4 80242AC4 44060000 */ mfc1 $a2, $f0 -/* C38FF8 80242AC8 0C01C5BC */ jal func_800716F0 -/* C38FFC 80242ACC 26310001 */ addiu $s1, $s1, 1 -/* C39000 80242AD0 AE020008 */ sw $v0, 8($s0) -/* C39004 80242AD4 E614002C */ swc1 $f20, 0x2c($s0) -/* C39008 80242AD8 E6140020 */ swc1 $f20, 0x20($s0) -/* C3900C 80242ADC E6140014 */ swc1 $f20, 0x14($s0) -/* C39010 80242AE0 E6140050 */ swc1 $f20, 0x50($s0) -/* C39014 80242AE4 E6140044 */ swc1 $f20, 0x44($s0) -/* C39018 80242AE8 E6140038 */ swc1 $f20, 0x38($s0) -/* C3901C 80242AEC 2A220003 */ slti $v0, $s1, 3 -/* C39020 80242AF0 1440FFEC */ bnez $v0, .L80242AA4 -/* C39024 80242AF4 26100004 */ addiu $s0, $s0, 4 -/* C39028 80242AF8 0000882D */ daddu $s1, $zero, $zero -/* C3902C 80242AFC 0240802D */ daddu $s0, $s2, $zero -/* C39030 80242B00 3C148024 */ lui $s4, %hi(D_80243D88_C3A2B8) -/* C39034 80242B04 26943D88 */ addiu $s4, $s4, %lo(D_80243D88_C3A2B8) -/* C39038 80242B08 3C014248 */ lui $at, 0x4248 -/* C3903C 80242B0C 4481A000 */ mtc1 $at, $f20 -/* C39040 80242B10 24130044 */ addiu $s3, $zero, 0x44 -/* C39044 80242B14 AE400000 */ sw $zero, ($s2) -/* C39048 80242B18 AE400004 */ sw $zero, 4($s2) -/* C3904C 80242B1C AE400060 */ sw $zero, 0x60($s2) -/* C39050 80242B20 AE400064 */ sw $zero, 0x64($s2) -.L80242B24: -/* C39054 80242B24 27A40020 */ addiu $a0, $sp, 0x20 -/* C39058 80242B28 4406A000 */ mfc1 $a2, $f20 -/* C3905C 80242B2C 8E870000 */ lw $a3, ($s4) -/* C39060 80242B30 02532821 */ addu $a1, $s2, $s3 -/* C39064 80242B34 0C00A7E7 */ jal add_vec2D_polar -/* C39068 80242B38 AFA00020 */ sw $zero, 0x20($sp) -/* C3906C 80242B3C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C39070 80242B40 C7A40020 */ lwc1 $f4, 0x20($sp) -/* C39074 80242B44 46041082 */ mul.s $f2, $f2, $f4 -/* C39078 80242B48 00000000 */ nop -/* C3907C 80242B4C C7A00018 */ lwc1 $f0, 0x18($sp) -/* C39080 80242B50 46040002 */ mul.s $f0, $f0, $f4 -/* C39084 80242B54 00000000 */ nop -/* C39088 80242B58 E6020038 */ swc1 $f2, 0x38($s0) -/* C3908C 80242B5C E6000050 */ swc1 $f0, 0x50($s0) -/* C39090 80242B60 8E42005C */ lw $v0, 0x5c($s2) -/* C39094 80242B64 C6000038 */ lwc1 $f0, 0x38($s0) -/* C39098 80242B68 C4420048 */ lwc1 $f2, 0x48($v0) -/* C3909C 80242B6C 46001080 */ add.s $f2, $f2, $f0 -/* C390A0 80242B70 C6A00038 */ lwc1 $f0, 0x38($s5) -/* C390A4 80242B74 46020001 */ sub.s $f0, $f0, $f2 -/* C390A8 80242B78 E6000038 */ swc1 $f0, 0x38($s0) -/* C390AC 80242B7C 8E42005C */ lw $v0, 0x5c($s2) -/* C390B0 80242B80 C6000044 */ lwc1 $f0, 0x44($s0) -/* C390B4 80242B84 C442004C */ lwc1 $f2, 0x4c($v0) -/* C390B8 80242B88 46001080 */ add.s $f2, $f2, $f0 -/* C390BC 80242B8C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* C390C0 80242B90 46020001 */ sub.s $f0, $f0, $f2 -/* C390C4 80242B94 E6000044 */ swc1 $f0, 0x44($s0) -/* C390C8 80242B98 8E42005C */ lw $v0, 0x5c($s2) -/* C390CC 80242B9C C6000050 */ lwc1 $f0, 0x50($s0) -/* C390D0 80242BA0 C4420050 */ lwc1 $f2, 0x50($v0) -/* C390D4 80242BA4 26940004 */ addiu $s4, $s4, 4 -/* C390D8 80242BA8 46001080 */ add.s $f2, $f2, $f0 -/* C390DC 80242BAC C6A00040 */ lwc1 $f0, 0x40($s5) -/* C390E0 80242BB0 26730004 */ addiu $s3, $s3, 4 -/* C390E4 80242BB4 46020001 */ sub.s $f0, $f0, $f2 -/* C390E8 80242BB8 26310001 */ addiu $s1, $s1, 1 -/* C390EC 80242BBC 2A220003 */ slti $v0, $s1, 3 -/* C390F0 80242BC0 E6000050 */ swc1 $f0, 0x50($s0) -/* C390F4 80242BC4 1440FFD7 */ bnez $v0, .L80242B24 -/* C390F8 80242BC8 26100004 */ addiu $s0, $s0, 4 -.L80242BCC: -/* C390FC 80242BCC 8ED20060 */ lw $s2, 0x60($s6) -/* C39100 80242BD0 8E430000 */ lw $v1, ($s2) -/* C39104 80242BD4 24020001 */ addiu $v0, $zero, 1 -/* C39108 80242BD8 10620038 */ beq $v1, $v0, .L80242CBC -/* C3910C 80242BDC 28620002 */ slti $v0, $v1, 2 -/* C39110 80242BE0 50400005 */ beql $v0, $zero, .L80242BF8 -/* C39114 80242BE4 24020002 */ addiu $v0, $zero, 2 -/* C39118 80242BE8 10600007 */ beqz $v1, .L80242C08 -/* C3911C 80242BEC 24040005 */ addiu $a0, $zero, 5 -/* C39120 80242BF0 08090B68 */ j .L80242DA0 -/* C39124 80242BF4 00000000 */ nop -.L80242BF8: -/* C39128 80242BF8 10620058 */ beq $v1, $v0, .L80242D5C -/* C3912C 80242BFC 00000000 */ nop -/* C39130 80242C00 08090B68 */ j .L80242DA0 -/* C39134 80242C04 00000000 */ nop -.L80242C08: -/* C39138 80242C08 0000882D */ daddu $s1, $zero, $zero -/* C3913C 80242C0C 3C148024 */ lui $s4, %hi(D_80243D88_C3A2B8) -/* C39140 80242C10 26943D88 */ addiu $s4, $s4, %lo(D_80243D88_C3A2B8) -/* C39144 80242C14 24130020 */ addiu $s3, $zero, 0x20 -/* C39148 80242C18 3C064248 */ lui $a2, 0x4248 -/* C3914C 80242C1C 44800000 */ mtc1 $zero, $f0 -/* C39150 80242C20 24020014 */ addiu $v0, $zero, 0x14 -/* C39154 80242C24 AFA20010 */ sw $v0, 0x10($sp) -/* C39158 80242C28 44050000 */ mfc1 $a1, $f0 -/* C3915C 80242C2C 8E470060 */ lw $a3, 0x60($s2) -/* C39160 80242C30 4485B000 */ mtc1 $a1, $f22 -/* C39164 80242C34 0C00A8ED */ jal update_lerp -/* C39168 80242C38 0240802D */ daddu $s0, $s2, $zero -/* C3916C 80242C3C 46000506 */ mov.s $f20, $f0 -.L80242C40: -/* C39170 80242C40 4406A000 */ mfc1 $a2, $f20 -/* C39174 80242C44 27A40020 */ addiu $a0, $sp, 0x20 -/* C39178 80242C48 E6160020 */ swc1 $f22, 0x20($s0) -/* C3917C 80242C4C 8E870000 */ lw $a3, ($s4) -/* C39180 80242C50 02532821 */ addu $a1, $s2, $s3 -/* C39184 80242C54 0C00A7E7 */ jal add_vec2D_polar -/* C39188 80242C58 E7B60020 */ swc1 $f22, 0x20($sp) -/* C3918C 80242C5C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C39190 80242C60 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C39194 80242C64 46002102 */ mul.s $f4, $f4, $f0 -/* C39198 80242C68 00000000 */ nop -/* C3919C 80242C6C C7A20018 */ lwc1 $f2, 0x18($sp) -/* C391A0 80242C70 26940004 */ addiu $s4, $s4, 4 -/* C391A4 80242C74 46001082 */ mul.s $f2, $f2, $f0 -/* C391A8 80242C78 00000000 */ nop -/* C391AC 80242C7C 26730004 */ addiu $s3, $s3, 4 -/* C391B0 80242C80 26310001 */ addiu $s1, $s1, 1 -/* C391B4 80242C84 2A220003 */ slti $v0, $s1, 3 -/* C391B8 80242C88 E6040014 */ swc1 $f4, 0x14($s0) -/* C391BC 80242C8C E602002C */ swc1 $f2, 0x2c($s0) -/* C391C0 80242C90 1440FFEB */ bnez $v0, .L80242C40 -/* C391C4 80242C94 26100004 */ addiu $s0, $s0, 4 -/* C391C8 80242C98 8E420060 */ lw $v0, 0x60($s2) -/* C391CC 80242C9C 24420001 */ addiu $v0, $v0, 1 -/* C391D0 80242CA0 AE420060 */ sw $v0, 0x60($s2) -/* C391D4 80242CA4 28420015 */ slti $v0, $v0, 0x15 -/* C391D8 80242CA8 1440003D */ bnez $v0, .L80242DA0 -/* C391DC 80242CAC 24020001 */ addiu $v0, $zero, 1 -/* C391E0 80242CB0 AE420000 */ sw $v0, ($s2) -/* C391E4 80242CB4 08090B68 */ j .L80242DA0 -/* C391E8 80242CB8 AE400060 */ sw $zero, 0x60($s2) -.L80242CBC: -/* C391EC 80242CBC 0000882D */ daddu $s1, $zero, $zero -/* C391F0 80242CC0 3C148024 */ lui $s4, %hi(D_80243D88_C3A2B8) -/* C391F4 80242CC4 26943D88 */ addiu $s4, $s4, %lo(D_80243D88_C3A2B8) -/* C391F8 80242CC8 24130020 */ addiu $s3, $zero, 0x20 -/* C391FC 80242CCC 0240802D */ daddu $s0, $s2, $zero -/* C39200 80242CD0 3C014248 */ lui $at, 0x4248 -/* C39204 80242CD4 4481A000 */ mtc1 $at, $f20 -/* C39208 80242CD8 4480B000 */ mtc1 $zero, $f22 -.L80242CDC: -/* C3920C 80242CDC 4406A000 */ mfc1 $a2, $f20 -/* C39210 80242CE0 27A40020 */ addiu $a0, $sp, 0x20 -/* C39214 80242CE4 E6160020 */ swc1 $f22, 0x20($s0) -/* C39218 80242CE8 8E870000 */ lw $a3, ($s4) -/* C3921C 80242CEC 02532821 */ addu $a1, $s2, $s3 -/* C39220 80242CF0 0C00A7E7 */ jal add_vec2D_polar -/* C39224 80242CF4 E7B60020 */ swc1 $f22, 0x20($sp) -/* C39228 80242CF8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C3922C 80242CFC C7A00020 */ lwc1 $f0, 0x20($sp) -/* C39230 80242D00 46002102 */ mul.s $f4, $f4, $f0 -/* C39234 80242D04 00000000 */ nop -/* C39238 80242D08 C7A20018 */ lwc1 $f2, 0x18($sp) -/* C3923C 80242D0C 26940004 */ addiu $s4, $s4, 4 -/* C39240 80242D10 46001082 */ mul.s $f2, $f2, $f0 -/* C39244 80242D14 00000000 */ nop -/* C39248 80242D18 26730004 */ addiu $s3, $s3, 4 -/* C3924C 80242D1C 26310001 */ addiu $s1, $s1, 1 -/* C39250 80242D20 2A220003 */ slti $v0, $s1, 3 -/* C39254 80242D24 E6040014 */ swc1 $f4, 0x14($s0) -/* C39258 80242D28 E602002C */ swc1 $f2, 0x2c($s0) -/* C3925C 80242D2C 1440FFEB */ bnez $v0, .L80242CDC -/* C39260 80242D30 26100004 */ addiu $s0, $s0, 4 -/* C39264 80242D34 8E420060 */ lw $v0, 0x60($s2) -/* C39268 80242D38 24420001 */ addiu $v0, $v0, 1 -/* C3926C 80242D3C AE420060 */ sw $v0, 0x60($s2) -/* C39270 80242D40 28420010 */ slti $v0, $v0, 0x10 -/* C39274 80242D44 14400016 */ bnez $v0, .L80242DA0 -/* C39278 80242D48 2402000F */ addiu $v0, $zero, 0xf -/* C3927C 80242D4C AE420060 */ sw $v0, 0x60($s2) -/* C39280 80242D50 24020002 */ addiu $v0, $zero, 2 -/* C39284 80242D54 08090B68 */ j .L80242DA0 -/* C39288 80242D58 AE420000 */ sw $v0, ($s2) -.L80242D5C: -/* C3928C 80242D5C 8E420060 */ lw $v0, 0x60($s2) -/* C39290 80242D60 24420001 */ addiu $v0, $v0, 1 -/* C39294 80242D64 AE420060 */ sw $v0, 0x60($s2) -/* C39298 80242D68 2842001F */ slti $v0, $v0, 0x1f -/* C3929C 80242D6C 1440000C */ bnez $v0, .L80242DA0 -/* C392A0 80242D70 0000882D */ daddu $s1, $zero, $zero -/* C392A4 80242D74 0240282D */ daddu $a1, $s2, $zero -.L80242D78: -/* C392A8 80242D78 8CA20008 */ lw $v0, 8($a1) -/* C392AC 80242D7C 8C430000 */ lw $v1, ($v0) -/* C392B0 80242D80 26310001 */ addiu $s1, $s1, 1 -/* C392B4 80242D84 34630010 */ ori $v1, $v1, 0x10 -/* C392B8 80242D88 AC430000 */ sw $v1, ($v0) -/* C392BC 80242D8C 2A220003 */ slti $v0, $s1, 3 -/* C392C0 80242D90 1440FFF9 */ bnez $v0, .L80242D78 -/* C392C4 80242D94 24A50004 */ addiu $a1, $a1, 4 -/* C392C8 80242D98 08090BB5 */ j .L80242ED4 -/* C392CC 80242D9C 24020002 */ addiu $v0, $zero, 2 -.L80242DA0: -/* C392D0 80242DA0 8E430004 */ lw $v1, 4($s2) -/* C392D4 80242DA4 10600005 */ beqz $v1, .L80242DBC -/* C392D8 80242DA8 24020001 */ addiu $v0, $zero, 1 -/* C392DC 80242DAC 1062000B */ beq $v1, $v0, .L80242DDC -/* C392E0 80242DB0 0000882D */ daddu $s1, $zero, $zero -/* C392E4 80242DB4 08090BA4 */ j .L80242E90 -/* C392E8 80242DB8 0240282D */ daddu $a1, $s2, $zero -.L80242DBC: -/* C392EC 80242DBC 8E420064 */ lw $v0, 0x64($s2) -/* C392F0 80242DC0 24420001 */ addiu $v0, $v0, 1 -/* C392F4 80242DC4 AE420064 */ sw $v0, 0x64($s2) -/* C392F8 80242DC8 28420010 */ slti $v0, $v0, 0x10 -/* C392FC 80242DCC 1440002F */ bnez $v0, .L80242E8C -/* C39300 80242DD0 0000882D */ daddu $s1, $zero, $zero -/* C39304 80242DD4 08090BA0 */ j .L80242E80 -/* C39308 80242DD8 24020001 */ addiu $v0, $zero, 1 -.L80242DDC: -/* C3930C 80242DDC 4480A000 */ mtc1 $zero, $f20 -/* C39310 80242DE0 24130014 */ addiu $s3, $zero, 0x14 -/* C39314 80242DE4 0240802D */ daddu $s0, $s2, $zero -.L80242DE8: -/* C39318 80242DE8 4405A000 */ mfc1 $a1, $f20 -/* C3931C 80242DEC AFB30010 */ sw $s3, 0x10($sp) -/* C39320 80242DF0 8E060038 */ lw $a2, 0x38($s0) -/* C39324 80242DF4 8E470064 */ lw $a3, 0x64($s2) -/* C39328 80242DF8 0C00A8ED */ jal update_lerp -/* C3932C 80242DFC 24040001 */ addiu $a0, $zero, 1 -/* C39330 80242E00 C6020014 */ lwc1 $f2, 0x14($s0) -/* C39334 80242E04 46001080 */ add.s $f2, $f2, $f0 -/* C39338 80242E08 4405A000 */ mfc1 $a1, $f20 -/* C3933C 80242E0C E6020014 */ swc1 $f2, 0x14($s0) -/* C39340 80242E10 AFB30010 */ sw $s3, 0x10($sp) -/* C39344 80242E14 8E060044 */ lw $a2, 0x44($s0) -/* C39348 80242E18 8E470064 */ lw $a3, 0x64($s2) -/* C3934C 80242E1C 0C00A8ED */ jal update_lerp -/* C39350 80242E20 24040001 */ addiu $a0, $zero, 1 -/* C39354 80242E24 C6020020 */ lwc1 $f2, 0x20($s0) -/* C39358 80242E28 46001080 */ add.s $f2, $f2, $f0 -/* C3935C 80242E2C 4405A000 */ mfc1 $a1, $f20 -/* C39360 80242E30 E6020020 */ swc1 $f2, 0x20($s0) -/* C39364 80242E34 AFB30010 */ sw $s3, 0x10($sp) -/* C39368 80242E38 8E060050 */ lw $a2, 0x50($s0) -/* C3936C 80242E3C 8E470064 */ lw $a3, 0x64($s2) -/* C39370 80242E40 0C00A8ED */ jal update_lerp -/* C39374 80242E44 24040001 */ addiu $a0, $zero, 1 -/* C39378 80242E48 C602002C */ lwc1 $f2, 0x2c($s0) -/* C3937C 80242E4C 46001080 */ add.s $f2, $f2, $f0 -/* C39380 80242E50 26310001 */ addiu $s1, $s1, 1 -/* C39384 80242E54 2A220003 */ slti $v0, $s1, 3 -/* C39388 80242E58 E602002C */ swc1 $f2, 0x2c($s0) -/* C3938C 80242E5C 1440FFE2 */ bnez $v0, .L80242DE8 -/* C39390 80242E60 26100004 */ addiu $s0, $s0, 4 -/* C39394 80242E64 8E420064 */ lw $v0, 0x64($s2) -/* C39398 80242E68 24420001 */ addiu $v0, $v0, 1 -/* C3939C 80242E6C AE420064 */ sw $v0, 0x64($s2) -/* C393A0 80242E70 28420015 */ slti $v0, $v0, 0x15 -/* C393A4 80242E74 14400005 */ bnez $v0, .L80242E8C -/* C393A8 80242E78 0000882D */ daddu $s1, $zero, $zero -/* C393AC 80242E7C 24020002 */ addiu $v0, $zero, 2 -.L80242E80: -/* C393B0 80242E80 AE420004 */ sw $v0, 4($s2) -/* C393B4 80242E84 AE400064 */ sw $zero, 0x64($s2) -/* C393B8 80242E88 0000882D */ daddu $s1, $zero, $zero -.L80242E8C: -/* C393BC 80242E8C 0240282D */ daddu $a1, $s2, $zero -.L80242E90: -/* C393C0 80242E90 8CA20008 */ lw $v0, 8($a1) -/* C393C4 80242E94 C4A00014 */ lwc1 $f0, 0x14($a1) -/* C393C8 80242E98 8C42000C */ lw $v0, 0xc($v0) -/* C393CC 80242E9C E4400010 */ swc1 $f0, 0x10($v0) -/* C393D0 80242EA0 8CA20008 */ lw $v0, 8($a1) -/* C393D4 80242EA4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* C393D8 80242EA8 8C42000C */ lw $v0, 0xc($v0) -/* C393DC 80242EAC 26310001 */ addiu $s1, $s1, 1 -/* C393E0 80242EB0 E4400014 */ swc1 $f0, 0x14($v0) -/* C393E4 80242EB4 8CA20008 */ lw $v0, 8($a1) -/* C393E8 80242EB8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* C393EC 80242EBC 8C42000C */ lw $v0, 0xc($v0) -/* C393F0 80242EC0 E4400018 */ swc1 $f0, 0x18($v0) -/* C393F4 80242EC4 2A220003 */ slti $v0, $s1, 3 -/* C393F8 80242EC8 1440FFF1 */ bnez $v0, .L80242E90 -/* C393FC 80242ECC 24A50004 */ addiu $a1, $a1, 4 -/* C39400 80242ED0 0000102D */ daddu $v0, $zero, $zero -.L80242ED4: -/* C39404 80242ED4 8FBF0044 */ lw $ra, 0x44($sp) -/* C39408 80242ED8 8FB60040 */ lw $s6, 0x40($sp) -/* C3940C 80242EDC 8FB5003C */ lw $s5, 0x3c($sp) -/* C39410 80242EE0 8FB40038 */ lw $s4, 0x38($sp) -/* C39414 80242EE4 8FB30034 */ lw $s3, 0x34($sp) -/* C39418 80242EE8 8FB20030 */ lw $s2, 0x30($sp) -/* C3941C 80242EEC 8FB1002C */ lw $s1, 0x2c($sp) -/* C39420 80242EF0 8FB00028 */ lw $s0, 0x28($sp) -/* C39424 80242EF4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* C39428 80242EF8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C3942C 80242EFC D7B40048 */ ldc1 $f20, 0x48($sp) -/* C39430 80242F00 03E00008 */ jr $ra -/* C39434 80242F04 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s deleted file mode 100644 index c0bf09ddb6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242F08_C39438.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F08_C39438 -/* C39438 80242F08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3943C 80242F0C AFB10014 */ sw $s1, 0x14($sp) -/* C39440 80242F10 0080882D */ daddu $s1, $a0, $zero -/* C39444 80242F14 AFB20018 */ sw $s2, 0x18($sp) -/* C39448 80242F18 AFBF001C */ sw $ra, 0x1c($sp) -/* C3944C 80242F1C AFB00010 */ sw $s0, 0x10($sp) -/* C39450 80242F20 8E30000C */ lw $s0, 0xc($s1) -/* C39454 80242F24 10A00010 */ beqz $a1, .L80242F68 -/* C39458 80242F28 0000902D */ daddu $s2, $zero, $zero -/* C3945C 80242F2C 8E050000 */ lw $a1, ($s0) -/* C39460 80242F30 0C0B1EAF */ jal get_variable -/* C39464 80242F34 26100004 */ addiu $s0, $s0, 4 -/* C39468 80242F38 AE220084 */ sw $v0, 0x84($s1) -/* C3946C 80242F3C 8E050000 */ lw $a1, ($s0) -/* C39470 80242F40 0C0B1EAF */ jal get_variable -/* C39474 80242F44 0220202D */ daddu $a0, $s1, $zero -/* C39478 80242F48 0240202D */ daddu $a0, $s2, $zero -/* C3947C 80242F4C 240500D0 */ addiu $a1, $zero, 0xd0 -/* C39480 80242F50 00A0302D */ daddu $a2, $a1, $zero -/* C39484 80242F54 00A0382D */ daddu $a3, $a1, $zero -/* C39488 80242F58 AE220088 */ sw $v0, 0x88($s1) -/* C3948C 80242F5C AE200070 */ sw $zero, 0x70($s1) -/* C39490 80242F60 0C04DF84 */ jal set_transition_stencil_color -/* C39494 80242F64 AE200074 */ sw $zero, 0x74($s1) -.L80242F68: -/* C39498 80242F68 8E230070 */ lw $v1, 0x70($s1) -/* C3949C 80242F6C 24040001 */ addiu $a0, $zero, 1 -/* C394A0 80242F70 10640019 */ beq $v1, $a0, .L80242FD8 -/* C394A4 80242F74 28620002 */ slti $v0, $v1, 2 -/* C394A8 80242F78 10400005 */ beqz $v0, .L80242F90 -/* C394AC 80242F7C 24020002 */ addiu $v0, $zero, 2 -/* C394B0 80242F80 10600007 */ beqz $v1, .L80242FA0 -/* C394B4 80242F84 240500FF */ addiu $a1, $zero, 0xff -/* C394B8 80242F88 08090C06 */ j .L80243018 -/* C394BC 80242F8C 00000000 */ nop -.L80242F90: -/* C394C0 80242F90 10620019 */ beq $v1, $v0, .L80242FF8 -/* C394C4 80242F94 00000000 */ nop -/* C394C8 80242F98 08090C06 */ j .L80243018 -/* C394CC 80242F9C 00000000 */ nop -.L80242FA0: -/* C394D0 80242FA0 8E220074 */ lw $v0, 0x74($s1) -/* C394D4 80242FA4 14450004 */ bne $v0, $a1, .L80242FB8 -/* C394D8 80242FA8 00000000 */ nop -/* C394DC 80242FAC AE240070 */ sw $a0, 0x70($s1) -/* C394E0 80242FB0 AE200078 */ sw $zero, 0x78($s1) -/* C394E4 80242FB4 8E220074 */ lw $v0, 0x74($s1) -.L80242FB8: -/* C394E8 80242FB8 8E230084 */ lw $v1, 0x84($s1) -/* C394EC 80242FBC 00431021 */ addu $v0, $v0, $v1 -/* C394F0 80242FC0 AE220074 */ sw $v0, 0x74($s1) -/* C394F4 80242FC4 28420100 */ slti $v0, $v0, 0x100 -/* C394F8 80242FC8 50400013 */ beql $v0, $zero, .L80243018 -/* C394FC 80242FCC AE250074 */ sw $a1, 0x74($s1) -/* C39500 80242FD0 08090C06 */ j .L80243018 -/* C39504 80242FD4 00000000 */ nop -.L80242FD8: -/* C39508 80242FD8 8E220078 */ lw $v0, 0x78($s1) -/* C3950C 80242FDC 24420001 */ addiu $v0, $v0, 1 -/* C39510 80242FE0 AE220078 */ sw $v0, 0x78($s1) -/* C39514 80242FE4 28420002 */ slti $v0, $v0, 2 -/* C39518 80242FE8 1440000B */ bnez $v0, .L80243018 -/* C3951C 80242FEC 24020002 */ addiu $v0, $zero, 2 -/* C39520 80242FF0 08090C06 */ j .L80243018 -/* C39524 80242FF4 AE220070 */ sw $v0, 0x70($s1) -.L80242FF8: -/* C39528 80242FF8 8E230074 */ lw $v1, 0x74($s1) -/* C3952C 80242FFC 50600001 */ beql $v1, $zero, .L80243004 -/* C39530 80243000 24120001 */ addiu $s2, $zero, 1 -.L80243004: -/* C39534 80243004 8E220088 */ lw $v0, 0x88($s1) -/* C39538 80243008 00621023 */ subu $v0, $v1, $v0 -/* C3953C 8024300C 04410002 */ bgez $v0, .L80243018 -/* C39540 80243010 AE220074 */ sw $v0, 0x74($s1) -/* C39544 80243014 AE200074 */ sw $zero, 0x74($s1) -.L80243018: -/* C39548 80243018 C6200074 */ lwc1 $f0, 0x74($s1) -/* C3954C 8024301C 46800020 */ cvt.s.w $f0, $f0 -/* C39550 80243020 44050000 */ mfc1 $a1, $f0 -/* C39554 80243024 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* C39558 80243028 24040001 */ addiu $a0, $zero, 1 -/* C3955C 8024302C 0240102D */ daddu $v0, $s2, $zero -/* C39560 80243030 8FBF001C */ lw $ra, 0x1c($sp) -/* C39564 80243034 8FB20018 */ lw $s2, 0x18($sp) -/* C39568 80243038 8FB10014 */ lw $s1, 0x14($sp) -/* C3956C 8024303C 8FB00010 */ lw $s0, 0x10($sp) -/* C39570 80243040 03E00008 */ jr $ra -/* C39574 80243044 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s deleted file mode 100644 index c12ac096e6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430D8_C39608 -/* C39608 802430D8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C3960C 802430DC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* C39610 802430E0 AC800084 */ sw $zero, 0x84($a0) -/* C39614 802430E4 80620000 */ lb $v0, ($v1) -/* C39618 802430E8 10400005 */ beqz $v0, .L80243100 -/* C3961C 802430EC 24020003 */ addiu $v0, $zero, 3 -/* C39620 802430F0 80630003 */ lb $v1, 3($v1) -/* C39624 802430F4 14620002 */ bne $v1, $v0, .L80243100 -/* C39628 802430F8 24020001 */ addiu $v0, $zero, 1 -/* C3962C 802430FC AC820084 */ sw $v0, 0x84($a0) -.L80243100: -/* C39630 80243100 03E00008 */ jr $ra -/* C39634 80243104 24020002 */ addiu $v0, $zero, 2 -/* C39638 80243108 00000000 */ nop -/* C3963C 8024310C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s deleted file mode 100644 index 6b851094a5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240000_C3AA10.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C3AA10 -/* C3AA10 80240000 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) -/* C3AA14 80240004 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) -/* C3AA18 80240008 3C01C352 */ lui $at, 0xc352 -/* C3AA1C 8024000C 44810000 */ mtc1 $at, $f0 -/* C3AA20 80240010 00000000 */ nop -/* C3AA24 80240014 4602003E */ c.le.s $f0, $f2 -/* C3AA28 80240018 00000000 */ nop -/* C3AA2C 8024001C 45010002 */ bc1t .L80240028 -/* C3AA30 80240020 0000102D */ daddu $v0, $zero, $zero -/* C3AA34 80240024 24020002 */ addiu $v0, $zero, 2 -.L80240028: -/* C3AA38 80240028 03E00008 */ jr $ra -/* C3AA3C 8024002C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s deleted file mode 100644 index 20dc52b4e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240030_C3AA40.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_C3AA40 -/* C3AA40 80240030 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) -/* C3AA44 80240034 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) -/* C3AA48 80240038 3C01C387 */ lui $at, 0xc387 -/* C3AA4C 8024003C 44810000 */ mtc1 $at, $f0 -/* C3AA50 80240040 00000000 */ nop -/* C3AA54 80240044 4602003C */ c.lt.s $f0, $f2 -/* C3AA58 80240048 00000000 */ nop -/* C3AA5C 8024004C 45010002 */ bc1t .L80240058 -/* C3AA60 80240050 0000102D */ daddu $v0, $zero, $zero -/* C3AA64 80240054 24020002 */ addiu $v0, $zero, 2 -.L80240058: -/* C3AA68 80240058 03E00008 */ jr $ra -/* C3AA6C 8024005C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s deleted file mode 100644 index 0f2d5ed5d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268_C3AC78 -/* C3AC78 80240268 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3AC7C 8024026C AFBF0024 */ sw $ra, 0x24($sp) -/* C3AC80 80240270 AFB40020 */ sw $s4, 0x20($sp) -/* C3AC84 80240274 AFB3001C */ sw $s3, 0x1c($sp) -/* C3AC88 80240278 AFB20018 */ sw $s2, 0x18($sp) -/* C3AC8C 8024027C AFB10014 */ sw $s1, 0x14($sp) -/* C3AC90 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* C3AC94 80240284 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C3AC98 80240288 8C900148 */ lw $s0, 0x148($a0) -/* C3AC9C 8024028C 86040008 */ lh $a0, 8($s0) -/* C3ACA0 80240290 0C00EABB */ jal get_npc_unsafe -/* C3ACA4 80240294 24110001 */ addiu $s1, $zero, 1 -/* C3ACA8 80240298 86040008 */ lh $a0, 8($s0) -/* C3ACAC 8024029C 0040802D */ daddu $s0, $v0, $zero -/* C3ACB0 802402A0 3C05800B */ lui $a1, %hi(gCameras) -/* C3ACB4 802402A4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C3ACB8 802402A8 3C03800A */ lui $v1, %hi(D_8009A634) -/* C3ACBC 802402AC 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C3ACC0 802402B0 00912021 */ addu $a0, $a0, $s1 -/* C3ACC4 802402B4 00031080 */ sll $v0, $v1, 2 -/* C3ACC8 802402B8 00431021 */ addu $v0, $v0, $v1 -/* C3ACCC 802402BC 00021080 */ sll $v0, $v0, 2 -/* C3ACD0 802402C0 00431023 */ subu $v0, $v0, $v1 -/* C3ACD4 802402C4 000218C0 */ sll $v1, $v0, 3 -/* C3ACD8 802402C8 00431021 */ addu $v0, $v0, $v1 -/* C3ACDC 802402CC 000210C0 */ sll $v0, $v0, 3 -/* C3ACE0 802402D0 0C00FB3A */ jal get_enemy -/* C3ACE4 802402D4 00459021 */ addu $s2, $v0, $a1 -/* C3ACE8 802402D8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C3ACEC 802402DC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C3ACF0 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3ACF4 802402E4 8E830000 */ lw $v1, ($s4) -/* C3ACF8 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3ACFC 802402EC 8C660028 */ lw $a2, 0x28($v1) -/* C3AD00 802402F0 8C670030 */ lw $a3, 0x30($v1) -/* C3AD04 802402F4 0C00A7B5 */ jal dist2D -/* C3AD08 802402F8 0040982D */ daddu $s3, $v0, $zero -/* C3AD0C 802402FC C6620074 */ lwc1 $f2, 0x74($s3) -/* C3AD10 80240300 468010A0 */ cvt.s.w $f2, $f2 -/* C3AD14 80240304 4600103C */ c.lt.s $f2, $f0 -/* C3AD18 80240308 00000000 */ nop -/* C3AD1C 8024030C 45030001 */ bc1tl .L80240314 -/* C3AD20 80240310 0000882D */ daddu $s1, $zero, $zero -.L80240314: -/* C3AD24 80240314 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C3AD28 80240318 C60E000C */ lwc1 $f14, 0xc($s0) -/* C3AD2C 8024031C 3C014387 */ lui $at, 0x4387 -/* C3AD30 80240320 4481A000 */ mtc1 $at, $f20 -/* C3AD34 80240324 0C00A70A */ jal get_clamped_angle_diff -/* C3AD38 80240328 00000000 */ nop -/* C3AD3C 8024032C 0C00A6C9 */ jal clamp_angle -/* C3AD40 80240330 46000306 */ mov.s $f12, $f0 -/* C3AD44 80240334 3C018024 */ lui $at, %hi(D_80242340_C3CD50) -/* C3AD48 80240338 D4222340 */ ldc1 $f2, %lo(D_80242340_C3CD50)($at) -/* C3AD4C 8024033C 46000021 */ cvt.d.s $f0, $f0 -/* C3AD50 80240340 4622003C */ c.lt.d $f0, $f2 -/* C3AD54 80240344 00000000 */ nop -/* C3AD58 80240348 45000003 */ bc1f .L80240358 -/* C3AD5C 8024034C 00000000 */ nop -/* C3AD60 80240350 3C0142B4 */ lui $at, 0x42b4 -/* C3AD64 80240354 4481A000 */ mtc1 $at, $f20 -.L80240358: -/* C3AD68 80240358 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3AD6C 8024035C 8E820000 */ lw $v0, ($s4) -/* C3AD70 80240360 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3AD74 80240364 8C460028 */ lw $a2, 0x28($v0) -/* C3AD78 80240368 0C00A720 */ jal atan2 -/* C3AD7C 8024036C 8C470030 */ lw $a3, 0x30($v0) -/* C3AD80 80240370 4600A306 */ mov.s $f12, $f20 -/* C3AD84 80240374 0C00A70A */ jal get_clamped_angle_diff -/* C3AD88 80240378 46000386 */ mov.s $f14, $f0 -/* C3AD8C 8024037C C6620078 */ lwc1 $f2, 0x78($s3) -/* C3AD90 80240380 468010A0 */ cvt.s.w $f2, $f2 -/* C3AD94 80240384 46000005 */ abs.s $f0, $f0 -/* C3AD98 80240388 4600103C */ c.lt.s $f2, $f0 -/* C3AD9C 8024038C 00000000 */ nop -/* C3ADA0 80240390 45030001 */ bc1tl .L80240398 -/* C3ADA4 80240394 0000882D */ daddu $s1, $zero, $zero -.L80240398: -/* C3ADA8 80240398 8E820000 */ lw $v0, ($s4) -/* C3ADAC 8024039C C600003C */ lwc1 $f0, 0x3c($s0) -/* C3ADB0 802403A0 C442002C */ lwc1 $f2, 0x2c($v0) -/* C3ADB4 802403A4 860200A8 */ lh $v0, 0xa8($s0) -/* C3ADB8 802403A8 46020001 */ sub.s $f0, $f0, $f2 -/* C3ADBC 802403AC 44821000 */ mtc1 $v0, $f2 -/* C3ADC0 802403B0 00000000 */ nop -/* C3ADC4 802403B4 468010A1 */ cvt.d.w $f2, $f2 -/* C3ADC8 802403B8 46221080 */ add.d $f2, $f2, $f2 -/* C3ADCC 802403BC 46000005 */ abs.s $f0, $f0 -/* C3ADD0 802403C0 46000021 */ cvt.d.s $f0, $f0 -/* C3ADD4 802403C4 4620103E */ c.le.d $f2, $f0 -/* C3ADD8 802403C8 00000000 */ nop -/* C3ADDC 802403CC 45030001 */ bc1tl .L802403D4 -/* C3ADE0 802403D0 0000882D */ daddu $s1, $zero, $zero -.L802403D4: -/* C3ADE4 802403D4 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C3ADE8 802403D8 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C3ADEC 802403DC 24020009 */ addiu $v0, $zero, 9 -/* C3ADF0 802403E0 50620001 */ beql $v1, $v0, .L802403E8 -/* C3ADF4 802403E4 0000882D */ daddu $s1, $zero, $zero -.L802403E8: -/* C3ADF8 802403E8 24020007 */ addiu $v0, $zero, 7 -/* C3ADFC 802403EC 50620001 */ beql $v1, $v0, .L802403F4 -/* C3AE00 802403F0 0000882D */ daddu $s1, $zero, $zero -.L802403F4: -/* C3AE04 802403F4 0220102D */ daddu $v0, $s1, $zero -/* C3AE08 802403F8 8FBF0024 */ lw $ra, 0x24($sp) -/* C3AE0C 802403FC 8FB40020 */ lw $s4, 0x20($sp) -/* C3AE10 80240400 8FB3001C */ lw $s3, 0x1c($sp) -/* C3AE14 80240404 8FB20018 */ lw $s2, 0x18($sp) -/* C3AE18 80240408 8FB10014 */ lw $s1, 0x14($sp) -/* C3AE1C 8024040C 8FB00010 */ lw $s0, 0x10($sp) -/* C3AE20 80240410 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C3AE24 80240414 03E00008 */ jr $ra -/* C3AE28 80240418 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s deleted file mode 100644 index c01f826070..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024041C_C3AE2C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_C3AE2C -/* C3AE2C 8024041C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3AE30 80240420 AFB40028 */ sw $s4, 0x28($sp) -/* C3AE34 80240424 0080A02D */ daddu $s4, $a0, $zero -/* C3AE38 80240428 AFBF002C */ sw $ra, 0x2c($sp) -/* C3AE3C 8024042C AFB30024 */ sw $s3, 0x24($sp) -/* C3AE40 80240430 AFB20020 */ sw $s2, 0x20($sp) -/* C3AE44 80240434 AFB1001C */ sw $s1, 0x1c($sp) -/* C3AE48 80240438 AFB00018 */ sw $s0, 0x18($sp) -/* C3AE4C 8024043C 8E910148 */ lw $s1, 0x148($s4) -/* C3AE50 80240440 86240008 */ lh $a0, 8($s1) -/* C3AE54 80240444 0C00EABB */ jal get_npc_unsafe -/* C3AE58 80240448 00A0802D */ daddu $s0, $a1, $zero -/* C3AE5C 8024044C 16000005 */ bnez $s0, .L80240464 -/* C3AE60 80240450 0040902D */ daddu $s2, $v0, $zero -/* C3AE64 80240454 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3AE68 80240458 30420004 */ andi $v0, $v0, 4 -/* C3AE6C 8024045C 10400015 */ beqz $v0, .L802404B4 -/* C3AE70 80240460 00000000 */ nop -.L80240464: -/* C3AE74 80240464 AE800070 */ sw $zero, 0x70($s4) -/* C3AE78 80240468 8E420000 */ lw $v0, ($s2) -/* C3AE7C 8024046C 3C031F30 */ lui $v1, 0x1f30 -/* C3AE80 80240470 A640008E */ sh $zero, 0x8e($s2) -/* C3AE84 80240474 34420102 */ ori $v0, $v0, 0x102 -/* C3AE88 80240478 AE420000 */ sw $v0, ($s2) -/* C3AE8C 8024047C 8E220000 */ lw $v0, ($s1) -/* C3AE90 80240480 3C01C47A */ lui $at, 0xc47a -/* C3AE94 80240484 44810000 */ mtc1 $at, $f0 -/* C3AE98 80240488 00431025 */ or $v0, $v0, $v1 -/* C3AE9C 8024048C AE220000 */ sw $v0, ($s1) -/* C3AEA0 80240490 AE400038 */ sw $zero, 0x38($s2) -/* C3AEA4 80240494 E640003C */ swc1 $f0, 0x3c($s2) -/* C3AEA8 80240498 AE400040 */ sw $zero, 0x40($s2) -/* C3AEAC 8024049C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C3AEB0 802404A0 30620004 */ andi $v0, $v1, 4 -/* C3AEB4 802404A4 10400003 */ beqz $v0, .L802404B4 -/* C3AEB8 802404A8 2402FFFB */ addiu $v0, $zero, -5 -/* C3AEBC 802404AC 00621024 */ and $v0, $v1, $v0 -/* C3AEC0 802404B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404B4: -/* C3AEC4 802404B4 8E930070 */ lw $s3, 0x70($s4) -/* C3AEC8 802404B8 12600005 */ beqz $s3, .L802404D0 -/* C3AECC 802404BC 24020001 */ addiu $v0, $zero, 1 -/* C3AED0 802404C0 12620048 */ beq $s3, $v0, .L802405E4 -/* C3AED4 802404C4 00000000 */ nop -/* C3AED8 802404C8 08090196 */ j .L80240658 -/* C3AEDC 802404CC 00000000 */ nop -.L802404D0: -/* C3AEE0 802404D0 86240008 */ lh $a0, 8($s1) -/* C3AEE4 802404D4 0C00FB3A */ jal get_enemy -/* C3AEE8 802404D8 2484FFFF */ addiu $a0, $a0, -1 -/* C3AEEC 802404DC 0040802D */ daddu $s0, $v0, $zero -/* C3AEF0 802404E0 0C00EABB */ jal get_npc_unsafe -/* C3AEF4 802404E4 86040008 */ lh $a0, 8($s0) -/* C3AEF8 802404E8 24030001 */ addiu $v1, $zero, 1 -/* C3AEFC 802404EC 0040982D */ daddu $s3, $v0, $zero -/* C3AF00 802404F0 A2230007 */ sb $v1, 7($s1) -/* C3AF04 802404F4 8E03006C */ lw $v1, 0x6c($s0) -/* C3AF08 802404F8 24020003 */ addiu $v0, $zero, 3 -/* C3AF0C 802404FC 14620056 */ bne $v1, $v0, .L80240658 -/* C3AF10 80240500 00000000 */ nop -/* C3AF14 80240504 8E2500A8 */ lw $a1, 0xa8($s1) -/* C3AF18 80240508 10A00003 */ beqz $a1, .L80240518 -/* C3AF1C 8024050C 0260202D */ daddu $a0, $s3, $zero -/* C3AF20 80240510 0C012530 */ jal func_800494C0 -/* C3AF24 80240514 0000302D */ daddu $a2, $zero, $zero -.L80240518: -/* C3AF28 80240518 27A40010 */ addiu $a0, $sp, 0x10 -/* C3AF2C 8024051C C6280070 */ lwc1 $f8, 0x70($s1) -/* C3AF30 80240520 46804220 */ cvt.s.w $f8, $f8 -/* C3AF34 80240524 C6620034 */ lwc1 $f2, 0x34($s3) -/* C3AF38 80240528 3C014387 */ lui $at, 0x4387 -/* C3AF3C 8024052C 44810000 */ mtc1 $at, $f0 -/* C3AF40 80240530 44064000 */ mfc1 $a2, $f8 -/* C3AF44 80240534 46020001 */ sub.s $f0, $f0, $f2 -/* C3AF48 80240538 C6660038 */ lwc1 $f6, 0x38($s3) -/* C3AF4C 8024053C C6640040 */ lwc1 $f4, 0x40($s3) -/* C3AF50 80240540 44070000 */ mfc1 $a3, $f0 -/* C3AF54 80240544 27A50014 */ addiu $a1, $sp, 0x14 -/* C3AF58 80240548 E7A60010 */ swc1 $f6, 0x10($sp) -/* C3AF5C 8024054C 0C00A7E7 */ jal add_vec2D_polar -/* C3AF60 80240550 E7A40014 */ swc1 $f4, 0x14($sp) -/* C3AF64 80240554 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C3AF68 80240558 4600020D */ trunc.w.s $f8, $f0 -/* C3AF6C 8024055C 44024000 */ mfc1 $v0, $f8 -/* C3AF70 80240560 E6400038 */ swc1 $f0, 0x38($s2) -/* C3AF74 80240564 A6220010 */ sh $v0, 0x10($s1) -/* C3AF78 80240568 C660003C */ lwc1 $f0, 0x3c($s3) -/* C3AF7C 8024056C C622006C */ lwc1 $f2, 0x6c($s1) -/* C3AF80 80240570 468010A0 */ cvt.s.w $f2, $f2 -/* C3AF84 80240574 46020000 */ add.s $f0, $f0, $f2 -/* C3AF88 80240578 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C3AF8C 8024057C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C3AF90 80240580 E640003C */ swc1 $f0, 0x3c($s2) -/* C3AF94 80240584 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C3AF98 80240588 4600020D */ trunc.w.s $f8, $f0 -/* C3AF9C 8024058C 44024000 */ mfc1 $v0, $f8 -/* C3AFA0 80240590 00000000 */ nop -/* C3AFA4 80240594 A6220012 */ sh $v0, 0x12($s1) -/* C3AFA8 80240598 4600120D */ trunc.w.s $f8, $f2 -/* C3AFAC 8024059C 44024000 */ mfc1 $v0, $f8 -/* C3AFB0 802405A0 E6420040 */ swc1 $f2, 0x40($s2) -/* C3AFB4 802405A4 A6220014 */ sh $v0, 0x14($s1) -/* C3AFB8 802405A8 8C660028 */ lw $a2, 0x28($v1) -/* C3AFBC 802405AC 8C670030 */ lw $a3, 0x30($v1) -/* C3AFC0 802405B0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C3AFC4 802405B4 0C00A720 */ jal atan2 -/* C3AFC8 802405B8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C3AFCC 802405BC 3C03E0EF */ lui $v1, 0xe0ef -/* C3AFD0 802405C0 E640000C */ swc1 $f0, 0xc($s2) -/* C3AFD4 802405C4 8E220000 */ lw $v0, ($s1) -/* C3AFD8 802405C8 3463FFFF */ ori $v1, $v1, 0xffff -/* C3AFDC 802405CC 00431024 */ and $v0, $v0, $v1 -/* C3AFE0 802405D0 AE220000 */ sw $v0, ($s1) -/* C3AFE4 802405D4 24020001 */ addiu $v0, $zero, 1 -/* C3AFE8 802405D8 A640008E */ sh $zero, 0x8e($s2) -/* C3AFEC 802405DC 08090196 */ j .L80240658 -/* C3AFF0 802405E0 AE820070 */ sw $v0, 0x70($s4) -.L802405E4: -/* C3AFF4 802405E4 86240008 */ lh $a0, 8($s1) -/* C3AFF8 802405E8 0C00FB3A */ jal get_enemy -/* C3AFFC 802405EC 2484FFFF */ addiu $a0, $a0, -1 -/* C3B000 802405F0 0040802D */ daddu $s0, $v0, $zero -/* C3B004 802405F4 0C00EABB */ jal get_npc_unsafe -/* C3B008 802405F8 86040008 */ lh $a0, 8($s0) -/* C3B00C 802405FC 9642008E */ lhu $v0, 0x8e($s2) -/* C3B010 80240600 24420001 */ addiu $v0, $v0, 1 -/* C3B014 80240604 A642008E */ sh $v0, 0x8e($s2) -/* C3B018 80240608 00021400 */ sll $v0, $v0, 0x10 -/* C3B01C 8024060C 8E23007C */ lw $v1, 0x7c($s1) -/* C3B020 80240610 00021403 */ sra $v0, $v0, 0x10 -/* C3B024 80240614 0043102A */ slt $v0, $v0, $v1 -/* C3B028 80240618 50400001 */ beql $v0, $zero, .L80240620 -/* C3B02C 8024061C A2200007 */ sb $zero, 7($s1) -.L80240620: -/* C3B030 80240620 8E03006C */ lw $v1, 0x6c($s0) -/* C3B034 80240624 24020004 */ addiu $v0, $zero, 4 -/* C3B038 80240628 1462000B */ bne $v1, $v0, .L80240658 -/* C3B03C 8024062C 3C021F10 */ lui $v0, 0x1f10 -/* C3B040 80240630 8E230000 */ lw $v1, ($s1) -/* C3B044 80240634 3C01C47A */ lui $at, 0xc47a -/* C3B048 80240638 44810000 */ mtc1 $at, $f0 -/* C3B04C 8024063C 00621825 */ or $v1, $v1, $v0 -/* C3B050 80240640 AE230000 */ sw $v1, ($s1) -/* C3B054 80240644 AE400038 */ sw $zero, 0x38($s2) -/* C3B058 80240648 E640003C */ swc1 $f0, 0x3c($s2) -/* C3B05C 8024064C AE400040 */ sw $zero, 0x40($s2) -/* C3B060 80240650 A2330007 */ sb $s3, 7($s1) -/* C3B064 80240654 AE800070 */ sw $zero, 0x70($s4) -.L80240658: -/* C3B068 80240658 8FBF002C */ lw $ra, 0x2c($sp) -/* C3B06C 8024065C 8FB40028 */ lw $s4, 0x28($sp) -/* C3B070 80240660 8FB30024 */ lw $s3, 0x24($sp) -/* C3B074 80240664 8FB20020 */ lw $s2, 0x20($sp) -/* C3B078 80240668 8FB1001C */ lw $s1, 0x1c($sp) -/* C3B07C 8024066C 8FB00018 */ lw $s0, 0x18($sp) -/* C3B080 80240670 0000102D */ daddu $v0, $zero, $zero -/* C3B084 80240674 03E00008 */ jr $ra -/* C3B088 80240678 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s deleted file mode 100644 index 83bf52c3af..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_8024067C_C3B08C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_C3B08C -/* C3B08C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B090 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* C3B094 80240684 0080882D */ daddu $s1, $a0, $zero -/* C3B098 80240688 AFBF0018 */ sw $ra, 0x18($sp) -/* C3B09C 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* C3B0A0 80240690 8E300148 */ lw $s0, 0x148($s1) -/* C3B0A4 80240694 0C00EABB */ jal get_npc_unsafe -/* C3B0A8 80240698 86040008 */ lh $a0, 8($s0) -/* C3B0AC 8024069C 0040202D */ daddu $a0, $v0, $zero -/* C3B0B0 802406A0 8482008E */ lh $v0, 0x8e($a0) -/* C3B0B4 802406A4 9483008E */ lhu $v1, 0x8e($a0) -/* C3B0B8 802406A8 18400002 */ blez $v0, .L802406B4 -/* C3B0BC 802406AC 2462FFFF */ addiu $v0, $v1, -1 -/* C3B0C0 802406B0 A482008E */ sh $v0, 0x8e($a0) -.L802406B4: -/* C3B0C4 802406B4 8482008E */ lh $v0, 0x8e($a0) -/* C3B0C8 802406B8 24030001 */ addiu $v1, $zero, 1 -/* C3B0CC 802406BC 14430005 */ bne $v0, $v1, .L802406D4 -/* C3B0D0 802406C0 00000000 */ nop -/* C3B0D4 802406C4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3B0D8 802406C8 8C420030 */ lw $v0, 0x30($v0) -/* C3B0DC 802406CC 080901BC */ j .L802406F0 -/* C3B0E0 802406D0 AC820028 */ sw $v0, 0x28($a0) -.L802406D4: -/* C3B0E4 802406D4 1C400006 */ bgtz $v0, .L802406F0 -/* C3B0E8 802406D8 00000000 */ nop -/* C3B0EC 802406DC 8E0200CC */ lw $v0, 0xcc($s0) -/* C3B0F0 802406E0 8C420028 */ lw $v0, 0x28($v0) -/* C3B0F4 802406E4 A480008E */ sh $zero, 0x8e($a0) -/* C3B0F8 802406E8 AC820028 */ sw $v0, 0x28($a0) -/* C3B0FC 802406EC AE230070 */ sw $v1, 0x70($s1) -.L802406F0: -/* C3B100 802406F0 8FBF0018 */ lw $ra, 0x18($sp) -/* C3B104 802406F4 8FB10014 */ lw $s1, 0x14($sp) -/* C3B108 802406F8 8FB00010 */ lw $s0, 0x10($sp) -/* C3B10C 802406FC 03E00008 */ jr $ra -/* C3B110 80240700 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s deleted file mode 100644 index 4ff2c98b89..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240704_C3B114 -/* C3B114 80240704 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3B118 80240708 AFB40048 */ sw $s4, 0x48($sp) -/* C3B11C 8024070C 0080A02D */ daddu $s4, $a0, $zero -/* C3B120 80240710 AFBF004C */ sw $ra, 0x4c($sp) -/* C3B124 80240714 AFB30044 */ sw $s3, 0x44($sp) -/* C3B128 80240718 AFB20040 */ sw $s2, 0x40($sp) -/* C3B12C 8024071C AFB1003C */ sw $s1, 0x3c($sp) -/* C3B130 80240720 AFB00038 */ sw $s0, 0x38($sp) -/* C3B134 80240724 8E930148 */ lw $s3, 0x148($s4) -/* C3B138 80240728 00C0802D */ daddu $s0, $a2, $zero -/* C3B13C 8024072C 86640008 */ lh $a0, 8($s3) -/* C3B140 80240730 0C00EABB */ jal get_npc_unsafe -/* C3B144 80240734 0000902D */ daddu $s2, $zero, $zero -/* C3B148 80240738 0C039D59 */ jal get_player_data -/* C3B14C 8024073C 0040882D */ daddu $s1, $v0, $zero -/* C3B150 80240740 0200202D */ daddu $a0, $s0, $zero -/* C3B154 80240744 0260282D */ daddu $a1, $s3, $zero -/* C3B158 80240748 0000382D */ daddu $a3, $zero, $zero -/* C3B15C 8024074C 3C0642A0 */ lui $a2, 0x42a0 -/* C3B160 80240750 0040802D */ daddu $s0, $v0, $zero -/* C3B164 80240754 0C01242D */ jal func_800490B4 -/* C3B168 80240758 AFA00010 */ sw $zero, 0x10($sp) -/* C3B16C 8024075C 10400022 */ beqz $v0, .L802407E8 -/* C3B170 80240760 00000000 */ nop -/* C3B174 80240764 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3B178 80240768 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3B17C 8024076C 804300B4 */ lb $v1, 0xb4($v0) -/* C3B180 80240770 24020002 */ addiu $v0, $zero, 2 -/* C3B184 80240774 10620013 */ beq $v1, $v0, .L802407C4 -/* C3B188 80240778 2402001A */ addiu $v0, $zero, 0x1a -/* C3B18C 8024077C 10620011 */ beq $v1, $v0, .L802407C4 -/* C3B190 80240780 24020003 */ addiu $v0, $zero, 3 -/* C3B194 80240784 1062000F */ beq $v1, $v0, .L802407C4 -/* C3B198 80240788 2402000E */ addiu $v0, $zero, 0xe -/* C3B19C 8024078C 1062000D */ beq $v1, $v0, .L802407C4 -/* C3B1A0 80240790 24020010 */ addiu $v0, $zero, 0x10 -/* C3B1A4 80240794 1062000B */ beq $v1, $v0, .L802407C4 -/* C3B1A8 80240798 2402000B */ addiu $v0, $zero, 0xb -/* C3B1AC 8024079C 10620009 */ beq $v1, $v0, .L802407C4 -/* C3B1B0 802407A0 2402000A */ addiu $v0, $zero, 0xa -/* C3B1B4 802407A4 10620007 */ beq $v1, $v0, .L802407C4 -/* C3B1B8 802407A8 24020012 */ addiu $v0, $zero, 0x12 -/* C3B1BC 802407AC 10620005 */ beq $v1, $v0, .L802407C4 -/* C3B1C0 802407B0 24020013 */ addiu $v0, $zero, 0x13 -/* C3B1C4 802407B4 10620003 */ beq $v1, $v0, .L802407C4 -/* C3B1C8 802407B8 24020025 */ addiu $v0, $zero, 0x25 -/* C3B1CC 802407BC 14620002 */ bne $v1, $v0, .L802407C8 -/* C3B1D0 802407C0 00000000 */ nop -.L802407C4: -/* C3B1D4 802407C4 24120001 */ addiu $s2, $zero, 1 -.L802407C8: -/* C3B1D8 802407C8 82030012 */ lb $v1, 0x12($s0) -/* C3B1DC 802407CC 24020002 */ addiu $v0, $zero, 2 -/* C3B1E0 802407D0 14620007 */ bne $v1, $v0, .L802407F0 -/* C3B1E4 802407D4 24020001 */ addiu $v0, $zero, 1 -/* C3B1E8 802407D8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3B1EC 802407DC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3B1F0 802407E0 50430002 */ beql $v0, $v1, .L802407EC -/* C3B1F4 802407E4 24120001 */ addiu $s2, $zero, 1 -.L802407E8: -/* C3B1F8 802407E8 82030012 */ lb $v1, 0x12($s0) -.L802407EC: -/* C3B1FC 802407EC 24020001 */ addiu $v0, $zero, 1 -.L802407F0: -/* C3B200 802407F0 14620006 */ bne $v1, $v0, .L8024080C -/* C3B204 802407F4 24020003 */ addiu $v0, $zero, 3 -/* C3B208 802407F8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3B20C 802407FC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3B210 80240800 14400008 */ bnez $v0, .L80240824 -/* C3B214 80240804 27A40028 */ addiu $a0, $sp, 0x28 -/* C3B218 80240808 24020003 */ addiu $v0, $zero, 3 -.L8024080C: -/* C3B21C 8024080C 1462001B */ bne $v1, $v0, .L8024087C -/* C3B220 80240810 24020002 */ addiu $v0, $zero, 2 -/* C3B224 80240814 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C3B228 80240818 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C3B22C 8024081C 14620017 */ bne $v1, $v0, .L8024087C -/* C3B230 80240820 27A40028 */ addiu $a0, $sp, 0x28 -.L80240824: -/* C3B234 80240824 27A5002C */ addiu $a1, $sp, 0x2c -/* C3B238 80240828 8E27000C */ lw $a3, 0xc($s1) -/* C3B23C 8024082C C6200038 */ lwc1 $f0, 0x38($s1) -/* C3B240 80240830 C6220040 */ lwc1 $f2, 0x40($s1) -/* C3B244 80240834 0000302D */ daddu $a2, $zero, $zero -/* C3B248 80240838 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3B24C 8024083C 0C00A7E7 */ jal add_vec2D_polar -/* C3B250 80240840 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C3B254 80240844 3C028011 */ lui $v0, %hi(wPartnerNpc) -/* C3B258 80240848 8C42C930 */ lw $v0, %lo(wPartnerNpc)($v0) -/* C3B25C 8024084C C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C3B260 80240850 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C3B264 80240854 8C460038 */ lw $a2, 0x38($v0) -/* C3B268 80240858 0C00A7B5 */ jal dist2D -/* C3B26C 8024085C 8C470040 */ lw $a3, 0x40($v0) -/* C3B270 80240860 3C0142A0 */ lui $at, 0x42a0 -/* C3B274 80240864 44811000 */ mtc1 $at, $f2 -/* C3B278 80240868 00000000 */ nop -/* C3B27C 8024086C 4602003E */ c.le.s $f0, $f2 -/* C3B280 80240870 00000000 */ nop -/* C3B284 80240874 45030001 */ bc1tl .L8024087C -/* C3B288 80240878 24120001 */ addiu $s2, $zero, 1 -.L8024087C: -/* C3B28C 8024087C 12400026 */ beqz $s2, .L80240918 -/* C3B290 80240880 0220202D */ daddu $a0, $s1, $zero -/* C3B294 80240884 3C05B000 */ lui $a1, 0xb000 -/* C3B298 80240888 34A5000E */ ori $a1, $a1, 0xe -/* C3B29C 8024088C 0C012530 */ jal func_800494C0 -/* C3B2A0 80240890 0000302D */ daddu $a2, $zero, $zero -/* C3B2A4 80240894 0000202D */ daddu $a0, $zero, $zero -/* C3B2A8 80240898 0220282D */ daddu $a1, $s1, $zero -/* C3B2AC 8024089C 0000302D */ daddu $a2, $zero, $zero -/* C3B2B0 802408A0 862200A8 */ lh $v0, 0xa8($s1) -/* C3B2B4 802408A4 8E6300CC */ lw $v1, 0xcc($s3) -/* C3B2B8 802408A8 3C013F80 */ lui $at, 0x3f80 -/* C3B2BC 802408AC 44810000 */ mtc1 $at, $f0 -/* C3B2C0 802408B0 3C014000 */ lui $at, 0x4000 -/* C3B2C4 802408B4 44811000 */ mtc1 $at, $f2 -/* C3B2C8 802408B8 3C01C1A0 */ lui $at, 0xc1a0 -/* C3B2CC 802408BC 44812000 */ mtc1 $at, $f4 -/* C3B2D0 802408C0 44823000 */ mtc1 $v0, $f6 -/* C3B2D4 802408C4 00000000 */ nop -/* C3B2D8 802408C8 468031A0 */ cvt.s.w $f6, $f6 -/* C3B2DC 802408CC 44073000 */ mfc1 $a3, $f6 -/* C3B2E0 802408D0 8C63002C */ lw $v1, 0x2c($v1) -/* C3B2E4 802408D4 2402000A */ addiu $v0, $zero, 0xa -/* C3B2E8 802408D8 A622008E */ sh $v0, 0x8e($s1) -/* C3B2EC 802408DC 2402000F */ addiu $v0, $zero, 0xf -/* C3B2F0 802408E0 AE230028 */ sw $v1, 0x28($s1) -/* C3B2F4 802408E4 AFA2001C */ sw $v0, 0x1c($sp) -/* C3B2F8 802408E8 27A20030 */ addiu $v0, $sp, 0x30 -/* C3B2FC 802408EC E7A00010 */ swc1 $f0, 0x10($sp) -/* C3B300 802408F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3B304 802408F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3B308 802408F8 0C01BFA4 */ jal fx_emote -/* C3B30C 802408FC AFA20020 */ sw $v0, 0x20($sp) -/* C3B310 80240900 0220202D */ daddu $a0, $s1, $zero -/* C3B314 80240904 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3B318 80240908 0C012530 */ jal func_800494C0 -/* C3B31C 8024090C 3C060020 */ lui $a2, 0x20 -/* C3B320 80240910 24020002 */ addiu $v0, $zero, 2 -/* C3B324 80240914 AE820070 */ sw $v0, 0x70($s4) -.L80240918: -/* C3B328 80240918 9622008E */ lhu $v0, 0x8e($s1) -/* C3B32C 8024091C 24420001 */ addiu $v0, $v0, 1 -/* C3B330 80240920 A622008E */ sh $v0, 0x8e($s1) -/* C3B334 80240924 00021400 */ sll $v0, $v0, 0x10 -/* C3B338 80240928 00021C03 */ sra $v1, $v0, 0x10 -/* C3B33C 8024092C 2402001B */ addiu $v0, $zero, 0x1b -/* C3B340 80240930 14620005 */ bne $v1, $v0, .L80240948 -/* C3B344 80240934 24020039 */ addiu $v0, $zero, 0x39 -/* C3B348 80240938 0220202D */ daddu $a0, $s1, $zero -/* C3B34C 8024093C 3C05B000 */ lui $a1, 0xb000 -/* C3B350 80240940 08090257 */ j .L8024095C -/* C3B354 80240944 34A5000C */ ori $a1, $a1, 0xc -.L80240948: -/* C3B358 80240948 14620008 */ bne $v1, $v0, .L8024096C -/* C3B35C 8024094C 2402003B */ addiu $v0, $zero, 0x3b -/* C3B360 80240950 0220202D */ daddu $a0, $s1, $zero -/* C3B364 80240954 3C05B000 */ lui $a1, 0xb000 -/* C3B368 80240958 34A5000D */ ori $a1, $a1, 0xd -.L8024095C: -/* C3B36C 8024095C 0C012530 */ jal func_800494C0 -/* C3B370 80240960 0000302D */ daddu $a2, $zero, $zero -/* C3B374 80240964 08090267 */ j .L8024099C -/* C3B378 80240968 00000000 */ nop -.L8024096C: -/* C3B37C 8024096C 14620005 */ bne $v1, $v0, .L80240984 -/* C3B380 80240970 2402003C */ addiu $v0, $zero, 0x3c -/* C3B384 80240974 8E6200CC */ lw $v0, 0xcc($s3) -/* C3B388 80240978 8C420030 */ lw $v0, 0x30($v0) -/* C3B38C 8024097C 08090267 */ j .L8024099C -/* C3B390 80240980 AE220028 */ sw $v0, 0x28($s1) -.L80240984: -/* C3B394 80240984 14620005 */ bne $v1, $v0, .L8024099C -/* C3B398 80240988 00000000 */ nop -/* C3B39C 8024098C 8E6200CC */ lw $v0, 0xcc($s3) -/* C3B3A0 80240990 8C420028 */ lw $v0, 0x28($v0) -/* C3B3A4 80240994 A620008E */ sh $zero, 0x8e($s1) -/* C3B3A8 80240998 AE220028 */ sw $v0, 0x28($s1) -.L8024099C: -/* C3B3AC 8024099C 8FBF004C */ lw $ra, 0x4c($sp) -/* C3B3B0 802409A0 8FB40048 */ lw $s4, 0x48($sp) -/* C3B3B4 802409A4 8FB30044 */ lw $s3, 0x44($sp) -/* C3B3B8 802409A8 8FB20040 */ lw $s2, 0x40($sp) -/* C3B3BC 802409AC 8FB1003C */ lw $s1, 0x3c($sp) -/* C3B3C0 802409B0 8FB00038 */ lw $s0, 0x38($sp) -/* C3B3C4 802409B4 03E00008 */ jr $ra -/* C3B3C8 802409B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s deleted file mode 100644 index 0aa6554af9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409BC_C3B3CC -/* C3B3CC 802409BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B3D0 802409C0 AFB10014 */ sw $s1, 0x14($sp) -/* C3B3D4 802409C4 0080882D */ daddu $s1, $a0, $zero -/* C3B3D8 802409C8 AFBF0018 */ sw $ra, 0x18($sp) -/* C3B3DC 802409CC AFB00010 */ sw $s0, 0x10($sp) -/* C3B3E0 802409D0 8E300148 */ lw $s0, 0x148($s1) -/* C3B3E4 802409D4 0C00EABB */ jal get_npc_unsafe -/* C3B3E8 802409D8 86040008 */ lh $a0, 8($s0) -/* C3B3EC 802409DC 0040182D */ daddu $v1, $v0, $zero -/* C3B3F0 802409E0 9462008E */ lhu $v0, 0x8e($v1) -/* C3B3F4 802409E4 2442FFFF */ addiu $v0, $v0, -1 -/* C3B3F8 802409E8 A462008E */ sh $v0, 0x8e($v1) -/* C3B3FC 802409EC 00021400 */ sll $v0, $v0, 0x10 -/* C3B400 802409F0 1C400006 */ bgtz $v0, .L80240A0C -/* C3B404 802409F4 24020001 */ addiu $v0, $zero, 1 -/* C3B408 802409F8 A462008E */ sh $v0, 0x8e($v1) -/* C3B40C 802409FC 24020028 */ addiu $v0, $zero, 0x28 -/* C3B410 80240A00 AE020088 */ sw $v0, 0x88($s0) -/* C3B414 80240A04 24020003 */ addiu $v0, $zero, 3 -/* C3B418 80240A08 AE220070 */ sw $v0, 0x70($s1) -.L80240A0C: -/* C3B41C 80240A0C 8FBF0018 */ lw $ra, 0x18($sp) -/* C3B420 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* C3B424 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* C3B428 80240A18 03E00008 */ jr $ra -/* C3B42C 80240A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s deleted file mode 100644 index 9d5573c7b6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240A20_C3B430.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A20_C3B430 -/* C3B430 80240A20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B434 80240A24 AFB10014 */ sw $s1, 0x14($sp) -/* C3B438 80240A28 0080882D */ daddu $s1, $a0, $zero -/* C3B43C 80240A2C AFBF001C */ sw $ra, 0x1c($sp) -/* C3B440 80240A30 AFB20018 */ sw $s2, 0x18($sp) -/* C3B444 80240A34 AFB00010 */ sw $s0, 0x10($sp) -/* C3B448 80240A38 8E320148 */ lw $s2, 0x148($s1) -/* C3B44C 80240A3C 0C00EABB */ jal get_npc_unsafe -/* C3B450 80240A40 86440008 */ lh $a0, 8($s2) -/* C3B454 80240A44 240400B4 */ addiu $a0, $zero, 0xb4 -/* C3B458 80240A48 0C00A67F */ jal rand_int -/* C3B45C 80240A4C 0040802D */ daddu $s0, $v0, $zero -/* C3B460 80240A50 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3B464 80240A54 44820000 */ mtc1 $v0, $f0 -/* C3B468 80240A58 00000000 */ nop -/* C3B46C 80240A5C 46800020 */ cvt.s.w $f0, $f0 -/* C3B470 80240A60 46006300 */ add.s $f12, $f12, $f0 -/* C3B474 80240A64 3C0142B4 */ lui $at, 0x42b4 -/* C3B478 80240A68 44810000 */ mtc1 $at, $f0 -/* C3B47C 80240A6C 0C00A6C9 */ jal clamp_angle -/* C3B480 80240A70 46006301 */ sub.s $f12, $f12, $f0 -/* C3B484 80240A74 E600000C */ swc1 $f0, 0xc($s0) -/* C3B488 80240A78 8E4200CC */ lw $v0, 0xcc($s2) -/* C3B48C 80240A7C 8C420000 */ lw $v0, ($v0) -/* C3B490 80240A80 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C3B494 80240A84 0C00A67F */ jal rand_int -/* C3B498 80240A88 AE020028 */ sw $v0, 0x28($s0) -/* C3B49C 80240A8C 00021FC2 */ srl $v1, $v0, 0x1f -/* C3B4A0 80240A90 00431821 */ addu $v1, $v0, $v1 -/* C3B4A4 80240A94 00031843 */ sra $v1, $v1, 1 -/* C3B4A8 80240A98 00031840 */ sll $v1, $v1, 1 -/* C3B4AC 80240A9C 00431023 */ subu $v0, $v0, $v1 -/* C3B4B0 80240AA0 24420002 */ addiu $v0, $v0, 2 -/* C3B4B4 80240AA4 AE220074 */ sw $v0, 0x74($s1) -/* C3B4B8 80240AA8 24020004 */ addiu $v0, $zero, 4 -/* C3B4BC 80240AAC AE220070 */ sw $v0, 0x70($s1) -/* C3B4C0 80240AB0 8FBF001C */ lw $ra, 0x1c($sp) -/* C3B4C4 80240AB4 8FB20018 */ lw $s2, 0x18($sp) -/* C3B4C8 80240AB8 8FB10014 */ lw $s1, 0x14($sp) -/* C3B4CC 80240ABC 8FB00010 */ lw $s0, 0x10($sp) -/* C3B4D0 80240AC0 03E00008 */ jr $ra -/* C3B4D4 80240AC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s deleted file mode 100644 index 896396003d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240AC8_C3B4D8.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AC8_C3B4D8 -/* C3B4D8 80240AC8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3B4DC 80240ACC AFB20020 */ sw $s2, 0x20($sp) -/* C3B4E0 80240AD0 0080902D */ daddu $s2, $a0, $zero -/* C3B4E4 80240AD4 AFBF0028 */ sw $ra, 0x28($sp) -/* C3B4E8 80240AD8 AFB30024 */ sw $s3, 0x24($sp) -/* C3B4EC 80240ADC AFB1001C */ sw $s1, 0x1c($sp) -/* C3B4F0 80240AE0 AFB00018 */ sw $s0, 0x18($sp) -/* C3B4F4 80240AE4 8E510148 */ lw $s1, 0x148($s2) -/* C3B4F8 80240AE8 00A0982D */ daddu $s3, $a1, $zero -/* C3B4FC 80240AEC 86240008 */ lh $a0, 8($s1) -/* C3B500 80240AF0 0C00EABB */ jal get_npc_unsafe -/* C3B504 80240AF4 00C0802D */ daddu $s0, $a2, $zero -/* C3B508 80240AF8 0200202D */ daddu $a0, $s0, $zero -/* C3B50C 80240AFC 0040802D */ daddu $s0, $v0, $zero -/* C3B510 80240B00 AFA00010 */ sw $zero, 0x10($sp) -/* C3B514 80240B04 8E660024 */ lw $a2, 0x24($s3) -/* C3B518 80240B08 8E670028 */ lw $a3, 0x28($s3) -/* C3B51C 80240B0C 0C01242D */ jal func_800490B4 -/* C3B520 80240B10 0220282D */ daddu $a1, $s1, $zero -/* C3B524 80240B14 1040000C */ beqz $v0, .L80240B48 -/* C3B528 80240B18 00000000 */ nop -/* C3B52C 80240B1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3B530 80240B20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3B534 80240B24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B538 80240B28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B53C 80240B2C 8C460028 */ lw $a2, 0x28($v0) -/* C3B540 80240B30 0C00A720 */ jal atan2 -/* C3B544 80240B34 8C470030 */ lw $a3, 0x30($v0) -/* C3B548 80240B38 2402000C */ addiu $v0, $zero, 0xc -/* C3B54C 80240B3C E600000C */ swc1 $f0, 0xc($s0) -/* C3B550 80240B40 080902F9 */ j .L80240BE4 -/* C3B554 80240B44 AE420070 */ sw $v0, 0x70($s2) -.L80240B48: -/* C3B558 80240B48 9602008E */ lhu $v0, 0x8e($s0) -/* C3B55C 80240B4C 2442FFFF */ addiu $v0, $v0, -1 -/* C3B560 80240B50 A602008E */ sh $v0, 0x8e($s0) -/* C3B564 80240B54 00021400 */ sll $v0, $v0, 0x10 -/* C3B568 80240B58 1C400022 */ bgtz $v0, .L80240BE4 -/* C3B56C 80240B5C 00000000 */ nop -/* C3B570 80240B60 8E420074 */ lw $v0, 0x74($s2) -/* C3B574 80240B64 2442FFFF */ addiu $v0, $v0, -1 -/* C3B578 80240B68 18400014 */ blez $v0, .L80240BBC -/* C3B57C 80240B6C AE420074 */ sw $v0, 0x74($s2) -/* C3B580 80240B70 C600000C */ lwc1 $f0, 0xc($s0) -/* C3B584 80240B74 3C014334 */ lui $at, 0x4334 -/* C3B588 80240B78 44816000 */ mtc1 $at, $f12 -/* C3B58C 80240B7C 0C00A6C9 */ jal clamp_angle -/* C3B590 80240B80 460C0300 */ add.s $f12, $f0, $f12 -/* C3B594 80240B84 E600000C */ swc1 $f0, 0xc($s0) -/* C3B598 80240B88 8E640008 */ lw $a0, 8($s3) -/* C3B59C 80240B8C 000417C2 */ srl $v0, $a0, 0x1f -/* C3B5A0 80240B90 00822021 */ addu $a0, $a0, $v0 -/* C3B5A4 80240B94 00042043 */ sra $a0, $a0, 1 -/* C3B5A8 80240B98 0C00A67F */ jal rand_int -/* C3B5AC 80240B9C 24840001 */ addiu $a0, $a0, 1 -/* C3B5B0 80240BA0 8E630008 */ lw $v1, 8($s3) -/* C3B5B4 80240BA4 000327C2 */ srl $a0, $v1, 0x1f -/* C3B5B8 80240BA8 00641821 */ addu $v1, $v1, $a0 -/* C3B5BC 80240BAC 00031843 */ sra $v1, $v1, 1 -/* C3B5C0 80240BB0 00621821 */ addu $v1, $v1, $v0 -/* C3B5C4 80240BB4 080902F9 */ j .L80240BE4 -/* C3B5C8 80240BB8 A603008E */ sh $v1, 0x8e($s0) -.L80240BBC: -/* C3B5CC 80240BBC 8E250088 */ lw $a1, 0x88($s1) -/* C3B5D0 80240BC0 24020028 */ addiu $v0, $zero, 0x28 -/* C3B5D4 80240BC4 14A20003 */ bne $a1, $v0, .L80240BD4 -/* C3B5D8 80240BC8 24020032 */ addiu $v0, $zero, 0x32 -/* C3B5DC 80240BCC 080902F7 */ j .L80240BDC -/* C3B5E0 80240BD0 24020014 */ addiu $v0, $zero, 0x14 -.L80240BD4: -/* C3B5E4 80240BD4 14A20003 */ bne $a1, $v0, .L80240BE4 -/* C3B5E8 80240BD8 24020019 */ addiu $v0, $zero, 0x19 -.L80240BDC: -/* C3B5EC 80240BDC A602008E */ sh $v0, 0x8e($s0) -/* C3B5F0 80240BE0 AE450070 */ sw $a1, 0x70($s2) -.L80240BE4: -/* C3B5F4 80240BE4 8FBF0028 */ lw $ra, 0x28($sp) -/* C3B5F8 80240BE8 8FB30024 */ lw $s3, 0x24($sp) -/* C3B5FC 80240BEC 8FB20020 */ lw $s2, 0x20($sp) -/* C3B600 80240BF0 8FB1001C */ lw $s1, 0x1c($sp) -/* C3B604 80240BF4 8FB00018 */ lw $s0, 0x18($sp) -/* C3B608 80240BF8 03E00008 */ jr $ra -/* C3B60C 80240BFC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s deleted file mode 100644 index 3b4bc77068..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C00_C3B610 -/* C3B610 80240C00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B614 80240C04 AFB20018 */ sw $s2, 0x18($sp) -/* C3B618 80240C08 0080902D */ daddu $s2, $a0, $zero -/* C3B61C 80240C0C AFBF001C */ sw $ra, 0x1c($sp) -/* C3B620 80240C10 AFB10014 */ sw $s1, 0x14($sp) -/* C3B624 80240C14 AFB00010 */ sw $s0, 0x10($sp) -/* C3B628 80240C18 8E500148 */ lw $s0, 0x148($s2) -/* C3B62C 80240C1C 86040008 */ lh $a0, 8($s0) -/* C3B630 80240C20 0C00EABB */ jal get_npc_unsafe -/* C3B634 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* C3B638 80240C28 0040182D */ daddu $v1, $v0, $zero -/* C3B63C 80240C2C 9462008E */ lhu $v0, 0x8e($v1) -/* C3B640 80240C30 2442FFFF */ addiu $v0, $v0, -1 -/* C3B644 80240C34 A462008E */ sh $v0, 0x8e($v1) -/* C3B648 80240C38 00021400 */ sll $v0, $v0, 0x10 -/* C3B64C 80240C3C 1C400015 */ bgtz $v0, .L80240C94 -/* C3B650 80240C40 00000000 */ nop -/* C3B654 80240C44 8E0200CC */ lw $v0, 0xcc($s0) -/* C3B658 80240C48 8C420004 */ lw $v0, 4($v0) -/* C3B65C 80240C4C AC620028 */ sw $v0, 0x28($v1) -/* C3B660 80240C50 8E0200D0 */ lw $v0, 0xd0($s0) -/* C3B664 80240C54 8C420014 */ lw $v0, 0x14($v0) -/* C3B668 80240C58 04410004 */ bgez $v0, .L80240C6C -/* C3B66C 80240C5C 00000000 */ nop -/* C3B670 80240C60 C6200000 */ lwc1 $f0, ($s1) -/* C3B674 80240C64 08090323 */ j .L80240C8C -/* C3B678 80240C68 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C6C: -/* C3B67C 80240C6C 3C018024 */ lui $at, %hi(D_80242348_C3CD58) -/* C3B680 80240C70 D4222348 */ ldc1 $f2, %lo(D_80242348_C3CD58)($at) -/* C3B684 80240C74 44820000 */ mtc1 $v0, $f0 -/* C3B688 80240C78 00000000 */ nop -/* C3B68C 80240C7C 46800021 */ cvt.d.w $f0, $f0 -/* C3B690 80240C80 46220003 */ div.d $f0, $f0, $f2 -/* C3B694 80240C84 46200020 */ cvt.s.d $f0, $f0 -/* C3B698 80240C88 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C8C: -/* C3B69C 80240C8C 24020029 */ addiu $v0, $zero, 0x29 -/* C3B6A0 80240C90 AE420070 */ sw $v0, 0x70($s2) -.L80240C94: -/* C3B6A4 80240C94 8FBF001C */ lw $ra, 0x1c($sp) -/* C3B6A8 80240C98 8FB20018 */ lw $s2, 0x18($sp) -/* C3B6AC 80240C9C 8FB10014 */ lw $s1, 0x14($sp) -/* C3B6B0 80240CA0 8FB00010 */ lw $s0, 0x10($sp) -/* C3B6B4 80240CA4 03E00008 */ jr $ra -/* C3B6B8 80240CA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s deleted file mode 100644 index 062ab5ffb1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240CAC_C3B6BC.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CAC_C3B6BC -/* C3B6BC 80240CAC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C3B6C0 80240CB0 AFB3002C */ sw $s3, 0x2c($sp) -/* C3B6C4 80240CB4 0080982D */ daddu $s3, $a0, $zero -/* C3B6C8 80240CB8 AFBF0030 */ sw $ra, 0x30($sp) -/* C3B6CC 80240CBC AFB20028 */ sw $s2, 0x28($sp) -/* C3B6D0 80240CC0 AFB10024 */ sw $s1, 0x24($sp) -/* C3B6D4 80240CC4 AFB00020 */ sw $s0, 0x20($sp) -/* C3B6D8 80240CC8 8E720148 */ lw $s2, 0x148($s3) -/* C3B6DC 80240CCC 00A0882D */ daddu $s1, $a1, $zero -/* C3B6E0 80240CD0 86440008 */ lh $a0, 8($s2) -/* C3B6E4 80240CD4 0C00EABB */ jal get_npc_unsafe -/* C3B6E8 80240CD8 00C0802D */ daddu $s0, $a2, $zero -/* C3B6EC 80240CDC 0200202D */ daddu $a0, $s0, $zero -/* C3B6F0 80240CE0 0240282D */ daddu $a1, $s2, $zero -/* C3B6F4 80240CE4 AFA00010 */ sw $zero, 0x10($sp) -/* C3B6F8 80240CE8 8E260024 */ lw $a2, 0x24($s1) -/* C3B6FC 80240CEC 8E270028 */ lw $a3, 0x28($s1) -/* C3B700 80240CF0 0C01242D */ jal func_800490B4 -/* C3B704 80240CF4 0040802D */ daddu $s0, $v0, $zero -/* C3B708 80240CF8 1040000C */ beqz $v0, .L80240D2C -/* C3B70C 80240CFC 00000000 */ nop -/* C3B710 80240D00 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B714 80240D04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3B718 80240D08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3B71C 80240D0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B720 80240D10 8C460028 */ lw $a2, 0x28($v0) -/* C3B724 80240D14 0C00A720 */ jal atan2 -/* C3B728 80240D18 8C470030 */ lw $a3, 0x30($v0) -/* C3B72C 80240D1C 2402000C */ addiu $v0, $zero, 0xc -/* C3B730 80240D20 E600000C */ swc1 $f0, 0xc($s0) -/* C3B734 80240D24 08090382 */ j .L80240E08 -/* C3B738 80240D28 AE620070 */ sw $v0, 0x70($s3) -.L80240D2C: -/* C3B73C 80240D2C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B740 80240D30 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3B744 80240D34 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B748 80240D38 C4440000 */ lwc1 $f4, ($v0) -/* C3B74C 80240D3C 46802120 */ cvt.s.w $f4, $f4 -/* C3B750 80240D40 44062000 */ mfc1 $a2, $f4 -/* C3B754 80240D44 C4440008 */ lwc1 $f4, 8($v0) -/* C3B758 80240D48 46802120 */ cvt.s.w $f4, $f4 -/* C3B75C 80240D4C 44072000 */ mfc1 $a3, $f4 -/* C3B760 80240D50 0C00A7B5 */ jal dist2D -/* C3B764 80240D54 00000000 */ nop -/* C3B768 80240D58 C6020018 */ lwc1 $f2, 0x18($s0) -/* C3B76C 80240D5C 4602003E */ c.le.s $f0, $f2 -/* C3B770 80240D60 00000000 */ nop -/* C3B774 80240D64 4500000B */ bc1f .L80240D94 -/* C3B778 80240D68 00000000 */ nop -/* C3B77C 80240D6C 8E4200CC */ lw $v0, 0xcc($s2) -/* C3B780 80240D70 8C430000 */ lw $v1, ($v0) -/* C3B784 80240D74 2402000F */ addiu $v0, $zero, 0xf -/* C3B788 80240D78 A602008E */ sh $v0, 0x8e($s0) -/* C3B78C 80240D7C 24020032 */ addiu $v0, $zero, 0x32 -/* C3B790 80240D80 AE030028 */ sw $v1, 0x28($s0) -/* C3B794 80240D84 AE420088 */ sw $v0, 0x88($s2) -/* C3B798 80240D88 24020003 */ addiu $v0, $zero, 3 -/* C3B79C 80240D8C 08090382 */ j .L80240E08 -/* C3B7A0 80240D90 AE620070 */ sw $v0, 0x70($s3) -.L80240D94: -/* C3B7A4 80240D94 8602008C */ lh $v0, 0x8c($s0) -/* C3B7A8 80240D98 1440001B */ bnez $v0, .L80240E08 -/* C3B7AC 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* C3B7B0 80240DA0 27A60018 */ addiu $a2, $sp, 0x18 -/* C3B7B4 80240DA4 3C0540A0 */ lui $a1, 0x40a0 -/* C3B7B8 80240DA8 C600000C */ lwc1 $f0, 0xc($s0) -/* C3B7BC 80240DAC 0000382D */ daddu $a3, $zero, $zero -/* C3B7C0 80240DB0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C3B7C4 80240DB4 AFA00010 */ sw $zero, 0x10($sp) -/* C3B7C8 80240DB8 0C0129E1 */ jal func_8004A784 -/* C3B7CC 80240DBC AFA00014 */ sw $zero, 0x14($sp) -/* C3B7D0 80240DC0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C3B7D4 80240DC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3B7D8 80240DC8 E600000C */ swc1 $f0, 0xc($s0) -/* C3B7DC 80240DCC 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3B7E0 80240DD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3B7E4 80240DD4 C4440000 */ lwc1 $f4, ($v0) -/* C3B7E8 80240DD8 46802120 */ cvt.s.w $f4, $f4 -/* C3B7EC 80240DDC 44062000 */ mfc1 $a2, $f4 -/* C3B7F0 80240DE0 C4440008 */ lwc1 $f4, 8($v0) -/* C3B7F4 80240DE4 46802120 */ cvt.s.w $f4, $f4 -/* C3B7F8 80240DE8 44072000 */ mfc1 $a3, $f4 -/* C3B7FC 80240DEC 0C00A720 */ jal atan2 -/* C3B800 80240DF0 00000000 */ nop -/* C3B804 80240DF4 8E050018 */ lw $a1, 0x18($s0) -/* C3B808 80240DF8 44060000 */ mfc1 $a2, $f0 -/* C3B80C 80240DFC 0200202D */ daddu $a0, $s0, $zero -/* C3B810 80240E00 0C00EA95 */ jal npc_move_heading -/* C3B814 80240E04 AC86000C */ sw $a2, 0xc($a0) -.L80240E08: -/* C3B818 80240E08 8FBF0030 */ lw $ra, 0x30($sp) -/* C3B81C 80240E0C 8FB3002C */ lw $s3, 0x2c($sp) -/* C3B820 80240E10 8FB20028 */ lw $s2, 0x28($sp) -/* C3B824 80240E14 8FB10024 */ lw $s1, 0x24($sp) -/* C3B828 80240E18 8FB00020 */ lw $s0, 0x20($sp) -/* C3B82C 80240E1C 03E00008 */ jr $ra -/* C3B830 80240E20 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s deleted file mode 100644 index 612e23d371..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E24_C3B834.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E24_C3B834 -/* C3B834 80240E24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3B838 80240E28 AFB00010 */ sw $s0, 0x10($sp) -/* C3B83C 80240E2C 0080802D */ daddu $s0, $a0, $zero -/* C3B840 80240E30 AFBF0014 */ sw $ra, 0x14($sp) -/* C3B844 80240E34 8E020148 */ lw $v0, 0x148($s0) -/* C3B848 80240E38 0C00EABB */ jal get_npc_unsafe -/* C3B84C 80240E3C 84440008 */ lh $a0, 8($v0) -/* C3B850 80240E40 0040182D */ daddu $v1, $v0, $zero -/* C3B854 80240E44 8462008C */ lh $v0, 0x8c($v1) -/* C3B858 80240E48 14400009 */ bnez $v0, .L80240E70 -/* C3B85C 80240E4C 00000000 */ nop -/* C3B860 80240E50 9462008E */ lhu $v0, 0x8e($v1) -/* C3B864 80240E54 2442FFFF */ addiu $v0, $v0, -1 -/* C3B868 80240E58 A462008E */ sh $v0, 0x8e($v1) -/* C3B86C 80240E5C 00021400 */ sll $v0, $v0, 0x10 -/* C3B870 80240E60 1C400003 */ bgtz $v0, .L80240E70 -/* C3B874 80240E64 00000000 */ nop -/* C3B878 80240E68 A460008E */ sh $zero, 0x8e($v1) -/* C3B87C 80240E6C AE000070 */ sw $zero, 0x70($s0) -.L80240E70: -/* C3B880 80240E70 8FBF0014 */ lw $ra, 0x14($sp) -/* C3B884 80240E74 8FB00010 */ lw $s0, 0x10($sp) -/* C3B888 80240E78 03E00008 */ jr $ra -/* C3B88C 80240E7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s deleted file mode 100644 index 7ccdf7bc02..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_C3B890 -/* C3B890 80240E80 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3B894 80240E84 AFB20038 */ sw $s2, 0x38($sp) -/* C3B898 80240E88 0080902D */ daddu $s2, $a0, $zero -/* C3B89C 80240E8C AFBF0048 */ sw $ra, 0x48($sp) -/* C3B8A0 80240E90 AFB50044 */ sw $s5, 0x44($sp) -/* C3B8A4 80240E94 AFB40040 */ sw $s4, 0x40($sp) -/* C3B8A8 80240E98 AFB3003C */ sw $s3, 0x3c($sp) -/* C3B8AC 80240E9C AFB10034 */ sw $s1, 0x34($sp) -/* C3B8B0 80240EA0 AFB00030 */ sw $s0, 0x30($sp) -/* C3B8B4 80240EA4 8E510148 */ lw $s1, 0x148($s2) -/* C3B8B8 80240EA8 86240008 */ lh $a0, 8($s1) -/* C3B8BC 80240EAC 0C00EABB */ jal get_npc_unsafe -/* C3B8C0 80240EB0 00A0802D */ daddu $s0, $a1, $zero -/* C3B8C4 80240EB4 8E43000C */ lw $v1, 0xc($s2) -/* C3B8C8 80240EB8 0240202D */ daddu $a0, $s2, $zero -/* C3B8CC 80240EBC 8C650000 */ lw $a1, ($v1) -/* C3B8D0 80240EC0 0C0B1EAF */ jal get_variable -/* C3B8D4 80240EC4 0040A02D */ daddu $s4, $v0, $zero -/* C3B8D8 80240EC8 AFA00010 */ sw $zero, 0x10($sp) -/* C3B8DC 80240ECC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B8E0 80240ED0 8C630030 */ lw $v1, 0x30($v1) -/* C3B8E4 80240ED4 AFA30014 */ sw $v1, 0x14($sp) -/* C3B8E8 80240ED8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B8EC 80240EDC 8C63001C */ lw $v1, 0x1c($v1) -/* C3B8F0 80240EE0 AFA30018 */ sw $v1, 0x18($sp) -/* C3B8F4 80240EE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B8F8 80240EE8 8C630024 */ lw $v1, 0x24($v1) -/* C3B8FC 80240EEC AFA3001C */ sw $v1, 0x1c($sp) -/* C3B900 80240EF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B904 80240EF4 8C630028 */ lw $v1, 0x28($v1) -/* C3B908 80240EF8 27B50010 */ addiu $s5, $sp, 0x10 -/* C3B90C 80240EFC AFA30020 */ sw $v1, 0x20($sp) -/* C3B910 80240F00 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3B914 80240F04 3C014220 */ lui $at, 0x4220 -/* C3B918 80240F08 44810000 */ mtc1 $at, $f0 -/* C3B91C 80240F0C 8C63002C */ lw $v1, 0x2c($v1) -/* C3B920 80240F10 0040982D */ daddu $s3, $v0, $zero -/* C3B924 80240F14 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3B928 80240F18 A7A0002C */ sh $zero, 0x2c($sp) -/* C3B92C 80240F1C 16000005 */ bnez $s0, .L80240F34 -/* C3B930 80240F20 AFA30024 */ sw $v1, 0x24($sp) -/* C3B934 80240F24 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3B938 80240F28 30420004 */ andi $v0, $v0, 4 -/* C3B93C 80240F2C 10400027 */ beqz $v0, .L80240FCC -/* C3B940 80240F30 00000000 */ nop -.L80240F34: -/* C3B944 80240F34 2402001E */ addiu $v0, $zero, 0x1e -/* C3B948 80240F38 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3B94C 80240F3C AE400070 */ sw $zero, 0x70($s2) -/* C3B950 80240F40 A682008E */ sh $v0, 0x8e($s4) -/* C3B954 80240F44 8E2300CC */ lw $v1, 0xcc($s1) -/* C3B958 80240F48 8E820000 */ lw $v0, ($s4) -/* C3B95C 80240F4C 8C630028 */ lw $v1, 0x28($v1) -/* C3B960 80240F50 00441024 */ and $v0, $v0, $a0 -/* C3B964 80240F54 AE820000 */ sw $v0, ($s4) -/* C3B968 80240F58 AE830028 */ sw $v1, 0x28($s4) -/* C3B96C 80240F5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3B970 80240F60 AE20006C */ sw $zero, 0x6c($s1) -/* C3B974 80240F64 8C420034 */ lw $v0, 0x34($v0) -/* C3B978 80240F68 14400006 */ bnez $v0, .L80240F84 -/* C3B97C 80240F6C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C3B980 80240F70 8E820000 */ lw $v0, ($s4) -/* C3B984 80240F74 2403FFF7 */ addiu $v1, $zero, -9 -/* C3B988 80240F78 34420200 */ ori $v0, $v0, 0x200 -/* C3B98C 80240F7C 080903E4 */ j .L80240F90 -/* C3B990 80240F80 00431024 */ and $v0, $v0, $v1 -.L80240F84: -/* C3B994 80240F84 8E820000 */ lw $v0, ($s4) -/* C3B998 80240F88 00431024 */ and $v0, $v0, $v1 -/* C3B99C 80240F8C 34420008 */ ori $v0, $v0, 8 -.L80240F90: -/* C3B9A0 80240F90 AE820000 */ sw $v0, ($s4) -/* C3B9A4 80240F94 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3B9A8 80240F98 30420004 */ andi $v0, $v0, 4 -/* C3B9AC 80240F9C 10400007 */ beqz $v0, .L80240FBC -/* C3B9B0 80240FA0 24020063 */ addiu $v0, $zero, 0x63 -/* C3B9B4 80240FA4 AE420070 */ sw $v0, 0x70($s2) -/* C3B9B8 80240FA8 24020028 */ addiu $v0, $zero, 0x28 -/* C3B9BC 80240FAC AE420074 */ sw $v0, 0x74($s2) -/* C3B9C0 80240FB0 8E2200CC */ lw $v0, 0xcc($s1) -/* C3B9C4 80240FB4 8C420000 */ lw $v0, ($v0) -/* C3B9C8 80240FB8 AE820028 */ sw $v0, 0x28($s4) -.L80240FBC: -/* C3B9CC 80240FBC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3B9D0 80240FC0 2403FFFB */ addiu $v1, $zero, -5 -/* C3B9D4 80240FC4 00431024 */ and $v0, $v0, $v1 -/* C3B9D8 80240FC8 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240FCC: -/* C3B9DC 80240FCC 8E420070 */ lw $v0, 0x70($s2) -/* C3B9E0 80240FD0 2442FFF6 */ addiu $v0, $v0, -0xa -/* C3B9E4 80240FD4 2C420014 */ sltiu $v0, $v0, 0x14 -/* C3B9E8 80240FD8 10400009 */ beqz $v0, .L80241000 -/* C3B9EC 80240FDC 00000000 */ nop -/* C3B9F0 80240FE0 8E22006C */ lw $v0, 0x6c($s1) -/* C3B9F4 80240FE4 14400006 */ bnez $v0, .L80241000 -/* C3B9F8 80240FE8 00000000 */ nop -/* C3B9FC 80240FEC 0C09009A */ jal func_80240268_C3AC78 -/* C3BA00 80240FF0 0240202D */ daddu $a0, $s2, $zero -/* C3BA04 80240FF4 10400002 */ beqz $v0, .L80241000 -/* C3BA08 80240FF8 2402001E */ addiu $v0, $zero, 0x1e -/* C3BA0C 80240FFC AE420070 */ sw $v0, 0x70($s2) -.L80241000: -/* C3BA10 80241000 8E430070 */ lw $v1, 0x70($s2) -/* C3BA14 80241004 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3BA18 80241008 10400067 */ beqz $v0, L802411A8_C3BBB8 -/* C3BA1C 8024100C 00031080 */ sll $v0, $v1, 2 -/* C3BA20 80241010 3C018024 */ lui $at, %hi(jtbl_80242350_C3CD60) -/* C3BA24 80241014 00220821 */ addu $at, $at, $v0 -/* C3BA28 80241018 8C222350 */ lw $v0, %lo(jtbl_80242350_C3CD60)($at) -/* C3BA2C 8024101C 00400008 */ jr $v0 -/* C3BA30 80241020 00000000 */ nop -glabel L80241024_C3BA34 -/* C3BA34 80241024 0240202D */ daddu $a0, $s2, $zero -/* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero -/* C3BA3C 8024102C 0C09019F */ jal func_8024067C_C3B08C -/* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C3BA44 80241034 0809046A */ j L802411A8_C3BBB8 -/* C3BA48 80241038 00000000 */ nop -glabel L8024103C_C3BA4C -/* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero -/* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero -/* C3BA54 80241044 0C0901C1 */ jal func_80240704_C3B114 -/* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C3BA5C 8024104C 0809046A */ j L802411A8_C3BBB8 -/* C3BA60 80241050 00000000 */ nop -glabel L80241054_C3BA64 -/* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero -/* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero -/* C3BA6C 8024105C 0C09026F */ jal func_802409BC_C3B3CC -/* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero -/* C3BA74 80241064 0809046A */ j L802411A8_C3BBB8 -/* C3BA78 80241068 00000000 */ nop -glabel L8024106C_C3BA7C -/* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero -/* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero -/* C3BA84 80241074 0C090288 */ jal func_80240A20_C3B430 -/* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero -/* C3BA8C 8024107C 0809046A */ j L802411A8_C3BBB8 -/* C3BA90 80241080 00000000 */ nop -glabel L80241084_C3BA94 -/* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero -/* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero -/* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8_C3B4D8 -/* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero -/* C3BAA4 80241094 0809046A */ j L802411A8_C3BBB8 -/* C3BAA8 80241098 00000000 */ nop -glabel L8024109C_C3BAAC -/* C3BAAC 8024109C 0240202D */ daddu $a0, $s2, $zero -/* C3BAB0 802410A0 0260282D */ daddu $a1, $s3, $zero -/* C3BAB4 802410A4 0C0127DF */ jal func_80049F7C -/* C3BAB8 802410A8 02A0302D */ daddu $a2, $s5, $zero -/* C3BABC 802410AC 8E430070 */ lw $v1, 0x70($s2) -/* C3BAC0 802410B0 2402000D */ addiu $v0, $zero, 0xd -/* C3BAC4 802410B4 1462003C */ bne $v1, $v0, L802411A8_C3BBB8 -/* C3BAC8 802410B8 00000000 */ nop -glabel L802410BC_C3BACC -/* C3BACC 802410BC 0240202D */ daddu $a0, $s2, $zero -/* C3BAD0 802410C0 0260282D */ daddu $a1, $s3, $zero -/* C3BAD4 802410C4 0C012849 */ jal func_8004A124 -/* C3BAD8 802410C8 02A0302D */ daddu $a2, $s5, $zero -/* C3BADC 802410CC 0809046A */ j L802411A8_C3BBB8 -/* C3BAE0 802410D0 00000000 */ nop -glabel L802410D4_C3BAE4 -/* C3BAE4 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C3BAE8 802410D8 0260282D */ daddu $a1, $s3, $zero -/* C3BAEC 802410DC 0C0128FA */ jal func_8004A3E8 -/* C3BAF0 802410E0 02A0302D */ daddu $a2, $s5, $zero -/* C3BAF4 802410E4 2402000F */ addiu $v0, $zero, 0xf -/* C3BAF8 802410E8 A682008E */ sh $v0, 0x8e($s4) -/* C3BAFC 802410EC 24020028 */ addiu $v0, $zero, 0x28 -/* C3BB00 802410F0 AE220088 */ sw $v0, 0x88($s1) -/* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 -/* C3BB08 802410F8 0809046A */ j L802411A8_C3BBB8 -/* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) -glabel L80241100_C3BB10 -/* C3BB10 80241100 0C090018 */ jal dgb_05_UnkNpcAIFunc6 -/* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero -/* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) -/* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f -/* C3BB20 80241110 14620025 */ bne $v1, $v0, L802411A8_C3BBB8 -/* C3BB24 80241114 00000000 */ nop -glabel L80241118_C3BB28 -/* C3BB28 80241118 0C090033 */ jal dgb_05_UnkNpcAIFunc7 -/* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero -/* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) -/* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 -/* C3BB38 80241128 1462001F */ bne $v1, $v0, L802411A8_C3BBB8 -/* C3BB3C 8024112C 00000000 */ nop -glabel L80241130_C3BB40 -/* C3BB40 80241130 0C09004F */ jal dgb_05_UnkNpcAIFunc8 -/* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero -/* C3BB48 80241138 0809046A */ j L802411A8_C3BBB8 -/* C3BB4C 8024113C 00000000 */ nop -glabel L80241140_C3BB50 -/* C3BB50 80241140 0C090085 */ jal dgb_05_UnkNpcAIFunc5 -/* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero -/* C3BB58 80241148 0809046A */ j L802411A8_C3BBB8 -/* C3BB5C 8024114C 00000000 */ nop -glabel L80241150_C3BB60 -/* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero -/* C3BB64 80241154 0260282D */ daddu $a1, $s3, $zero -/* C3BB68 80241158 0C090300 */ jal func_80240C00_C3B610 -/* C3BB6C 8024115C 02A0302D */ daddu $a2, $s5, $zero -/* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) -/* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 -/* C3BB78 80241168 1462000F */ bne $v1, $v0, L802411A8_C3BBB8 -/* C3BB7C 8024116C 00000000 */ nop -glabel L80241170_C3BB80 -/* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero -/* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero -/* C3BB88 80241178 0C09032B */ jal func_80240CAC_C3B6BC -/* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero -/* C3BB90 80241180 0809046A */ j L802411A8_C3BBB8 -/* C3BB94 80241184 00000000 */ nop -glabel L80241188_C3BB98 -/* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero -/* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero -/* C3BBA0 80241190 0C090389 */ jal func_80240E24_C3B834 -/* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero -/* C3BBA8 80241198 0809046A */ j L802411A8_C3BBB8 -/* C3BBAC 8024119C 00000000 */ nop -glabel L802411A0_C3BBB0 -/* C3BBB0 802411A0 0C0129CF */ jal func_8004A73C -/* C3BBB4 802411A4 0240202D */ daddu $a0, $s2, $zero -glabel L802411A8_C3BBB8 -/* C3BBB8 802411A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C3BBBC 802411AC 8FB50044 */ lw $s5, 0x44($sp) -/* C3BBC0 802411B0 8FB40040 */ lw $s4, 0x40($sp) -/* C3BBC4 802411B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C3BBC8 802411B8 8FB20038 */ lw $s2, 0x38($sp) -/* C3BBCC 802411BC 8FB10034 */ lw $s1, 0x34($sp) -/* C3BBD0 802411C0 8FB00030 */ lw $s0, 0x30($sp) -/* C3BBD4 802411C4 0000102D */ daddu $v0, $zero, $zero -/* C3BBD8 802411C8 03E00008 */ jr $ra -/* C3BBDC 802411CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s deleted file mode 100644 index c18422150c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ /dev/null @@ -1,201 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D0_C3BBE0 -/* C3BBE0 802411D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3BBE4 802411D4 AFB20038 */ sw $s2, 0x38($sp) -/* C3BBE8 802411D8 0080902D */ daddu $s2, $a0, $zero -/* C3BBEC 802411DC AFBF0048 */ sw $ra, 0x48($sp) -/* C3BBF0 802411E0 AFB50044 */ sw $s5, 0x44($sp) -/* C3BBF4 802411E4 AFB40040 */ sw $s4, 0x40($sp) -/* C3BBF8 802411E8 AFB3003C */ sw $s3, 0x3c($sp) -/* C3BBFC 802411EC AFB10034 */ sw $s1, 0x34($sp) -/* C3BC00 802411F0 AFB00030 */ sw $s0, 0x30($sp) -/* C3BC04 802411F4 8E510148 */ lw $s1, 0x148($s2) -/* C3BC08 802411F8 86240008 */ lh $a0, 8($s1) -/* C3BC0C 802411FC 0C00EABB */ jal get_npc_unsafe -/* C3BC10 80241200 00A0802D */ daddu $s0, $a1, $zero -/* C3BC14 80241204 8E43000C */ lw $v1, 0xc($s2) -/* C3BC18 80241208 0240202D */ daddu $a0, $s2, $zero -/* C3BC1C 8024120C 8C650000 */ lw $a1, ($v1) -/* C3BC20 80241210 0C0B1EAF */ jal get_variable -/* C3BC24 80241214 0040A82D */ daddu $s5, $v0, $zero -/* C3BC28 80241218 AFA00010 */ sw $zero, 0x10($sp) -/* C3BC2C 8024121C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC30 80241220 8C630030 */ lw $v1, 0x30($v1) -/* C3BC34 80241224 AFA30014 */ sw $v1, 0x14($sp) -/* C3BC38 80241228 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC3C 8024122C 8C63001C */ lw $v1, 0x1c($v1) -/* C3BC40 80241230 AFA30018 */ sw $v1, 0x18($sp) -/* C3BC44 80241234 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC48 80241238 8C630024 */ lw $v1, 0x24($v1) -/* C3BC4C 8024123C AFA3001C */ sw $v1, 0x1c($sp) -/* C3BC50 80241240 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC54 80241244 8C630028 */ lw $v1, 0x28($v1) -/* C3BC58 80241248 27B40010 */ addiu $s4, $sp, 0x10 -/* C3BC5C 8024124C AFA30020 */ sw $v1, 0x20($sp) -/* C3BC60 80241250 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC64 80241254 3C014282 */ lui $at, 0x4282 -/* C3BC68 80241258 44810000 */ mtc1 $at, $f0 -/* C3BC6C 8024125C 8C63002C */ lw $v1, 0x2c($v1) -/* C3BC70 80241260 0040982D */ daddu $s3, $v0, $zero -/* C3BC74 80241264 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3BC78 80241268 A7A0002C */ sh $zero, 0x2c($sp) -/* C3BC7C 8024126C 16000005 */ bnez $s0, .L80241284 -/* C3BC80 80241270 AFA30024 */ sw $v1, 0x24($sp) -/* C3BC84 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3BC88 80241278 30420004 */ andi $v0, $v0, 4 -/* C3BC8C 8024127C 10400020 */ beqz $v0, .L80241300 -/* C3BC90 80241280 00000000 */ nop -.L80241284: -/* C3BC94 80241284 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3BC98 80241288 AE400070 */ sw $zero, 0x70($s2) -/* C3BC9C 8024128C A6A0008E */ sh $zero, 0x8e($s5) -/* C3BCA0 80241290 8E2200CC */ lw $v0, 0xcc($s1) -/* C3BCA4 80241294 8EA30000 */ lw $v1, ($s5) -/* C3BCA8 80241298 8C420000 */ lw $v0, ($v0) -/* C3BCAC 8024129C 00641824 */ and $v1, $v1, $a0 -/* C3BCB0 802412A0 AEA30000 */ sw $v1, ($s5) -/* C3BCB4 802412A4 AEA20028 */ sw $v0, 0x28($s5) -/* C3BCB8 802412A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3BCBC 802412AC 8C420034 */ lw $v0, 0x34($v0) -/* C3BCC0 802412B0 54400005 */ bnel $v0, $zero, .L802412C8 -/* C3BCC4 802412B4 2402FDFF */ addiu $v0, $zero, -0x201 -/* C3BCC8 802412B8 34620200 */ ori $v0, $v1, 0x200 -/* C3BCCC 802412BC 2403FFF7 */ addiu $v1, $zero, -9 -/* C3BCD0 802412C0 080904B4 */ j .L802412D0 -/* C3BCD4 802412C4 00431024 */ and $v0, $v0, $v1 -.L802412C8: -/* C3BCD8 802412C8 00621024 */ and $v0, $v1, $v0 -/* C3BCDC 802412CC 34420008 */ ori $v0, $v0, 8 -.L802412D0: -/* C3BCE0 802412D0 AEA20000 */ sw $v0, ($s5) -/* C3BCE4 802412D4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3BCE8 802412D8 30420004 */ andi $v0, $v0, 4 -/* C3BCEC 802412DC 10400007 */ beqz $v0, .L802412FC -/* C3BCF0 802412E0 24020063 */ addiu $v0, $zero, 0x63 -/* C3BCF4 802412E4 AE420070 */ sw $v0, 0x70($s2) -/* C3BCF8 802412E8 AE400074 */ sw $zero, 0x74($s2) -/* C3BCFC 802412EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3BD00 802412F0 2403FFFB */ addiu $v1, $zero, -5 -/* C3BD04 802412F4 00431024 */ and $v0, $v0, $v1 -/* C3BD08 802412F8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802412FC: -/* C3BD0C 802412FC AE20006C */ sw $zero, 0x6c($s1) -.L80241300: -/* C3BD10 80241300 8E420070 */ lw $v0, 0x70($s2) -/* C3BD14 80241304 2842001E */ slti $v0, $v0, 0x1e -/* C3BD18 80241308 10400009 */ beqz $v0, .L80241330 -/* C3BD1C 8024130C 00000000 */ nop -/* C3BD20 80241310 8E22006C */ lw $v0, 0x6c($s1) -/* C3BD24 80241314 14400006 */ bnez $v0, .L80241330 -/* C3BD28 80241318 00000000 */ nop -/* C3BD2C 8024131C 0C09009A */ jal func_80240268_C3AC78 -/* C3BD30 80241320 0240202D */ daddu $a0, $s2, $zero -/* C3BD34 80241324 10400002 */ beqz $v0, .L80241330 -/* C3BD38 80241328 2402001E */ addiu $v0, $zero, 0x1e -/* C3BD3C 8024132C AE420070 */ sw $v0, 0x70($s2) -.L80241330: -/* C3BD40 80241330 8E430070 */ lw $v1, 0x70($s2) -/* C3BD44 80241334 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3BD48 80241338 10400048 */ beqz $v0, L8024145C_C3BE6C -/* C3BD4C 8024133C 00031080 */ sll $v0, $v1, 2 -/* C3BD50 80241340 3C018024 */ lui $at, %hi(jtbl_802424E0_C3CEF0) -/* C3BD54 80241344 00220821 */ addu $at, $at, $v0 -/* C3BD58 80241348 8C2224E0 */ lw $v0, %lo(jtbl_802424E0_C3CEF0)($at) -/* C3BD5C 8024134C 00400008 */ jr $v0 -/* C3BD60 80241350 00000000 */ nop -glabel L80241354_C3BD64 -/* C3BD64 80241354 0240202D */ daddu $a0, $s2, $zero -/* C3BD68 80241358 0260282D */ daddu $a1, $s3, $zero -/* C3BD6C 8024135C 0C012568 */ jal func_800495A0 -/* C3BD70 80241360 0280302D */ daddu $a2, $s4, $zero -glabel L80241364_C3BD74 -/* C3BD74 80241364 0240202D */ daddu $a0, $s2, $zero -/* C3BD78 80241368 0260282D */ daddu $a1, $s3, $zero -/* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 -/* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero -/* C3BD84 80241374 08090517 */ j L8024145C_C3BE6C -/* C3BD88 80241378 00000000 */ nop -glabel L8024137C_C3BD8C -/* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero -/* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero -/* C3BD94 80241384 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero -glabel L8024138C_C3BD9C -/* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero -/* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero -/* C3BDA4 80241394 0C012701 */ jal func_80049C04 -/* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero -/* C3BDAC 8024139C 08090517 */ j L8024145C_C3BE6C -/* C3BDB0 802413A0 00000000 */ nop -glabel L802413A4_C3BDB4 -/* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero -/* C3BDB8 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C3BDBC 802413AC 0C01278F */ jal func_80049E3C -/* C3BDC0 802413B0 0280302D */ daddu $a2, $s4, $zero -glabel L802413B4_C3BDC4 -/* C3BDC4 802413B4 0240202D */ daddu $a0, $s2, $zero -/* C3BDC8 802413B8 0260282D */ daddu $a1, $s3, $zero -/* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC -/* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero -/* C3BDD4 802413C4 08090517 */ j L8024145C_C3BE6C -/* C3BDD8 802413C8 00000000 */ nop -glabel L802413CC_C3BDDC -/* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero -/* C3BDE0 802413D0 0260282D */ daddu $a1, $s3, $zero -/* C3BDE4 802413D4 0C0127DF */ jal func_80049F7C -/* C3BDE8 802413D8 0280302D */ daddu $a2, $s4, $zero -glabel L802413DC_C3BDEC -/* C3BDEC 802413DC 0240202D */ daddu $a0, $s2, $zero -/* C3BDF0 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C3BDF4 802413E4 0C012849 */ jal func_8004A124 -/* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero -/* C3BDFC 802413EC 08090517 */ j L8024145C_C3BE6C -/* C3BE00 802413F0 00000000 */ nop -glabel L802413F4_C3BE04 -/* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero -/* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero -/* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 -/* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero -/* C3BE14 80241404 08090517 */ j L8024145C_C3BE6C -/* C3BE18 80241408 00000000 */ nop -glabel L8024140C_C3BE1C -/* C3BE1C 8024140C 0C090018 */ jal dgb_05_UnkNpcAIFunc6 -/* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero -glabel L80241414_C3BE24 -/* C3BE24 80241414 0C090033 */ jal dgb_05_UnkNpcAIFunc7 -/* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero -/* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) -/* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 -/* C3BE34 80241424 1462000D */ bne $v1, $v0, L8024145C_C3BE6C -/* C3BE38 80241428 00000000 */ nop -glabel L8024142C_C3BE3C -/* C3BE3C 8024142C 0C09004F */ jal dgb_05_UnkNpcAIFunc8 -/* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero -/* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) -/* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 -/* C3BE4C 8024143C 14620007 */ bne $v1, $v0, L8024145C_C3BE6C -/* C3BE50 80241440 00000000 */ nop -glabel L80241444_C3BE54 -/* C3BE54 80241444 0C090085 */ jal dgb_05_UnkNpcAIFunc5 -/* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero -/* C3BE5C 8024144C 08090517 */ j L8024145C_C3BE6C -/* C3BE60 80241450 00000000 */ nop -glabel L80241454_C3BE64 -/* C3BE64 80241454 0C0129CF */ jal func_8004A73C -/* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero -glabel L8024145C_C3BE6C -/* C3BE6C 8024145C 8FBF0048 */ lw $ra, 0x48($sp) -/* C3BE70 80241460 8FB50044 */ lw $s5, 0x44($sp) -/* C3BE74 80241464 8FB40040 */ lw $s4, 0x40($sp) -/* C3BE78 80241468 8FB3003C */ lw $s3, 0x3c($sp) -/* C3BE7C 8024146C 8FB20038 */ lw $s2, 0x38($sp) -/* C3BE80 80241470 8FB10034 */ lw $s1, 0x34($sp) -/* C3BE84 80241474 8FB00030 */ lw $s0, 0x30($sp) -/* C3BE88 80241478 0000102D */ daddu $v0, $zero, $zero -/* C3BE8C 8024147C 03E00008 */ jr $ra -/* C3BE90 80241480 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3BE94 80241484 00000000 */ nop -/* C3BE98 80241488 00000000 */ nop -/* C3BE9C 8024148C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s deleted file mode 100644 index a963d6b8c6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C3D080 -/* C3D080 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3D084 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C3D088 80240008 3C108024 */ lui $s0, %hi(D_80240620_C3D6A0) -/* C3D08C 8024000C 26100620 */ addiu $s0, $s0, %lo(D_80240620_C3D6A0) -/* C3D090 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* C3D094 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* C3D098 80240018 8E020000 */ lw $v0, ($s0) -/* C3D09C 8024001C 14400010 */ bnez $v0, .L80240060 -/* C3D0A0 80240020 0080882D */ daddu $s1, $a0, $zero -/* C3D0A4 80240024 0C00AB39 */ jal heap_malloc -/* C3D0A8 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* C3D0AC 8024002C AE020000 */ sw $v0, ($s0) -/* C3D0B0 80240030 0000182D */ daddu $v1, $zero, $zero -/* C3D0B4 80240034 0040282D */ daddu $a1, $v0, $zero -/* C3D0B8 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* C3D0BC 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* C3D0C0 80240040 24840004 */ addiu $a0, $a0, 4 -/* C3D0C4 80240044 24630001 */ addiu $v1, $v1, 1 -/* C3D0C8 80240048 ACA20000 */ sw $v0, ($a1) -/* C3D0CC 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* C3D0D0 80240050 1440FFFA */ bnez $v0, .L8024003C -/* C3D0D4 80240054 24A50004 */ addiu $a1, $a1, 4 -/* C3D0D8 80240058 08090027 */ j .L8024009C -/* C3D0DC 8024005C 00000000 */ nop -.L80240060: -/* C3D0E0 80240060 0000182D */ daddu $v1, $zero, $zero -/* C3D0E4 80240064 0040282D */ daddu $a1, $v0, $zero -/* C3D0E8 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* C3D0EC 8024006C 8CA20000 */ lw $v0, ($a1) -/* C3D0F0 80240070 24A50004 */ addiu $a1, $a1, 4 -/* C3D0F4 80240074 24630001 */ addiu $v1, $v1, 1 -/* C3D0F8 80240078 AC820084 */ sw $v0, 0x84($a0) -/* C3D0FC 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* C3D100 80240080 1440FFFA */ bnez $v0, .L8024006C -/* C3D104 80240084 24840004 */ addiu $a0, $a0, 4 -/* C3D108 80240088 3C108024 */ lui $s0, %hi(D_80240620_C3D6A0) -/* C3D10C 8024008C 26100620 */ addiu $s0, $s0, %lo(D_80240620_C3D6A0) -/* C3D110 80240090 0C00AB4B */ jal heap_free -/* C3D114 80240094 8E040000 */ lw $a0, ($s0) -/* C3D118 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* C3D11C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* C3D120 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* C3D124 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* C3D128 802400A8 24020002 */ addiu $v0, $zero, 2 -/* C3D12C 802400AC 03E00008 */ jr $ra -/* C3D130 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s deleted file mode 100644 index b928255acd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C3DDF8 -/* C3DDF8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3DDFC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C3DE00 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C3DE04 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C3DE08 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C3DE0C 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C3DE10 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C3DE14 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C3DE18 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C3DE1C 8024022C 86040008 */ lh $a0, 8($s0) -/* C3DE20 80240230 0C00EABB */ jal get_npc_unsafe -/* C3DE24 80240234 24110001 */ addiu $s1, $zero, 1 -/* C3DE28 80240238 86040008 */ lh $a0, 8($s0) -/* C3DE2C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C3DE30 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C3DE34 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C3DE38 80240248 3C03800A */ lui $v1, %hi(D_8009A634) -/* C3DE3C 8024024C 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C3DE40 80240250 00912021 */ addu $a0, $a0, $s1 -/* C3DE44 80240254 00031080 */ sll $v0, $v1, 2 -/* C3DE48 80240258 00431021 */ addu $v0, $v0, $v1 -/* C3DE4C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C3DE50 80240260 00431023 */ subu $v0, $v0, $v1 -/* C3DE54 80240264 000218C0 */ sll $v1, $v0, 3 -/* C3DE58 80240268 00431021 */ addu $v0, $v0, $v1 -/* C3DE5C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C3DE60 80240270 0C00FB3A */ jal get_enemy -/* C3DE64 80240274 00459021 */ addu $s2, $v0, $a1 -/* C3DE68 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C3DE6C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C3DE70 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3DE74 80240284 8E830000 */ lw $v1, ($s4) -/* C3DE78 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3DE7C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C3DE80 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C3DE84 80240294 0C00A7B5 */ jal dist2D -/* C3DE88 80240298 0040982D */ daddu $s3, $v0, $zero -/* C3DE8C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C3DE90 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C3DE94 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C3DE98 802402A8 00000000 */ nop -/* C3DE9C 802402AC 45030001 */ bc1tl .L802402B4 -/* C3DEA0 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C3DEA4 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C3DEA8 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C3DEAC 802402BC 3C014387 */ lui $at, 0x4387 -/* C3DEB0 802402C0 4481A000 */ mtc1 $at, $f20 -/* C3DEB4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C3DEB8 802402C8 00000000 */ nop -/* C3DEBC 802402CC 0C00A6C9 */ jal clamp_angle -/* C3DEC0 802402D0 46000306 */ mov.s $f12, $f0 -/* C3DEC4 802402D4 3C018024 */ lui $at, %hi(D_80241E90_C3FA80) -/* C3DEC8 802402D8 D4221E90 */ ldc1 $f2, %lo(D_80241E90_C3FA80)($at) -/* C3DECC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C3DED0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C3DED4 802402E4 00000000 */ nop -/* C3DED8 802402E8 45000003 */ bc1f .L802402F8 -/* C3DEDC 802402EC 00000000 */ nop -/* C3DEE0 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C3DEE4 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C3DEE8 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3DEEC 802402FC 8E820000 */ lw $v0, ($s4) -/* C3DEF0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3DEF4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C3DEF8 80240308 0C00A720 */ jal atan2 -/* C3DEFC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C3DF00 80240310 4600A306 */ mov.s $f12, $f20 -/* C3DF04 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C3DF08 80240318 46000386 */ mov.s $f14, $f0 -/* C3DF0C 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C3DF10 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C3DF14 80240324 46000005 */ abs.s $f0, $f0 -/* C3DF18 80240328 4600103C */ c.lt.s $f2, $f0 -/* C3DF1C 8024032C 00000000 */ nop -/* C3DF20 80240330 45030001 */ bc1tl .L80240338 -/* C3DF24 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C3DF28 80240338 8E820000 */ lw $v0, ($s4) -/* C3DF2C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C3DF30 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C3DF34 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C3DF38 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C3DF3C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C3DF40 80240350 00000000 */ nop -/* C3DF44 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C3DF48 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C3DF4C 8024035C 46000005 */ abs.s $f0, $f0 -/* C3DF50 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C3DF54 80240364 4620103E */ c.le.d $f2, $f0 -/* C3DF58 80240368 00000000 */ nop -/* C3DF5C 8024036C 45030001 */ bc1tl .L80240374 -/* C3DF60 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C3DF64 80240374 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C3DF68 80240378 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C3DF6C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C3DF70 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C3DF74 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C3DF78 80240388 24020007 */ addiu $v0, $zero, 7 -/* C3DF7C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C3DF80 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C3DF84 80240394 0220102D */ daddu $v0, $s1, $zero -/* C3DF88 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C3DF8C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C3DF90 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C3DF94 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C3DF98 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C3DF9C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C3DFA0 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C3DFA4 802403B4 03E00008 */ jr $ra -/* C3DFA8 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s deleted file mode 100644 index ba0a40cb38..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024061C_C3E20C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C3E20C -/* C3E20C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E210 80240620 AFB10014 */ sw $s1, 0x14($sp) -/* C3E214 80240624 0080882D */ daddu $s1, $a0, $zero -/* C3E218 80240628 AFBF0018 */ sw $ra, 0x18($sp) -/* C3E21C 8024062C AFB00010 */ sw $s0, 0x10($sp) -/* C3E220 80240630 8E300148 */ lw $s0, 0x148($s1) -/* C3E224 80240634 0C00EABB */ jal get_npc_unsafe -/* C3E228 80240638 86040008 */ lh $a0, 8($s0) -/* C3E22C 8024063C 0040202D */ daddu $a0, $v0, $zero -/* C3E230 80240640 8482008E */ lh $v0, 0x8e($a0) -/* C3E234 80240644 9483008E */ lhu $v1, 0x8e($a0) -/* C3E238 80240648 18400002 */ blez $v0, .L80240654 -/* C3E23C 8024064C 2462FFFF */ addiu $v0, $v1, -1 -/* C3E240 80240650 A482008E */ sh $v0, 0x8e($a0) -.L80240654: -/* C3E244 80240654 8482008E */ lh $v0, 0x8e($a0) -/* C3E248 80240658 24030001 */ addiu $v1, $zero, 1 -/* C3E24C 8024065C 14430005 */ bne $v0, $v1, .L80240674 -/* C3E250 80240660 00000000 */ nop -/* C3E254 80240664 8E0200CC */ lw $v0, 0xcc($s0) -/* C3E258 80240668 8C420030 */ lw $v0, 0x30($v0) -/* C3E25C 8024066C 080901A4 */ j .L80240690 -/* C3E260 80240670 AC820028 */ sw $v0, 0x28($a0) -.L80240674: -/* C3E264 80240674 1C400006 */ bgtz $v0, .L80240690 -/* C3E268 80240678 00000000 */ nop -/* C3E26C 8024067C 8E0200CC */ lw $v0, 0xcc($s0) -/* C3E270 80240680 8C420028 */ lw $v0, 0x28($v0) -/* C3E274 80240684 A480008E */ sh $zero, 0x8e($a0) -/* C3E278 80240688 AC820028 */ sw $v0, 0x28($a0) -/* C3E27C 8024068C AE230070 */ sw $v1, 0x70($s1) -.L80240690: -/* C3E280 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* C3E284 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* C3E288 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* C3E28C 8024069C 03E00008 */ jr $ra -/* C3E290 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s deleted file mode 100644 index 45676316e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_C3E294 -/* C3E294 802406A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3E298 802406A8 AFB40048 */ sw $s4, 0x48($sp) -/* C3E29C 802406AC 0080A02D */ daddu $s4, $a0, $zero -/* C3E2A0 802406B0 AFBF004C */ sw $ra, 0x4c($sp) -/* C3E2A4 802406B4 AFB30044 */ sw $s3, 0x44($sp) -/* C3E2A8 802406B8 AFB20040 */ sw $s2, 0x40($sp) -/* C3E2AC 802406BC AFB1003C */ sw $s1, 0x3c($sp) -/* C3E2B0 802406C0 AFB00038 */ sw $s0, 0x38($sp) -/* C3E2B4 802406C4 8E930148 */ lw $s3, 0x148($s4) -/* C3E2B8 802406C8 00C0802D */ daddu $s0, $a2, $zero -/* C3E2BC 802406CC 86640008 */ lh $a0, 8($s3) -/* C3E2C0 802406D0 0C00EABB */ jal get_npc_unsafe -/* C3E2C4 802406D4 0000902D */ daddu $s2, $zero, $zero -/* C3E2C8 802406D8 0C039D59 */ jal get_player_data -/* C3E2CC 802406DC 0040882D */ daddu $s1, $v0, $zero -/* C3E2D0 802406E0 0200202D */ daddu $a0, $s0, $zero -/* C3E2D4 802406E4 0260282D */ daddu $a1, $s3, $zero -/* C3E2D8 802406E8 0000382D */ daddu $a3, $zero, $zero -/* C3E2DC 802406EC 3C0642A0 */ lui $a2, 0x42a0 -/* C3E2E0 802406F0 0040802D */ daddu $s0, $v0, $zero -/* C3E2E4 802406F4 0C01242D */ jal func_800490B4 -/* C3E2E8 802406F8 AFA00010 */ sw $zero, 0x10($sp) -/* C3E2EC 802406FC 10400022 */ beqz $v0, .L80240788 -/* C3E2F0 80240700 00000000 */ nop -/* C3E2F4 80240704 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3E2F8 80240708 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3E2FC 8024070C 804300B4 */ lb $v1, 0xb4($v0) -/* C3E300 80240710 24020002 */ addiu $v0, $zero, 2 -/* C3E304 80240714 10620013 */ beq $v1, $v0, .L80240764 -/* C3E308 80240718 2402001A */ addiu $v0, $zero, 0x1a -/* C3E30C 8024071C 10620011 */ beq $v1, $v0, .L80240764 -/* C3E310 80240720 24020003 */ addiu $v0, $zero, 3 -/* C3E314 80240724 1062000F */ beq $v1, $v0, .L80240764 -/* C3E318 80240728 2402000E */ addiu $v0, $zero, 0xe -/* C3E31C 8024072C 1062000D */ beq $v1, $v0, .L80240764 -/* C3E320 80240730 24020010 */ addiu $v0, $zero, 0x10 -/* C3E324 80240734 1062000B */ beq $v1, $v0, .L80240764 -/* C3E328 80240738 2402000B */ addiu $v0, $zero, 0xb -/* C3E32C 8024073C 10620009 */ beq $v1, $v0, .L80240764 -/* C3E330 80240740 2402000A */ addiu $v0, $zero, 0xa -/* C3E334 80240744 10620007 */ beq $v1, $v0, .L80240764 -/* C3E338 80240748 24020012 */ addiu $v0, $zero, 0x12 -/* C3E33C 8024074C 10620005 */ beq $v1, $v0, .L80240764 -/* C3E340 80240750 24020013 */ addiu $v0, $zero, 0x13 -/* C3E344 80240754 10620003 */ beq $v1, $v0, .L80240764 -/* C3E348 80240758 24020025 */ addiu $v0, $zero, 0x25 -/* C3E34C 8024075C 14620002 */ bne $v1, $v0, .L80240768 -/* C3E350 80240760 00000000 */ nop -.L80240764: -/* C3E354 80240764 24120001 */ addiu $s2, $zero, 1 -.L80240768: -/* C3E358 80240768 82030012 */ lb $v1, 0x12($s0) -/* C3E35C 8024076C 24020002 */ addiu $v0, $zero, 2 -/* C3E360 80240770 14620007 */ bne $v1, $v0, .L80240790 -/* C3E364 80240774 24020001 */ addiu $v0, $zero, 1 -/* C3E368 80240778 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3E36C 8024077C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3E370 80240780 50430002 */ beql $v0, $v1, .L8024078C -/* C3E374 80240784 24120001 */ addiu $s2, $zero, 1 -.L80240788: -/* C3E378 80240788 82030012 */ lb $v1, 0x12($s0) -.L8024078C: -/* C3E37C 8024078C 24020001 */ addiu $v0, $zero, 1 -.L80240790: -/* C3E380 80240790 14620006 */ bne $v1, $v0, .L802407AC -/* C3E384 80240794 24020003 */ addiu $v0, $zero, 3 -/* C3E388 80240798 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C3E38C 8024079C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C3E390 802407A0 14400008 */ bnez $v0, .L802407C4 -/* C3E394 802407A4 27A40028 */ addiu $a0, $sp, 0x28 -/* C3E398 802407A8 24020003 */ addiu $v0, $zero, 3 -.L802407AC: -/* C3E39C 802407AC 1462001B */ bne $v1, $v0, .L8024081C -/* C3E3A0 802407B0 24020002 */ addiu $v0, $zero, 2 -/* C3E3A4 802407B4 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C3E3A8 802407B8 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C3E3AC 802407BC 14620017 */ bne $v1, $v0, .L8024081C -/* C3E3B0 802407C0 27A40028 */ addiu $a0, $sp, 0x28 -.L802407C4: -/* C3E3B4 802407C4 27A5002C */ addiu $a1, $sp, 0x2c -/* C3E3B8 802407C8 8E27000C */ lw $a3, 0xc($s1) -/* C3E3BC 802407CC C6200038 */ lwc1 $f0, 0x38($s1) -/* C3E3C0 802407D0 C6220040 */ lwc1 $f2, 0x40($s1) -/* C3E3C4 802407D4 0000302D */ daddu $a2, $zero, $zero -/* C3E3C8 802407D8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3E3CC 802407DC 0C00A7E7 */ jal add_vec2D_polar -/* C3E3D0 802407E0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C3E3D4 802407E4 3C028011 */ lui $v0, %hi(wPartnerNpc) -/* C3E3D8 802407E8 8C42C930 */ lw $v0, %lo(wPartnerNpc)($v0) -/* C3E3DC 802407EC C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C3E3E0 802407F0 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C3E3E4 802407F4 8C460038 */ lw $a2, 0x38($v0) -/* C3E3E8 802407F8 0C00A7B5 */ jal dist2D -/* C3E3EC 802407FC 8C470040 */ lw $a3, 0x40($v0) -/* C3E3F0 80240800 3C0142A0 */ lui $at, 0x42a0 -/* C3E3F4 80240804 44811000 */ mtc1 $at, $f2 -/* C3E3F8 80240808 00000000 */ nop -/* C3E3FC 8024080C 4602003E */ c.le.s $f0, $f2 -/* C3E400 80240810 00000000 */ nop -/* C3E404 80240814 45030001 */ bc1tl .L8024081C -/* C3E408 80240818 24120001 */ addiu $s2, $zero, 1 -.L8024081C: -/* C3E40C 8024081C 12400026 */ beqz $s2, .L802408B8 -/* C3E410 80240820 0220202D */ daddu $a0, $s1, $zero -/* C3E414 80240824 3C05B000 */ lui $a1, 0xb000 -/* C3E418 80240828 34A5000E */ ori $a1, $a1, 0xe -/* C3E41C 8024082C 0C012530 */ jal func_800494C0 -/* C3E420 80240830 0000302D */ daddu $a2, $zero, $zero -/* C3E424 80240834 0000202D */ daddu $a0, $zero, $zero -/* C3E428 80240838 0220282D */ daddu $a1, $s1, $zero -/* C3E42C 8024083C 0000302D */ daddu $a2, $zero, $zero -/* C3E430 80240840 862200A8 */ lh $v0, 0xa8($s1) -/* C3E434 80240844 8E6300CC */ lw $v1, 0xcc($s3) -/* C3E438 80240848 3C013F80 */ lui $at, 0x3f80 -/* C3E43C 8024084C 44810000 */ mtc1 $at, $f0 -/* C3E440 80240850 3C014000 */ lui $at, 0x4000 -/* C3E444 80240854 44811000 */ mtc1 $at, $f2 -/* C3E448 80240858 3C01C1A0 */ lui $at, 0xc1a0 -/* C3E44C 8024085C 44812000 */ mtc1 $at, $f4 -/* C3E450 80240860 44823000 */ mtc1 $v0, $f6 -/* C3E454 80240864 00000000 */ nop -/* C3E458 80240868 468031A0 */ cvt.s.w $f6, $f6 -/* C3E45C 8024086C 44073000 */ mfc1 $a3, $f6 -/* C3E460 80240870 8C63002C */ lw $v1, 0x2c($v1) -/* C3E464 80240874 2402000A */ addiu $v0, $zero, 0xa -/* C3E468 80240878 A622008E */ sh $v0, 0x8e($s1) -/* C3E46C 8024087C 2402000F */ addiu $v0, $zero, 0xf -/* C3E470 80240880 AE230028 */ sw $v1, 0x28($s1) -/* C3E474 80240884 AFA2001C */ sw $v0, 0x1c($sp) -/* C3E478 80240888 27A20030 */ addiu $v0, $sp, 0x30 -/* C3E47C 8024088C E7A00010 */ swc1 $f0, 0x10($sp) -/* C3E480 80240890 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3E484 80240894 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3E488 80240898 0C01BFA4 */ jal fx_emote -/* C3E48C 8024089C AFA20020 */ sw $v0, 0x20($sp) -/* C3E490 802408A0 0220202D */ daddu $a0, $s1, $zero -/* C3E494 802408A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3E498 802408A8 0C012530 */ jal func_800494C0 -/* C3E49C 802408AC 3C060020 */ lui $a2, 0x20 -/* C3E4A0 802408B0 24020002 */ addiu $v0, $zero, 2 -/* C3E4A4 802408B4 AE820070 */ sw $v0, 0x70($s4) -.L802408B8: -/* C3E4A8 802408B8 9622008E */ lhu $v0, 0x8e($s1) -/* C3E4AC 802408BC 24420001 */ addiu $v0, $v0, 1 -/* C3E4B0 802408C0 A622008E */ sh $v0, 0x8e($s1) -/* C3E4B4 802408C4 00021400 */ sll $v0, $v0, 0x10 -/* C3E4B8 802408C8 00021C03 */ sra $v1, $v0, 0x10 -/* C3E4BC 802408CC 2402001B */ addiu $v0, $zero, 0x1b -/* C3E4C0 802408D0 14620005 */ bne $v1, $v0, .L802408E8 -/* C3E4C4 802408D4 24020039 */ addiu $v0, $zero, 0x39 -/* C3E4C8 802408D8 0220202D */ daddu $a0, $s1, $zero -/* C3E4CC 802408DC 3C05B000 */ lui $a1, 0xb000 -/* C3E4D0 802408E0 0809023F */ j .L802408FC -/* C3E4D4 802408E4 34A5000C */ ori $a1, $a1, 0xc -.L802408E8: -/* C3E4D8 802408E8 14620008 */ bne $v1, $v0, .L8024090C -/* C3E4DC 802408EC 2402003B */ addiu $v0, $zero, 0x3b -/* C3E4E0 802408F0 0220202D */ daddu $a0, $s1, $zero -/* C3E4E4 802408F4 3C05B000 */ lui $a1, 0xb000 -/* C3E4E8 802408F8 34A5000D */ ori $a1, $a1, 0xd -.L802408FC: -/* C3E4EC 802408FC 0C012530 */ jal func_800494C0 -/* C3E4F0 80240900 0000302D */ daddu $a2, $zero, $zero -/* C3E4F4 80240904 0809024F */ j .L8024093C -/* C3E4F8 80240908 00000000 */ nop -.L8024090C: -/* C3E4FC 8024090C 14620005 */ bne $v1, $v0, .L80240924 -/* C3E500 80240910 2402003C */ addiu $v0, $zero, 0x3c -/* C3E504 80240914 8E6200CC */ lw $v0, 0xcc($s3) -/* C3E508 80240918 8C420030 */ lw $v0, 0x30($v0) -/* C3E50C 8024091C 0809024F */ j .L8024093C -/* C3E510 80240920 AE220028 */ sw $v0, 0x28($s1) -.L80240924: -/* C3E514 80240924 14620005 */ bne $v1, $v0, .L8024093C -/* C3E518 80240928 00000000 */ nop -/* C3E51C 8024092C 8E6200CC */ lw $v0, 0xcc($s3) -/* C3E520 80240930 8C420028 */ lw $v0, 0x28($v0) -/* C3E524 80240934 A620008E */ sh $zero, 0x8e($s1) -/* C3E528 80240938 AE220028 */ sw $v0, 0x28($s1) -.L8024093C: -/* C3E52C 8024093C 8FBF004C */ lw $ra, 0x4c($sp) -/* C3E530 80240940 8FB40048 */ lw $s4, 0x48($sp) -/* C3E534 80240944 8FB30044 */ lw $s3, 0x44($sp) -/* C3E538 80240948 8FB20040 */ lw $s2, 0x40($sp) -/* C3E53C 8024094C 8FB1003C */ lw $s1, 0x3c($sp) -/* C3E540 80240950 8FB00038 */ lw $s0, 0x38($sp) -/* C3E544 80240954 03E00008 */ jr $ra -/* C3E548 80240958 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024095C_C3E54C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024095C_C3E54C.s deleted file mode 100644 index c66ddd5988..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_8024095C_C3E54C.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_C3E54C -/* C3E54C 8024095C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E550 80240960 AFB10014 */ sw $s1, 0x14($sp) -/* C3E554 80240964 0080882D */ daddu $s1, $a0, $zero -/* C3E558 80240968 AFBF0018 */ sw $ra, 0x18($sp) -/* C3E55C 8024096C AFB00010 */ sw $s0, 0x10($sp) -/* C3E560 80240970 8E300148 */ lw $s0, 0x148($s1) -/* C3E564 80240974 0C00EABB */ jal get_npc_unsafe -/* C3E568 80240978 86040008 */ lh $a0, 8($s0) -/* C3E56C 8024097C 0040182D */ daddu $v1, $v0, $zero -/* C3E570 80240980 9462008E */ lhu $v0, 0x8e($v1) -/* C3E574 80240984 2442FFFF */ addiu $v0, $v0, -1 -/* C3E578 80240988 A462008E */ sh $v0, 0x8e($v1) -/* C3E57C 8024098C 00021400 */ sll $v0, $v0, 0x10 -/* C3E580 80240990 1C400006 */ bgtz $v0, .L802409AC -/* C3E584 80240994 24020001 */ addiu $v0, $zero, 1 -/* C3E588 80240998 A462008E */ sh $v0, 0x8e($v1) -/* C3E58C 8024099C 24020028 */ addiu $v0, $zero, 0x28 -/* C3E590 802409A0 AE020088 */ sw $v0, 0x88($s0) -/* C3E594 802409A4 24020003 */ addiu $v0, $zero, 3 -/* C3E598 802409A8 AE220070 */ sw $v0, 0x70($s1) -.L802409AC: -/* C3E59C 802409AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C3E5A0 802409B0 8FB10014 */ lw $s1, 0x14($sp) -/* C3E5A4 802409B4 8FB00010 */ lw $s0, 0x10($sp) -/* C3E5A8 802409B8 03E00008 */ jr $ra -/* C3E5AC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s deleted file mode 100644 index d4e6ccba07..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802409C0_C3E5B0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0_C3E5B0 -/* C3E5B0 802409C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E5B4 802409C4 AFB10014 */ sw $s1, 0x14($sp) -/* C3E5B8 802409C8 0080882D */ daddu $s1, $a0, $zero -/* C3E5BC 802409CC AFBF001C */ sw $ra, 0x1c($sp) -/* C3E5C0 802409D0 AFB20018 */ sw $s2, 0x18($sp) -/* C3E5C4 802409D4 AFB00010 */ sw $s0, 0x10($sp) -/* C3E5C8 802409D8 8E320148 */ lw $s2, 0x148($s1) -/* C3E5CC 802409DC 0C00EABB */ jal get_npc_unsafe -/* C3E5D0 802409E0 86440008 */ lh $a0, 8($s2) -/* C3E5D4 802409E4 240400B4 */ addiu $a0, $zero, 0xb4 -/* C3E5D8 802409E8 0C00A67F */ jal rand_int -/* C3E5DC 802409EC 0040802D */ daddu $s0, $v0, $zero -/* C3E5E0 802409F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3E5E4 802409F4 44820000 */ mtc1 $v0, $f0 -/* C3E5E8 802409F8 00000000 */ nop -/* C3E5EC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* C3E5F0 80240A00 46006300 */ add.s $f12, $f12, $f0 -/* C3E5F4 80240A04 3C0142B4 */ lui $at, 0x42b4 -/* C3E5F8 80240A08 44810000 */ mtc1 $at, $f0 -/* C3E5FC 80240A0C 0C00A6C9 */ jal clamp_angle -/* C3E600 80240A10 46006301 */ sub.s $f12, $f12, $f0 -/* C3E604 80240A14 E600000C */ swc1 $f0, 0xc($s0) -/* C3E608 80240A18 8E4200CC */ lw $v0, 0xcc($s2) -/* C3E60C 80240A1C 8C420000 */ lw $v0, ($v0) -/* C3E610 80240A20 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C3E614 80240A24 0C00A67F */ jal rand_int -/* C3E618 80240A28 AE020028 */ sw $v0, 0x28($s0) -/* C3E61C 80240A2C 00021FC2 */ srl $v1, $v0, 0x1f -/* C3E620 80240A30 00431821 */ addu $v1, $v0, $v1 -/* C3E624 80240A34 00031843 */ sra $v1, $v1, 1 -/* C3E628 80240A38 00031840 */ sll $v1, $v1, 1 -/* C3E62C 80240A3C 00431023 */ subu $v0, $v0, $v1 -/* C3E630 80240A40 24420002 */ addiu $v0, $v0, 2 -/* C3E634 80240A44 AE220074 */ sw $v0, 0x74($s1) -/* C3E638 80240A48 24020004 */ addiu $v0, $zero, 4 -/* C3E63C 80240A4C AE220070 */ sw $v0, 0x70($s1) -/* C3E640 80240A50 8FBF001C */ lw $ra, 0x1c($sp) -/* C3E644 80240A54 8FB20018 */ lw $s2, 0x18($sp) -/* C3E648 80240A58 8FB10014 */ lw $s1, 0x14($sp) -/* C3E64C 80240A5C 8FB00010 */ lw $s0, 0x10($sp) -/* C3E650 80240A60 03E00008 */ jr $ra -/* C3E654 80240A64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s deleted file mode 100644 index 69533dfffa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240A68_C3E658.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A68_C3E658 -/* C3E658 80240A68 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3E65C 80240A6C AFB20020 */ sw $s2, 0x20($sp) -/* C3E660 80240A70 0080902D */ daddu $s2, $a0, $zero -/* C3E664 80240A74 AFBF0028 */ sw $ra, 0x28($sp) -/* C3E668 80240A78 AFB30024 */ sw $s3, 0x24($sp) -/* C3E66C 80240A7C AFB1001C */ sw $s1, 0x1c($sp) -/* C3E670 80240A80 AFB00018 */ sw $s0, 0x18($sp) -/* C3E674 80240A84 8E510148 */ lw $s1, 0x148($s2) -/* C3E678 80240A88 00A0982D */ daddu $s3, $a1, $zero -/* C3E67C 80240A8C 86240008 */ lh $a0, 8($s1) -/* C3E680 80240A90 0C00EABB */ jal get_npc_unsafe -/* C3E684 80240A94 00C0802D */ daddu $s0, $a2, $zero -/* C3E688 80240A98 0200202D */ daddu $a0, $s0, $zero -/* C3E68C 80240A9C 0040802D */ daddu $s0, $v0, $zero -/* C3E690 80240AA0 AFA00010 */ sw $zero, 0x10($sp) -/* C3E694 80240AA4 8E660024 */ lw $a2, 0x24($s3) -/* C3E698 80240AA8 8E670028 */ lw $a3, 0x28($s3) -/* C3E69C 80240AAC 0C01242D */ jal func_800490B4 -/* C3E6A0 80240AB0 0220282D */ daddu $a1, $s1, $zero -/* C3E6A4 80240AB4 1040000C */ beqz $v0, .L80240AE8 -/* C3E6A8 80240AB8 00000000 */ nop -/* C3E6AC 80240ABC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3E6B0 80240AC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3E6B4 80240AC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E6B8 80240AC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E6BC 80240ACC 8C460028 */ lw $a2, 0x28($v0) -/* C3E6C0 80240AD0 0C00A720 */ jal atan2 -/* C3E6C4 80240AD4 8C470030 */ lw $a3, 0x30($v0) -/* C3E6C8 80240AD8 2402000C */ addiu $v0, $zero, 0xc -/* C3E6CC 80240ADC E600000C */ swc1 $f0, 0xc($s0) -/* C3E6D0 80240AE0 080902E1 */ j .L80240B84 -/* C3E6D4 80240AE4 AE420070 */ sw $v0, 0x70($s2) -.L80240AE8: -/* C3E6D8 80240AE8 9602008E */ lhu $v0, 0x8e($s0) -/* C3E6DC 80240AEC 2442FFFF */ addiu $v0, $v0, -1 -/* C3E6E0 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* C3E6E4 80240AF4 00021400 */ sll $v0, $v0, 0x10 -/* C3E6E8 80240AF8 1C400022 */ bgtz $v0, .L80240B84 -/* C3E6EC 80240AFC 00000000 */ nop -/* C3E6F0 80240B00 8E420074 */ lw $v0, 0x74($s2) -/* C3E6F4 80240B04 2442FFFF */ addiu $v0, $v0, -1 -/* C3E6F8 80240B08 18400014 */ blez $v0, .L80240B5C -/* C3E6FC 80240B0C AE420074 */ sw $v0, 0x74($s2) -/* C3E700 80240B10 C600000C */ lwc1 $f0, 0xc($s0) -/* C3E704 80240B14 3C014334 */ lui $at, 0x4334 -/* C3E708 80240B18 44816000 */ mtc1 $at, $f12 -/* C3E70C 80240B1C 0C00A6C9 */ jal clamp_angle -/* C3E710 80240B20 460C0300 */ add.s $f12, $f0, $f12 -/* C3E714 80240B24 E600000C */ swc1 $f0, 0xc($s0) -/* C3E718 80240B28 8E640008 */ lw $a0, 8($s3) -/* C3E71C 80240B2C 000417C2 */ srl $v0, $a0, 0x1f -/* C3E720 80240B30 00822021 */ addu $a0, $a0, $v0 -/* C3E724 80240B34 00042043 */ sra $a0, $a0, 1 -/* C3E728 80240B38 0C00A67F */ jal rand_int -/* C3E72C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* C3E730 80240B40 8E630008 */ lw $v1, 8($s3) -/* C3E734 80240B44 000327C2 */ srl $a0, $v1, 0x1f -/* C3E738 80240B48 00641821 */ addu $v1, $v1, $a0 -/* C3E73C 80240B4C 00031843 */ sra $v1, $v1, 1 -/* C3E740 80240B50 00621821 */ addu $v1, $v1, $v0 -/* C3E744 80240B54 080902E1 */ j .L80240B84 -/* C3E748 80240B58 A603008E */ sh $v1, 0x8e($s0) -.L80240B5C: -/* C3E74C 80240B5C 8E250088 */ lw $a1, 0x88($s1) -/* C3E750 80240B60 24020028 */ addiu $v0, $zero, 0x28 -/* C3E754 80240B64 14A20003 */ bne $a1, $v0, .L80240B74 -/* C3E758 80240B68 24020032 */ addiu $v0, $zero, 0x32 -/* C3E75C 80240B6C 080902DF */ j .L80240B7C -/* C3E760 80240B70 24020014 */ addiu $v0, $zero, 0x14 -.L80240B74: -/* C3E764 80240B74 14A20003 */ bne $a1, $v0, .L80240B84 -/* C3E768 80240B78 24020019 */ addiu $v0, $zero, 0x19 -.L80240B7C: -/* C3E76C 80240B7C A602008E */ sh $v0, 0x8e($s0) -/* C3E770 80240B80 AE450070 */ sw $a1, 0x70($s2) -.L80240B84: -/* C3E774 80240B84 8FBF0028 */ lw $ra, 0x28($sp) -/* C3E778 80240B88 8FB30024 */ lw $s3, 0x24($sp) -/* C3E77C 80240B8C 8FB20020 */ lw $s2, 0x20($sp) -/* C3E780 80240B90 8FB1001C */ lw $s1, 0x1c($sp) -/* C3E784 80240B94 8FB00018 */ lw $s0, 0x18($sp) -/* C3E788 80240B98 03E00008 */ jr $ra -/* C3E78C 80240B9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s deleted file mode 100644 index d9bc8073d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA0_C3E790 -/* C3E790 80240BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3E794 80240BA4 AFB20018 */ sw $s2, 0x18($sp) -/* C3E798 80240BA8 0080902D */ daddu $s2, $a0, $zero -/* C3E79C 80240BAC AFBF001C */ sw $ra, 0x1c($sp) -/* C3E7A0 80240BB0 AFB10014 */ sw $s1, 0x14($sp) -/* C3E7A4 80240BB4 AFB00010 */ sw $s0, 0x10($sp) -/* C3E7A8 80240BB8 8E500148 */ lw $s0, 0x148($s2) -/* C3E7AC 80240BBC 86040008 */ lh $a0, 8($s0) -/* C3E7B0 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C3E7B4 80240BC4 00A0882D */ daddu $s1, $a1, $zero -/* C3E7B8 80240BC8 0040182D */ daddu $v1, $v0, $zero -/* C3E7BC 80240BCC 9462008E */ lhu $v0, 0x8e($v1) -/* C3E7C0 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* C3E7C4 80240BD4 A462008E */ sh $v0, 0x8e($v1) -/* C3E7C8 80240BD8 00021400 */ sll $v0, $v0, 0x10 -/* C3E7CC 80240BDC 1C400015 */ bgtz $v0, .L80240C34 -/* C3E7D0 80240BE0 00000000 */ nop -/* C3E7D4 80240BE4 8E0200CC */ lw $v0, 0xcc($s0) -/* C3E7D8 80240BE8 8C420004 */ lw $v0, 4($v0) -/* C3E7DC 80240BEC AC620028 */ sw $v0, 0x28($v1) -/* C3E7E0 80240BF0 8E0200D0 */ lw $v0, 0xd0($s0) -/* C3E7E4 80240BF4 8C420014 */ lw $v0, 0x14($v0) -/* C3E7E8 80240BF8 04410004 */ bgez $v0, .L80240C0C -/* C3E7EC 80240BFC 00000000 */ nop -/* C3E7F0 80240C00 C6200000 */ lwc1 $f0, ($s1) -/* C3E7F4 80240C04 0809030B */ j .L80240C2C -/* C3E7F8 80240C08 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C0C: -/* C3E7FC 80240C0C 3C018024 */ lui $at, %hi(D_80241E98_C3FA88) -/* C3E800 80240C10 D4221E98 */ ldc1 $f2, %lo(D_80241E98_C3FA88)($at) -/* C3E804 80240C14 44820000 */ mtc1 $v0, $f0 -/* C3E808 80240C18 00000000 */ nop -/* C3E80C 80240C1C 46800021 */ cvt.d.w $f0, $f0 -/* C3E810 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* C3E814 80240C24 46200020 */ cvt.s.d $f0, $f0 -/* C3E818 80240C28 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C2C: -/* C3E81C 80240C2C 24020029 */ addiu $v0, $zero, 0x29 -/* C3E820 80240C30 AE420070 */ sw $v0, 0x70($s2) -.L80240C34: -/* C3E824 80240C34 8FBF001C */ lw $ra, 0x1c($sp) -/* C3E828 80240C38 8FB20018 */ lw $s2, 0x18($sp) -/* C3E82C 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* C3E830 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* C3E834 80240C44 03E00008 */ jr $ra -/* C3E838 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s deleted file mode 100644 index b7b0191e42..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240C4C_C3E83C.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_C3E83C -/* C3E83C 80240C4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C3E840 80240C50 AFB3002C */ sw $s3, 0x2c($sp) -/* C3E844 80240C54 0080982D */ daddu $s3, $a0, $zero -/* C3E848 80240C58 AFBF0030 */ sw $ra, 0x30($sp) -/* C3E84C 80240C5C AFB20028 */ sw $s2, 0x28($sp) -/* C3E850 80240C60 AFB10024 */ sw $s1, 0x24($sp) -/* C3E854 80240C64 AFB00020 */ sw $s0, 0x20($sp) -/* C3E858 80240C68 8E720148 */ lw $s2, 0x148($s3) -/* C3E85C 80240C6C 00A0882D */ daddu $s1, $a1, $zero -/* C3E860 80240C70 86440008 */ lh $a0, 8($s2) -/* C3E864 80240C74 0C00EABB */ jal get_npc_unsafe -/* C3E868 80240C78 00C0802D */ daddu $s0, $a2, $zero -/* C3E86C 80240C7C 0200202D */ daddu $a0, $s0, $zero -/* C3E870 80240C80 0240282D */ daddu $a1, $s2, $zero -/* C3E874 80240C84 AFA00010 */ sw $zero, 0x10($sp) -/* C3E878 80240C88 8E260024 */ lw $a2, 0x24($s1) -/* C3E87C 80240C8C 8E270028 */ lw $a3, 0x28($s1) -/* C3E880 80240C90 0C01242D */ jal func_800490B4 -/* C3E884 80240C94 0040802D */ daddu $s0, $v0, $zero -/* C3E888 80240C98 1040000C */ beqz $v0, .L80240CCC -/* C3E88C 80240C9C 00000000 */ nop -/* C3E890 80240CA0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E894 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3E898 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3E89C 80240CAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E8A0 80240CB0 8C460028 */ lw $a2, 0x28($v0) -/* C3E8A4 80240CB4 0C00A720 */ jal atan2 -/* C3E8A8 80240CB8 8C470030 */ lw $a3, 0x30($v0) -/* C3E8AC 80240CBC 2402000C */ addiu $v0, $zero, 0xc -/* C3E8B0 80240CC0 E600000C */ swc1 $f0, 0xc($s0) -/* C3E8B4 80240CC4 0809036A */ j .L80240DA8 -/* C3E8B8 80240CC8 AE620070 */ sw $v0, 0x70($s3) -.L80240CCC: -/* C3E8BC 80240CCC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E8C0 80240CD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3E8C4 80240CD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E8C8 80240CD8 C4440000 */ lwc1 $f4, ($v0) -/* C3E8CC 80240CDC 46802120 */ cvt.s.w $f4, $f4 -/* C3E8D0 80240CE0 44062000 */ mfc1 $a2, $f4 -/* C3E8D4 80240CE4 C4440008 */ lwc1 $f4, 8($v0) -/* C3E8D8 80240CE8 46802120 */ cvt.s.w $f4, $f4 -/* C3E8DC 80240CEC 44072000 */ mfc1 $a3, $f4 -/* C3E8E0 80240CF0 0C00A7B5 */ jal dist2D -/* C3E8E4 80240CF4 00000000 */ nop -/* C3E8E8 80240CF8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C3E8EC 80240CFC 4602003E */ c.le.s $f0, $f2 -/* C3E8F0 80240D00 00000000 */ nop -/* C3E8F4 80240D04 4500000B */ bc1f .L80240D34 -/* C3E8F8 80240D08 00000000 */ nop -/* C3E8FC 80240D0C 8E4200CC */ lw $v0, 0xcc($s2) -/* C3E900 80240D10 8C430000 */ lw $v1, ($v0) -/* C3E904 80240D14 2402000F */ addiu $v0, $zero, 0xf -/* C3E908 80240D18 A602008E */ sh $v0, 0x8e($s0) -/* C3E90C 80240D1C 24020032 */ addiu $v0, $zero, 0x32 -/* C3E910 80240D20 AE030028 */ sw $v1, 0x28($s0) -/* C3E914 80240D24 AE420088 */ sw $v0, 0x88($s2) -/* C3E918 80240D28 24020003 */ addiu $v0, $zero, 3 -/* C3E91C 80240D2C 0809036A */ j .L80240DA8 -/* C3E920 80240D30 AE620070 */ sw $v0, 0x70($s3) -.L80240D34: -/* C3E924 80240D34 8602008C */ lh $v0, 0x8c($s0) -/* C3E928 80240D38 1440001B */ bnez $v0, .L80240DA8 -/* C3E92C 80240D3C 0200202D */ daddu $a0, $s0, $zero -/* C3E930 80240D40 27A60018 */ addiu $a2, $sp, 0x18 -/* C3E934 80240D44 3C0540A0 */ lui $a1, 0x40a0 -/* C3E938 80240D48 C600000C */ lwc1 $f0, 0xc($s0) -/* C3E93C 80240D4C 0000382D */ daddu $a3, $zero, $zero -/* C3E940 80240D50 E7A00018 */ swc1 $f0, 0x18($sp) -/* C3E944 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C3E948 80240D58 0C0129E1 */ jal func_8004A784 -/* C3E94C 80240D5C AFA00014 */ sw $zero, 0x14($sp) -/* C3E950 80240D60 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C3E954 80240D64 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C3E958 80240D68 E600000C */ swc1 $f0, 0xc($s0) -/* C3E95C 80240D6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* C3E960 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3E964 80240D74 C4440000 */ lwc1 $f4, ($v0) -/* C3E968 80240D78 46802120 */ cvt.s.w $f4, $f4 -/* C3E96C 80240D7C 44062000 */ mfc1 $a2, $f4 -/* C3E970 80240D80 C4440008 */ lwc1 $f4, 8($v0) -/* C3E974 80240D84 46802120 */ cvt.s.w $f4, $f4 -/* C3E978 80240D88 44072000 */ mfc1 $a3, $f4 -/* C3E97C 80240D8C 0C00A720 */ jal atan2 -/* C3E980 80240D90 00000000 */ nop -/* C3E984 80240D94 8E050018 */ lw $a1, 0x18($s0) -/* C3E988 80240D98 44060000 */ mfc1 $a2, $f0 -/* C3E98C 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* C3E990 80240DA0 0C00EA95 */ jal npc_move_heading -/* C3E994 80240DA4 AC86000C */ sw $a2, 0xc($a0) -.L80240DA8: -/* C3E998 80240DA8 8FBF0030 */ lw $ra, 0x30($sp) -/* C3E99C 80240DAC 8FB3002C */ lw $s3, 0x2c($sp) -/* C3E9A0 80240DB0 8FB20028 */ lw $s2, 0x28($sp) -/* C3E9A4 80240DB4 8FB10024 */ lw $s1, 0x24($sp) -/* C3E9A8 80240DB8 8FB00020 */ lw $s0, 0x20($sp) -/* C3E9AC 80240DBC 03E00008 */ jr $ra -/* C3E9B0 80240DC0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s deleted file mode 100644 index 2a3a8aec68..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240DC4_C3E9B4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4_C3E9B4 -/* C3E9B4 80240DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C3E9B8 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* C3E9BC 80240DCC 0080802D */ daddu $s0, $a0, $zero -/* C3E9C0 80240DD0 AFBF0014 */ sw $ra, 0x14($sp) -/* C3E9C4 80240DD4 8E020148 */ lw $v0, 0x148($s0) -/* C3E9C8 80240DD8 0C00EABB */ jal get_npc_unsafe -/* C3E9CC 80240DDC 84440008 */ lh $a0, 8($v0) -/* C3E9D0 80240DE0 0040182D */ daddu $v1, $v0, $zero -/* C3E9D4 80240DE4 8462008C */ lh $v0, 0x8c($v1) -/* C3E9D8 80240DE8 14400009 */ bnez $v0, .L80240E10 -/* C3E9DC 80240DEC 00000000 */ nop -/* C3E9E0 80240DF0 9462008E */ lhu $v0, 0x8e($v1) -/* C3E9E4 80240DF4 2442FFFF */ addiu $v0, $v0, -1 -/* C3E9E8 80240DF8 A462008E */ sh $v0, 0x8e($v1) -/* C3E9EC 80240DFC 00021400 */ sll $v0, $v0, 0x10 -/* C3E9F0 80240E00 1C400003 */ bgtz $v0, .L80240E10 -/* C3E9F4 80240E04 00000000 */ nop -/* C3E9F8 80240E08 A460008E */ sh $zero, 0x8e($v1) -/* C3E9FC 80240E0C AE000070 */ sw $zero, 0x70($s0) -.L80240E10: -/* C3EA00 80240E10 8FBF0014 */ lw $ra, 0x14($sp) -/* C3EA04 80240E14 8FB00010 */ lw $s0, 0x10($sp) -/* C3EA08 80240E18 03E00008 */ jr $ra -/* C3EA0C 80240E1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s deleted file mode 100644 index 6082358e5c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E20_C3EA10 -/* C3EA10 80240E20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3EA14 80240E24 AFB20038 */ sw $s2, 0x38($sp) -/* C3EA18 80240E28 0080902D */ daddu $s2, $a0, $zero -/* C3EA1C 80240E2C AFBF0048 */ sw $ra, 0x48($sp) -/* C3EA20 80240E30 AFB50044 */ sw $s5, 0x44($sp) -/* C3EA24 80240E34 AFB40040 */ sw $s4, 0x40($sp) -/* C3EA28 80240E38 AFB3003C */ sw $s3, 0x3c($sp) -/* C3EA2C 80240E3C AFB10034 */ sw $s1, 0x34($sp) -/* C3EA30 80240E40 AFB00030 */ sw $s0, 0x30($sp) -/* C3EA34 80240E44 8E510148 */ lw $s1, 0x148($s2) -/* C3EA38 80240E48 86240008 */ lh $a0, 8($s1) -/* C3EA3C 80240E4C 0C00EABB */ jal get_npc_unsafe -/* C3EA40 80240E50 00A0802D */ daddu $s0, $a1, $zero -/* C3EA44 80240E54 8E43000C */ lw $v1, 0xc($s2) -/* C3EA48 80240E58 0240202D */ daddu $a0, $s2, $zero -/* C3EA4C 80240E5C 8C650000 */ lw $a1, ($v1) -/* C3EA50 80240E60 0C0B1EAF */ jal get_variable -/* C3EA54 80240E64 0040A02D */ daddu $s4, $v0, $zero -/* C3EA58 80240E68 AFA00010 */ sw $zero, 0x10($sp) -/* C3EA5C 80240E6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA60 80240E70 8C630030 */ lw $v1, 0x30($v1) -/* C3EA64 80240E74 AFA30014 */ sw $v1, 0x14($sp) -/* C3EA68 80240E78 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA6C 80240E7C 8C63001C */ lw $v1, 0x1c($v1) -/* C3EA70 80240E80 AFA30018 */ sw $v1, 0x18($sp) -/* C3EA74 80240E84 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA78 80240E88 8C630024 */ lw $v1, 0x24($v1) -/* C3EA7C 80240E8C AFA3001C */ sw $v1, 0x1c($sp) -/* C3EA80 80240E90 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA84 80240E94 8C630028 */ lw $v1, 0x28($v1) -/* C3EA88 80240E98 27B50010 */ addiu $s5, $sp, 0x10 -/* C3EA8C 80240E9C AFA30020 */ sw $v1, 0x20($sp) -/* C3EA90 80240EA0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EA94 80240EA4 3C014220 */ lui $at, 0x4220 -/* C3EA98 80240EA8 44810000 */ mtc1 $at, $f0 -/* C3EA9C 80240EAC 8C63002C */ lw $v1, 0x2c($v1) -/* C3EAA0 80240EB0 0040982D */ daddu $s3, $v0, $zero -/* C3EAA4 80240EB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3EAA8 80240EB8 A7A0002C */ sh $zero, 0x2c($sp) -/* C3EAAC 80240EBC 16000005 */ bnez $s0, .L80240ED4 -/* C3EAB0 80240EC0 AFA30024 */ sw $v1, 0x24($sp) -/* C3EAB4 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EAB8 80240EC8 30420004 */ andi $v0, $v0, 4 -/* C3EABC 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C3EAC0 80240ED0 00000000 */ nop -.L80240ED4: -/* C3EAC4 80240ED4 2402001E */ addiu $v0, $zero, 0x1e -/* C3EAC8 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3EACC 80240EDC AE400070 */ sw $zero, 0x70($s2) -/* C3EAD0 80240EE0 A682008E */ sh $v0, 0x8e($s4) -/* C3EAD4 80240EE4 8E2300CC */ lw $v1, 0xcc($s1) -/* C3EAD8 80240EE8 8E820000 */ lw $v0, ($s4) -/* C3EADC 80240EEC 8C630028 */ lw $v1, 0x28($v1) -/* C3EAE0 80240EF0 00441024 */ and $v0, $v0, $a0 -/* C3EAE4 80240EF4 AE820000 */ sw $v0, ($s4) -/* C3EAE8 80240EF8 AE830028 */ sw $v1, 0x28($s4) -/* C3EAEC 80240EFC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3EAF0 80240F00 AE20006C */ sw $zero, 0x6c($s1) -/* C3EAF4 80240F04 8C420034 */ lw $v0, 0x34($v0) -/* C3EAF8 80240F08 14400006 */ bnez $v0, .L80240F24 -/* C3EAFC 80240F0C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C3EB00 80240F10 8E820000 */ lw $v0, ($s4) -/* C3EB04 80240F14 2403FFF7 */ addiu $v1, $zero, -9 -/* C3EB08 80240F18 34420200 */ ori $v0, $v0, 0x200 -/* C3EB0C 80240F1C 080903CC */ j .L80240F30 -/* C3EB10 80240F20 00431024 */ and $v0, $v0, $v1 -.L80240F24: -/* C3EB14 80240F24 8E820000 */ lw $v0, ($s4) -/* C3EB18 80240F28 00431024 */ and $v0, $v0, $v1 -/* C3EB1C 80240F2C 34420008 */ ori $v0, $v0, 8 -.L80240F30: -/* C3EB20 80240F30 AE820000 */ sw $v0, ($s4) -/* C3EB24 80240F34 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EB28 80240F38 30420004 */ andi $v0, $v0, 4 -/* C3EB2C 80240F3C 10400007 */ beqz $v0, .L80240F5C -/* C3EB30 80240F40 24020063 */ addiu $v0, $zero, 0x63 -/* C3EB34 80240F44 AE420070 */ sw $v0, 0x70($s2) -/* C3EB38 80240F48 24020028 */ addiu $v0, $zero, 0x28 -/* C3EB3C 80240F4C AE420074 */ sw $v0, 0x74($s2) -/* C3EB40 80240F50 8E2200CC */ lw $v0, 0xcc($s1) -/* C3EB44 80240F54 8C420000 */ lw $v0, ($v0) -/* C3EB48 80240F58 AE820028 */ sw $v0, 0x28($s4) -.L80240F5C: -/* C3EB4C 80240F5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EB50 80240F60 2403FFFB */ addiu $v1, $zero, -5 -/* C3EB54 80240F64 00431024 */ and $v0, $v0, $v1 -/* C3EB58 80240F68 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240F6C: -/* C3EB5C 80240F6C 8E420070 */ lw $v0, 0x70($s2) -/* C3EB60 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa -/* C3EB64 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 -/* C3EB68 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C3EB6C 80240F7C 00000000 */ nop -/* C3EB70 80240F80 8E22006C */ lw $v0, 0x6c($s1) -/* C3EB74 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C3EB78 80240F88 00000000 */ nop -/* C3EB7C 80240F8C 0C090082 */ jal func_80240208_C3DDF8 -/* C3EB80 80240F90 0240202D */ daddu $a0, $s2, $zero -/* C3EB84 80240F94 10400002 */ beqz $v0, .L80240FA0 -/* C3EB88 80240F98 2402001E */ addiu $v0, $zero, 0x1e -/* C3EB8C 80240F9C AE420070 */ sw $v0, 0x70($s2) -.L80240FA0: -/* C3EB90 80240FA0 8E430070 */ lw $v1, 0x70($s2) -/* C3EB94 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3EB98 80240FA8 10400067 */ beqz $v0, L80241148_C3ED38 -/* C3EB9C 80240FAC 00031080 */ sll $v0, $v1, 2 -/* C3EBA0 80240FB0 3C018024 */ lui $at, %hi(jtbl_80241EA0_C3FA90) -/* C3EBA4 80240FB4 00220821 */ addu $at, $at, $v0 -/* C3EBA8 80240FB8 8C221EA0 */ lw $v0, %lo(jtbl_80241EA0_C3FA90)($at) -/* C3EBAC 80240FBC 00400008 */ jr $v0 -/* C3EBB0 80240FC0 00000000 */ nop -glabel L80240FC4_C3EBB4 -/* C3EBB4 80240FC4 0240202D */ daddu $a0, $s2, $zero -/* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero -/* C3EBBC 80240FCC 0C090187 */ jal func_8024061C_C3E20C -/* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* C3EBC4 80240FD4 08090452 */ j L80241148_C3ED38 -/* C3EBC8 80240FD8 00000000 */ nop -glabel L80240FDC_C3EBCC -/* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero -/* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero -/* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4_C3E294 -/* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero -/* C3EBDC 80240FEC 08090452 */ j L80241148_C3ED38 -/* C3EBE0 80240FF0 00000000 */ nop -glabel L80240FF4_C3EBE4 -/* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero -/* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero -/* C3EBEC 80240FFC 0C090257 */ jal func_8024095C_C3E54C -/* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero -/* C3EBF4 80241004 08090452 */ j L80241148_C3ED38 -/* C3EBF8 80241008 00000000 */ nop -glabel L8024100C_C3EBFC -/* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero -/* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero -/* C3EC04 80241014 0C090270 */ jal func_802409C0_C3E5B0 -/* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero -/* C3EC0C 8024101C 08090452 */ j L80241148_C3ED38 -/* C3EC10 80241020 00000000 */ nop -glabel L80241024_C3EC14 -/* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero -/* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero -/* C3EC1C 8024102C 0C09029A */ jal func_80240A68_C3E658 -/* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C3EC24 80241034 08090452 */ j L80241148_C3ED38 -/* C3EC28 80241038 00000000 */ nop -glabel L8024103C_C3EC2C -/* C3EC2C 8024103C 0240202D */ daddu $a0, $s2, $zero -/* C3EC30 80241040 0260282D */ daddu $a1, $s3, $zero -/* C3EC34 80241044 0C0127DF */ jal func_80049F7C -/* C3EC38 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C3EC3C 8024104C 8E430070 */ lw $v1, 0x70($s2) -/* C3EC40 80241050 2402000D */ addiu $v0, $zero, 0xd -/* C3EC44 80241054 1462003C */ bne $v1, $v0, L80241148_C3ED38 -/* C3EC48 80241058 00000000 */ nop -glabel L8024105C_C3EC4C -/* C3EC4C 8024105C 0240202D */ daddu $a0, $s2, $zero -/* C3EC50 80241060 0260282D */ daddu $a1, $s3, $zero -/* C3EC54 80241064 0C012849 */ jal func_8004A124 -/* C3EC58 80241068 02A0302D */ daddu $a2, $s5, $zero -/* C3EC5C 8024106C 08090452 */ j L80241148_C3ED38 -/* C3EC60 80241070 00000000 */ nop -glabel L80241074_C3EC64 -/* C3EC64 80241074 0240202D */ daddu $a0, $s2, $zero -/* C3EC68 80241078 0260282D */ daddu $a1, $s3, $zero -/* C3EC6C 8024107C 0C0128FA */ jal func_8004A3E8 -/* C3EC70 80241080 02A0302D */ daddu $a2, $s5, $zero -/* C3EC74 80241084 2402000F */ addiu $v0, $zero, 0xf -/* C3EC78 80241088 A682008E */ sh $v0, 0x8e($s4) -/* C3EC7C 8024108C 24020028 */ addiu $v0, $zero, 0x28 -/* C3EC80 80241090 AE220088 */ sw $v0, 0x88($s1) -/* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 -/* C3EC88 80241098 08090452 */ j L80241148_C3ED38 -/* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) -glabel L802410A0_C3EC90 -/* C3EC90 802410A0 0C090000 */ jal dgb_07_UnkNpcAIFunc6 -/* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero -/* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) -/* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f -/* C3ECA0 802410B0 14620025 */ bne $v1, $v0, L80241148_C3ED38 -/* C3ECA4 802410B4 00000000 */ nop -glabel L802410B8_C3ECA8 -/* C3ECA8 802410B8 0C09001B */ jal dgb_07_UnkNpcAIFunc7 -/* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero -/* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) -/* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 -/* C3ECB8 802410C8 1462001F */ bne $v1, $v0, L80241148_C3ED38 -/* C3ECBC 802410CC 00000000 */ nop -glabel L802410D0_C3ECC0 -/* C3ECC0 802410D0 0C090037 */ jal dgb_07_UnkNpcAIFunc8 -/* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C3ECC8 802410D8 08090452 */ j L80241148_C3ED38 -/* C3ECCC 802410DC 00000000 */ nop -glabel L802410E0_C3ECD0 -/* C3ECD0 802410E0 0C09006D */ jal dgb_07_UnkNpcAIFunc5 -/* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero -/* C3ECD8 802410E8 08090452 */ j L80241148_C3ED38 -/* C3ECDC 802410EC 00000000 */ nop -glabel L802410F0_C3ECE0 -/* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero -/* C3ECE4 802410F4 0260282D */ daddu $a1, $s3, $zero -/* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0_C3E790 -/* C3ECEC 802410FC 02A0302D */ daddu $a2, $s5, $zero -/* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) -/* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 -/* C3ECF8 80241108 1462000F */ bne $v1, $v0, L80241148_C3ED38 -/* C3ECFC 8024110C 00000000 */ nop -glabel L80241110_C3ED00 -/* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero -/* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero -/* C3ED08 80241118 0C090313 */ jal func_80240C4C_C3E83C -/* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* C3ED10 80241120 08090452 */ j L80241148_C3ED38 -/* C3ED14 80241124 00000000 */ nop -glabel L80241128_C3ED18 -/* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero -/* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero -/* C3ED20 80241130 0C090371 */ jal func_80240DC4_C3E9B4 -/* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero -/* C3ED28 80241138 08090452 */ j L80241148_C3ED38 -/* C3ED2C 8024113C 00000000 */ nop -glabel L80241140_C3ED30 -/* C3ED30 80241140 0C0129CF */ jal func_8004A73C -/* C3ED34 80241144 0240202D */ daddu $a0, $s2, $zero -glabel L80241148_C3ED38 -/* C3ED38 80241148 8FBF0048 */ lw $ra, 0x48($sp) -/* C3ED3C 8024114C 8FB50044 */ lw $s5, 0x44($sp) -/* C3ED40 80241150 8FB40040 */ lw $s4, 0x40($sp) -/* C3ED44 80241154 8FB3003C */ lw $s3, 0x3c($sp) -/* C3ED48 80241158 8FB20038 */ lw $s2, 0x38($sp) -/* C3ED4C 8024115C 8FB10034 */ lw $s1, 0x34($sp) -/* C3ED50 80241160 8FB00030 */ lw $s0, 0x30($sp) -/* C3ED54 80241164 0000102D */ daddu $v0, $zero, $zero -/* C3ED58 80241168 03E00008 */ jr $ra -/* C3ED5C 8024116C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s deleted file mode 100644 index 518221d11f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ /dev/null @@ -1,201 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_C3ED60 -/* C3ED60 80241170 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3ED64 80241174 AFB20038 */ sw $s2, 0x38($sp) -/* C3ED68 80241178 0080902D */ daddu $s2, $a0, $zero -/* C3ED6C 8024117C AFBF0048 */ sw $ra, 0x48($sp) -/* C3ED70 80241180 AFB50044 */ sw $s5, 0x44($sp) -/* C3ED74 80241184 AFB40040 */ sw $s4, 0x40($sp) -/* C3ED78 80241188 AFB3003C */ sw $s3, 0x3c($sp) -/* C3ED7C 8024118C AFB10034 */ sw $s1, 0x34($sp) -/* C3ED80 80241190 AFB00030 */ sw $s0, 0x30($sp) -/* C3ED84 80241194 8E510148 */ lw $s1, 0x148($s2) -/* C3ED88 80241198 86240008 */ lh $a0, 8($s1) -/* C3ED8C 8024119C 0C00EABB */ jal get_npc_unsafe -/* C3ED90 802411A0 00A0802D */ daddu $s0, $a1, $zero -/* C3ED94 802411A4 8E43000C */ lw $v1, 0xc($s2) -/* C3ED98 802411A8 0240202D */ daddu $a0, $s2, $zero -/* C3ED9C 802411AC 8C650000 */ lw $a1, ($v1) -/* C3EDA0 802411B0 0C0B1EAF */ jal get_variable -/* C3EDA4 802411B4 0040A82D */ daddu $s5, $v0, $zero -/* C3EDA8 802411B8 AFA00010 */ sw $zero, 0x10($sp) -/* C3EDAC 802411BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDB0 802411C0 8C630030 */ lw $v1, 0x30($v1) -/* C3EDB4 802411C4 AFA30014 */ sw $v1, 0x14($sp) -/* C3EDB8 802411C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDBC 802411CC 8C63001C */ lw $v1, 0x1c($v1) -/* C3EDC0 802411D0 AFA30018 */ sw $v1, 0x18($sp) -/* C3EDC4 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDC8 802411D8 8C630024 */ lw $v1, 0x24($v1) -/* C3EDCC 802411DC AFA3001C */ sw $v1, 0x1c($sp) -/* C3EDD0 802411E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDD4 802411E4 8C630028 */ lw $v1, 0x28($v1) -/* C3EDD8 802411E8 27B40010 */ addiu $s4, $sp, 0x10 -/* C3EDDC 802411EC AFA30020 */ sw $v1, 0x20($sp) -/* C3EDE0 802411F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3EDE4 802411F4 3C014282 */ lui $at, 0x4282 -/* C3EDE8 802411F8 44810000 */ mtc1 $at, $f0 -/* C3EDEC 802411FC 8C63002C */ lw $v1, 0x2c($v1) -/* C3EDF0 80241200 0040982D */ daddu $s3, $v0, $zero -/* C3EDF4 80241204 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3EDF8 80241208 A7A0002C */ sh $zero, 0x2c($sp) -/* C3EDFC 8024120C 16000005 */ bnez $s0, .L80241224 -/* C3EE00 80241210 AFA30024 */ sw $v1, 0x24($sp) -/* C3EE04 80241214 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EE08 80241218 30420004 */ andi $v0, $v0, 4 -/* C3EE0C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C3EE10 80241220 00000000 */ nop -.L80241224: -/* C3EE14 80241224 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3EE18 80241228 AE400070 */ sw $zero, 0x70($s2) -/* C3EE1C 8024122C A6A0008E */ sh $zero, 0x8e($s5) -/* C3EE20 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* C3EE24 80241234 8EA30000 */ lw $v1, ($s5) -/* C3EE28 80241238 8C420000 */ lw $v0, ($v0) -/* C3EE2C 8024123C 00641824 */ and $v1, $v1, $a0 -/* C3EE30 80241240 AEA30000 */ sw $v1, ($s5) -/* C3EE34 80241244 AEA20028 */ sw $v0, 0x28($s5) -/* C3EE38 80241248 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3EE3C 8024124C 8C420034 */ lw $v0, 0x34($v0) -/* C3EE40 80241250 54400005 */ bnel $v0, $zero, .L80241268 -/* C3EE44 80241254 2402FDFF */ addiu $v0, $zero, -0x201 -/* C3EE48 80241258 34620200 */ ori $v0, $v1, 0x200 -/* C3EE4C 8024125C 2403FFF7 */ addiu $v1, $zero, -9 -/* C3EE50 80241260 0809049C */ j .L80241270 -/* C3EE54 80241264 00431024 */ and $v0, $v0, $v1 -.L80241268: -/* C3EE58 80241268 00621024 */ and $v0, $v1, $v0 -/* C3EE5C 8024126C 34420008 */ ori $v0, $v0, 8 -.L80241270: -/* C3EE60 80241270 AEA20000 */ sw $v0, ($s5) -/* C3EE64 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EE68 80241278 30420004 */ andi $v0, $v0, 4 -/* C3EE6C 8024127C 10400007 */ beqz $v0, .L8024129C -/* C3EE70 80241280 24020063 */ addiu $v0, $zero, 0x63 -/* C3EE74 80241284 AE420070 */ sw $v0, 0x70($s2) -/* C3EE78 80241288 AE400074 */ sw $zero, 0x74($s2) -/* C3EE7C 8024128C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3EE80 80241290 2403FFFB */ addiu $v1, $zero, -5 -/* C3EE84 80241294 00431024 */ and $v0, $v0, $v1 -/* C3EE88 80241298 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024129C: -/* C3EE8C 8024129C AE20006C */ sw $zero, 0x6c($s1) -.L802412A0: -/* C3EE90 802412A0 8E420070 */ lw $v0, 0x70($s2) -/* C3EE94 802412A4 2842001E */ slti $v0, $v0, 0x1e -/* C3EE98 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C3EE9C 802412AC 00000000 */ nop -/* C3EEA0 802412B0 8E22006C */ lw $v0, 0x6c($s1) -/* C3EEA4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C3EEA8 802412B8 00000000 */ nop -/* C3EEAC 802412BC 0C090082 */ jal func_80240208_C3DDF8 -/* C3EEB0 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C3EEB4 802412C4 10400002 */ beqz $v0, .L802412D0 -/* C3EEB8 802412C8 2402001E */ addiu $v0, $zero, 0x1e -/* C3EEBC 802412CC AE420070 */ sw $v0, 0x70($s2) -.L802412D0: -/* C3EEC0 802412D0 8E430070 */ lw $v1, 0x70($s2) -/* C3EEC4 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3EEC8 802412D8 10400048 */ beqz $v0, L802413FC_C3EFEC -/* C3EECC 802412DC 00031080 */ sll $v0, $v1, 2 -/* C3EED0 802412E0 3C018024 */ lui $at, %hi(jtbl_80242030_C3FC20) -/* C3EED4 802412E4 00220821 */ addu $at, $at, $v0 -/* C3EED8 802412E8 8C222030 */ lw $v0, %lo(jtbl_80242030_C3FC20)($at) -/* C3EEDC 802412EC 00400008 */ jr $v0 -/* C3EEE0 802412F0 00000000 */ nop -glabel L802412F4_C3EEE4 -/* C3EEE4 802412F4 0240202D */ daddu $a0, $s2, $zero -/* C3EEE8 802412F8 0260282D */ daddu $a1, $s3, $zero -/* C3EEEC 802412FC 0C012568 */ jal func_800495A0 -/* C3EEF0 80241300 0280302D */ daddu $a2, $s4, $zero -glabel L80241304_C3EEF4 -/* C3EEF4 80241304 0240202D */ daddu $a0, $s2, $zero -/* C3EEF8 80241308 0260282D */ daddu $a1, $s3, $zero -/* C3EEFC 8024130C 0C0125AE */ jal func_800496B8 -/* C3EF00 80241310 0280302D */ daddu $a2, $s4, $zero -/* C3EF04 80241314 080904FF */ j L802413FC_C3EFEC -/* C3EF08 80241318 00000000 */ nop -glabel L8024131C_C3EF0C -/* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero -/* C3EF10 80241320 0260282D */ daddu $a1, $s3, $zero -/* C3EF14 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C3EF18 80241328 0280302D */ daddu $a2, $s4, $zero -glabel L8024132C_C3EF1C -/* C3EF1C 8024132C 0240202D */ daddu $a0, $s2, $zero -/* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero -/* C3EF24 80241334 0C012701 */ jal func_80049C04 -/* C3EF28 80241338 0280302D */ daddu $a2, $s4, $zero -/* C3EF2C 8024133C 080904FF */ j L802413FC_C3EFEC -/* C3EF30 80241340 00000000 */ nop -glabel L80241344_C3EF34 -/* C3EF34 80241344 0240202D */ daddu $a0, $s2, $zero -/* C3EF38 80241348 0260282D */ daddu $a1, $s3, $zero -/* C3EF3C 8024134C 0C01278F */ jal func_80049E3C -/* C3EF40 80241350 0280302D */ daddu $a2, $s4, $zero -glabel L80241354_C3EF44 -/* C3EF44 80241354 0240202D */ daddu $a0, $s2, $zero -/* C3EF48 80241358 0260282D */ daddu $a1, $s3, $zero -/* C3EF4C 8024135C 0C0127B3 */ jal func_80049ECC -/* C3EF50 80241360 0280302D */ daddu $a2, $s4, $zero -/* C3EF54 80241364 080904FF */ j L802413FC_C3EFEC -/* C3EF58 80241368 00000000 */ nop -glabel L8024136C_C3EF5C -/* C3EF5C 8024136C 0240202D */ daddu $a0, $s2, $zero -/* C3EF60 80241370 0260282D */ daddu $a1, $s3, $zero -/* C3EF64 80241374 0C0127DF */ jal func_80049F7C -/* C3EF68 80241378 0280302D */ daddu $a2, $s4, $zero -glabel L8024137C_C3EF6C -/* C3EF6C 8024137C 0240202D */ daddu $a0, $s2, $zero -/* C3EF70 80241380 0260282D */ daddu $a1, $s3, $zero -/* C3EF74 80241384 0C012849 */ jal func_8004A124 -/* C3EF78 80241388 0280302D */ daddu $a2, $s4, $zero -/* C3EF7C 8024138C 080904FF */ j L802413FC_C3EFEC -/* C3EF80 80241390 00000000 */ nop -glabel L80241394_C3EF84 -/* C3EF84 80241394 0240202D */ daddu $a0, $s2, $zero -/* C3EF88 80241398 0260282D */ daddu $a1, $s3, $zero -/* C3EF8C 8024139C 0C0128FA */ jal func_8004A3E8 -/* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero -/* C3EF94 802413A4 080904FF */ j L802413FC_C3EFEC -/* C3EF98 802413A8 00000000 */ nop -glabel L802413AC_C3EF9C -/* C3EF9C 802413AC 0C090000 */ jal dgb_07_UnkNpcAIFunc6 -/* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero -glabel L802413B4_C3EFA4 -/* C3EFA4 802413B4 0C09001B */ jal dgb_07_UnkNpcAIFunc7 -/* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero -/* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) -/* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* C3EFB4 802413C4 1462000D */ bne $v1, $v0, L802413FC_C3EFEC -/* C3EFB8 802413C8 00000000 */ nop -glabel L802413CC_C3EFBC -/* C3EFBC 802413CC 0C090037 */ jal dgb_07_UnkNpcAIFunc8 -/* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero -/* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) -/* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* C3EFCC 802413DC 14620007 */ bne $v1, $v0, L802413FC_C3EFEC -/* C3EFD0 802413E0 00000000 */ nop -glabel L802413E4_C3EFD4 -/* C3EFD4 802413E4 0C09006D */ jal dgb_07_UnkNpcAIFunc5 -/* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C3EFDC 802413EC 080904FF */ j L802413FC_C3EFEC -/* C3EFE0 802413F0 00000000 */ nop -glabel L802413F4_C3EFE4 -/* C3EFE4 802413F4 0C0129CF */ jal func_8004A73C -/* C3EFE8 802413F8 0240202D */ daddu $a0, $s2, $zero -glabel L802413FC_C3EFEC -/* C3EFEC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C3EFF0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C3EFF4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C3EFF8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C3EFFC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C3F000 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C3F004 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C3F008 80241418 0000102D */ daddu $v0, $zero, $zero -/* C3F00C 8024141C 03E00008 */ jr $ra -/* C3F010 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3F014 80241424 00000000 */ nop -/* C3F018 80241428 00000000 */ nop -/* C3F01C 8024142C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s deleted file mode 100644 index 70454f5f47..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/update_starpoints_display_C3DFAC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C3DFAC -/* C3DFAC 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3DFB0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C3DFB4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C3DFB8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C3DFBC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C3DFC0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C3DFC4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C3DFC8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C3DFCC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C3DFD0 802403E0 86240008 */ lh $a0, 8($s1) -/* C3DFD4 802403E4 0C00EABB */ jal get_npc_unsafe -/* C3DFD8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C3DFDC 802403EC 16000005 */ bnez $s0, .L80240404 -/* C3DFE0 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C3DFE4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3DFE8 802403F8 30420004 */ andi $v0, $v0, 4 -/* C3DFEC 802403FC 10400015 */ beqz $v0, .L80240454 -/* C3DFF0 80240400 00000000 */ nop -.L80240404: -/* C3DFF4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C3DFF8 80240408 8E420000 */ lw $v0, ($s2) -/* C3DFFC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C3E000 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C3E004 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C3E008 80240418 AE420000 */ sw $v0, ($s2) -/* C3E00C 8024041C 8E220000 */ lw $v0, ($s1) -/* C3E010 80240420 3C01C47A */ lui $at, 0xc47a -/* C3E014 80240424 44810000 */ mtc1 $at, $f0 -/* C3E018 80240428 00431025 */ or $v0, $v0, $v1 -/* C3E01C 8024042C AE220000 */ sw $v0, ($s1) -/* C3E020 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C3E024 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C3E028 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C3E02C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C3E030 80240440 30620004 */ andi $v0, $v1, 4 -/* C3E034 80240444 10400003 */ beqz $v0, .L80240454 -/* C3E038 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C3E03C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C3E040 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C3E044 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C3E048 80240458 12600005 */ beqz $s3, .L80240470 -/* C3E04C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C3E050 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C3E054 80240464 00000000 */ nop -/* C3E058 80240468 0809017E */ j .L802405F8 -/* C3E05C 8024046C 00000000 */ nop -.L80240470: -/* C3E060 80240470 86240008 */ lh $a0, 8($s1) -/* C3E064 80240474 0C00FB3A */ jal get_enemy -/* C3E068 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C3E06C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C3E070 80240480 0C00EABB */ jal get_npc_unsafe -/* C3E074 80240484 86040008 */ lh $a0, 8($s0) -/* C3E078 80240488 24030001 */ addiu $v1, $zero, 1 -/* C3E07C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C3E080 80240490 A2230007 */ sb $v1, 7($s1) -/* C3E084 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C3E088 80240498 24020003 */ addiu $v0, $zero, 3 -/* C3E08C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C3E090 802404A0 00000000 */ nop -/* C3E094 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C3E098 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C3E09C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C3E0A0 802404B0 0C012530 */ jal func_800494C0 -/* C3E0A4 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C3E0A8 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C3E0AC 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C3E0B0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C3E0B4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C3E0B8 802404C8 3C014387 */ lui $at, 0x4387 -/* C3E0BC 802404CC 44810000 */ mtc1 $at, $f0 -/* C3E0C0 802404D0 44064000 */ mfc1 $a2, $f8 -/* C3E0C4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C3E0C8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C3E0CC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C3E0D0 802404E0 44070000 */ mfc1 $a3, $f0 -/* C3E0D4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C3E0D8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C3E0DC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C3E0E0 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C3E0E4 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C3E0E8 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C3E0EC 802404FC 44024000 */ mfc1 $v0, $f8 -/* C3E0F0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C3E0F4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C3E0F8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C3E0FC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C3E100 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C3E104 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C3E108 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C3E10C 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C3E110 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C3E114 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C3E118 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C3E11C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C3E120 80240530 00000000 */ nop -/* C3E124 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C3E128 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C3E12C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C3E130 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C3E134 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C3E138 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C3E13C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C3E140 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C3E144 80240554 0C00A720 */ jal atan2 -/* C3E148 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C3E14C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C3E150 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C3E154 80240564 8E220000 */ lw $v0, ($s1) -/* C3E158 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C3E15C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C3E160 80240570 AE220000 */ sw $v0, ($s1) -/* C3E164 80240574 24020001 */ addiu $v0, $zero, 1 -/* C3E168 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C3E16C 8024057C 0809017E */ j .L802405F8 -/* C3E170 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C3E174 80240584 86240008 */ lh $a0, 8($s1) -/* C3E178 80240588 0C00FB3A */ jal get_enemy -/* C3E17C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C3E180 80240590 0040802D */ daddu $s0, $v0, $zero -/* C3E184 80240594 0C00EABB */ jal get_npc_unsafe -/* C3E188 80240598 86040008 */ lh $a0, 8($s0) -/* C3E18C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C3E190 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C3E194 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C3E198 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C3E19C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C3E1A0 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C3E1A4 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C3E1A8 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C3E1AC 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C3E1B0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C3E1B4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C3E1B8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C3E1BC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C3E1C0 802405D0 8E230000 */ lw $v1, ($s1) -/* C3E1C4 802405D4 3C01C47A */ lui $at, 0xc47a -/* C3E1C8 802405D8 44810000 */ mtc1 $at, $f0 -/* C3E1CC 802405DC 00621825 */ or $v1, $v1, $v0 -/* C3E1D0 802405E0 AE230000 */ sw $v1, ($s1) -/* C3E1D4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C3E1D8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C3E1DC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C3E1E0 802405F0 A2330007 */ sb $s3, 7($s1) -/* C3E1E4 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C3E1E8 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C3E1EC 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C3E1F0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C3E1F4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C3E1F8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C3E1FC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C3E200 80240610 0000102D */ daddu $v0, $zero, $zero -/* C3E204 80240614 03E00008 */ jr $ra -/* C3E208 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/dgb_08_func_80241910_C416C0.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s rename to ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/dgb_08_func_80241910_C416C0.s index 982db7ad13..e83d21a718 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/dgb_08_func_80241910_C416C0.s @@ -1,6 +1,14 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata +glabel D_80246D40_C46AF0 +.double 0.09 + +glabel D_80246D48_C46AF8 +.double 0.09 + +.section .text glabel func_80241910_C416C0 /* C416C0 80241910 27BDFF80 */ addiu $sp, $sp, -0x80 /* C416C4 80241914 AFB3004C */ sw $s3, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s deleted file mode 100644 index 73d4ab7f6d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C3FDB0 -/* C3FDB0 80240000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C3FDB4 80240004 AFB50024 */ sw $s5, 0x24($sp) -/* C3FDB8 80240008 0080A82D */ daddu $s5, $a0, $zero -/* C3FDBC 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* C3FDC0 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* C3FDC4 80240014 AFB40020 */ sw $s4, 0x20($sp) -/* C3FDC8 80240018 AFB3001C */ sw $s3, 0x1c($sp) -/* C3FDCC 8024001C AFB20018 */ sw $s2, 0x18($sp) -/* C3FDD0 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* C3FDD4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* C3FDD8 80240028 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C3FDDC 8024002C F7B60038 */ sdc1 $f22, 0x38($sp) -/* C3FDE0 80240030 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C3FDE4 80240034 8EB30148 */ lw $s3, 0x148($s5) -/* C3FDE8 80240038 86640008 */ lh $a0, 8($s3) -/* C3FDEC 8024003C 0C00EABB */ jal get_npc_unsafe -/* C3FDF0 80240040 00A0B02D */ daddu $s6, $a1, $zero -/* C3FDF4 80240044 0040A02D */ daddu $s4, $v0, $zero -/* C3FDF8 80240048 AEA00074 */ sw $zero, 0x74($s5) -/* C3FDFC 8024004C C6980038 */ lwc1 $f24, 0x38($s4) -/* C3FE00 80240050 C6960040 */ lwc1 $f22, 0x40($s4) -/* C3FE04 80240054 0000902D */ daddu $s2, $zero, $zero -/* C3FE08 80240058 AEA00078 */ sw $zero, 0x78($s5) -/* C3FE0C 8024005C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C3FE10 80240060 8C620000 */ lw $v0, ($v1) -/* C3FE14 80240064 3C0146FF */ lui $at, 0x46ff -/* C3FE18 80240068 3421FE00 */ ori $at, $at, 0xfe00 -/* C3FE1C 8024006C 4481A000 */ mtc1 $at, $f20 -/* C3FE20 80240070 18400018 */ blez $v0, .L802400D4 -/* C3FE24 80240074 0240802D */ daddu $s0, $s2, $zero -/* C3FE28 80240078 0240882D */ daddu $s1, $s2, $zero -.L8024007C: -/* C3FE2C 8024007C 02231021 */ addu $v0, $s1, $v1 -/* C3FE30 80240080 4600C306 */ mov.s $f12, $f24 -/* C3FE34 80240084 C4440004 */ lwc1 $f4, 4($v0) -/* C3FE38 80240088 46802120 */ cvt.s.w $f4, $f4 -/* C3FE3C 8024008C 44062000 */ mfc1 $a2, $f4 -/* C3FE40 80240090 C444000C */ lwc1 $f4, 0xc($v0) -/* C3FE44 80240094 46802120 */ cvt.s.w $f4, $f4 -/* C3FE48 80240098 44072000 */ mfc1 $a3, $f4 -/* C3FE4C 8024009C 0C00A7B5 */ jal dist2D -/* C3FE50 802400A0 4600B386 */ mov.s $f14, $f22 -/* C3FE54 802400A4 4614003C */ c.lt.s $f0, $f20 -/* C3FE58 802400A8 00000000 */ nop -/* C3FE5C 802400AC 45000003 */ bc1f .L802400BC -/* C3FE60 802400B0 2631000C */ addiu $s1, $s1, 0xc -/* C3FE64 802400B4 46000506 */ mov.s $f20, $f0 -/* C3FE68 802400B8 AEB20078 */ sw $s2, 0x78($s5) -.L802400BC: -/* C3FE6C 802400BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* C3FE70 802400C0 26100001 */ addiu $s0, $s0, 1 -/* C3FE74 802400C4 8C620000 */ lw $v0, ($v1) -/* C3FE78 802400C8 0202102A */ slt $v0, $s0, $v0 -/* C3FE7C 802400CC 1440FFEB */ bnez $v0, .L8024007C -/* C3FE80 802400D0 26520001 */ addiu $s2, $s2, 1 -.L802400D4: -/* C3FE84 802400D4 8E6200CC */ lw $v0, 0xcc($s3) -/* C3FE88 802400D8 8C420004 */ lw $v0, 4($v0) -/* C3FE8C 802400DC AE820028 */ sw $v0, 0x28($s4) -/* C3FE90 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* C3FE94 802400E4 8C42007C */ lw $v0, 0x7c($v0) -/* C3FE98 802400E8 04410004 */ bgez $v0, .L802400FC -/* C3FE9C 802400EC 00000000 */ nop -/* C3FEA0 802400F0 C6C00000 */ lwc1 $f0, ($s6) -/* C3FEA4 802400F4 08090047 */ j .L8024011C -/* C3FEA8 802400F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802400FC: -/* C3FEAC 802400FC 3C018024 */ lui $at, %hi(D_80246A00_C467B0) -/* C3FEB0 80240100 D4226A00 */ ldc1 $f2, %lo(D_80246A00_C467B0)($at) -/* C3FEB4 80240104 44820000 */ mtc1 $v0, $f0 -/* C3FEB8 80240108 00000000 */ nop -/* C3FEBC 8024010C 46800021 */ cvt.d.w $f0, $f0 -/* C3FEC0 80240110 46220003 */ div.d $f0, $f0, $f2 -/* C3FEC4 80240114 46200020 */ cvt.s.d $f0, $f0 -/* C3FEC8 80240118 E6800018 */ swc1 $f0, 0x18($s4) -.L8024011C: -/* C3FECC 8024011C 24020001 */ addiu $v0, $zero, 1 -/* C3FED0 80240120 AEA20070 */ sw $v0, 0x70($s5) -/* C3FED4 80240124 8FBF002C */ lw $ra, 0x2c($sp) -/* C3FED8 80240128 8FB60028 */ lw $s6, 0x28($sp) -/* C3FEDC 8024012C 8FB50024 */ lw $s5, 0x24($sp) -/* C3FEE0 80240130 8FB40020 */ lw $s4, 0x20($sp) -/* C3FEE4 80240134 8FB3001C */ lw $s3, 0x1c($sp) -/* C3FEE8 80240138 8FB20018 */ lw $s2, 0x18($sp) -/* C3FEEC 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* C3FEF0 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* C3FEF4 80240144 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C3FEF8 80240148 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C3FEFC 8024014C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C3FF00 80240150 03E00008 */ jr $ra -/* C3FF04 80240154 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s deleted file mode 100644 index 3b849886b2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240158_C3FF08.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_C3FF08 -/* C3FF08 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C3FF0C 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* C3FF10 80240160 0080902D */ daddu $s2, $a0, $zero -/* C3FF14 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* C3FF18 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* C3FF1C 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* C3FF20 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* C3FF24 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* C3FF28 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C3FF2C 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C3FF30 80240180 8E510148 */ lw $s1, 0x148($s2) -/* C3FF34 80240184 00A0982D */ daddu $s3, $a1, $zero -/* C3FF38 80240188 86240008 */ lh $a0, 8($s1) -/* C3FF3C 8024018C 0C00EABB */ jal get_npc_unsafe -/* C3FF40 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* C3FF44 80240194 8E630014 */ lw $v1, 0x14($s3) -/* C3FF48 80240198 04600030 */ bltz $v1, .L8024025C -/* C3FF4C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* C3FF50 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* C3FF54 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* C3FF58 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* C3FF5C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* C3FF60 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* C3FF64 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* C3FF68 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* C3FF6C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* C3FF70 802401C0 0C01242D */ jal func_800490B4 -/* C3FF74 802401C4 0220282D */ daddu $a1, $s1, $zero -/* C3FF78 802401C8 10400021 */ beqz $v0, .L80240250 -/* C3FF7C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* C3FF80 802401D0 0200282D */ daddu $a1, $s0, $zero -/* C3FF84 802401D4 0000302D */ daddu $a2, $zero, $zero -/* C3FF88 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* C3FF8C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* C3FF90 802401E0 44810000 */ mtc1 $at, $f0 -/* C3FF94 802401E4 3C014000 */ lui $at, 0x4000 -/* C3FF98 802401E8 44811000 */ mtc1 $at, $f2 -/* C3FF9C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C3FFA0 802401F0 44812000 */ mtc1 $at, $f4 -/* C3FFA4 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* C3FFA8 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C3FFAC 802401FC 44833000 */ mtc1 $v1, $f6 -/* C3FFB0 80240200 00000000 */ nop -/* C3FFB4 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* C3FFB8 80240208 44073000 */ mfc1 $a3, $f6 -/* C3FFBC 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* C3FFC0 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* C3FFC4 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3FFC8 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* C3FFCC 8024021C 0C01BFA4 */ jal fx_emote -/* C3FFD0 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3FFD4 80240224 0200202D */ daddu $a0, $s0, $zero -/* C3FFD8 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C3FFDC 8024022C 0C012530 */ jal func_800494C0 -/* C3FFE0 80240230 3C060020 */ lui $a2, 0x20 -/* C3FFE4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* C3FFE8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* C3FFEC 8024023C 30420001 */ andi $v0, $v0, 1 -/* C3FFF0 80240240 14400064 */ bnez $v0, .L802403D4 -/* C3FFF4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* C3FFF8 80240248 080900F5 */ j .L802403D4 -/* C3FFFC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* C40000 80240250 8E420074 */ lw $v0, 0x74($s2) -/* C40004 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* C40008 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* C4000C 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* C40010 80240260 1440005D */ bnez $v0, .L802403D8 -/* C40014 80240264 00000000 */ nop -/* C40018 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* C4001C 8024026C 3C014010 */ lui $at, 0x4010 -/* C40020 80240270 44811800 */ mtc1 $at, $f3 -/* C40024 80240274 44801000 */ mtc1 $zero, $f2 -/* C40028 80240278 46000021 */ cvt.d.s $f0, $f0 -/* C4002C 8024027C 4622003C */ c.lt.d $f0, $f2 -/* C40030 80240280 00000000 */ nop -/* C40034 80240284 45000003 */ bc1f .L80240294 -/* C40038 80240288 0200202D */ daddu $a0, $s0, $zero -/* C4003C 8024028C 080900A6 */ j .L80240298 -/* C40040 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* C40044 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* C40048 80240298 0C00F598 */ jal func_8003D660 -/* C4004C 8024029C 00000000 */ nop -/* C40050 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40054 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* C40058 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4005C 802402AC 00031040 */ sll $v0, $v1, 1 -/* C40060 802402B0 00431021 */ addu $v0, $v0, $v1 -/* C40064 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C40068 802402B8 00021080 */ sll $v0, $v0, 2 -/* C4006C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* C40070 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* C40074 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C40078 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* C4007C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* C40080 802402D0 4406B000 */ mfc1 $a2, $f22 -/* C40084 802402D4 4407A000 */ mfc1 $a3, $f20 -/* C40088 802402D8 0C00A720 */ jal atan2 -/* C4008C 802402DC 00000000 */ nop -/* C40090 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* C40094 802402E4 44060000 */ mfc1 $a2, $f0 -/* C40098 802402E8 0200202D */ daddu $a0, $s0, $zero -/* C4009C 802402EC 0C00EA95 */ jal npc_move_heading -/* C400A0 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* C400A4 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C400A8 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C400AC 802402FC 4406B000 */ mfc1 $a2, $f22 -/* C400B0 80240300 4407A000 */ mfc1 $a3, $f20 -/* C400B4 80240304 0C00A7B5 */ jal dist2D -/* C400B8 80240308 00000000 */ nop -/* C400BC 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* C400C0 80240310 4602003E */ c.le.s $f0, $f2 -/* C400C4 80240314 00000000 */ nop -/* C400C8 80240318 4500002F */ bc1f .L802403D8 -/* C400CC 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C400D0 80240320 24020002 */ addiu $v0, $zero, 2 -/* C400D4 80240324 0C00A67F */ jal rand_int -/* C400D8 80240328 AE420070 */ sw $v0, 0x70($s2) -/* C400DC 8024032C 3C035555 */ lui $v1, 0x5555 -/* C400E0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* C400E4 80240334 00430018 */ mult $v0, $v1 -/* C400E8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* C400EC 8024033C 00004010 */ mfhi $t0 -/* C400F0 80240340 01042023 */ subu $a0, $t0, $a0 -/* C400F4 80240344 00041840 */ sll $v1, $a0, 1 -/* C400F8 80240348 00641821 */ addu $v1, $v1, $a0 -/* C400FC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* C40100 80240350 24430002 */ addiu $v1, $v0, 2 -/* C40104 80240354 AE430074 */ sw $v1, 0x74($s2) -/* C40108 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* C4010C 8024035C 18400009 */ blez $v0, .L80240384 -/* C40110 80240360 24020004 */ addiu $v0, $zero, 4 -/* C40114 80240364 8E620004 */ lw $v0, 4($s3) -/* C40118 80240368 18400006 */ blez $v0, .L80240384 -/* C4011C 8024036C 24020004 */ addiu $v0, $zero, 4 -/* C40120 80240370 8E620008 */ lw $v0, 8($s3) -/* C40124 80240374 18400003 */ blez $v0, .L80240384 -/* C40128 80240378 24020004 */ addiu $v0, $zero, 4 -/* C4012C 8024037C 14600002 */ bnez $v1, .L80240388 -/* C40130 80240380 00000000 */ nop -.L80240384: -/* C40134 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* C40138 80240388 0C00A67F */ jal rand_int -/* C4013C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* C40140 80240390 3C0351EB */ lui $v1, 0x51eb -/* C40144 80240394 3463851F */ ori $v1, $v1, 0x851f -/* C40148 80240398 00430018 */ mult $v0, $v1 -/* C4014C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* C40150 802403A0 00004010 */ mfhi $t0 -/* C40154 802403A4 00082143 */ sra $a0, $t0, 5 -/* C40158 802403A8 00832023 */ subu $a0, $a0, $v1 -/* C4015C 802403AC 00041840 */ sll $v1, $a0, 1 -/* C40160 802403B0 00641821 */ addu $v1, $v1, $a0 -/* C40164 802403B4 000318C0 */ sll $v1, $v1, 3 -/* C40168 802403B8 00641821 */ addu $v1, $v1, $a0 -/* C4016C 802403BC 00031880 */ sll $v1, $v1, 2 -/* C40170 802403C0 8E640004 */ lw $a0, 4($s3) -/* C40174 802403C4 00431023 */ subu $v0, $v0, $v1 -/* C40178 802403C8 0044102A */ slt $v0, $v0, $a0 -/* C4017C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* C40180 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* C40184 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* C40188 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* C4018C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* C40190 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* C40194 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* C40198 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* C4019C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* C401A0 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C401A4 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C401A8 802403F8 03E00008 */ jr $ra -/* C401AC 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s deleted file mode 100644 index eabff7f791..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802404C0_C40270.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_C40270 -/* C40270 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C40274 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* C40278 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* C4027C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* C40280 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* C40284 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* C40288 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* C4028C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* C40290 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* C40294 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* C40298 802404E8 86240008 */ lh $a0, 8($s1) -/* C4029C 802404EC 0C00EABB */ jal get_npc_unsafe -/* C402A0 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* C402A4 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* C402A8 802404F8 04600031 */ bltz $v1, .L802405C0 -/* C402AC 802404FC 0040802D */ daddu $s0, $v0, $zero -/* C402B0 80240500 0260202D */ daddu $a0, $s3, $zero -/* C402B4 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* C402B8 80240508 8E460024 */ lw $a2, 0x24($s2) -/* C402BC 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* C402C0 80240510 0C01242D */ jal func_800490B4 -/* C402C4 80240514 0220282D */ daddu $a1, $s1, $zero -/* C402C8 80240518 10400029 */ beqz $v0, .L802405C0 -/* C402CC 8024051C 0000202D */ daddu $a0, $zero, $zero -/* C402D0 80240520 0200282D */ daddu $a1, $s0, $zero -/* C402D4 80240524 0000302D */ daddu $a2, $zero, $zero -/* C402D8 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* C402DC 8024052C 3C013F80 */ lui $at, 0x3f80 -/* C402E0 80240530 44810000 */ mtc1 $at, $f0 -/* C402E4 80240534 3C014000 */ lui $at, 0x4000 -/* C402E8 80240538 44811000 */ mtc1 $at, $f2 -/* C402EC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* C402F0 80240540 44812000 */ mtc1 $at, $f4 -/* C402F4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* C402F8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* C402FC 8024054C 44833000 */ mtc1 $v1, $f6 -/* C40300 80240550 00000000 */ nop -/* C40304 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* C40308 80240558 44073000 */ mfc1 $a3, $f6 -/* C4030C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* C40310 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* C40314 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* C40318 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4031C 8024056C 0C01BFA4 */ jal fx_emote -/* C40320 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* C40324 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C40328 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C4032C 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40330 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C40334 80240584 8C460028 */ lw $a2, 0x28($v0) -/* C40338 80240588 0C00A720 */ jal atan2 -/* C4033C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* C40340 80240590 0200202D */ daddu $a0, $s0, $zero -/* C40344 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C40348 80240598 3C060020 */ lui $a2, 0x20 -/* C4034C 8024059C 0C012530 */ jal func_800494C0 -/* C40350 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* C40354 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* C40358 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* C4035C 802405AC 30420001 */ andi $v0, $v0, 1 -/* C40360 802405B0 14400029 */ bnez $v0, .L80240658 -/* C40364 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* C40368 802405B8 08090196 */ j .L80240658 -/* C4036C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* C40370 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* C40374 802405C4 14400025 */ bnez $v0, .L8024065C -/* C40378 802405C8 00000000 */ nop -/* C4037C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* C40380 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* C40384 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* C40388 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* C4038C 802405DC 1440001F */ bnez $v0, .L8024065C -/* C40390 802405E0 00000000 */ nop -/* C40394 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* C40398 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* C4039C 802405EC 10400019 */ beqz $v0, .L80240654 -/* C403A0 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* C403A4 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* C403A8 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* C403AC 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* C403B0 80240600 14400007 */ bnez $v0, .L80240620 -/* C403B4 80240604 00000000 */ nop -/* C403B8 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* C403BC 8024060C 3C014334 */ lui $at, 0x4334 -/* C403C0 80240610 44816000 */ mtc1 $at, $f12 -/* C403C4 80240614 0C00A6C9 */ jal clamp_angle -/* C403C8 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* C403CC 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* C403D0 80240620 8E440008 */ lw $a0, 8($s2) -/* C403D4 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* C403D8 80240628 00822021 */ addu $a0, $a0, $v0 -/* C403DC 8024062C 00042043 */ sra $a0, $a0, 1 -/* C403E0 80240630 0C00A67F */ jal rand_int -/* C403E4 80240634 24840001 */ addiu $a0, $a0, 1 -/* C403E8 80240638 8E430008 */ lw $v1, 8($s2) -/* C403EC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* C403F0 80240640 00641821 */ addu $v1, $v1, $a0 -/* C403F4 80240644 00031843 */ sra $v1, $v1, 1 -/* C403F8 80240648 00621821 */ addu $v1, $v1, $v0 -/* C403FC 8024064C 08090197 */ j .L8024065C -/* C40400 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* C40404 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* C40408 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* C4040C 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* C40410 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* C40414 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* C40418 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* C4041C 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* C40420 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* C40424 80240674 03E00008 */ jr $ra -/* C40428 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s deleted file mode 100644 index 7a9db56e6e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_C4042C -/* C4042C 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40430 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* C40434 80240684 0080882D */ daddu $s1, $a0, $zero -/* C40438 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* C4043C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* C40440 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* C40444 80240694 8E300148 */ lw $s0, 0x148($s1) -/* C40448 80240698 86040008 */ lh $a0, 8($s0) -/* C4044C 8024069C 0C00EABB */ jal get_npc_unsafe -/* C40450 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* C40454 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* C40458 802406A8 24630001 */ addiu $v1, $v1, 1 -/* C4045C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* C40460 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C40464 802406B4 8C840000 */ lw $a0, ($a0) -/* C40468 802406B8 0064182A */ slt $v1, $v1, $a0 -/* C4046C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C40470 802406C0 0040282D */ daddu $a1, $v0, $zero -/* C40474 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* C40478 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* C4047C 802406CC 8C420004 */ lw $v0, 4($v0) -/* C40480 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* C40484 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C40488 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* C4048C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* C40490 802406E0 00000000 */ nop -/* C40494 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* C40498 802406E8 080901C4 */ j .L80240710 -/* C4049C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* C404A0 802406F0 3C018024 */ lui $at, %hi(D_80246A08_C467B8) -/* C404A4 802406F4 D4226A08 */ ldc1 $f2, %lo(D_80246A08_C467B8)($at) -/* C404A8 802406F8 44820000 */ mtc1 $v0, $f0 -/* C404AC 802406FC 00000000 */ nop -/* C404B0 80240700 46800021 */ cvt.d.w $f0, $f0 -/* C404B4 80240704 46220003 */ div.d $f0, $f0, $f2 -/* C404B8 80240708 46200020 */ cvt.s.d $f0, $f0 -/* C404BC 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* C404C0 80240710 24020001 */ addiu $v0, $zero, 1 -/* C404C4 80240714 AE220070 */ sw $v0, 0x70($s1) -/* C404C8 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* C404CC 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* C404D0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* C404D4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* C404D8 80240728 03E00008 */ jr $ra -/* C404DC 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s deleted file mode 100644 index 83026d5f8f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024094C_C406FC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_C406FC -/* C406FC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C40700 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* C40704 80240954 0080982D */ daddu $s3, $a0, $zero -/* C40708 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* C4070C 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* C40710 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* C40714 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* C40718 80240968 8E720148 */ lw $s2, 0x148($s3) -/* C4071C 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* C40720 80240970 86440008 */ lh $a0, 8($s2) -/* C40724 80240974 0C00EABB */ jal get_npc_unsafe -/* C40728 80240978 00C0802D */ daddu $s0, $a2, $zero -/* C4072C 8024097C 0200202D */ daddu $a0, $s0, $zero -/* C40730 80240980 0240282D */ daddu $a1, $s2, $zero -/* C40734 80240984 24030001 */ addiu $v1, $zero, 1 -/* C40738 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* C4073C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* C40740 80240990 8E270028 */ lw $a3, 0x28($s1) -/* C40744 80240994 0C01242D */ jal func_800490B4 -/* C40748 80240998 0040802D */ daddu $s0, $v0, $zero -/* C4074C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* C40750 802409A0 0200202D */ daddu $a0, $s0, $zero -/* C40754 802409A4 24040002 */ addiu $a0, $zero, 2 -/* C40758 802409A8 0200282D */ daddu $a1, $s0, $zero -/* C4075C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* C40760 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* C40764 802409B4 3C013F80 */ lui $at, 0x3f80 -/* C40768 802409B8 44810000 */ mtc1 $at, $f0 -/* C4076C 802409BC 3C014000 */ lui $at, 0x4000 -/* C40770 802409C0 44811000 */ mtc1 $at, $f2 -/* C40774 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* C40778 802409C8 44812000 */ mtc1 $at, $f4 -/* C4077C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* C40780 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C40784 802409D4 44833000 */ mtc1 $v1, $f6 -/* C40788 802409D8 00000000 */ nop -/* C4078C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* C40790 802409E0 44073000 */ mfc1 $a3, $f6 -/* C40794 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* C40798 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* C4079C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* C407A0 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C407A4 802409F4 0C01BFA4 */ jal fx_emote -/* C407A8 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C407AC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* C407B0 80240A00 8C430000 */ lw $v1, ($v0) -/* C407B4 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* C407B8 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* C407BC 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* C407C0 80240A10 08090293 */ j .L80240A4C -/* C407C4 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* C407C8 80240A18 0C00F598 */ jal func_8003D660 -/* C407CC 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* C407D0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* C407D4 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* C407D8 80240A28 0C00EA95 */ jal npc_move_heading -/* C407DC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* C407E0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* C407E4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* C407E8 80240A38 18400003 */ blez $v0, .L80240A48 -/* C407EC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* C407F0 80240A40 08090294 */ j .L80240A50 -/* C407F4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* C407F8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* C407FC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* C40800 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* C40804 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* C40808 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* C4080C 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* C40810 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* C40814 80240A64 03E00008 */ jr $ra -/* C40818 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s deleted file mode 100644 index 9c92700679..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240AD4_C40884.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_C40884 -/* C40884 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C40888 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* C4088C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* C40890 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* C40894 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* C40898 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* C4089C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* C408A0 80240AF0 86040008 */ lh $a0, 8($s0) -/* C408A4 80240AF4 0C00EABB */ jal get_npc_unsafe -/* C408A8 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* C408AC 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* C408B0 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* C408B4 80240B04 8C630000 */ lw $v1, ($v1) -/* C408B8 80240B08 0083182A */ slt $v1, $a0, $v1 -/* C408BC 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* C408C0 80240B10 0040302D */ daddu $a2, $v0, $zero -/* C408C4 80240B14 00041040 */ sll $v0, $a0, 1 -/* C408C8 80240B18 00441021 */ addu $v0, $v0, $a0 -/* C408CC 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* C408D0 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* C408D4 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C408D8 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* C408DC 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* C408E0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* C408E4 80240B34 4602003E */ c.le.s $f0, $f2 -/* C408E8 80240B38 00000000 */ nop -/* C408EC 80240B3C 45020003 */ bc1fl .L80240B4C -/* C408F0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* C408F4 80240B44 080902D7 */ j .L80240B5C -/* C408F8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* C408FC 80240B4C 8C620000 */ lw $v0, ($v1) -/* C40900 80240B50 0082102A */ slt $v0, $a0, $v0 -/* C40904 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* C40908 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* C4090C 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* C40910 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* C40914 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* C40918 80240B68 8C420004 */ lw $v0, 4($v0) -/* C4091C 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* C40920 80240B70 24020001 */ addiu $v0, $zero, 1 -/* C40924 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* C40928 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* C4092C 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* C40930 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* C40934 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* C40938 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* C4093C 80240B8C 03E00008 */ jr $ra -/* C40940 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s deleted file mode 100644 index 83129d0670..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ /dev/null @@ -1,214 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_C40944 -/* C40944 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C40948 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* C4094C 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* C40950 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* C40954 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* C40958 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* C4095C 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* C40960 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* C40964 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* C40968 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* C4096C 80240BBC 86240008 */ lh $a0, 8($s1) -/* C40970 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C40974 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* C40978 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* C4097C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* C40980 80240BD0 8C650000 */ lw $a1, ($v1) -/* C40984 80240BD4 0C0B1EAF */ jal get_variable -/* C40988 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* C4098C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* C40990 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C40994 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* C40998 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* C4099C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409A0 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* C409A4 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* C409A8 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409AC 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* C409B0 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* C409B4 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409B8 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* C409BC 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* C409C0 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* C409C4 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* C409C8 80240C18 3C014282 */ lui $at, 0x4282 -/* C409CC 80240C1C 44810000 */ mtc1 $at, $f0 -/* C409D0 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* C409D4 80240C24 0040982D */ daddu $s3, $v0, $zero -/* C409D8 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* C409DC 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* C409E0 80240C30 16000005 */ bnez $s0, .L80240C48 -/* C409E4 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* C409E8 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* C409EC 80240C3C 30420004 */ andi $v0, $v0, 4 -/* C409F0 80240C40 10400044 */ beqz $v0, .L80240D54 -/* C409F4 80240C44 00000000 */ nop -.L80240C48: -/* C409F8 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* C409FC 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* C40A00 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* C40A04 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* C40A08 80240C58 8E430000 */ lw $v1, ($s2) -/* C40A0C 80240C5C 8C420000 */ lw $v0, ($v0) -/* C40A10 80240C60 00641824 */ and $v1, $v1, $a0 -/* C40A14 80240C64 AE430000 */ sw $v1, ($s2) -/* C40A18 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* C40A1C 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C40A20 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* C40A24 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* C40A28 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* C40A2C 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* C40A30 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* C40A34 80240C84 08090325 */ j .L80240C94 -/* C40A38 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* C40A3C 80240C8C 00621024 */ and $v0, $v1, $v0 -/* C40A40 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* C40A44 80240C94 AE420000 */ sw $v0, ($s2) -/* C40A48 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* C40A4C 80240C9C 30420004 */ andi $v0, $v0, 4 -/* C40A50 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* C40A54 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* C40A58 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* C40A5C 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* C40A60 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C40A64 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* C40A68 80240CB8 00431024 */ and $v0, $v0, $v1 -/* C40A6C 80240CBC 0809033C */ j .L80240CF0 -/* C40A70 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* C40A74 80240CC4 8E220000 */ lw $v0, ($s1) -/* C40A78 80240CC8 3C034000 */ lui $v1, 0x4000 -/* C40A7C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* C40A80 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* C40A84 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* C40A88 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* C40A8C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* C40A90 80240CE0 8E220000 */ lw $v0, ($s1) -/* C40A94 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* C40A98 80240CE8 00431024 */ and $v0, $v0, $v1 -/* C40A9C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* C40AA0 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* C40AA4 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* C40AA8 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* C40AAC 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* C40AB0 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* C40AB4 80240D04 44812000 */ mtc1 $at, $f4 -/* C40AB8 80240D08 44823000 */ mtc1 $v0, $f6 -/* C40ABC 80240D0C 00000000 */ nop -/* C40AC0 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* C40AC4 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* C40AC8 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* C40ACC 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* C40AD0 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* C40AD4 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* C40AD8 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* C40ADC 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* C40AE0 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C40AE4 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* C40AE8 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* C40AEC 80240D3C 0C0372DF */ jal func_800DCB7C -/* C40AF0 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* C40AF4 80240D44 10400003 */ beqz $v0, .L80240D54 -/* C40AF8 80240D48 00000000 */ nop -/* C40AFC 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C40B00 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* C40B04 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* C40B08 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* C40B0C 80240D5C 10400042 */ beqz $v0, L80240E68_C40C18 -/* C40B10 80240D60 00031080 */ sll $v0, $v1, 2 -/* C40B14 80240D64 3C018024 */ lui $at, %hi(jtbl_80246A10_C467C0) -/* C40B18 80240D68 00220821 */ addu $at, $at, $v0 -/* C40B1C 80240D6C 8C226A10 */ lw $v0, %lo(jtbl_80246A10_C467C0)($at) -/* C40B20 80240D70 00400008 */ jr $v0 -/* C40B24 80240D74 00000000 */ nop -glabel L80240D78_C40B28 -/* C40B28 80240D78 0280202D */ daddu $a0, $s4, $zero -/* C40B2C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* C40B30 80240D80 0C090000 */ jal func_80240000_C3FDB0 -/* C40B34 80240D84 02A0302D */ daddu $a2, $s5, $zero -glabel L80240D88_C40B38 -/* C40B38 80240D88 0280202D */ daddu $a0, $s4, $zero -/* C40B3C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* C40B40 80240D90 0C090056 */ jal func_80240158_C3FF08 -/* C40B44 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* C40B48 80240D98 0809039A */ j L80240E68_C40C18 -/* C40B4C 80240D9C 00000000 */ nop -glabel L80240DA0_C40B50 -/* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C40B58 80240DA8 0C090100 */ jal dgb_08_UnkNpcAIFunc1 -/* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero -glabel L80240DB0_C40B60 -/* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* C40B68 80240DB8 0C090130 */ jal func_802404C0_C40270 -/* C40B6C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* C40B70 80240DC0 0809039A */ j L80240E68_C40C18 -/* C40B74 80240DC4 00000000 */ nop -glabel L80240DC8_C40B78 -/* C40B78 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* C40B7C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C40B80 80240DD0 0C09019F */ jal func_8024067C_C4042C -/* C40B84 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C40B88 80240DD8 0809039A */ j L80240E68_C40C18 -/* C40B8C 80240DDC 00000000 */ nop -glabel L80240DE0_C40B90 -/* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C40B98 80240DE8 0C0901CC */ jal dgb_08_NpcJumpFunc2 -/* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -glabel L80240DF0_C40BA0 -/* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C40BA8 80240DF8 0C0901E9 */ jal dgb_08_NpcJumpFunc -/* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C40BB0 80240E00 0809039A */ j L80240E68_C40C18 -/* C40BB4 80240E04 00000000 */ nop -glabel L80240E08_C40BB8 -/* C40BB8 80240E08 0280202D */ daddu $a0, $s4, $zero -/* C40BBC 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C40BC0 80240E10 0C090207 */ jal dgb_08_UnkNpcAIFunc13 -/* C40BC4 80240E14 02A0302D */ daddu $a2, $s5, $zero -glabel L80240E18_C40BC8 -/* C40BC8 80240E18 0280202D */ daddu $a0, $s4, $zero -/* C40BCC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* C40BD0 80240E20 0C090253 */ jal func_8024094C_C406FC -/* C40BD4 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* C40BD8 80240E28 0809039A */ j L80240E68_C40C18 -/* C40BDC 80240E2C 00000000 */ nop -glabel L80240E30_C40BE0 -/* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero -/* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal dgb_08_UnkNpcDurationFlagFunc -/* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C40BF0 80240E40 0809039A */ j L80240E68_C40C18 -/* C40BF4 80240E44 00000000 */ nop -glabel L80240E48_C40BF8 -/* C40BF8 80240E48 0280202D */ daddu $a0, $s4, $zero -/* C40BFC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C40C00 80240E50 0C0902B5 */ jal func_80240AD4_C40884 -/* C40C04 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C40C08 80240E58 0809039A */ j L80240E68_C40C18 -/* C40C0C 80240E5C 00000000 */ nop -glabel L80240E60_C40C10 -/* C40C10 80240E60 0C0129CF */ jal func_8004A73C -/* C40C14 80240E64 0280202D */ daddu $a0, $s4, $zero -glabel L80240E68_C40C18 -/* C40C18 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* C40C1C 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* C40C20 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* C40C24 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* C40C28 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* C40C2C 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* C40C30 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* C40C34 80240E84 0000102D */ daddu $v0, $zero, $zero -/* C40C38 80240E88 03E00008 */ jr $ra -/* C40C3C 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s deleted file mode 100644 index d5b60e3d2a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241098_C40E48 -/* C40E48 80241098 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C40E4C 8024109C AFBF0024 */ sw $ra, 0x24($sp) -/* C40E50 802410A0 AFB40020 */ sw $s4, 0x20($sp) -/* C40E54 802410A4 AFB3001C */ sw $s3, 0x1c($sp) -/* C40E58 802410A8 AFB20018 */ sw $s2, 0x18($sp) -/* C40E5C 802410AC AFB10014 */ sw $s1, 0x14($sp) -/* C40E60 802410B0 AFB00010 */ sw $s0, 0x10($sp) -/* C40E64 802410B4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C40E68 802410B8 8C900148 */ lw $s0, 0x148($a0) -/* C40E6C 802410BC 86040008 */ lh $a0, 8($s0) -/* C40E70 802410C0 0C00EABB */ jal get_npc_unsafe -/* C40E74 802410C4 24110001 */ addiu $s1, $zero, 1 -/* C40E78 802410C8 86040008 */ lh $a0, 8($s0) -/* C40E7C 802410CC 0040802D */ daddu $s0, $v0, $zero -/* C40E80 802410D0 3C05800B */ lui $a1, %hi(gCameras) -/* C40E84 802410D4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C40E88 802410D8 3C03800A */ lui $v1, %hi(D_8009A634) -/* C40E8C 802410DC 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C40E90 802410E0 00912021 */ addu $a0, $a0, $s1 -/* C40E94 802410E4 00031080 */ sll $v0, $v1, 2 -/* C40E98 802410E8 00431021 */ addu $v0, $v0, $v1 -/* C40E9C 802410EC 00021080 */ sll $v0, $v0, 2 -/* C40EA0 802410F0 00431023 */ subu $v0, $v0, $v1 -/* C40EA4 802410F4 000218C0 */ sll $v1, $v0, 3 -/* C40EA8 802410F8 00431021 */ addu $v0, $v0, $v1 -/* C40EAC 802410FC 000210C0 */ sll $v0, $v0, 3 -/* C40EB0 80241100 0C00FB3A */ jal get_enemy -/* C40EB4 80241104 00459021 */ addu $s2, $v0, $a1 -/* C40EB8 80241108 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C40EBC 8024110C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C40EC0 80241110 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40EC4 80241114 8E830000 */ lw $v1, ($s4) -/* C40EC8 80241118 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C40ECC 8024111C 8C660028 */ lw $a2, 0x28($v1) -/* C40ED0 80241120 8C670030 */ lw $a3, 0x30($v1) -/* C40ED4 80241124 0C00A7B5 */ jal dist2D -/* C40ED8 80241128 0040982D */ daddu $s3, $v0, $zero -/* C40EDC 8024112C C6620074 */ lwc1 $f2, 0x74($s3) -/* C40EE0 80241130 468010A0 */ cvt.s.w $f2, $f2 -/* C40EE4 80241134 4600103C */ c.lt.s $f2, $f0 -/* C40EE8 80241138 00000000 */ nop -/* C40EEC 8024113C 45030001 */ bc1tl .L80241144 -/* C40EF0 80241140 0000882D */ daddu $s1, $zero, $zero -.L80241144: -/* C40EF4 80241144 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C40EF8 80241148 C60E000C */ lwc1 $f14, 0xc($s0) -/* C40EFC 8024114C 3C014387 */ lui $at, 0x4387 -/* C40F00 80241150 4481A000 */ mtc1 $at, $f20 -/* C40F04 80241154 0C00A70A */ jal get_clamped_angle_diff -/* C40F08 80241158 00000000 */ nop -/* C40F0C 8024115C 0C00A6C9 */ jal clamp_angle -/* C40F10 80241160 46000306 */ mov.s $f12, $f0 -/* C40F14 80241164 3C018024 */ lui $at, %hi(D_80246BA0_C46950) -/* C40F18 80241168 D4226BA0 */ ldc1 $f2, %lo(D_80246BA0_C46950)($at) -/* C40F1C 8024116C 46000021 */ cvt.d.s $f0, $f0 -/* C40F20 80241170 4622003C */ c.lt.d $f0, $f2 -/* C40F24 80241174 00000000 */ nop -/* C40F28 80241178 45000003 */ bc1f .L80241188 -/* C40F2C 8024117C 00000000 */ nop -/* C40F30 80241180 3C0142B4 */ lui $at, 0x42b4 -/* C40F34 80241184 4481A000 */ mtc1 $at, $f20 -.L80241188: -/* C40F38 80241188 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C40F3C 8024118C 8E820000 */ lw $v0, ($s4) -/* C40F40 80241190 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C40F44 80241194 8C460028 */ lw $a2, 0x28($v0) -/* C40F48 80241198 0C00A720 */ jal atan2 -/* C40F4C 8024119C 8C470030 */ lw $a3, 0x30($v0) -/* C40F50 802411A0 4600A306 */ mov.s $f12, $f20 -/* C40F54 802411A4 0C00A70A */ jal get_clamped_angle_diff -/* C40F58 802411A8 46000386 */ mov.s $f14, $f0 -/* C40F5C 802411AC C6620078 */ lwc1 $f2, 0x78($s3) -/* C40F60 802411B0 468010A0 */ cvt.s.w $f2, $f2 -/* C40F64 802411B4 46000005 */ abs.s $f0, $f0 -/* C40F68 802411B8 4600103C */ c.lt.s $f2, $f0 -/* C40F6C 802411BC 00000000 */ nop -/* C40F70 802411C0 45030001 */ bc1tl .L802411C8 -/* C40F74 802411C4 0000882D */ daddu $s1, $zero, $zero -.L802411C8: -/* C40F78 802411C8 8E820000 */ lw $v0, ($s4) -/* C40F7C 802411CC C600003C */ lwc1 $f0, 0x3c($s0) -/* C40F80 802411D0 C442002C */ lwc1 $f2, 0x2c($v0) -/* C40F84 802411D4 860200A8 */ lh $v0, 0xa8($s0) -/* C40F88 802411D8 46020001 */ sub.s $f0, $f0, $f2 -/* C40F8C 802411DC 44821000 */ mtc1 $v0, $f2 -/* C40F90 802411E0 00000000 */ nop -/* C40F94 802411E4 468010A1 */ cvt.d.w $f2, $f2 -/* C40F98 802411E8 46221080 */ add.d $f2, $f2, $f2 -/* C40F9C 802411EC 46000005 */ abs.s $f0, $f0 -/* C40FA0 802411F0 46000021 */ cvt.d.s $f0, $f0 -/* C40FA4 802411F4 4620103E */ c.le.d $f2, $f0 -/* C40FA8 802411F8 00000000 */ nop -/* C40FAC 802411FC 45030001 */ bc1tl .L80241204 -/* C40FB0 80241200 0000882D */ daddu $s1, $zero, $zero -.L80241204: -/* C40FB4 80241204 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C40FB8 80241208 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C40FBC 8024120C 24020009 */ addiu $v0, $zero, 9 -/* C40FC0 80241210 50620001 */ beql $v1, $v0, .L80241218 -/* C40FC4 80241214 0000882D */ daddu $s1, $zero, $zero -.L80241218: -/* C40FC8 80241218 24020007 */ addiu $v0, $zero, 7 -/* C40FCC 8024121C 50620001 */ beql $v1, $v0, .L80241224 -/* C40FD0 80241220 0000882D */ daddu $s1, $zero, $zero -.L80241224: -/* C40FD4 80241224 0220102D */ daddu $v0, $s1, $zero -/* C40FD8 80241228 8FBF0024 */ lw $ra, 0x24($sp) -/* C40FDC 8024122C 8FB40020 */ lw $s4, 0x20($sp) -/* C40FE0 80241230 8FB3001C */ lw $s3, 0x1c($sp) -/* C40FE4 80241234 8FB20018 */ lw $s2, 0x18($sp) -/* C40FE8 80241238 8FB10014 */ lw $s1, 0x14($sp) -/* C40FEC 8024123C 8FB00010 */ lw $s0, 0x10($sp) -/* C40FF0 80241240 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C40FF4 80241244 03E00008 */ jr $ra -/* C40FF8 80241248 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s deleted file mode 100644 index c9f4e89897..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024124C_C40FFC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024124C_C40FFC -/* C40FFC 8024124C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C41000 80241250 AFB40028 */ sw $s4, 0x28($sp) -/* C41004 80241254 0080A02D */ daddu $s4, $a0, $zero -/* C41008 80241258 AFBF002C */ sw $ra, 0x2c($sp) -/* C4100C 8024125C AFB30024 */ sw $s3, 0x24($sp) -/* C41010 80241260 AFB20020 */ sw $s2, 0x20($sp) -/* C41014 80241264 AFB1001C */ sw $s1, 0x1c($sp) -/* C41018 80241268 AFB00018 */ sw $s0, 0x18($sp) -/* C4101C 8024126C 8E910148 */ lw $s1, 0x148($s4) -/* C41020 80241270 86240008 */ lh $a0, 8($s1) -/* C41024 80241274 0C00EABB */ jal get_npc_unsafe -/* C41028 80241278 00A0802D */ daddu $s0, $a1, $zero -/* C4102C 8024127C 16000005 */ bnez $s0, .L80241294 -/* C41030 80241280 0040902D */ daddu $s2, $v0, $zero -/* C41034 80241284 8E2200B0 */ lw $v0, 0xb0($s1) -/* C41038 80241288 30420004 */ andi $v0, $v0, 4 -/* C4103C 8024128C 10400015 */ beqz $v0, .L802412E4 -/* C41040 80241290 00000000 */ nop -.L80241294: -/* C41044 80241294 AE800070 */ sw $zero, 0x70($s4) -/* C41048 80241298 8E420000 */ lw $v0, ($s2) -/* C4104C 8024129C 3C031F30 */ lui $v1, 0x1f30 -/* C41050 802412A0 A640008E */ sh $zero, 0x8e($s2) -/* C41054 802412A4 34420102 */ ori $v0, $v0, 0x102 -/* C41058 802412A8 AE420000 */ sw $v0, ($s2) -/* C4105C 802412AC 8E220000 */ lw $v0, ($s1) -/* C41060 802412B0 3C01C47A */ lui $at, 0xc47a -/* C41064 802412B4 44810000 */ mtc1 $at, $f0 -/* C41068 802412B8 00431025 */ or $v0, $v0, $v1 -/* C4106C 802412BC AE220000 */ sw $v0, ($s1) -/* C41070 802412C0 AE400038 */ sw $zero, 0x38($s2) -/* C41074 802412C4 E640003C */ swc1 $f0, 0x3c($s2) -/* C41078 802412C8 AE400040 */ sw $zero, 0x40($s2) -/* C4107C 802412CC 8E2300B0 */ lw $v1, 0xb0($s1) -/* C41080 802412D0 30620004 */ andi $v0, $v1, 4 -/* C41084 802412D4 10400003 */ beqz $v0, .L802412E4 -/* C41088 802412D8 2402FFFB */ addiu $v0, $zero, -5 -/* C4108C 802412DC 00621024 */ and $v0, $v1, $v0 -/* C41090 802412E0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802412E4: -/* C41094 802412E4 8E930070 */ lw $s3, 0x70($s4) -/* C41098 802412E8 12600005 */ beqz $s3, .L80241300 -/* C4109C 802412EC 24020001 */ addiu $v0, $zero, 1 -/* C410A0 802412F0 12620048 */ beq $s3, $v0, .L80241414 -/* C410A4 802412F4 00000000 */ nop -/* C410A8 802412F8 08090522 */ j .L80241488 -/* C410AC 802412FC 00000000 */ nop -.L80241300: -/* C410B0 80241300 86240008 */ lh $a0, 8($s1) -/* C410B4 80241304 0C00FB3A */ jal get_enemy -/* C410B8 80241308 2484FFFF */ addiu $a0, $a0, -1 -/* C410BC 8024130C 0040802D */ daddu $s0, $v0, $zero -/* C410C0 80241310 0C00EABB */ jal get_npc_unsafe -/* C410C4 80241314 86040008 */ lh $a0, 8($s0) -/* C410C8 80241318 24030001 */ addiu $v1, $zero, 1 -/* C410CC 8024131C 0040982D */ daddu $s3, $v0, $zero -/* C410D0 80241320 A2230007 */ sb $v1, 7($s1) -/* C410D4 80241324 8E03006C */ lw $v1, 0x6c($s0) -/* C410D8 80241328 24020003 */ addiu $v0, $zero, 3 -/* C410DC 8024132C 14620056 */ bne $v1, $v0, .L80241488 -/* C410E0 80241330 00000000 */ nop -/* C410E4 80241334 8E2500A8 */ lw $a1, 0xa8($s1) -/* C410E8 80241338 10A00003 */ beqz $a1, .L80241348 -/* C410EC 8024133C 0260202D */ daddu $a0, $s3, $zero -/* C410F0 80241340 0C012530 */ jal func_800494C0 -/* C410F4 80241344 0000302D */ daddu $a2, $zero, $zero -.L80241348: -/* C410F8 80241348 27A40010 */ addiu $a0, $sp, 0x10 -/* C410FC 8024134C C6280070 */ lwc1 $f8, 0x70($s1) -/* C41100 80241350 46804220 */ cvt.s.w $f8, $f8 -/* C41104 80241354 C6620034 */ lwc1 $f2, 0x34($s3) -/* C41108 80241358 3C014387 */ lui $at, 0x4387 -/* C4110C 8024135C 44810000 */ mtc1 $at, $f0 -/* C41110 80241360 44064000 */ mfc1 $a2, $f8 -/* C41114 80241364 46020001 */ sub.s $f0, $f0, $f2 -/* C41118 80241368 C6660038 */ lwc1 $f6, 0x38($s3) -/* C4111C 8024136C C6640040 */ lwc1 $f4, 0x40($s3) -/* C41120 80241370 44070000 */ mfc1 $a3, $f0 -/* C41124 80241374 27A50014 */ addiu $a1, $sp, 0x14 -/* C41128 80241378 E7A60010 */ swc1 $f6, 0x10($sp) -/* C4112C 8024137C 0C00A7E7 */ jal add_vec2D_polar -/* C41130 80241380 E7A40014 */ swc1 $f4, 0x14($sp) -/* C41134 80241384 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C41138 80241388 4600020D */ trunc.w.s $f8, $f0 -/* C4113C 8024138C 44024000 */ mfc1 $v0, $f8 -/* C41140 80241390 E6400038 */ swc1 $f0, 0x38($s2) -/* C41144 80241394 A6220010 */ sh $v0, 0x10($s1) -/* C41148 80241398 C660003C */ lwc1 $f0, 0x3c($s3) -/* C4114C 8024139C C622006C */ lwc1 $f2, 0x6c($s1) -/* C41150 802413A0 468010A0 */ cvt.s.w $f2, $f2 -/* C41154 802413A4 46020000 */ add.s $f0, $f0, $f2 -/* C41158 802413A8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C4115C 802413AC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C41160 802413B0 E640003C */ swc1 $f0, 0x3c($s2) -/* C41164 802413B4 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C41168 802413B8 4600020D */ trunc.w.s $f8, $f0 -/* C4116C 802413BC 44024000 */ mfc1 $v0, $f8 -/* C41170 802413C0 00000000 */ nop -/* C41174 802413C4 A6220012 */ sh $v0, 0x12($s1) -/* C41178 802413C8 4600120D */ trunc.w.s $f8, $f2 -/* C4117C 802413CC 44024000 */ mfc1 $v0, $f8 -/* C41180 802413D0 E6420040 */ swc1 $f2, 0x40($s2) -/* C41184 802413D4 A6220014 */ sh $v0, 0x14($s1) -/* C41188 802413D8 8C660028 */ lw $a2, 0x28($v1) -/* C4118C 802413DC 8C670030 */ lw $a3, 0x30($v1) -/* C41190 802413E0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C41194 802413E4 0C00A720 */ jal atan2 -/* C41198 802413E8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4119C 802413EC 3C03E0EF */ lui $v1, 0xe0ef -/* C411A0 802413F0 E640000C */ swc1 $f0, 0xc($s2) -/* C411A4 802413F4 8E220000 */ lw $v0, ($s1) -/* C411A8 802413F8 3463FFFF */ ori $v1, $v1, 0xffff -/* C411AC 802413FC 00431024 */ and $v0, $v0, $v1 -/* C411B0 80241400 AE220000 */ sw $v0, ($s1) -/* C411B4 80241404 24020001 */ addiu $v0, $zero, 1 -/* C411B8 80241408 A640008E */ sh $zero, 0x8e($s2) -/* C411BC 8024140C 08090522 */ j .L80241488 -/* C411C0 80241410 AE820070 */ sw $v0, 0x70($s4) -.L80241414: -/* C411C4 80241414 86240008 */ lh $a0, 8($s1) -/* C411C8 80241418 0C00FB3A */ jal get_enemy -/* C411CC 8024141C 2484FFFF */ addiu $a0, $a0, -1 -/* C411D0 80241420 0040802D */ daddu $s0, $v0, $zero -/* C411D4 80241424 0C00EABB */ jal get_npc_unsafe -/* C411D8 80241428 86040008 */ lh $a0, 8($s0) -/* C411DC 8024142C 9642008E */ lhu $v0, 0x8e($s2) -/* C411E0 80241430 24420001 */ addiu $v0, $v0, 1 -/* C411E4 80241434 A642008E */ sh $v0, 0x8e($s2) -/* C411E8 80241438 00021400 */ sll $v0, $v0, 0x10 -/* C411EC 8024143C 8E23007C */ lw $v1, 0x7c($s1) -/* C411F0 80241440 00021403 */ sra $v0, $v0, 0x10 -/* C411F4 80241444 0043102A */ slt $v0, $v0, $v1 -/* C411F8 80241448 50400001 */ beql $v0, $zero, .L80241450 -/* C411FC 8024144C A2200007 */ sb $zero, 7($s1) -.L80241450: -/* C41200 80241450 8E03006C */ lw $v1, 0x6c($s0) -/* C41204 80241454 24020004 */ addiu $v0, $zero, 4 -/* C41208 80241458 1462000B */ bne $v1, $v0, .L80241488 -/* C4120C 8024145C 3C021F10 */ lui $v0, 0x1f10 -/* C41210 80241460 8E230000 */ lw $v1, ($s1) -/* C41214 80241464 3C01C47A */ lui $at, 0xc47a -/* C41218 80241468 44810000 */ mtc1 $at, $f0 -/* C4121C 8024146C 00621825 */ or $v1, $v1, $v0 -/* C41220 80241470 AE230000 */ sw $v1, ($s1) -/* C41224 80241474 AE400038 */ sw $zero, 0x38($s2) -/* C41228 80241478 E640003C */ swc1 $f0, 0x3c($s2) -/* C4122C 8024147C AE400040 */ sw $zero, 0x40($s2) -/* C41230 80241480 A2330007 */ sb $s3, 7($s1) -/* C41234 80241484 AE800070 */ sw $zero, 0x70($s4) -.L80241488: -/* C41238 80241488 8FBF002C */ lw $ra, 0x2c($sp) -/* C4123C 8024148C 8FB40028 */ lw $s4, 0x28($sp) -/* C41240 80241490 8FB30024 */ lw $s3, 0x24($sp) -/* C41244 80241494 8FB20020 */ lw $s2, 0x20($sp) -/* C41248 80241498 8FB1001C */ lw $s1, 0x1c($sp) -/* C4124C 8024149C 8FB00018 */ lw $s0, 0x18($sp) -/* C41250 802414A0 0000102D */ daddu $v0, $zero, $zero -/* C41254 802414A4 03E00008 */ jr $ra -/* C41258 802414A8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s deleted file mode 100644 index d002f9db89..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ /dev/null @@ -1,198 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414AC_C4125C -/* C4125C 802414AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C41260 802414B0 AFB20038 */ sw $s2, 0x38($sp) -/* C41264 802414B4 0080902D */ daddu $s2, $a0, $zero -/* C41268 802414B8 AFBF0048 */ sw $ra, 0x48($sp) -/* C4126C 802414BC AFB50044 */ sw $s5, 0x44($sp) -/* C41270 802414C0 AFB40040 */ sw $s4, 0x40($sp) -/* C41274 802414C4 AFB3003C */ sw $s3, 0x3c($sp) -/* C41278 802414C8 AFB10034 */ sw $s1, 0x34($sp) -/* C4127C 802414CC AFB00030 */ sw $s0, 0x30($sp) -/* C41280 802414D0 8E510148 */ lw $s1, 0x148($s2) -/* C41284 802414D4 86240008 */ lh $a0, 8($s1) -/* C41288 802414D8 0C00EABB */ jal get_npc_unsafe -/* C4128C 802414DC 00A0802D */ daddu $s0, $a1, $zero -/* C41290 802414E0 8E43000C */ lw $v1, 0xc($s2) -/* C41294 802414E4 0240202D */ daddu $a0, $s2, $zero -/* C41298 802414E8 8C650000 */ lw $a1, ($v1) -/* C4129C 802414EC 0C0B1EAF */ jal get_variable -/* C412A0 802414F0 0040A82D */ daddu $s5, $v0, $zero -/* C412A4 802414F4 AFA00010 */ sw $zero, 0x10($sp) -/* C412A8 802414F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412AC 802414FC 8C630030 */ lw $v1, 0x30($v1) -/* C412B0 80241500 AFA30014 */ sw $v1, 0x14($sp) -/* C412B4 80241504 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412B8 80241508 8C63001C */ lw $v1, 0x1c($v1) -/* C412BC 8024150C AFA30018 */ sw $v1, 0x18($sp) -/* C412C0 80241510 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412C4 80241514 8C630024 */ lw $v1, 0x24($v1) -/* C412C8 80241518 AFA3001C */ sw $v1, 0x1c($sp) -/* C412CC 8024151C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412D0 80241520 8C630028 */ lw $v1, 0x28($v1) -/* C412D4 80241524 27B40010 */ addiu $s4, $sp, 0x10 -/* C412D8 80241528 AFA30020 */ sw $v1, 0x20($sp) -/* C412DC 8024152C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412E0 80241530 3C014282 */ lui $at, 0x4282 -/* C412E4 80241534 44810000 */ mtc1 $at, $f0 -/* C412E8 80241538 8C63002C */ lw $v1, 0x2c($v1) -/* C412EC 8024153C 0040982D */ daddu $s3, $v0, $zero -/* C412F0 80241540 E7A00028 */ swc1 $f0, 0x28($sp) -/* C412F4 80241544 A7A0002C */ sh $zero, 0x2c($sp) -/* C412F8 80241548 16000005 */ bnez $s0, .L80241560 -/* C412FC 8024154C AFA30024 */ sw $v1, 0x24($sp) -/* C41300 80241550 8E2200B0 */ lw $v0, 0xb0($s1) -/* C41304 80241554 30420004 */ andi $v0, $v0, 4 -/* C41308 80241558 10400020 */ beqz $v0, .L802415DC -/* C4130C 8024155C 00000000 */ nop -.L80241560: -/* C41310 80241560 2404F7FF */ addiu $a0, $zero, -0x801 -/* C41314 80241564 AE400070 */ sw $zero, 0x70($s2) -/* C41318 80241568 A6A0008E */ sh $zero, 0x8e($s5) -/* C4131C 8024156C 8E2200CC */ lw $v0, 0xcc($s1) -/* C41320 80241570 8EA30000 */ lw $v1, ($s5) -/* C41324 80241574 8C420000 */ lw $v0, ($v0) -/* C41328 80241578 00641824 */ and $v1, $v1, $a0 -/* C4132C 8024157C AEA30000 */ sw $v1, ($s5) -/* C41330 80241580 AEA20028 */ sw $v0, 0x28($s5) -/* C41334 80241584 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41338 80241588 8C420034 */ lw $v0, 0x34($v0) -/* C4133C 8024158C 54400005 */ bnel $v0, $zero, .L802415A4 -/* C41340 80241590 2402FDFF */ addiu $v0, $zero, -0x201 -/* C41344 80241594 34620200 */ ori $v0, $v1, 0x200 -/* C41348 80241598 2403FFF7 */ addiu $v1, $zero, -9 -/* C4134C 8024159C 0809056B */ j .L802415AC -/* C41350 802415A0 00431024 */ and $v0, $v0, $v1 -.L802415A4: -/* C41354 802415A4 00621024 */ and $v0, $v1, $v0 -/* C41358 802415A8 34420008 */ ori $v0, $v0, 8 -.L802415AC: -/* C4135C 802415AC AEA20000 */ sw $v0, ($s5) -/* C41360 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C41364 802415B4 30420004 */ andi $v0, $v0, 4 -/* C41368 802415B8 10400007 */ beqz $v0, .L802415D8 -/* C4136C 802415BC 24020063 */ addiu $v0, $zero, 0x63 -/* C41370 802415C0 AE420070 */ sw $v0, 0x70($s2) -/* C41374 802415C4 AE400074 */ sw $zero, 0x74($s2) -/* C41378 802415C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4137C 802415CC 2403FFFB */ addiu $v1, $zero, -5 -/* C41380 802415D0 00431024 */ and $v0, $v0, $v1 -/* C41384 802415D4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802415D8: -/* C41388 802415D8 AE20006C */ sw $zero, 0x6c($s1) -.L802415DC: -/* C4138C 802415DC 8E420070 */ lw $v0, 0x70($s2) -/* C41390 802415E0 2842001E */ slti $v0, $v0, 0x1e -/* C41394 802415E4 10400009 */ beqz $v0, .L8024160C -/* C41398 802415E8 00000000 */ nop -/* C4139C 802415EC 8E22006C */ lw $v0, 0x6c($s1) -/* C413A0 802415F0 14400006 */ bnez $v0, .L8024160C -/* C413A4 802415F4 00000000 */ nop -/* C413A8 802415F8 0C090426 */ jal func_80241098_C40E48 -/* C413AC 802415FC 0240202D */ daddu $a0, $s2, $zero -/* C413B0 80241600 10400002 */ beqz $v0, .L8024160C -/* C413B4 80241604 2402001E */ addiu $v0, $zero, 0x1e -/* C413B8 80241608 AE420070 */ sw $v0, 0x70($s2) -.L8024160C: -/* C413BC 8024160C 8E430070 */ lw $v1, 0x70($s2) -/* C413C0 80241610 2C620064 */ sltiu $v0, $v1, 0x64 -/* C413C4 80241614 10400048 */ beqz $v0, L80241738_C414E8 -/* C413C8 80241618 00031080 */ sll $v0, $v1, 2 -/* C413CC 8024161C 3C018024 */ lui $at, %hi(jtbl_80246BA8_C46958) -/* C413D0 80241620 00220821 */ addu $at, $at, $v0 -/* C413D4 80241624 8C226BA8 */ lw $v0, %lo(jtbl_80246BA8_C46958)($at) -/* C413D8 80241628 00400008 */ jr $v0 -/* C413DC 8024162C 00000000 */ nop -glabel L80241630_C413E0 -/* C413E0 80241630 0240202D */ daddu $a0, $s2, $zero -/* C413E4 80241634 0260282D */ daddu $a1, $s3, $zero -/* C413E8 80241638 0C012568 */ jal func_800495A0 -/* C413EC 8024163C 0280302D */ daddu $a2, $s4, $zero -glabel L80241640_C413F0 -/* C413F0 80241640 0240202D */ daddu $a0, $s2, $zero -/* C413F4 80241644 0260282D */ daddu $a1, $s3, $zero -/* C413F8 80241648 0C0125AE */ jal func_800496B8 -/* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero -/* C41400 80241650 080905CE */ j L80241738_C414E8 -/* C41404 80241654 00000000 */ nop -glabel L80241658_C41408 -/* C41408 80241658 0240202D */ daddu $a0, $s2, $zero -/* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero -/* C41410 80241660 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C41414 80241664 0280302D */ daddu $a2, $s4, $zero -glabel L80241668_C41418 -/* C41418 80241668 0240202D */ daddu $a0, $s2, $zero -/* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero -/* C41420 80241670 0C012701 */ jal func_80049C04 -/* C41424 80241674 0280302D */ daddu $a2, $s4, $zero -/* C41428 80241678 080905CE */ j L80241738_C414E8 -/* C4142C 8024167C 00000000 */ nop -glabel L80241680_C41430 -/* C41430 80241680 0240202D */ daddu $a0, $s2, $zero -/* C41434 80241684 0260282D */ daddu $a1, $s3, $zero -/* C41438 80241688 0C01278F */ jal func_80049E3C -/* C4143C 8024168C 0280302D */ daddu $a2, $s4, $zero -glabel L80241690_C41440 -/* C41440 80241690 0240202D */ daddu $a0, $s2, $zero -/* C41444 80241694 0260282D */ daddu $a1, $s3, $zero -/* C41448 80241698 0C0127B3 */ jal func_80049ECC -/* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero -/* C41450 802416A0 080905CE */ j L80241738_C414E8 -/* C41454 802416A4 00000000 */ nop -glabel L802416A8_C41458 -/* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero -/* C4145C 802416AC 0260282D */ daddu $a1, $s3, $zero -/* C41460 802416B0 0C0127DF */ jal func_80049F7C -/* C41464 802416B4 0280302D */ daddu $a2, $s4, $zero -glabel L802416B8_C41468 -/* C41468 802416B8 0240202D */ daddu $a0, $s2, $zero -/* C4146C 802416BC 0260282D */ daddu $a1, $s3, $zero -/* C41470 802416C0 0C012849 */ jal func_8004A124 -/* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero -/* C41478 802416C8 080905CE */ j L80241738_C414E8 -/* C4147C 802416CC 00000000 */ nop -glabel L802416D0_C41480 -/* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero -/* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero -/* C41488 802416D8 0C0128FA */ jal func_8004A3E8 -/* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero -/* C41490 802416E0 080905CE */ j L80241738_C414E8 -/* C41494 802416E4 00000000 */ nop -glabel L802416E8_C41498 -/* C41498 802416E8 0C0903A4 */ jal dgb_08_UnkNpcAIFunc6 -/* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero -glabel L802416F0_C414A0 -/* C414A0 802416F0 0C0903BF */ jal dgb_08_UnkNpcAIFunc7 -/* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero -/* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) -/* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 -/* C414B0 80241700 1462000D */ bne $v1, $v0, L80241738_C414E8 -/* C414B4 80241704 00000000 */ nop -glabel L80241708_C414B8 -/* C414B8 80241708 0C0903DB */ jal dgb_08_UnkNpcAIFunc8 -/* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero -/* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) -/* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 -/* C414C8 80241718 14620007 */ bne $v1, $v0, L80241738_C414E8 -/* C414CC 8024171C 00000000 */ nop -glabel L80241720_C414D0 -/* C414D0 80241720 0C090411 */ jal dgb_08_UnkNpcAIFunc5 -/* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero -/* C414D8 80241728 080905CE */ j L80241738_C414E8 -/* C414DC 8024172C 00000000 */ nop -glabel L80241730_C414E0 -/* C414E0 80241730 0C0129CF */ jal func_8004A73C -/* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero -glabel L80241738_C414E8 -/* C414E8 80241738 8FBF0048 */ lw $ra, 0x48($sp) -/* C414EC 8024173C 8FB50044 */ lw $s5, 0x44($sp) -/* C414F0 80241740 8FB40040 */ lw $s4, 0x40($sp) -/* C414F4 80241744 8FB3003C */ lw $s3, 0x3c($sp) -/* C414F8 80241748 8FB20038 */ lw $s2, 0x38($sp) -/* C414FC 8024174C 8FB10034 */ lw $s1, 0x34($sp) -/* C41500 80241750 8FB00030 */ lw $s0, 0x30($sp) -/* C41504 80241754 0000102D */ daddu $v0, $zero, $zero -/* C41508 80241758 03E00008 */ jr $ra -/* C4150C 8024175C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s deleted file mode 100644 index 390692861a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241760_C41510 -/* C41510 80241760 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C41514 80241764 AFB3002C */ sw $s3, 0x2c($sp) -/* C41518 80241768 0080982D */ daddu $s3, $a0, $zero -/* C4151C 8024176C AFBF0030 */ sw $ra, 0x30($sp) -/* C41520 80241770 AFB20028 */ sw $s2, 0x28($sp) -/* C41524 80241774 AFB10024 */ sw $s1, 0x24($sp) -/* C41528 80241778 AFB00020 */ sw $s0, 0x20($sp) -/* C4152C 8024177C 8E710148 */ lw $s1, 0x148($s3) -/* C41530 80241780 86240008 */ lh $a0, 8($s1) -/* C41534 80241784 0C00EABB */ jal get_npc_unsafe -/* C41538 80241788 00A0902D */ daddu $s2, $a1, $zero -/* C4153C 8024178C 8E440004 */ lw $a0, 4($s2) -/* C41540 80241790 0040802D */ daddu $s0, $v0, $zero -/* C41544 80241794 00041FC2 */ srl $v1, $a0, 0x1f -/* C41548 80241798 00832021 */ addu $a0, $a0, $v1 -/* C4154C 8024179C 00042043 */ sra $a0, $a0, 1 -/* C41550 802417A0 0C00A67F */ jal rand_int -/* C41554 802417A4 24840001 */ addiu $a0, $a0, 1 -/* C41558 802417A8 8E430004 */ lw $v1, 4($s2) -/* C4155C 802417AC 000327C2 */ srl $a0, $v1, 0x1f -/* C41560 802417B0 00641821 */ addu $v1, $v1, $a0 -/* C41564 802417B4 00031843 */ sra $v1, $v1, 1 -/* C41568 802417B8 00621821 */ addu $v1, $v1, $v0 -/* C4156C 802417BC A603008E */ sh $v1, 0x8e($s0) -/* C41570 802417C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C41574 802417C4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C41578 802417C8 C4640000 */ lwc1 $f4, ($v1) -/* C4157C 802417CC 46802120 */ cvt.s.w $f4, $f4 -/* C41580 802417D0 C4620008 */ lwc1 $f2, 8($v1) -/* C41584 802417D4 468010A0 */ cvt.s.w $f2, $f2 -/* C41588 802417D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4158C 802417DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41590 802417E0 44061000 */ mfc1 $a2, $f2 -/* C41594 802417E4 C440000C */ lwc1 $f0, 0xc($v0) -/* C41598 802417E8 46800020 */ cvt.s.w $f0, $f0 -/* C4159C 802417EC E7A00014 */ swc1 $f0, 0x14($sp) -/* C415A0 802417F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C415A4 802417F4 44052000 */ mfc1 $a1, $f4 -/* C415A8 802417F8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C415AC 802417FC 46800020 */ cvt.s.w $f0, $f0 -/* C415B0 80241800 E7A00018 */ swc1 $f0, 0x18($sp) -/* C415B4 80241804 8C640018 */ lw $a0, 0x18($v1) -/* C415B8 80241808 0C0123F5 */ jal is_point_within_region -/* C415BC 8024180C 8E070038 */ lw $a3, 0x38($s0) -/* C415C0 80241810 1040000E */ beqz $v0, .L8024184C -/* C415C4 80241814 00000000 */ nop -/* C415C8 80241818 8E2200D0 */ lw $v0, 0xd0($s1) -/* C415CC 8024181C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C415D0 80241820 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C415D4 80241824 C4460000 */ lwc1 $f6, ($v0) -/* C415D8 80241828 468031A0 */ cvt.s.w $f6, $f6 -/* C415DC 8024182C 44063000 */ mfc1 $a2, $f6 -/* C415E0 80241830 C4460008 */ lwc1 $f6, 8($v0) -/* C415E4 80241834 468031A0 */ cvt.s.w $f6, $f6 -/* C415E8 80241838 44073000 */ mfc1 $a3, $f6 -/* C415EC 8024183C 0C00A720 */ jal atan2 -/* C415F0 80241840 00000000 */ nop -/* C415F4 80241844 0809061F */ j .L8024187C -/* C415F8 80241848 E600000C */ swc1 $f0, 0xc($s0) -.L8024184C: -/* C415FC 8024184C 0C00A67F */ jal rand_int -/* C41600 80241850 2404003C */ addiu $a0, $zero, 0x3c -/* C41604 80241854 C60C000C */ lwc1 $f12, 0xc($s0) -/* C41608 80241858 44820000 */ mtc1 $v0, $f0 -/* C4160C 8024185C 00000000 */ nop -/* C41610 80241860 46800020 */ cvt.s.w $f0, $f0 -/* C41614 80241864 46006300 */ add.s $f12, $f12, $f0 -/* C41618 80241868 3C0141F0 */ lui $at, 0x41f0 -/* C4161C 8024186C 44810000 */ mtc1 $at, $f0 -/* C41620 80241870 0C00A6C9 */ jal clamp_angle -/* C41624 80241874 46006301 */ sub.s $f12, $f12, $f0 -/* C41628 80241878 E600000C */ swc1 $f0, 0xc($s0) -.L8024187C: -/* C4162C 8024187C 8E2200CC */ lw $v0, 0xcc($s1) -/* C41630 80241880 8C420004 */ lw $v0, 4($v0) -/* C41634 80241884 AE020028 */ sw $v0, 0x28($s0) -/* C41638 80241888 AE600074 */ sw $zero, 0x74($s3) -/* C4163C 8024188C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41640 80241890 8C420014 */ lw $v0, 0x14($v0) -/* C41644 80241894 04410004 */ bgez $v0, .L802418A8 -/* C41648 80241898 00000000 */ nop -/* C4164C 8024189C C6400000 */ lwc1 $f0, ($s2) -/* C41650 802418A0 08090632 */ j .L802418C8 -/* C41654 802418A4 E6000018 */ swc1 $f0, 0x18($s0) -.L802418A8: -/* C41658 802418A8 3C018024 */ lui $at, %hi(D_80246D38_C46AE8) -/* C4165C 802418AC D4226D38 */ ldc1 $f2, %lo(D_80246D38_C46AE8)($at) -/* C41660 802418B0 44820000 */ mtc1 $v0, $f0 -/* C41664 802418B4 00000000 */ nop -/* C41668 802418B8 46800021 */ cvt.d.w $f0, $f0 -/* C4166C 802418BC 46220003 */ div.d $f0, $f0, $f2 -/* C41670 802418C0 46200020 */ cvt.s.d $f0, $f0 -/* C41674 802418C4 E6000018 */ swc1 $f0, 0x18($s0) -.L802418C8: -/* C41678 802418C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C4167C 802418CC 3C014059 */ lui $at, 0x4059 -/* C41680 802418D0 44811800 */ mtc1 $at, $f3 -/* C41684 802418D4 44801000 */ mtc1 $zero, $f2 -/* C41688 802418D8 46000021 */ cvt.d.s $f0, $f0 -/* C4168C 802418DC 46220002 */ mul.d $f0, $f0, $f2 -/* C41690 802418E0 00000000 */ nop -/* C41694 802418E4 24020001 */ addiu $v0, $zero, 1 -/* C41698 802418E8 4620018D */ trunc.w.d $f6, $f0 -/* C4169C 802418EC E626007C */ swc1 $f6, 0x7c($s1) -/* C416A0 802418F0 AE620070 */ sw $v0, 0x70($s3) -/* C416A4 802418F4 8FBF0030 */ lw $ra, 0x30($sp) -/* C416A8 802418F8 8FB3002C */ lw $s3, 0x2c($sp) -/* C416AC 802418FC 8FB20028 */ lw $s2, 0x28($sp) -/* C416B0 80241900 8FB10024 */ lw $s1, 0x24($sp) -/* C416B4 80241904 8FB00020 */ lw $s0, 0x20($sp) -/* C416B8 80241908 03E00008 */ jr $ra -/* C416BC 8024190C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s deleted file mode 100644 index 3cecddf7e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FF8_C41DA8 -/* C41DA8 80241FF8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C41DAC 80241FFC AFB3004C */ sw $s3, 0x4c($sp) -/* C41DB0 80242000 0080982D */ daddu $s3, $a0, $zero -/* C41DB4 80242004 AFBF0054 */ sw $ra, 0x54($sp) -/* C41DB8 80242008 AFB40050 */ sw $s4, 0x50($sp) -/* C41DBC 8024200C AFB20048 */ sw $s2, 0x48($sp) -/* C41DC0 80242010 AFB10044 */ sw $s1, 0x44($sp) -/* C41DC4 80242014 AFB00040 */ sw $s0, 0x40($sp) -/* C41DC8 80242018 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C41DCC 8024201C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C41DD0 80242020 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C41DD4 80242024 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C41DD8 80242028 8E710148 */ lw $s1, 0x148($s3) -/* C41DDC 8024202C 00A0902D */ daddu $s2, $a1, $zero -/* C41DE0 80242030 86240008 */ lh $a0, 8($s1) -/* C41DE4 80242034 0C00EABB */ jal get_npc_unsafe -/* C41DE8 80242038 00C0A02D */ daddu $s4, $a2, $zero -/* C41DEC 8024203C 0040802D */ daddu $s0, $v0, $zero -/* C41DF0 80242040 C6200078 */ lwc1 $f0, 0x78($s1) -/* C41DF4 80242044 46800020 */ cvt.s.w $f0, $f0 -/* C41DF8 80242048 46000021 */ cvt.d.s $f0, $f0 -/* C41DFC 8024204C 3C014059 */ lui $at, 0x4059 -/* C41E00 80242050 44811800 */ mtc1 $at, $f3 -/* C41E04 80242054 44801000 */ mtc1 $zero, $f2 -/* C41E08 80242058 8602008E */ lh $v0, 0x8e($s0) -/* C41E0C 8024205C 9603008E */ lhu $v1, 0x8e($s0) -/* C41E10 80242060 46220003 */ div.d $f0, $f0, $f2 -/* C41E14 80242064 46200620 */ cvt.s.d $f24, $f0 -/* C41E18 80242068 C6200088 */ lwc1 $f0, 0x88($s1) -/* C41E1C 8024206C 46800020 */ cvt.s.w $f0, $f0 -/* C41E20 80242070 46000021 */ cvt.d.s $f0, $f0 -/* C41E24 80242074 46220003 */ div.d $f0, $f0, $f2 -/* C41E28 80242078 46200020 */ cvt.s.d $f0, $f0 -/* C41E2C 8024207C 18400003 */ blez $v0, .L8024208C -/* C41E30 80242080 4600C680 */ add.s $f26, $f24, $f0 -/* C41E34 80242084 2462FFFF */ addiu $v0, $v1, -1 -/* C41E38 80242088 A602008E */ sh $v0, 0x8e($s0) -.L8024208C: -/* C41E3C 8024208C 8E220070 */ lw $v0, 0x70($s1) -/* C41E40 80242090 18400034 */ blez $v0, .L80242164 -/* C41E44 80242094 00000000 */ nop -/* C41E48 80242098 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C41E4C 8024209C 46806320 */ cvt.s.w $f12, $f12 -/* C41E50 802420A0 44820000 */ mtc1 $v0, $f0 -/* C41E54 802420A4 00000000 */ nop -/* C41E58 802420A8 46800020 */ cvt.s.w $f0, $f0 -/* C41E5C 802420AC 46000021 */ cvt.d.s $f0, $f0 -/* C41E60 802420B0 46220003 */ div.d $f0, $f0, $f2 -/* C41E64 802420B4 0C00A8BB */ jal sin_deg -/* C41E68 802420B8 462005A0 */ cvt.s.d $f22, $f0 -/* C41E6C 802420BC 8E020000 */ lw $v0, ($s0) -/* C41E70 802420C0 30420008 */ andi $v0, $v0, 8 -/* C41E74 802420C4 10400003 */ beqz $v0, .L802420D4 -/* C41E78 802420C8 46000506 */ mov.s $f20, $f0 -/* C41E7C 802420CC 08090845 */ j .L80242114 -/* C41E80 802420D0 0000102D */ daddu $v0, $zero, $zero -.L802420D4: -/* C41E84 802420D4 27A50028 */ addiu $a1, $sp, 0x28 -/* C41E88 802420D8 27A6002C */ addiu $a2, $sp, 0x2c -/* C41E8C 802420DC C6000038 */ lwc1 $f0, 0x38($s0) -/* C41E90 802420E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C41E94 802420E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C41E98 802420E8 3C01447A */ lui $at, 0x447a -/* C41E9C 802420EC 44813000 */ mtc1 $at, $f6 -/* C41EA0 802420F0 27A20034 */ addiu $v0, $sp, 0x34 -/* C41EA4 802420F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C41EA8 802420F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C41EAC 802420FC E7A40030 */ swc1 $f4, 0x30($sp) -/* C41EB0 80242100 E7A60034 */ swc1 $f6, 0x34($sp) -/* C41EB4 80242104 AFA20010 */ sw $v0, 0x10($sp) -/* C41EB8 80242108 8E040080 */ lw $a0, 0x80($s0) -/* C41EBC 8024210C 0C0372DF */ jal func_800DCB7C -/* C41EC0 80242110 27A70030 */ addiu $a3, $sp, 0x30 -.L80242114: -/* C41EC4 80242114 10400007 */ beqz $v0, .L80242134 -/* C41EC8 80242118 00000000 */ nop -/* C41ECC 8024211C 4616A082 */ mul.s $f2, $f20, $f22 -/* C41ED0 80242120 00000000 */ nop -/* C41ED4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C41ED8 80242128 46180000 */ add.s $f0, $f0, $f24 -/* C41EDC 8024212C 08090850 */ j .L80242140 -/* C41EE0 80242130 46020000 */ add.s $f0, $f0, $f2 -.L80242134: -/* C41EE4 80242134 4616A002 */ mul.s $f0, $f20, $f22 -/* C41EE8 80242138 00000000 */ nop -/* C41EEC 8024213C 4600D000 */ add.s $f0, $f26, $f0 -.L80242140: -/* C41EF0 80242140 E600003C */ swc1 $f0, 0x3c($s0) -/* C41EF4 80242144 8E220074 */ lw $v0, 0x74($s1) -/* C41EF8 80242148 2442000A */ addiu $v0, $v0, 0xa -/* C41EFC 8024214C 44826000 */ mtc1 $v0, $f12 -/* C41F00 80242150 00000000 */ nop -/* C41F04 80242154 0C00A6C9 */ jal clamp_angle -/* C41F08 80242158 46806320 */ cvt.s.w $f12, $f12 -/* C41F0C 8024215C 4600020D */ trunc.w.s $f8, $f0 -/* C41F10 80242160 E6280074 */ swc1 $f8, 0x74($s1) -.L80242164: -/* C41F14 80242164 8E220090 */ lw $v0, 0x90($s1) -/* C41F18 80242168 1C400040 */ bgtz $v0, .L8024226C -/* C41F1C 8024216C 2442FFFF */ addiu $v0, $v0, -1 -/* C41F20 80242170 860200A8 */ lh $v0, 0xa8($s0) -/* C41F24 80242174 C600003C */ lwc1 $f0, 0x3c($s0) -/* C41F28 80242178 44821000 */ mtc1 $v0, $f2 -/* C41F2C 8024217C 00000000 */ nop -/* C41F30 80242180 468010A0 */ cvt.s.w $f2, $f2 -/* C41F34 80242184 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C41F38 80242188 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C41F3C 8024218C 46020000 */ add.s $f0, $f0, $f2 -/* C41F40 80242190 3C014024 */ lui $at, 0x4024 -/* C41F44 80242194 44812800 */ mtc1 $at, $f5 -/* C41F48 80242198 44802000 */ mtc1 $zero, $f4 -/* C41F4C 8024219C C442002C */ lwc1 $f2, 0x2c($v0) -/* C41F50 802421A0 46000021 */ cvt.d.s $f0, $f0 -/* C41F54 802421A4 46240000 */ add.d $f0, $f0, $f4 -/* C41F58 802421A8 460010A1 */ cvt.d.s $f2, $f2 -/* C41F5C 802421AC 4620103C */ c.lt.d $f2, $f0 -/* C41F60 802421B0 00000000 */ nop -/* C41F64 802421B4 4500002E */ bc1f .L80242270 -/* C41F68 802421B8 0280202D */ daddu $a0, $s4, $zero -/* C41F6C 802421BC 24020001 */ addiu $v0, $zero, 1 -/* C41F70 802421C0 AFA20010 */ sw $v0, 0x10($sp) -/* C41F74 802421C4 8E460024 */ lw $a2, 0x24($s2) -/* C41F78 802421C8 8E470028 */ lw $a3, 0x28($s2) -/* C41F7C 802421CC 0C01242D */ jal func_800490B4 -/* C41F80 802421D0 0220282D */ daddu $a1, $s1, $zero -/* C41F84 802421D4 10400026 */ beqz $v0, .L80242270 -/* C41F88 802421D8 0000202D */ daddu $a0, $zero, $zero -/* C41F8C 802421DC 0200282D */ daddu $a1, $s0, $zero -/* C41F90 802421E0 0000302D */ daddu $a2, $zero, $zero -/* C41F94 802421E4 2412000C */ addiu $s2, $zero, 0xc -/* C41F98 802421E8 860300A8 */ lh $v1, 0xa8($s0) -/* C41F9C 802421EC 3C013F80 */ lui $at, 0x3f80 -/* C41FA0 802421F0 44810000 */ mtc1 $at, $f0 -/* C41FA4 802421F4 3C014000 */ lui $at, 0x4000 -/* C41FA8 802421F8 44811000 */ mtc1 $at, $f2 -/* C41FAC 802421FC 3C01C1A0 */ lui $at, 0xc1a0 -/* C41FB0 80242200 44812000 */ mtc1 $at, $f4 -/* C41FB4 80242204 44834000 */ mtc1 $v1, $f8 -/* C41FB8 80242208 00000000 */ nop -/* C41FBC 8024220C 46804220 */ cvt.s.w $f8, $f8 -/* C41FC0 80242210 44074000 */ mfc1 $a3, $f8 -/* C41FC4 80242214 27A20038 */ addiu $v0, $sp, 0x38 -/* C41FC8 80242218 AFB2001C */ sw $s2, 0x1c($sp) -/* C41FCC 8024221C AFA20020 */ sw $v0, 0x20($sp) -/* C41FD0 80242220 E7A00010 */ swc1 $f0, 0x10($sp) -/* C41FD4 80242224 E7A20014 */ swc1 $f2, 0x14($sp) -/* C41FD8 80242228 0C01BFA4 */ jal fx_emote -/* C41FDC 8024222C E7A40018 */ swc1 $f4, 0x18($sp) -/* C41FE0 80242230 0200202D */ daddu $a0, $s0, $zero -/* C41FE4 80242234 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C41FE8 80242238 C480003C */ lwc1 $f0, 0x3c($a0) -/* C41FEC 8024223C 3C060020 */ lui $a2, 0x20 -/* C41FF0 80242240 0C012530 */ jal func_800494C0 -/* C41FF4 80242244 E4800064 */ swc1 $f0, 0x64($a0) -/* C41FF8 80242248 8E220018 */ lw $v0, 0x18($s1) -/* C41FFC 8024224C 9442002A */ lhu $v0, 0x2a($v0) -/* C42000 80242250 30420001 */ andi $v0, $v0, 1 -/* C42004 80242254 10400003 */ beqz $v0, .L80242264 -/* C42008 80242258 2402000A */ addiu $v0, $zero, 0xa -/* C4200C 8024225C 080908C3 */ j .L8024230C -/* C42010 80242260 AE620070 */ sw $v0, 0x70($s3) -.L80242264: -/* C42014 80242264 080908C3 */ j .L8024230C -/* C42018 80242268 AE720070 */ sw $s2, 0x70($s3) -.L8024226C: -/* C4201C 8024226C AE220090 */ sw $v0, 0x90($s1) -.L80242270: -/* C42020 80242270 8602008C */ lh $v0, 0x8c($s0) -/* C42024 80242274 14400025 */ bnez $v0, .L8024230C -/* C42028 80242278 00000000 */ nop -/* C4202C 8024227C 8602008E */ lh $v0, 0x8e($s0) -/* C42030 80242280 1C400022 */ bgtz $v0, .L8024230C -/* C42034 80242284 00000000 */ nop -/* C42038 80242288 8E620074 */ lw $v0, 0x74($s3) -/* C4203C 8024228C 2442FFFF */ addiu $v0, $v0, -1 -/* C42040 80242290 1840001D */ blez $v0, .L80242308 -/* C42044 80242294 AE620074 */ sw $v0, 0x74($s3) -/* C42048 80242298 8E220018 */ lw $v0, 0x18($s1) -/* C4204C 8024229C 9442002A */ lhu $v0, 0x2a($v0) -/* C42050 802422A0 30420010 */ andi $v0, $v0, 0x10 -/* C42054 802422A4 14400007 */ bnez $v0, .L802422C4 -/* C42058 802422A8 00000000 */ nop -/* C4205C 802422AC C600000C */ lwc1 $f0, 0xc($s0) -/* C42060 802422B0 3C014334 */ lui $at, 0x4334 -/* C42064 802422B4 44816000 */ mtc1 $at, $f12 -/* C42068 802422B8 0C00A6C9 */ jal clamp_angle -/* C4206C 802422BC 460C0300 */ add.s $f12, $f0, $f12 -/* C42070 802422C0 E600000C */ swc1 $f0, 0xc($s0) -.L802422C4: -/* C42074 802422C4 0C00A67F */ jal rand_int -/* C42078 802422C8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4207C 802422CC 3C032E8B */ lui $v1, 0x2e8b -/* C42080 802422D0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C42084 802422D4 00430018 */ mult $v0, $v1 -/* C42088 802422D8 00021FC3 */ sra $v1, $v0, 0x1f -/* C4208C 802422DC 00004010 */ mfhi $t0 -/* C42090 802422E0 00082043 */ sra $a0, $t0, 1 -/* C42094 802422E4 00832023 */ subu $a0, $a0, $v1 -/* C42098 802422E8 00041840 */ sll $v1, $a0, 1 -/* C4209C 802422EC 00641821 */ addu $v1, $v1, $a0 -/* C420A0 802422F0 00031880 */ sll $v1, $v1, 2 -/* C420A4 802422F4 00641823 */ subu $v1, $v1, $a0 -/* C420A8 802422F8 00431023 */ subu $v0, $v0, $v1 -/* C420AC 802422FC 24420005 */ addiu $v0, $v0, 5 -/* C420B0 80242300 080908C3 */ j .L8024230C -/* C420B4 80242304 A602008E */ sh $v0, 0x8e($s0) -.L80242308: -/* C420B8 80242308 AE600070 */ sw $zero, 0x70($s3) -.L8024230C: -/* C420BC 8024230C 8FBF0054 */ lw $ra, 0x54($sp) -/* C420C0 80242310 8FB40050 */ lw $s4, 0x50($sp) -/* C420C4 80242314 8FB3004C */ lw $s3, 0x4c($sp) -/* C420C8 80242318 8FB20048 */ lw $s2, 0x48($sp) -/* C420CC 8024231C 8FB10044 */ lw $s1, 0x44($sp) -/* C420D0 80242320 8FB00040 */ lw $s0, 0x40($sp) -/* C420D4 80242324 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C420D8 80242328 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C420DC 8024232C D7B60060 */ ldc1 $f22, 0x60($sp) -/* C420E0 80242330 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C420E4 80242334 03E00008 */ jr $ra -/* C420E8 80242338 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s deleted file mode 100644 index 922be01152..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423B4_C42164 -/* C42164 802423B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C42168 802423B8 AFB00010 */ sw $s0, 0x10($sp) -/* C4216C 802423BC 0080802D */ daddu $s0, $a0, $zero -/* C42170 802423C0 AFBF0014 */ sw $ra, 0x14($sp) -/* C42174 802423C4 8E020148 */ lw $v0, 0x148($s0) -/* C42178 802423C8 0C00EABB */ jal get_npc_unsafe -/* C4217C 802423CC 84440008 */ lh $a0, 8($v0) -/* C42180 802423D0 9443008E */ lhu $v1, 0x8e($v0) -/* C42184 802423D4 C440003C */ lwc1 $f0, 0x3c($v0) -/* C42188 802423D8 24640001 */ addiu $a0, $v1, 1 -/* C4218C 802423DC 00031C00 */ sll $v1, $v1, 0x10 -/* C42190 802423E0 00031B83 */ sra $v1, $v1, 0xe -/* C42194 802423E4 A444008E */ sh $a0, 0x8e($v0) -/* C42198 802423E8 3C018024 */ lui $at, %hi(D_80244460_C44210) -/* C4219C 802423EC 00230821 */ addu $at, $at, $v1 -/* C421A0 802423F0 C4224460 */ lwc1 $f2, %lo(D_80244460_C44210)($at) -/* C421A4 802423F4 8443008E */ lh $v1, 0x8e($v0) -/* C421A8 802423F8 46020000 */ add.s $f0, $f0, $f2 -/* C421AC 802423FC 28630005 */ slti $v1, $v1, 5 -/* C421B0 80242400 14600003 */ bnez $v1, .L80242410 -/* C421B4 80242404 E440003C */ swc1 $f0, 0x3c($v0) -/* C421B8 80242408 2402000C */ addiu $v0, $zero, 0xc -/* C421BC 8024240C AE020070 */ sw $v0, 0x70($s0) -.L80242410: -/* C421C0 80242410 8FBF0014 */ lw $ra, 0x14($sp) -/* C421C4 80242414 8FB00010 */ lw $s0, 0x10($sp) -/* C421C8 80242418 03E00008 */ jr $ra -/* C421CC 8024241C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s deleted file mode 100644 index d6fa5bdb1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425B8_C42368 -/* C42368 802425B8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C4236C 802425BC AFB20030 */ sw $s2, 0x30($sp) -/* C42370 802425C0 0080902D */ daddu $s2, $a0, $zero -/* C42374 802425C4 AFBF0038 */ sw $ra, 0x38($sp) -/* C42378 802425C8 AFB30034 */ sw $s3, 0x34($sp) -/* C4237C 802425CC AFB1002C */ sw $s1, 0x2c($sp) -/* C42380 802425D0 AFB00028 */ sw $s0, 0x28($sp) -/* C42384 802425D4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C42388 802425D8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C4238C 802425DC 8E510148 */ lw $s1, 0x148($s2) -/* C42390 802425E0 86240008 */ lh $a0, 8($s1) -/* C42394 802425E4 0C00EABB */ jal get_npc_unsafe -/* C42398 802425E8 00A0982D */ daddu $s3, $a1, $zero -/* C4239C 802425EC 0040802D */ daddu $s0, $v0, $zero -/* C423A0 802425F0 0200202D */ daddu $a0, $s0, $zero -/* C423A4 802425F4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C423A8 802425F8 468010A0 */ cvt.s.w $f2, $f2 -/* C423AC 802425FC 460010A1 */ cvt.d.s $f2, $f2 -/* C423B0 80242600 C604001C */ lwc1 $f4, 0x1c($s0) -/* C423B4 80242604 C6000014 */ lwc1 $f0, 0x14($s0) -/* C423B8 80242608 8E050018 */ lw $a1, 0x18($s0) -/* C423BC 8024260C 46002100 */ add.s $f4, $f4, $f0 -/* C423C0 80242610 8E06000C */ lw $a2, 0xc($s0) -/* C423C4 80242614 C6200078 */ lwc1 $f0, 0x78($s1) -/* C423C8 80242618 46800020 */ cvt.s.w $f0, $f0 -/* C423CC 8024261C E604001C */ swc1 $f4, 0x1c($s0) -/* C423D0 80242620 3C014059 */ lui $at, 0x4059 -/* C423D4 80242624 44812800 */ mtc1 $at, $f5 -/* C423D8 80242628 44802000 */ mtc1 $zero, $f4 -/* C423DC 8024262C 46000021 */ cvt.d.s $f0, $f0 -/* C423E0 80242630 46240003 */ div.d $f0, $f0, $f4 -/* C423E4 80242634 46200520 */ cvt.s.d $f20, $f0 -/* C423E8 80242638 46241083 */ div.d $f2, $f2, $f4 -/* C423EC 8024263C 0C00EA95 */ jal npc_move_heading -/* C423F0 80242640 462015A0 */ cvt.s.d $f22, $f2 -/* C423F4 80242644 C604001C */ lwc1 $f4, 0x1c($s0) -/* C423F8 80242648 44801000 */ mtc1 $zero, $f2 -/* C423FC 8024264C 44801800 */ mtc1 $zero, $f3 -/* C42400 80242650 46002021 */ cvt.d.s $f0, $f4 -/* C42404 80242654 4620103E */ c.le.d $f2, $f0 -/* C42408 80242658 00000000 */ nop -/* C4240C 8024265C 45000030 */ bc1f .L80242720 -/* C42410 80242660 00000000 */ nop -/* C42414 80242664 C600003C */ lwc1 $f0, 0x3c($s0) -/* C42418 80242668 46040000 */ add.s $f0, $f0, $f4 -/* C4241C 8024266C E600003C */ swc1 $f0, 0x3c($s0) -/* C42420 80242670 8E2200CC */ lw $v0, 0xcc($s1) -/* C42424 80242674 8C420024 */ lw $v0, 0x24($v0) -/* C42428 80242678 AE020028 */ sw $v0, 0x28($s0) -/* C4242C 8024267C A2200007 */ sb $zero, 7($s1) -/* C42430 80242680 8E020000 */ lw $v0, ($s0) -/* C42434 80242684 30420008 */ andi $v0, $v0, 8 -/* C42438 80242688 14400011 */ bnez $v0, .L802426D0 -/* C4243C 8024268C 0000102D */ daddu $v0, $zero, $zero -/* C42440 80242690 27A50018 */ addiu $a1, $sp, 0x18 -/* C42444 80242694 27A6001C */ addiu $a2, $sp, 0x1c -/* C42448 80242698 C6000038 */ lwc1 $f0, 0x38($s0) -/* C4244C 8024269C C602003C */ lwc1 $f2, 0x3c($s0) -/* C42450 802426A0 C6040040 */ lwc1 $f4, 0x40($s0) -/* C42454 802426A4 3C01447A */ lui $at, 0x447a -/* C42458 802426A8 44813000 */ mtc1 $at, $f6 -/* C4245C 802426AC 27A20024 */ addiu $v0, $sp, 0x24 -/* C42460 802426B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C42464 802426B4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C42468 802426B8 E7A40020 */ swc1 $f4, 0x20($sp) -/* C4246C 802426BC E7A60024 */ swc1 $f6, 0x24($sp) -/* C42470 802426C0 AFA20010 */ sw $v0, 0x10($sp) -/* C42474 802426C4 8E040080 */ lw $a0, 0x80($s0) -/* C42478 802426C8 0C0372DF */ jal func_800DCB7C -/* C4247C 802426CC 27A70020 */ addiu $a3, $sp, 0x20 -.L802426D0: -/* C42480 802426D0 1040000B */ beqz $v0, .L80242700 -/* C42484 802426D4 00000000 */ nop -/* C42488 802426D8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C4248C 802426DC 46140080 */ add.s $f2, $f0, $f20 -/* C42490 802426E0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C42494 802426E4 4600103E */ c.le.s $f2, $f0 -/* C42498 802426E8 00000000 */ nop -/* C4249C 802426EC 4500008D */ bc1f .L80242924 -/* C424A0 802426F0 00000000 */ nop -/* C424A4 802426F4 E602003C */ swc1 $f2, 0x3c($s0) -/* C424A8 802426F8 08090A49 */ j .L80242924 -/* C424AC 802426FC AE400070 */ sw $zero, 0x70($s2) -.L80242700: -/* C424B0 80242700 C602003C */ lwc1 $f2, 0x3c($s0) -/* C424B4 80242704 C6000064 */ lwc1 $f0, 0x64($s0) -/* C424B8 80242708 4602003E */ c.le.s $f0, $f2 -/* C424BC 8024270C 00000000 */ nop -/* C424C0 80242710 45030084 */ bc1tl .L80242924 -/* C424C4 80242714 AE400070 */ sw $zero, 0x70($s2) -/* C424C8 80242718 08090A49 */ j .L80242924 -/* C424CC 8024271C 00000000 */ nop -.L80242720: -/* C424D0 80242720 4622003C */ c.lt.d $f0, $f2 -/* C424D4 80242724 00000000 */ nop -/* C424D8 80242728 4500007E */ bc1f .L80242924 -/* C424DC 8024272C 00000000 */ nop -/* C424E0 80242730 9602008E */ lhu $v0, 0x8e($s0) -/* C424E4 80242734 24420001 */ addiu $v0, $v0, 1 -/* C424E8 80242738 A602008E */ sh $v0, 0x8e($s0) -/* C424EC 8024273C 00021400 */ sll $v0, $v0, 0x10 -/* C424F0 80242740 8E630020 */ lw $v1, 0x20($s3) -/* C424F4 80242744 00021403 */ sra $v0, $v0, 0x10 -/* C424F8 80242748 0043102A */ slt $v0, $v0, $v1 -/* C424FC 8024274C 14400026 */ bnez $v0, .L802427E8 -/* C42500 80242750 00000000 */ nop -/* C42504 80242754 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42508 80242758 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4250C 8024275C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42510 80242760 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C42514 80242764 A600008E */ sh $zero, 0x8e($s0) -/* C42518 80242768 8C460028 */ lw $a2, 0x28($v0) -/* C4251C 8024276C 0C00A720 */ jal atan2 -/* C42520 80242770 8C470030 */ lw $a3, 0x30($v0) -/* C42524 80242774 46000506 */ mov.s $f20, $f0 -/* C42528 80242778 C60C000C */ lwc1 $f12, 0xc($s0) -/* C4252C 8024277C 0C00A70A */ jal get_clamped_angle_diff -/* C42530 80242780 4600A386 */ mov.s $f14, $f20 -/* C42534 80242784 46000086 */ mov.s $f2, $f0 -/* C42538 80242788 8E62001C */ lw $v0, 0x1c($s3) -/* C4253C 8024278C 46001005 */ abs.s $f0, $f2 -/* C42540 80242790 44822000 */ mtc1 $v0, $f4 -/* C42544 80242794 00000000 */ nop -/* C42548 80242798 46802120 */ cvt.s.w $f4, $f4 -/* C4254C 8024279C 4600203C */ c.lt.s $f4, $f0 -/* C42550 802427A0 00000000 */ nop -/* C42554 802427A4 4500000D */ bc1f .L802427DC -/* C42558 802427A8 00000000 */ nop -/* C4255C 802427AC 44800000 */ mtc1 $zero, $f0 -/* C42560 802427B0 C614000C */ lwc1 $f20, 0xc($s0) -/* C42564 802427B4 4600103C */ c.lt.s $f2, $f0 -/* C42568 802427B8 00000000 */ nop -/* C4256C 802427BC 45000006 */ bc1f .L802427D8 -/* C42570 802427C0 00021023 */ negu $v0, $v0 -/* C42574 802427C4 44820000 */ mtc1 $v0, $f0 -/* C42578 802427C8 00000000 */ nop -/* C4257C 802427CC 46800020 */ cvt.s.w $f0, $f0 -/* C42580 802427D0 080909F7 */ j .L802427DC -/* C42584 802427D4 4600A500 */ add.s $f20, $f20, $f0 -.L802427D8: -/* C42588 802427D8 4604A500 */ add.s $f20, $f20, $f4 -.L802427DC: -/* C4258C 802427DC 0C00A6C9 */ jal clamp_angle -/* C42590 802427E0 4600A306 */ mov.s $f12, $f20 -/* C42594 802427E4 E600000C */ swc1 $f0, 0xc($s0) -.L802427E8: -/* C42598 802427E8 8E020000 */ lw $v0, ($s0) -/* C4259C 802427EC 30420008 */ andi $v0, $v0, 8 -/* C425A0 802427F0 1040000A */ beqz $v0, .L8024281C -/* C425A4 802427F4 27A50018 */ addiu $a1, $sp, 0x18 -/* C425A8 802427F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C425AC 802427FC C600001C */ lwc1 $f0, 0x1c($s0) -/* C425B0 80242800 46001080 */ add.s $f2, $f2, $f0 -/* C425B4 80242804 4616103C */ c.lt.s $f2, $f22 -/* C425B8 80242808 00000000 */ nop -/* C425BC 8024280C 45020045 */ bc1fl .L80242924 -/* C425C0 80242810 E602003C */ swc1 $f2, 0x3c($s0) -/* C425C4 80242814 08090A48 */ j .L80242920 -/* C425C8 80242818 E616003C */ swc1 $f22, 0x3c($s0) -.L8024281C: -/* C425CC 8024281C C6000038 */ lwc1 $f0, 0x38($s0) -/* C425D0 80242820 27A6001C */ addiu $a2, $sp, 0x1c -/* C425D4 80242824 E7A00018 */ swc1 $f0, 0x18($sp) -/* C425D8 80242828 860200A8 */ lh $v0, 0xa8($s0) -/* C425DC 8024282C C600001C */ lwc1 $f0, 0x1c($s0) -/* C425E0 80242830 C604003C */ lwc1 $f4, 0x3c($s0) -/* C425E4 80242834 44821000 */ mtc1 $v0, $f2 -/* C425E8 80242838 00000000 */ nop -/* C425EC 8024283C 468010A0 */ cvt.s.w $f2, $f2 -/* C425F0 80242840 46000005 */ abs.s $f0, $f0 -/* C425F4 80242844 46020000 */ add.s $f0, $f0, $f2 -/* C425F8 80242848 C6060040 */ lwc1 $f6, 0x40($s0) -/* C425FC 8024284C 27A20024 */ addiu $v0, $sp, 0x24 -/* C42600 80242850 46022100 */ add.s $f4, $f4, $f2 -/* C42604 80242854 3C014024 */ lui $at, 0x4024 -/* C42608 80242858 44811800 */ mtc1 $at, $f3 -/* C4260C 8024285C 44801000 */ mtc1 $zero, $f2 -/* C42610 80242860 46000021 */ cvt.d.s $f0, $f0 -/* C42614 80242864 46220000 */ add.d $f0, $f0, $f2 -/* C42618 80242868 E7A60020 */ swc1 $f6, 0x20($sp) -/* C4261C 8024286C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C42620 80242870 46200020 */ cvt.s.d $f0, $f0 -/* C42624 80242874 E7A00024 */ swc1 $f0, 0x24($sp) -/* C42628 80242878 AFA20010 */ sw $v0, 0x10($sp) -/* C4262C 8024287C 8E040080 */ lw $a0, 0x80($s0) -/* C42630 80242880 0C0372DF */ jal func_800DCB7C -/* C42634 80242884 27A70020 */ addiu $a3, $sp, 0x20 -/* C42638 80242888 10400015 */ beqz $v0, .L802428E0 -/* C4263C 8024288C 00000000 */ nop -/* C42640 80242890 860200A8 */ lh $v0, 0xa8($s0) -/* C42644 80242894 C604001C */ lwc1 $f4, 0x1c($s0) -/* C42648 80242898 44820000 */ mtc1 $v0, $f0 -/* C4264C 8024289C 00000000 */ nop -/* C42650 802428A0 46800020 */ cvt.s.w $f0, $f0 -/* C42654 802428A4 46002085 */ abs.s $f2, $f4 -/* C42658 802428A8 46020000 */ add.s $f0, $f0, $f2 -/* C4265C 802428AC C7A20024 */ lwc1 $f2, 0x24($sp) -/* C42660 802428B0 4600103E */ c.le.s $f2, $f0 -/* C42664 802428B4 00000000 */ nop -/* C42668 802428B8 45000005 */ bc1f .L802428D0 -/* C4266C 802428BC 00000000 */ nop -/* C42670 802428C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C42674 802428C4 AE00001C */ sw $zero, 0x1c($s0) -/* C42678 802428C8 08090A49 */ j .L80242924 -/* C4267C 802428CC E600003C */ swc1 $f0, 0x3c($s0) -.L802428D0: -/* C42680 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C42684 802428D4 46040000 */ add.s $f0, $f0, $f4 -/* C42688 802428D8 08090A49 */ j .L80242924 -/* C4268C 802428DC E600003C */ swc1 $f0, 0x3c($s0) -.L802428E0: -/* C42690 802428E0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C42694 802428E4 860200A8 */ lh $v0, 0xa8($s0) -/* C42698 802428E8 46163081 */ sub.s $f2, $f6, $f22 -/* C4269C 802428EC 44820000 */ mtc1 $v0, $f0 -/* C426A0 802428F0 00000000 */ nop -/* C426A4 802428F4 46800020 */ cvt.s.w $f0, $f0 -/* C426A8 802428F8 46001080 */ add.s $f2, $f2, $f0 -/* C426AC 802428FC C604001C */ lwc1 $f4, 0x1c($s0) -/* C426B0 80242900 46002005 */ abs.s $f0, $f4 -/* C426B4 80242904 4602003C */ c.lt.s $f0, $f2 -/* C426B8 80242908 00000000 */ nop -/* C426BC 8024290C 45020005 */ bc1fl .L80242924 -/* C426C0 80242910 AE00001C */ sw $zero, 0x1c($s0) -/* C426C4 80242914 46043000 */ add.s $f0, $f6, $f4 -/* C426C8 80242918 08090A49 */ j .L80242924 -/* C426CC 8024291C E600003C */ swc1 $f0, 0x3c($s0) -.L80242920: -/* C426D0 80242920 AE00001C */ sw $zero, 0x1c($s0) -.L80242924: -/* C426D4 80242924 8FBF0038 */ lw $ra, 0x38($sp) -/* C426D8 80242928 8FB30034 */ lw $s3, 0x34($sp) -/* C426DC 8024292C 8FB20030 */ lw $s2, 0x30($sp) -/* C426E0 80242930 8FB1002C */ lw $s1, 0x2c($sp) -/* C426E4 80242934 8FB00028 */ lw $s0, 0x28($sp) -/* C426E8 80242938 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C426EC 8024293C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C426F0 80242940 03E00008 */ jr $ra -/* C426F4 80242944 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s deleted file mode 100644 index 634946db20..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242948_C426F8 -/* C426F8 80242948 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C426FC 8024294C AFB00028 */ sw $s0, 0x28($sp) -/* C42700 80242950 00A0802D */ daddu $s0, $a1, $zero -/* C42704 80242954 AFB1002C */ sw $s1, 0x2c($sp) -/* C42708 80242958 00C0882D */ daddu $s1, $a2, $zero -/* C4270C 8024295C AFBF0034 */ sw $ra, 0x34($sp) -/* C42710 80242960 AFB20030 */ sw $s2, 0x30($sp) -/* C42714 80242964 AE200070 */ sw $zero, 0x70($s1) -/* C42718 80242968 8C830000 */ lw $v1, ($a0) -/* C4271C 8024296C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C42720 80242970 A480008E */ sh $zero, 0x8e($a0) -/* C42724 80242974 00621824 */ and $v1, $v1, $v0 -/* C42728 80242978 34650800 */ ori $a1, $v1, 0x800 -/* C4272C 8024297C AC850000 */ sw $a1, ($a0) -/* C42730 80242980 8E0200D0 */ lw $v0, 0xd0($s0) -/* C42734 80242984 8C420034 */ lw $v0, 0x34($v0) -/* C42738 80242988 10400003 */ beqz $v0, .L80242998 -/* C4273C 8024298C 00E0902D */ daddu $s2, $a3, $zero -/* C42740 80242990 08090A68 */ j .L802429A0 -/* C42744 80242994 34620808 */ ori $v0, $v1, 0x808 -.L80242998: -/* C42748 80242998 2402FFF7 */ addiu $v0, $zero, -9 -/* C4274C 8024299C 00A21024 */ and $v0, $a1, $v0 -.L802429A0: -/* C42750 802429A0 AC820000 */ sw $v0, ($a0) -/* C42754 802429A4 27A20024 */ addiu $v0, $sp, 0x24 -/* C42758 802429A8 27A50018 */ addiu $a1, $sp, 0x18 -/* C4275C 802429AC C4800038 */ lwc1 $f0, 0x38($a0) -/* C42760 802429B0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C42764 802429B4 C4840040 */ lwc1 $f4, 0x40($a0) -/* C42768 802429B8 3C01447A */ lui $at, 0x447a -/* C4276C 802429BC 44813000 */ mtc1 $at, $f6 -/* C42770 802429C0 27A6001C */ addiu $a2, $sp, 0x1c -/* C42774 802429C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C42778 802429C8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C4277C 802429CC E7A40020 */ swc1 $f4, 0x20($sp) -/* C42780 802429D0 E7A60024 */ swc1 $f6, 0x24($sp) -/* C42784 802429D4 AFA20010 */ sw $v0, 0x10($sp) -/* C42788 802429D8 8C840080 */ lw $a0, 0x80($a0) -/* C4278C 802429DC 0C0372DF */ jal func_800DCB7C -/* C42790 802429E0 27A70020 */ addiu $a3, $sp, 0x20 -/* C42794 802429E4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C42798 802429E8 3C014059 */ lui $at, 0x4059 -/* C4279C 802429EC 44812800 */ mtc1 $at, $f5 -/* C427A0 802429F0 44802000 */ mtc1 $zero, $f4 -/* C427A4 802429F4 460010A1 */ cvt.d.s $f2, $f2 -/* C427A8 802429F8 46241082 */ mul.d $f2, $f2, $f4 -/* C427AC 802429FC 00000000 */ nop -/* C427B0 80242A00 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C427B4 80242A04 46000021 */ cvt.d.s $f0, $f0 -/* C427B8 80242A08 46240002 */ mul.d $f0, $f0, $f4 -/* C427BC 80242A0C 00000000 */ nop -/* C427C0 80242A10 3C013FE0 */ lui $at, 0x3fe0 -/* C427C4 80242A14 44812800 */ mtc1 $at, $f5 -/* C427C8 80242A18 44802000 */ mtc1 $zero, $f4 -/* C427CC 80242A1C 00000000 */ nop -/* C427D0 80242A20 46241080 */ add.d $f2, $f2, $f4 -/* C427D4 80242A24 AE000074 */ sw $zero, 0x74($s0) -/* C427D8 80242A28 46240000 */ add.d $f0, $f0, $f4 -/* C427DC 80242A2C AE000090 */ sw $zero, 0x90($s0) -/* C427E0 80242A30 4620120D */ trunc.w.d $f8, $f2 -/* C427E4 80242A34 E6080078 */ swc1 $f8, 0x78($s0) -/* C427E8 80242A38 4620020D */ trunc.w.d $f8, $f0 -/* C427EC 80242A3C E6080088 */ swc1 $f8, 0x88($s0) -/* C427F0 80242A40 8E420014 */ lw $v0, 0x14($s2) -/* C427F4 80242A44 AE220074 */ sw $v0, 0x74($s1) -/* C427F8 80242A48 8E0200B0 */ lw $v0, 0xb0($s0) -/* C427FC 80242A4C 34420010 */ ori $v0, $v0, 0x10 -/* C42800 80242A50 AE0200B0 */ sw $v0, 0xb0($s0) -/* C42804 80242A54 8FBF0034 */ lw $ra, 0x34($sp) -/* C42808 80242A58 8FB20030 */ lw $s2, 0x30($sp) -/* C4280C 80242A5C 8FB1002C */ lw $s1, 0x2c($sp) -/* C42810 80242A60 8FB00028 */ lw $s0, 0x28($sp) -/* C42814 80242A64 03E00008 */ jr $ra -/* C42818 80242A68 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s deleted file mode 100644 index ee8ee2d687..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A6C_C4281C -/* C4281C 80242A6C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C42820 80242A70 AFB40040 */ sw $s4, 0x40($sp) -/* C42824 80242A74 0080A02D */ daddu $s4, $a0, $zero -/* C42828 80242A78 AFBF0048 */ sw $ra, 0x48($sp) -/* C4282C 80242A7C AFB50044 */ sw $s5, 0x44($sp) -/* C42830 80242A80 AFB3003C */ sw $s3, 0x3c($sp) -/* C42834 80242A84 AFB20038 */ sw $s2, 0x38($sp) -/* C42838 80242A88 AFB10034 */ sw $s1, 0x34($sp) -/* C4283C 80242A8C AFB00030 */ sw $s0, 0x30($sp) -/* C42840 80242A90 8E920148 */ lw $s2, 0x148($s4) -/* C42844 80242A94 86440008 */ lh $a0, 8($s2) -/* C42848 80242A98 8E90000C */ lw $s0, 0xc($s4) -/* C4284C 80242A9C 0C00EABB */ jal get_npc_unsafe -/* C42850 80242AA0 00A0882D */ daddu $s1, $a1, $zero -/* C42854 80242AA4 0280202D */ daddu $a0, $s4, $zero -/* C42858 80242AA8 8E050000 */ lw $a1, ($s0) -/* C4285C 80242AAC 0C0B1EAF */ jal get_variable -/* C42860 80242AB0 0040A82D */ daddu $s5, $v0, $zero -/* C42864 80242AB4 AFA00010 */ sw $zero, 0x10($sp) -/* C42868 80242AB8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4286C 80242ABC 8C630030 */ lw $v1, 0x30($v1) -/* C42870 80242AC0 AFA30014 */ sw $v1, 0x14($sp) -/* C42874 80242AC4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C42878 80242AC8 8C63001C */ lw $v1, 0x1c($v1) -/* C4287C 80242ACC AFA30018 */ sw $v1, 0x18($sp) -/* C42880 80242AD0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C42884 80242AD4 8C630024 */ lw $v1, 0x24($v1) -/* C42888 80242AD8 AFA3001C */ sw $v1, 0x1c($sp) -/* C4288C 80242ADC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C42890 80242AE0 8C630028 */ lw $v1, 0x28($v1) -/* C42894 80242AE4 27B30010 */ addiu $s3, $sp, 0x10 -/* C42898 80242AE8 AFA30020 */ sw $v1, 0x20($sp) -/* C4289C 80242AEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C428A0 80242AF0 3C0142F0 */ lui $at, 0x42f0 -/* C428A4 80242AF4 44810000 */ mtc1 $at, $f0 -/* C428A8 80242AF8 8C63002C */ lw $v1, 0x2c($v1) -/* C428AC 80242AFC 0040802D */ daddu $s0, $v0, $zero -/* C428B0 80242B00 E7A00028 */ swc1 $f0, 0x28($sp) -/* C428B4 80242B04 A7A0002C */ sh $zero, 0x2c($sp) -/* C428B8 80242B08 12200006 */ beqz $s1, .L80242B24 -/* C428BC 80242B0C AFA30024 */ sw $v1, 0x24($sp) -/* C428C0 80242B10 02A0202D */ daddu $a0, $s5, $zero -/* C428C4 80242B14 0240282D */ daddu $a1, $s2, $zero -/* C428C8 80242B18 0280302D */ daddu $a2, $s4, $zero -/* C428CC 80242B1C 0C090A52 */ jal func_80242948_C426F8 -/* C428D0 80242B20 0200382D */ daddu $a3, $s0, $zero -.L80242B24: -/* C428D4 80242B24 2402FFFE */ addiu $v0, $zero, -2 -/* C428D8 80242B28 A2A200AB */ sb $v0, 0xab($s5) -/* C428DC 80242B2C 8E4300B0 */ lw $v1, 0xb0($s2) -/* C428E0 80242B30 30620004 */ andi $v0, $v1, 4 -/* C428E4 80242B34 10400007 */ beqz $v0, .L80242B54 -/* C428E8 80242B38 00000000 */ nop -/* C428EC 80242B3C 824200B4 */ lb $v0, 0xb4($s2) -/* C428F0 80242B40 1440003C */ bnez $v0, .L80242C34 -/* C428F4 80242B44 0000102D */ daddu $v0, $zero, $zero -/* C428F8 80242B48 2402FFFB */ addiu $v0, $zero, -5 -/* C428FC 80242B4C 00621024 */ and $v0, $v1, $v0 -/* C42900 80242B50 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242B54: -/* C42904 80242B54 8E830070 */ lw $v1, 0x70($s4) -/* C42908 80242B58 2C62000F */ sltiu $v0, $v1, 0xf -/* C4290C 80242B5C 10400034 */ beqz $v0, L80242C30_C429E0 -/* C42910 80242B60 00031080 */ sll $v0, $v1, 2 -/* C42914 80242B64 3C018024 */ lui $at, %hi(jtbl_80246D50_C46B00) -/* C42918 80242B68 00220821 */ addu $at, $at, $v0 -/* C4291C 80242B6C 8C226D50 */ lw $v0, %lo(jtbl_80246D50_C46B00)($at) -/* C42920 80242B70 00400008 */ jr $v0 -/* C42924 80242B74 00000000 */ nop -glabel L80242B78_C42928 -/* C42928 80242B78 0280202D */ daddu $a0, $s4, $zero -/* C4292C 80242B7C 0200282D */ daddu $a1, $s0, $zero -/* C42930 80242B80 0C0905D8 */ jal func_80241760_C41510 -/* C42934 80242B84 0260302D */ daddu $a2, $s3, $zero -glabel L80242B88_C42938 -/* C42938 80242B88 0280202D */ daddu $a0, $s4, $zero -/* C4293C 80242B8C 0200282D */ daddu $a1, $s0, $zero -/* C42940 80242B90 0C090644 */ jal func_80241910_C416C0 -/* C42944 80242B94 0260302D */ daddu $a2, $s3, $zero -/* C42948 80242B98 08090B0D */ j .L80242C34 -/* C4294C 80242B9C 0000102D */ daddu $v0, $zero, $zero -glabel L80242BA0_C42950 -/* C42950 80242BA0 0280202D */ daddu $a0, $s4, $zero -/* C42954 80242BA4 0200282D */ daddu $a1, $s0, $zero -/* C42958 80242BA8 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 -/* C4295C 80242BAC 0260302D */ daddu $a2, $s3, $zero -glabel L80242BB0_C42960 -/* C42960 80242BB0 0280202D */ daddu $a0, $s4, $zero -/* C42964 80242BB4 0200282D */ daddu $a1, $s0, $zero -/* C42968 80242BB8 0C0907FE */ jal func_80241FF8_C41DA8 -/* C4296C 80242BBC 0260302D */ daddu $a2, $s3, $zero -/* C42970 80242BC0 08090B0D */ j .L80242C34 -/* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero -glabel L80242BC8_C42978 -/* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero -/* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero -/* C42980 80242BD0 0C0908CF */ jal dgb_08_UnkNpcAIFunc2 -/* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero -glabel L80242BD8_C42988 -/* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero -/* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero -/* C42990 80242BE0 0C0908ED */ jal func_802423B4_C42164 -/* C42994 80242BE4 0260302D */ daddu $a2, $s3, $zero -/* C42998 80242BE8 08090B0D */ j .L80242C34 -/* C4299C 80242BEC 0000102D */ daddu $v0, $zero, $zero -glabel L80242BF0_C429A0 -/* C429A0 80242BF0 0280202D */ daddu $a0, $s4, $zero -/* C429A4 80242BF4 0200282D */ daddu $a1, $s0, $zero -/* C429A8 80242BF8 0C090908 */ jal dgb_08_UnkNpcAIFunc14 -/* C429AC 80242BFC 0260302D */ daddu $a2, $s3, $zero -/* C429B0 80242C00 08090B0D */ j .L80242C34 -/* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero -glabel L80242C08_C429B8 -/* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero -/* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal dgb_08_UnkNpcAIFunc3 -/* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero -/* C429C8 80242C18 08090B0D */ j .L80242C34 -/* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero -glabel L80242C20_C429D0 -/* C429D0 80242C20 0280202D */ daddu $a0, $s4, $zero -/* C429D4 80242C24 0200282D */ daddu $a1, $s0, $zero -/* C429D8 80242C28 0C09096E */ jal func_802425B8_C42368 -/* C429DC 80242C2C 0260302D */ daddu $a2, $s3, $zero -glabel L80242C30_C429E0 -/* C429E0 80242C30 0000102D */ daddu $v0, $zero, $zero -.L80242C34: -/* C429E4 80242C34 8FBF0048 */ lw $ra, 0x48($sp) -/* C429E8 80242C38 8FB50044 */ lw $s5, 0x44($sp) -/* C429EC 80242C3C 8FB40040 */ lw $s4, 0x40($sp) -/* C429F0 80242C40 8FB3003C */ lw $s3, 0x3c($sp) -/* C429F4 80242C44 8FB20038 */ lw $s2, 0x38($sp) -/* C429F8 80242C48 8FB10034 */ lw $s1, 0x34($sp) -/* C429FC 80242C4C 8FB00030 */ lw $s0, 0x30($sp) -/* C42A00 80242C50 03E00008 */ jr $ra -/* C42A04 80242C54 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s deleted file mode 100644 index 0c0a879dda..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C58_C42A08 -/* C42A08 80242C58 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42A0C 80242C5C AFB3001C */ sw $s3, 0x1c($sp) -/* C42A10 80242C60 0080982D */ daddu $s3, $a0, $zero -/* C42A14 80242C64 AFBF0020 */ sw $ra, 0x20($sp) -/* C42A18 80242C68 AFB20018 */ sw $s2, 0x18($sp) -/* C42A1C 80242C6C AFB10014 */ sw $s1, 0x14($sp) -/* C42A20 80242C70 AFB00010 */ sw $s0, 0x10($sp) -/* C42A24 80242C74 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C42A28 80242C78 8E720148 */ lw $s2, 0x148($s3) -/* C42A2C 80242C7C 86440008 */ lh $a0, 8($s2) -/* C42A30 80242C80 0C00EABB */ jal get_npc_unsafe -/* C42A34 80242C84 00A0882D */ daddu $s1, $a1, $zero -/* C42A38 80242C88 0040802D */ daddu $s0, $v0, $zero -/* C42A3C 80242C8C 9602008E */ lhu $v0, 0x8e($s0) -/* C42A40 80242C90 2442FFFF */ addiu $v0, $v0, -1 -/* C42A44 80242C94 A602008E */ sh $v0, 0x8e($s0) -/* C42A48 80242C98 00021400 */ sll $v0, $v0, 0x10 -/* C42A4C 80242C9C 1C40003C */ bgtz $v0, .L80242D90 -/* C42A50 80242CA0 3C03FFDF */ lui $v1, 0xffdf -/* C42A54 80242CA4 8E020000 */ lw $v0, ($s0) -/* C42A58 80242CA8 3463FFFF */ ori $v1, $v1, 0xffff -/* C42A5C 80242CAC 00431024 */ and $v0, $v0, $v1 -/* C42A60 80242CB0 AE020000 */ sw $v0, ($s0) -/* C42A64 80242CB4 8E240020 */ lw $a0, 0x20($s1) -/* C42A68 80242CB8 000417C2 */ srl $v0, $a0, 0x1f -/* C42A6C 80242CBC 00822021 */ addu $a0, $a0, $v0 -/* C42A70 80242CC0 00042043 */ sra $a0, $a0, 1 -/* C42A74 80242CC4 0C00A67F */ jal rand_int -/* C42A78 80242CC8 24840001 */ addiu $a0, $a0, 1 -/* C42A7C 80242CCC 8E230020 */ lw $v1, 0x20($s1) -/* C42A80 80242CD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42A84 80242CD4 000327C2 */ srl $a0, $v1, 0x1f -/* C42A88 80242CD8 00641821 */ addu $v1, $v1, $a0 -/* C42A8C 80242CDC 00031843 */ sra $v1, $v1, 1 -/* C42A90 80242CE0 00621821 */ addu $v1, $v1, $v0 -/* C42A94 80242CE4 A603008E */ sh $v1, 0x8e($s0) -/* C42A98 80242CE8 8E4200CC */ lw $v0, 0xcc($s2) -/* C42A9C 80242CEC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C42AA0 80242CF0 8C420020 */ lw $v0, 0x20($v0) -/* C42AA4 80242CF4 AE020028 */ sw $v0, 0x28($s0) -/* C42AA8 80242CF8 C6200018 */ lwc1 $f0, 0x18($s1) -/* C42AAC 80242CFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42AB0 80242D00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C42AB4 80242D04 E6000018 */ swc1 $f0, 0x18($s0) -/* C42AB8 80242D08 8C460028 */ lw $a2, 0x28($v0) -/* C42ABC 80242D0C 0C00A720 */ jal atan2 -/* C42AC0 80242D10 8C470030 */ lw $a3, 0x30($v0) -/* C42AC4 80242D14 46000506 */ mov.s $f20, $f0 -/* C42AC8 80242D18 C60C000C */ lwc1 $f12, 0xc($s0) -/* C42ACC 80242D1C 0C00A70A */ jal get_clamped_angle_diff -/* C42AD0 80242D20 4600A386 */ mov.s $f14, $f20 -/* C42AD4 80242D24 46000086 */ mov.s $f2, $f0 -/* C42AD8 80242D28 8E22001C */ lw $v0, 0x1c($s1) -/* C42ADC 80242D2C 46001005 */ abs.s $f0, $f2 -/* C42AE0 80242D30 44822000 */ mtc1 $v0, $f4 -/* C42AE4 80242D34 00000000 */ nop -/* C42AE8 80242D38 46802120 */ cvt.s.w $f4, $f4 -/* C42AEC 80242D3C 4600203C */ c.lt.s $f4, $f0 -/* C42AF0 80242D40 00000000 */ nop -/* C42AF4 80242D44 4500000D */ bc1f .L80242D7C -/* C42AF8 80242D48 00000000 */ nop -/* C42AFC 80242D4C 44800000 */ mtc1 $zero, $f0 -/* C42B00 80242D50 C614000C */ lwc1 $f20, 0xc($s0) -/* C42B04 80242D54 4600103C */ c.lt.s $f2, $f0 -/* C42B08 80242D58 00000000 */ nop -/* C42B0C 80242D5C 45000006 */ bc1f .L80242D78 -/* C42B10 80242D60 00021023 */ negu $v0, $v0 -/* C42B14 80242D64 44820000 */ mtc1 $v0, $f0 -/* C42B18 80242D68 00000000 */ nop -/* C42B1C 80242D6C 46800020 */ cvt.s.w $f0, $f0 -/* C42B20 80242D70 08090B5F */ j .L80242D7C -/* C42B24 80242D74 4600A500 */ add.s $f20, $f20, $f0 -.L80242D78: -/* C42B28 80242D78 4604A500 */ add.s $f20, $f20, $f4 -.L80242D7C: -/* C42B2C 80242D7C 0C00A6C9 */ jal clamp_angle -/* C42B30 80242D80 4600A306 */ mov.s $f12, $f20 -/* C42B34 80242D84 2402000D */ addiu $v0, $zero, 0xd -/* C42B38 80242D88 E600000C */ swc1 $f0, 0xc($s0) -/* C42B3C 80242D8C AE620070 */ sw $v0, 0x70($s3) -.L80242D90: -/* C42B40 80242D90 8FBF0020 */ lw $ra, 0x20($sp) -/* C42B44 80242D94 8FB3001C */ lw $s3, 0x1c($sp) -/* C42B48 80242D98 8FB20018 */ lw $s2, 0x18($sp) -/* C42B4C 80242D9C 8FB10014 */ lw $s1, 0x14($sp) -/* C42B50 80242DA0 8FB00010 */ lw $s0, 0x10($sp) -/* C42B54 80242DA4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C42B58 80242DA8 03E00008 */ jr $ra -/* C42B5C 80242DAC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s deleted file mode 100644 index ec2a1527c1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DB0_C42B60 -/* C42B60 80242DB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42B64 80242DB4 AFB30024 */ sw $s3, 0x24($sp) -/* C42B68 80242DB8 0080982D */ daddu $s3, $a0, $zero -/* C42B6C 80242DBC AFBF0028 */ sw $ra, 0x28($sp) -/* C42B70 80242DC0 AFB20020 */ sw $s2, 0x20($sp) -/* C42B74 80242DC4 AFB1001C */ sw $s1, 0x1c($sp) -/* C42B78 80242DC8 AFB00018 */ sw $s0, 0x18($sp) -/* C42B7C 80242DCC 8E700148 */ lw $s0, 0x148($s3) -/* C42B80 80242DD0 00A0902D */ daddu $s2, $a1, $zero -/* C42B84 80242DD4 86040008 */ lh $a0, 8($s0) -/* C42B88 80242DD8 0C00EABB */ jal get_npc_unsafe -/* C42B8C 80242DDC 00C0882D */ daddu $s1, $a2, $zero -/* C42B90 80242DE0 0220202D */ daddu $a0, $s1, $zero -/* C42B94 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* C42B98 80242DE8 24030001 */ addiu $v1, $zero, 1 -/* C42B9C 80242DEC AFA30010 */ sw $v1, 0x10($sp) -/* C42BA0 80242DF0 8E460024 */ lw $a2, 0x24($s2) -/* C42BA4 80242DF4 8E470028 */ lw $a3, 0x28($s2) -/* C42BA8 80242DF8 0C01242D */ jal func_800490B4 -/* C42BAC 80242DFC 0040802D */ daddu $s0, $v0, $zero -/* C42BB0 80242E00 10400024 */ beqz $v0, .L80242E94 -/* C42BB4 80242E04 24020010 */ addiu $v0, $zero, 0x10 -/* C42BB8 80242E08 8E050018 */ lw $a1, 0x18($s0) -/* C42BBC 80242E0C 8E06000C */ lw $a2, 0xc($s0) -/* C42BC0 80242E10 0C00EA95 */ jal npc_move_heading -/* C42BC4 80242E14 0200202D */ daddu $a0, $s0, $zero -/* C42BC8 80242E18 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42BCC 80242E1C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C42BD0 80242E20 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42BD4 80242E24 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C42BD8 80242E28 8C460028 */ lw $a2, 0x28($v0) -/* C42BDC 80242E2C 0C00A7B5 */ jal dist2D -/* C42BE0 80242E30 8C470030 */ lw $a3, 0x30($v0) -/* C42BE4 80242E34 C6020018 */ lwc1 $f2, 0x18($s0) -/* C42BE8 80242E38 3C014004 */ lui $at, 0x4004 -/* C42BEC 80242E3C 44812800 */ mtc1 $at, $f5 -/* C42BF0 80242E40 44802000 */ mtc1 $zero, $f4 -/* C42BF4 80242E44 460010A1 */ cvt.d.s $f2, $f2 -/* C42BF8 80242E48 46241082 */ mul.d $f2, $f2, $f4 -/* C42BFC 80242E4C 00000000 */ nop -/* C42C00 80242E50 46000021 */ cvt.d.s $f0, $f0 -/* C42C04 80242E54 4622003E */ c.le.d $f0, $f2 -/* C42C08 80242E58 00000000 */ nop -/* C42C0C 80242E5C 45000003 */ bc1f .L80242E6C -/* C42C10 80242E60 2402000E */ addiu $v0, $zero, 0xe -/* C42C14 80242E64 08090BA5 */ j .L80242E94 -/* C42C18 80242E68 A600008E */ sh $zero, 0x8e($s0) -.L80242E6C: -/* C42C1C 80242E6C 9602008E */ lhu $v0, 0x8e($s0) -/* C42C20 80242E70 2442FFFF */ addiu $v0, $v0, -1 -/* C42C24 80242E74 A602008E */ sh $v0, 0x8e($s0) -/* C42C28 80242E78 00021400 */ sll $v0, $v0, 0x10 -/* C42C2C 80242E7C 1C400006 */ bgtz $v0, .L80242E98 -/* C42C30 80242E80 3C030020 */ lui $v1, 0x20 -/* C42C34 80242E84 8E020000 */ lw $v0, ($s0) -/* C42C38 80242E88 00431025 */ or $v0, $v0, $v1 -/* C42C3C 80242E8C AE020000 */ sw $v0, ($s0) -/* C42C40 80242E90 2402000C */ addiu $v0, $zero, 0xc -.L80242E94: -/* C42C44 80242E94 AE620070 */ sw $v0, 0x70($s3) -.L80242E98: -/* C42C48 80242E98 8FBF0028 */ lw $ra, 0x28($sp) -/* C42C4C 80242E9C 8FB30024 */ lw $s3, 0x24($sp) -/* C42C50 80242EA0 8FB20020 */ lw $s2, 0x20($sp) -/* C42C54 80242EA4 8FB1001C */ lw $s1, 0x1c($sp) -/* C42C58 80242EA8 8FB00018 */ lw $s0, 0x18($sp) -/* C42C5C 80242EAC 03E00008 */ jr $ra -/* C42C60 80242EB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s deleted file mode 100644 index 49ecc108a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EB4_C42C64 -/* C42C64 80242EB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42C68 80242EB8 AFB30024 */ sw $s3, 0x24($sp) -/* C42C6C 80242EBC 0080982D */ daddu $s3, $a0, $zero -/* C42C70 80242EC0 AFBF0028 */ sw $ra, 0x28($sp) -/* C42C74 80242EC4 AFB20020 */ sw $s2, 0x20($sp) -/* C42C78 80242EC8 AFB1001C */ sw $s1, 0x1c($sp) -/* C42C7C 80242ECC AFB00018 */ sw $s0, 0x18($sp) -/* C42C80 80242ED0 8E720148 */ lw $s2, 0x148($s3) -/* C42C84 80242ED4 86440008 */ lh $a0, 8($s2) -/* C42C88 80242ED8 0C00EABB */ jal get_npc_unsafe -/* C42C8C 80242EDC 24100007 */ addiu $s0, $zero, 7 -/* C42C90 80242EE0 0040882D */ daddu $s1, $v0, $zero -.L80242EE4: -/* C42C94 80242EE4 822200A4 */ lb $v0, 0xa4($s1) -/* C42C98 80242EE8 52020007 */ beql $s0, $v0, .L80242F08 -/* C42C9C 80242EEC 26100001 */ addiu $s0, $s0, 1 -/* C42CA0 80242EF0 0C00FB3A */ jal get_enemy -/* C42CA4 80242EF4 0200202D */ daddu $a0, $s0, $zero -/* C42CA8 80242EF8 8C42006C */ lw $v0, 0x6c($v0) -/* C42CAC 80242EFC 30420100 */ andi $v0, $v0, 0x100 -/* C42CB0 80242F00 1440001D */ bnez $v0, .L80242F78 -/* C42CB4 80242F04 26100001 */ addiu $s0, $s0, 1 -.L80242F08: -/* C42CB8 80242F08 2A020009 */ slti $v0, $s0, 9 -/* C42CBC 80242F0C 1440FFF5 */ bnez $v0, .L80242EE4 -/* C42CC0 80242F10 00000000 */ nop -/* C42CC4 80242F14 8E42006C */ lw $v0, 0x6c($s2) -/* C42CC8 80242F18 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C42CCC 80242F1C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C42CD0 80242F20 34420100 */ ori $v0, $v0, 0x100 -/* C42CD4 80242F24 AE42006C */ sw $v0, 0x6c($s2) -/* C42CD8 80242F28 C4600028 */ lwc1 $f0, 0x28($v1) -/* C42CDC 80242F2C E6200038 */ swc1 $f0, 0x38($s1) -/* C42CE0 80242F30 C4600030 */ lwc1 $f0, 0x30($v1) -/* C42CE4 80242F34 E6200040 */ swc1 $f0, 0x40($s1) -/* C42CE8 80242F38 8E43006C */ lw $v1, 0x6c($s2) -/* C42CEC 80242F3C 30621000 */ andi $v0, $v1, 0x1000 -/* C42CF0 80242F40 14400003 */ bnez $v0, .L80242F50 -/* C42CF4 80242F44 3C048000 */ lui $a0, 0x8000 -/* C42CF8 80242F48 34621000 */ ori $v0, $v1, 0x1000 -/* C42CFC 80242F4C AE42006C */ sw $v0, 0x6c($s2) -.L80242F50: -/* C42D00 80242F50 C6200040 */ lwc1 $f0, 0x40($s1) -/* C42D04 80242F54 34840011 */ ori $a0, $a0, 0x11 -/* C42D08 80242F58 E7A00010 */ swc1 $f0, 0x10($sp) -/* C42D0C 80242F5C 8E260038 */ lw $a2, 0x38($s1) -/* C42D10 80242F60 8E27003C */ lw $a3, 0x3c($s1) -/* C42D14 80242F64 0C052757 */ jal sfx_play_sound_at_position -/* C42D18 80242F68 24050002 */ addiu $a1, $zero, 2 -/* C42D1C 80242F6C 2402000F */ addiu $v0, $zero, 0xf -/* C42D20 80242F70 A620008E */ sh $zero, 0x8e($s1) -/* C42D24 80242F74 AE620070 */ sw $v0, 0x70($s3) -.L80242F78: -/* C42D28 80242F78 8FBF0028 */ lw $ra, 0x28($sp) -/* C42D2C 80242F7C 8FB30024 */ lw $s3, 0x24($sp) -/* C42D30 80242F80 8FB20020 */ lw $s2, 0x20($sp) -/* C42D34 80242F84 8FB1001C */ lw $s1, 0x1c($sp) -/* C42D38 80242F88 8FB00018 */ lw $s0, 0x18($sp) -/* C42D3C 80242F8C 03E00008 */ jr $ra -/* C42D40 80242F90 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s deleted file mode 100644 index f106088ff1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F94_C42D44 -/* C42D44 80242F94 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C42D48 80242F98 AFB40040 */ sw $s4, 0x40($sp) -/* C42D4C 80242F9C 0080A02D */ daddu $s4, $a0, $zero -/* C42D50 80242FA0 AFBF0044 */ sw $ra, 0x44($sp) -/* C42D54 80242FA4 AFB3003C */ sw $s3, 0x3c($sp) -/* C42D58 80242FA8 AFB20038 */ sw $s2, 0x38($sp) -/* C42D5C 80242FAC AFB10034 */ sw $s1, 0x34($sp) -/* C42D60 80242FB0 AFB00030 */ sw $s0, 0x30($sp) -/* C42D64 80242FB4 8E930148 */ lw $s3, 0x148($s4) -/* C42D68 80242FB8 00A0802D */ daddu $s0, $a1, $zero -/* C42D6C 80242FBC 86640008 */ lh $a0, 8($s3) -/* C42D70 80242FC0 0C00EABB */ jal get_npc_unsafe -/* C42D74 80242FC4 00C0882D */ daddu $s1, $a2, $zero -/* C42D78 80242FC8 3C048000 */ lui $a0, 0x8000 -/* C42D7C 80242FCC 0040902D */ daddu $s2, $v0, $zero -/* C42D80 80242FD0 C6400040 */ lwc1 $f0, 0x40($s2) -/* C42D84 80242FD4 34840011 */ ori $a0, $a0, 0x11 -/* C42D88 80242FD8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C42D8C 80242FDC 8E460038 */ lw $a2, 0x38($s2) -/* C42D90 80242FE0 8E47003C */ lw $a3, 0x3c($s2) -/* C42D94 80242FE4 0C05267B */ jal sfx_adjust_env_sound_pos -/* C42D98 80242FE8 24050002 */ addiu $a1, $zero, 2 -/* C42D9C 80242FEC 0220202D */ daddu $a0, $s1, $zero -/* C42DA0 80242FF0 24020001 */ addiu $v0, $zero, 1 -/* C42DA4 80242FF4 AFA20010 */ sw $v0, 0x10($sp) -/* C42DA8 80242FF8 8E060024 */ lw $a2, 0x24($s0) -/* C42DAC 80242FFC 8E070028 */ lw $a3, 0x28($s0) -/* C42DB0 80243000 0C01242D */ jal func_800490B4 -/* C42DB4 80243004 0260282D */ daddu $a1, $s3, $zero -/* C42DB8 80243008 1440000B */ bnez $v0, .L80243038 -/* C42DBC 8024300C 3C04FFDF */ lui $a0, 0xffdf -/* C42DC0 80243010 8E62006C */ lw $v0, 0x6c($s3) -/* C42DC4 80243014 2403FEFF */ addiu $v1, $zero, -0x101 -/* C42DC8 80243018 00431024 */ and $v0, $v0, $v1 -/* C42DCC 8024301C AE62006C */ sw $v0, 0x6c($s3) -/* C42DD0 80243020 8E420000 */ lw $v0, ($s2) -/* C42DD4 80243024 3484FFFF */ ori $a0, $a0, 0xffff -/* C42DD8 80243028 AE400048 */ sw $zero, 0x48($s2) -/* C42DDC 8024302C 00441024 */ and $v0, $v0, $a0 -/* C42DE0 80243030 08090C82 */ j .L80243208 -/* C42DE4 80243034 AE420000 */ sw $v0, ($s2) -.L80243038: -/* C42DE8 80243038 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C42DEC 8024303C 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C42DF0 80243040 C6440048 */ lwc1 $f4, 0x48($s2) -/* C42DF4 80243044 3C0141C8 */ lui $at, 0x41c8 -/* C42DF8 80243048 44810000 */ mtc1 $at, $f0 -/* C42DFC 8024304C 8E020000 */ lw $v0, ($s0) -/* C42E00 80243050 46002100 */ add.s $f4, $f4, $f0 -/* C42E04 80243054 C4420028 */ lwc1 $f2, 0x28($v0) -/* C42E08 80243058 3C014000 */ lui $at, 0x4000 -/* C42E0C 8024305C 44810000 */ mtc1 $at, $f0 -/* C42E10 80243060 E6420038 */ swc1 $f2, 0x38($s2) -/* C42E14 80243064 C4420030 */ lwc1 $f2, 0x30($v0) -/* C42E18 80243068 46001080 */ add.s $f2, $f2, $f0 -/* C42E1C 8024306C 3C018024 */ lui $at, %hi(D_80246D90_C46B40) -/* C42E20 80243070 D4266D90 */ ldc1 $f6, %lo(D_80246D90_C46B40)($at) -/* C42E24 80243074 46002021 */ cvt.d.s $f0, $f4 -/* C42E28 80243078 4620303C */ c.lt.d $f6, $f0 -/* C42E2C 8024307C E6440048 */ swc1 $f4, 0x48($s2) -/* C42E30 80243080 45000004 */ bc1f .L80243094 -/* C42E34 80243084 E6420040 */ swc1 $f2, 0x40($s2) -/* C42E38 80243088 46260001 */ sub.d $f0, $f0, $f6 -/* C42E3C 8024308C 46200020 */ cvt.s.d $f0, $f0 -/* C42E40 80243090 E6400048 */ swc1 $f0, 0x48($s2) -.L80243094: -/* C42E44 80243094 3C02B60B */ lui $v0, 0xb60b -/* C42E48 80243098 C6400048 */ lwc1 $f0, 0x48($s2) -/* C42E4C 8024309C 344260B7 */ ori $v0, $v0, 0x60b7 -/* C42E50 802430A0 4600020D */ trunc.w.s $f8, $f0 -/* C42E54 802430A4 44044000 */ mfc1 $a0, $f8 -/* C42E58 802430A8 00000000 */ nop -/* C42E5C 802430AC 00820018 */ mult $a0, $v0 -/* C42E60 802430B0 00041FC3 */ sra $v1, $a0, 0x1f -/* C42E64 802430B4 00004010 */ mfhi $t0 -/* C42E68 802430B8 01041021 */ addu $v0, $t0, $a0 -/* C42E6C 802430BC 000211C3 */ sra $v0, $v0, 7 -/* C42E70 802430C0 00431023 */ subu $v0, $v0, $v1 -/* C42E74 802430C4 00021840 */ sll $v1, $v0, 1 -/* C42E78 802430C8 00621821 */ addu $v1, $v1, $v0 -/* C42E7C 802430CC 00031100 */ sll $v0, $v1, 4 -/* C42E80 802430D0 00431023 */ subu $v0, $v0, $v1 -/* C42E84 802430D4 00021080 */ sll $v0, $v0, 2 -/* C42E88 802430D8 00822023 */ subu $a0, $a0, $v0 -/* C42E8C 802430DC 00042400 */ sll $a0, $a0, 0x10 -/* C42E90 802430E0 0C00A4F5 */ jal cosine -/* C42E94 802430E4 00042403 */ sra $a0, $a0, 0x10 -/* C42E98 802430E8 3C014260 */ lui $at, 0x4260 -/* C42E9C 802430EC 44811000 */ mtc1 $at, $f2 -/* C42EA0 802430F0 00000000 */ nop -/* C42EA4 802430F4 46020002 */ mul.s $f0, $f0, $f2 -/* C42EA8 802430F8 00000000 */ nop -/* C42EAC 802430FC 24050006 */ addiu $a1, $zero, 6 -/* C42EB0 80243100 3C01437F */ lui $at, 0x437f -/* C42EB4 80243104 44811000 */ mtc1 $at, $f2 -/* C42EB8 80243108 240200FF */ addiu $v0, $zero, 0xff -/* C42EBC 8024310C 46001081 */ sub.s $f2, $f2, $f0 -/* C42EC0 80243110 AFA20014 */ sw $v0, 0x14($sp) -/* C42EC4 80243114 AFA00018 */ sw $zero, 0x18($sp) -/* C42EC8 80243118 4600120D */ trunc.w.s $f8, $f2 -/* C42ECC 8024311C 44064000 */ mfc1 $a2, $f8 -/* C42ED0 80243120 00000000 */ nop -/* C42ED4 80243124 AFA60010 */ sw $a2, 0x10($sp) -/* C42ED8 80243128 8E440024 */ lw $a0, 0x24($s2) -/* C42EDC 8024312C 0C0B7A25 */ jal func_802DE894 -/* C42EE0 80243130 00C0382D */ daddu $a3, $a2, $zero -/* C42EE4 80243134 27A50020 */ addiu $a1, $sp, 0x20 -/* C42EE8 80243138 27A60024 */ addiu $a2, $sp, 0x24 -/* C42EEC 8024313C 8E020000 */ lw $v0, ($s0) -/* C42EF0 80243140 3C01447A */ lui $at, 0x447a -/* C42EF4 80243144 44810000 */ mtc1 $at, $f0 -/* C42EF8 80243148 C4420028 */ lwc1 $f2, 0x28($v0) -/* C42EFC 8024314C C444002C */ lwc1 $f4, 0x2c($v0) -/* C42F00 80243150 C4460030 */ lwc1 $f6, 0x30($v0) -/* C42F04 80243154 27A2002C */ addiu $v0, $sp, 0x2c -/* C42F08 80243158 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C42F0C 8024315C E7A20020 */ swc1 $f2, 0x20($sp) -/* C42F10 80243160 E7A40024 */ swc1 $f4, 0x24($sp) -/* C42F14 80243164 E7A60028 */ swc1 $f6, 0x28($sp) -/* C42F18 80243168 AFA20010 */ sw $v0, 0x10($sp) -/* C42F1C 8024316C 8E440080 */ lw $a0, 0x80($s2) -/* C42F20 80243170 0C0372DF */ jal func_800DCB7C -/* C42F24 80243174 27A70028 */ addiu $a3, $sp, 0x28 -/* C42F28 80243178 C644003C */ lwc1 $f4, 0x3c($s2) -/* C42F2C 8024317C C7A00024 */ lwc1 $f0, 0x24($sp) -/* C42F30 80243180 46002001 */ sub.s $f0, $f4, $f0 -/* C42F34 80243184 3C014038 */ lui $at, 0x4038 -/* C42F38 80243188 44811800 */ mtc1 $at, $f3 -/* C42F3C 8024318C 44801000 */ mtc1 $zero, $f2 -/* C42F40 80243190 46000005 */ abs.s $f0, $f0 -/* C42F44 80243194 46000021 */ cvt.d.s $f0, $f0 -/* C42F48 80243198 4620103C */ c.lt.d $f2, $f0 -/* C42F4C 8024319C 00000000 */ nop -/* C42F50 802431A0 45000008 */ bc1f .L802431C4 -/* C42F54 802431A4 3C03FFDF */ lui $v1, 0xffdf -/* C42F58 802431A8 3C018024 */ lui $at, %hi(D_80246D98_C46B48) -/* C42F5C 802431AC D4226D98 */ ldc1 $f2, %lo(D_80246D98_C46B48)($at) -/* C42F60 802431B0 46002021 */ cvt.d.s $f0, $f4 -/* C42F64 802431B4 46220001 */ sub.d $f0, $f0, $f2 -/* C42F68 802431B8 46200020 */ cvt.s.d $f0, $f0 -/* C42F6C 802431BC 08090C84 */ j .L80243210 -/* C42F70 802431C0 E640003C */ swc1 $f0, 0x3c($s2) -.L802431C4: -/* C42F74 802431C4 8E420000 */ lw $v0, ($s2) -/* C42F78 802431C8 3463FFFF */ ori $v1, $v1, 0xffff -/* C42F7C 802431CC AE400048 */ sw $zero, 0x48($s2) -/* C42F80 802431D0 00431024 */ and $v0, $v0, $v1 -/* C42F84 802431D4 AE420000 */ sw $v0, ($s2) -/* C42F88 802431D8 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C42F8C 802431DC 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C42F90 802431E0 24020009 */ addiu $v0, $zero, 9 -/* C42F94 802431E4 10620009 */ beq $v1, $v0, .L8024320C -/* C42F98 802431E8 24020010 */ addiu $v0, $zero, 0x10 -/* C42F9C 802431EC 0C03805E */ jal disable_player_input -/* C42FA0 802431F0 00000000 */ nop -/* C42FA4 802431F4 0C03BD8A */ jal func_800EF628 -/* C42FA8 802431F8 00000000 */ nop -/* C42FAC 802431FC 24020014 */ addiu $v0, $zero, 0x14 -/* C42FB0 80243200 08090C83 */ j .L8024320C -/* C42FB4 80243204 A640008E */ sh $zero, 0x8e($s2) -.L80243208: -/* C42FB8 80243208 24020010 */ addiu $v0, $zero, 0x10 -.L8024320C: -/* C42FBC 8024320C AE820070 */ sw $v0, 0x70($s4) -.L80243210: -/* C42FC0 80243210 8FBF0044 */ lw $ra, 0x44($sp) -/* C42FC4 80243214 8FB40040 */ lw $s4, 0x40($sp) -/* C42FC8 80243218 8FB3003C */ lw $s3, 0x3c($sp) -/* C42FCC 8024321C 8FB20038 */ lw $s2, 0x38($sp) -/* C42FD0 80243220 8FB10034 */ lw $s1, 0x34($sp) -/* C42FD4 80243224 8FB00030 */ lw $s0, 0x30($sp) -/* C42FD8 80243228 03E00008 */ jr $ra -/* C42FDC 8024322C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s deleted file mode 100644 index c4843b7444..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243230_C42FE0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243230_C42FE0 -/* C42FE0 80243230 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42FE4 80243234 AFB20028 */ sw $s2, 0x28($sp) -/* C42FE8 80243238 0080902D */ daddu $s2, $a0, $zero -/* C42FEC 8024323C AFBF002C */ sw $ra, 0x2c($sp) -/* C42FF0 80243240 AFB10024 */ sw $s1, 0x24($sp) -/* C42FF4 80243244 AFB00020 */ sw $s0, 0x20($sp) -/* C42FF8 80243248 8E500148 */ lw $s0, 0x148($s2) -/* C42FFC 8024324C 0C00EABB */ jal get_npc_unsafe -/* C43000 80243250 86040008 */ lh $a0, 8($s0) -/* C43004 80243254 2404FEFF */ addiu $a0, $zero, -0x101 -/* C43008 80243258 0040882D */ daddu $s1, $v0, $zero -/* C4300C 8024325C 0000282D */ daddu $a1, $zero, $zero -/* C43010 80243260 8E03006C */ lw $v1, 0x6c($s0) -/* C43014 80243264 00A0302D */ daddu $a2, $a1, $zero -/* C43018 80243268 00641824 */ and $v1, $v1, $a0 -/* C4301C 8024326C AE03006C */ sw $v1, 0x6c($s0) -/* C43020 80243270 AFA00010 */ sw $zero, 0x10($sp) -/* C43024 80243274 AFA00014 */ sw $zero, 0x14($sp) -/* C43028 80243278 AFA00018 */ sw $zero, 0x18($sp) -/* C4302C 8024327C 8E240024 */ lw $a0, 0x24($s1) -/* C43030 80243280 0C0B7A25 */ jal func_802DE894 -/* C43034 80243284 00A0382D */ daddu $a3, $a1, $zero -/* C43038 80243288 8E02006C */ lw $v0, 0x6c($s0) -/* C4303C 8024328C 30421000 */ andi $v0, $v0, 0x1000 -/* C43040 80243290 10400008 */ beqz $v0, .L802432B4 -/* C43044 80243294 00000000 */ nop -/* C43048 80243298 3C048000 */ lui $a0, 0x8000 -/* C4304C 8024329C 0C05271B */ jal sfx_stop_sound -/* C43050 802432A0 34840011 */ ori $a0, $a0, 0x11 -/* C43054 802432A4 8E02006C */ lw $v0, 0x6c($s0) -/* C43058 802432A8 2403EFFF */ addiu $v1, $zero, -0x1001 -/* C4305C 802432AC 00431024 */ and $v0, $v0, $v1 -/* C43060 802432B0 AE02006C */ sw $v0, 0x6c($s0) -.L802432B4: -/* C43064 802432B4 8E0200CC */ lw $v0, 0xcc($s0) -/* C43068 802432B8 8C430024 */ lw $v1, 0x24($v0) -/* C4306C 802432BC 24020014 */ addiu $v0, $zero, 0x14 -/* C43070 802432C0 A622008E */ sh $v0, 0x8e($s1) -/* C43074 802432C4 24020011 */ addiu $v0, $zero, 0x11 -/* C43078 802432C8 AE230028 */ sw $v1, 0x28($s1) -/* C4307C 802432CC AE420070 */ sw $v0, 0x70($s2) -/* C43080 802432D0 8FBF002C */ lw $ra, 0x2c($sp) -/* C43084 802432D4 8FB20028 */ lw $s2, 0x28($sp) -/* C43088 802432D8 8FB10024 */ lw $s1, 0x24($sp) -/* C4308C 802432DC 8FB00020 */ lw $s0, 0x20($sp) -/* C43090 802432E0 03E00008 */ jr $ra -/* C43094 802432E4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s deleted file mode 100644 index 6d3c5bf1d2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802432E8_C43098.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432E8_C43098 -/* C43098 802432E8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C4309C 802432EC AFB20048 */ sw $s2, 0x48($sp) -/* C430A0 802432F0 0080902D */ daddu $s2, $a0, $zero -/* C430A4 802432F4 AFBF004C */ sw $ra, 0x4c($sp) -/* C430A8 802432F8 AFB10044 */ sw $s1, 0x44($sp) -/* C430AC 802432FC AFB00040 */ sw $s0, 0x40($sp) -/* C430B0 80243300 F7B40050 */ sdc1 $f20, 0x50($sp) -/* C430B4 80243304 8E500148 */ lw $s0, 0x148($s2) -/* C430B8 80243308 0C00EABB */ jal get_npc_unsafe -/* C430BC 8024330C 86040008 */ lh $a0, 8($s0) -/* C430C0 80243310 27A50028 */ addiu $a1, $sp, 0x28 -/* C430C4 80243314 0040882D */ daddu $s1, $v0, $zero -/* C430C8 80243318 27A6002C */ addiu $a2, $sp, 0x2c -/* C430CC 8024331C 27A70030 */ addiu $a3, $sp, 0x30 -/* C430D0 80243320 C620003C */ lwc1 $f0, 0x3c($s1) -/* C430D4 80243324 3C014004 */ lui $at, 0x4004 -/* C430D8 80243328 44811800 */ mtc1 $at, $f3 -/* C430DC 8024332C 44801000 */ mtc1 $zero, $f2 -/* C430E0 80243330 C6260038 */ lwc1 $f6, 0x38($s1) -/* C430E4 80243334 46000021 */ cvt.d.s $f0, $f0 -/* C430E8 80243338 46220000 */ add.d $f0, $f0, $f2 -/* C430EC 8024333C 3C01447A */ lui $at, 0x447a -/* C430F0 80243340 44812000 */ mtc1 $at, $f4 -/* C430F4 80243344 C6020078 */ lwc1 $f2, 0x78($s0) -/* C430F8 80243348 468010A0 */ cvt.s.w $f2, $f2 -/* C430FC 8024334C 46200020 */ cvt.s.d $f0, $f0 -/* C43100 80243350 E620003C */ swc1 $f0, 0x3c($s1) -/* C43104 80243354 46000206 */ mov.s $f8, $f0 -/* C43108 80243358 C6200040 */ lwc1 $f0, 0x40($s1) -/* C4310C 8024335C 27A20034 */ addiu $v0, $sp, 0x34 -/* C43110 80243360 E7A00030 */ swc1 $f0, 0x30($sp) -/* C43114 80243364 3C014059 */ lui $at, 0x4059 -/* C43118 80243368 44810800 */ mtc1 $at, $f1 -/* C4311C 8024336C 44800000 */ mtc1 $zero, $f0 -/* C43120 80243370 460010A1 */ cvt.d.s $f2, $f2 -/* C43124 80243374 E7A60028 */ swc1 $f6, 0x28($sp) -/* C43128 80243378 E7A40034 */ swc1 $f4, 0x34($sp) -/* C4312C 8024337C E7A8002C */ swc1 $f8, 0x2c($sp) -/* C43130 80243380 AFA20010 */ sw $v0, 0x10($sp) -/* C43134 80243384 8E240080 */ lw $a0, 0x80($s1) -/* C43138 80243388 46201083 */ div.d $f2, $f2, $f0 -/* C4313C 8024338C 0C0372DF */ jal func_800DCB7C -/* C43140 80243390 46201520 */ cvt.s.d $f20, $f2 -/* C43144 80243394 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C43148 80243398 46140000 */ add.s $f0, $f0, $f20 -/* C4314C 8024339C C622003C */ lwc1 $f2, 0x3c($s1) -/* C43150 802433A0 4600103C */ c.lt.s $f2, $f0 -/* C43154 802433A4 00000000 */ nop -/* C43158 802433A8 45010028 */ bc1t .L8024344C -/* C4315C 802433AC 00000000 */ nop -/* C43160 802433B0 8E0200D0 */ lw $v0, 0xd0($s0) -/* C43164 802433B4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C43168 802433B8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C4316C 802433BC C44A0000 */ lwc1 $f10, ($v0) -/* C43170 802433C0 468052A0 */ cvt.s.w $f10, $f10 -/* C43174 802433C4 44065000 */ mfc1 $a2, $f10 -/* C43178 802433C8 C44A0008 */ lwc1 $f10, 8($v0) -/* C4317C 802433CC 468052A0 */ cvt.s.w $f10, $f10 -/* C43180 802433D0 44075000 */ mfc1 $a3, $f10 -/* C43184 802433D4 0C00A720 */ jal atan2 -/* C43188 802433D8 2410000A */ addiu $s0, $zero, 0xa -/* C4318C 802433DC 24040002 */ addiu $a0, $zero, 2 -/* C43190 802433E0 0220282D */ daddu $a1, $s1, $zero -/* C43194 802433E4 0000302D */ daddu $a2, $zero, $zero -/* C43198 802433E8 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* C4319C 802433EC 862200A8 */ lh $v0, 0xa8($s1) -/* C431A0 802433F0 E620000C */ swc1 $f0, 0xc($s1) -/* C431A4 802433F4 3C013F80 */ lui $at, 0x3f80 -/* C431A8 802433F8 44810000 */ mtc1 $at, $f0 -/* C431AC 802433FC 3C014000 */ lui $at, 0x4000 -/* C431B0 80243400 44812000 */ mtc1 $at, $f4 -/* C431B4 80243404 3C01C1A0 */ lui $at, 0xc1a0 -/* C431B8 80243408 44813000 */ mtc1 $at, $f6 -/* C431BC 8024340C 44825000 */ mtc1 $v0, $f10 -/* C431C0 80243410 00000000 */ nop -/* C431C4 80243414 468052A0 */ cvt.s.w $f10, $f10 -/* C431C8 80243418 46141080 */ add.s $f2, $f2, $f20 -/* C431CC 8024341C 44075000 */ mfc1 $a3, $f10 -/* C431D0 80243420 27A20038 */ addiu $v0, $sp, 0x38 -/* C431D4 80243424 E622003C */ swc1 $f2, 0x3c($s1) -/* C431D8 80243428 E7A00010 */ swc1 $f0, 0x10($sp) -/* C431DC 8024342C E7A40014 */ swc1 $f4, 0x14($sp) -/* C431E0 80243430 E7A60018 */ swc1 $f6, 0x18($sp) -/* C431E4 80243434 AFB0001C */ sw $s0, 0x1c($sp) -/* C431E8 80243438 0C01BFA4 */ jal fx_emote -/* C431EC 8024343C AFA20020 */ sw $v0, 0x20($sp) -/* C431F0 80243440 24020012 */ addiu $v0, $zero, 0x12 -/* C431F4 80243444 A630008E */ sh $s0, 0x8e($s1) -/* C431F8 80243448 AE420070 */ sw $v0, 0x70($s2) -.L8024344C: -/* C431FC 8024344C 8FBF004C */ lw $ra, 0x4c($sp) -/* C43200 80243450 8FB20048 */ lw $s2, 0x48($sp) -/* C43204 80243454 8FB10044 */ lw $s1, 0x44($sp) -/* C43208 80243458 8FB00040 */ lw $s0, 0x40($sp) -/* C4320C 8024345C D7B40050 */ ldc1 $f20, 0x50($sp) -/* C43210 80243460 03E00008 */ jr $ra -/* C43214 80243464 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243468_C43218.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243468_C43218.s deleted file mode 100644 index dce26df896..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243468_C43218.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243468_C43218 -/* C43218 80243468 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4321C 8024346C AFB00010 */ sw $s0, 0x10($sp) -/* C43220 80243470 0080802D */ daddu $s0, $a0, $zero -/* C43224 80243474 AFBF0014 */ sw $ra, 0x14($sp) -/* C43228 80243478 8E020148 */ lw $v0, 0x148($s0) -/* C4322C 8024347C 0C00EABB */ jal get_npc_unsafe -/* C43230 80243480 84440008 */ lh $a0, 8($v0) -/* C43234 80243484 9443008E */ lhu $v1, 0x8e($v0) -/* C43238 80243488 2463FFFF */ addiu $v1, $v1, -1 -/* C4323C 8024348C A443008E */ sh $v1, 0x8e($v0) -/* C43240 80243490 00031C00 */ sll $v1, $v1, 0x10 -/* C43244 80243494 1C600002 */ bgtz $v1, .L802434A0 -/* C43248 80243498 2402001E */ addiu $v0, $zero, 0x1e -/* C4324C 8024349C AE020070 */ sw $v0, 0x70($s0) -.L802434A0: -/* C43250 802434A0 8FBF0014 */ lw $ra, 0x14($sp) -/* C43254 802434A4 8FB00010 */ lw $s0, 0x10($sp) -/* C43258 802434A8 03E00008 */ jr $ra -/* C4325C 802434AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s deleted file mode 100644 index d102685be2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434B0_C43260 -/* C43260 802434B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C43264 802434B4 AFB00010 */ sw $s0, 0x10($sp) -/* C43268 802434B8 0080802D */ daddu $s0, $a0, $zero -/* C4326C 802434BC AFBF0014 */ sw $ra, 0x14($sp) -/* C43270 802434C0 8E020148 */ lw $v0, 0x148($s0) -/* C43274 802434C4 0C00EABB */ jal get_npc_unsafe -/* C43278 802434C8 84440008 */ lh $a0, 8($v0) -/* C4327C 802434CC 0040202D */ daddu $a0, $v0, $zero -/* C43280 802434D0 9482008E */ lhu $v0, 0x8e($a0) -/* C43284 802434D4 24420001 */ addiu $v0, $v0, 1 -/* C43288 802434D8 A482008E */ sh $v0, 0x8e($a0) -/* C4328C 802434DC 00021400 */ sll $v0, $v0, 0x10 -/* C43290 802434E0 00021403 */ sra $v0, $v0, 0x10 -/* C43294 802434E4 28420003 */ slti $v0, $v0, 3 -/* C43298 802434E8 1440000D */ bnez $v0, .L80243520 -/* C4329C 802434EC 24020009 */ addiu $v0, $zero, 9 -/* C432A0 802434F0 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C432A4 802434F4 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C432A8 802434F8 10620003 */ beq $v1, $v0, .L80243508 -/* C432AC 802434FC 24020064 */ addiu $v0, $zero, 0x64 -/* C432B0 80243500 08090D47 */ j .L8024351C -/* C432B4 80243504 A480008E */ sh $zero, 0x8e($a0) -.L80243508: -/* C432B8 80243508 0C038069 */ jal enable_player_input -/* C432BC 8024350C 00000000 */ nop -/* C432C0 80243510 0C03BD80 */ jal func_800EF600 -/* C432C4 80243514 00000000 */ nop -/* C432C8 80243518 24020010 */ addiu $v0, $zero, 0x10 -.L8024351C: -/* C432CC 8024351C AE020070 */ sw $v0, 0x70($s0) -.L80243520: -/* C432D0 80243520 8FBF0014 */ lw $ra, 0x14($sp) -/* C432D4 80243524 8FB00010 */ lw $s0, 0x10($sp) -/* C432D8 80243528 03E00008 */ jr $ra -/* C432DC 8024352C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s deleted file mode 100644 index d34e5ad80f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243530_C432E0 -/* C432E0 80243530 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C432E4 80243534 AFB20018 */ sw $s2, 0x18($sp) -/* C432E8 80243538 0080902D */ daddu $s2, $a0, $zero -/* C432EC 8024353C AFBF001C */ sw $ra, 0x1c($sp) -/* C432F0 80243540 AFB10014 */ sw $s1, 0x14($sp) -/* C432F4 80243544 AFB00010 */ sw $s0, 0x10($sp) -/* C432F8 80243548 8E500148 */ lw $s0, 0x148($s2) -/* C432FC 8024354C 86040008 */ lh $a0, 8($s0) -/* C43300 80243550 0C00EABB */ jal get_npc_unsafe -/* C43304 80243554 00A0882D */ daddu $s1, $a1, $zero -/* C43308 80243558 3C05FFDF */ lui $a1, 0xffdf -/* C4330C 8024355C 8E03006C */ lw $v1, 0x6c($s0) -/* C43310 80243560 2404FEFF */ addiu $a0, $zero, -0x101 -/* C43314 80243564 00641824 */ and $v1, $v1, $a0 -/* C43318 80243568 AE03006C */ sw $v1, 0x6c($s0) -/* C4331C 8024356C 8C430000 */ lw $v1, ($v0) -/* C43320 80243570 34A5FFFF */ ori $a1, $a1, 0xffff -/* C43324 80243574 00651824 */ and $v1, $v1, $a1 -/* C43328 80243578 AC430000 */ sw $v1, ($v0) -/* C4332C 8024357C C6200000 */ lwc1 $f0, ($s1) -/* C43330 80243580 46000021 */ cvt.d.s $f0, $f0 -/* C43334 80243584 46200000 */ add.d $f0, $f0, $f0 -/* C43338 80243588 46200020 */ cvt.s.d $f0, $f0 -/* C4333C 8024358C E4400018 */ swc1 $f0, 0x18($v0) -/* C43340 80243590 AE000074 */ sw $zero, 0x74($s0) -/* C43344 80243594 C440003C */ lwc1 $f0, 0x3c($v0) -/* C43348 80243598 3C014059 */ lui $at, 0x4059 -/* C4334C 8024359C 44811800 */ mtc1 $at, $f3 -/* C43350 802435A0 44801000 */ mtc1 $zero, $f2 -/* C43354 802435A4 46000021 */ cvt.d.s $f0, $f0 -/* C43358 802435A8 46220002 */ mul.d $f0, $f0, $f2 -/* C4335C 802435AC 00000000 */ nop -/* C43360 802435B0 2402001E */ addiu $v0, $zero, 0x1e -/* C43364 802435B4 4620010D */ trunc.w.d $f4, $f0 -/* C43368 802435B8 E604007C */ swc1 $f4, 0x7c($s0) -/* C4336C 802435BC AE420074 */ sw $v0, 0x74($s2) -/* C43370 802435C0 8FBF001C */ lw $ra, 0x1c($sp) -/* C43374 802435C4 8FB20018 */ lw $s2, 0x18($sp) -/* C43378 802435C8 8FB10014 */ lw $s1, 0x14($sp) -/* C4337C 802435CC 8FB00010 */ lw $s0, 0x10($sp) -/* C43380 802435D0 03E00008 */ jr $ra -/* C43384 802435D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s deleted file mode 100644 index 3a50b2bd34..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435D8_C43388 -/* C43388 802435D8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C4338C 802435DC AFB20048 */ sw $s2, 0x48($sp) -/* C43390 802435E0 0080902D */ daddu $s2, $a0, $zero -/* C43394 802435E4 AFBF0054 */ sw $ra, 0x54($sp) -/* C43398 802435E8 AFB40050 */ sw $s4, 0x50($sp) -/* C4339C 802435EC AFB3004C */ sw $s3, 0x4c($sp) -/* C433A0 802435F0 AFB10044 */ sw $s1, 0x44($sp) -/* C433A4 802435F4 AFB00040 */ sw $s0, 0x40($sp) -/* C433A8 802435F8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C433AC 802435FC F7B80068 */ sdc1 $f24, 0x68($sp) -/* C433B0 80243600 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C433B4 80243604 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C433B8 80243608 8E500148 */ lw $s0, 0x148($s2) -/* C433BC 8024360C 00A0982D */ daddu $s3, $a1, $zero -/* C433C0 80243610 86040008 */ lh $a0, 8($s0) -/* C433C4 80243614 0C00EABB */ jal get_npc_unsafe -/* C433C8 80243618 00C0A02D */ daddu $s4, $a2, $zero -/* C433CC 8024361C 0040882D */ daddu $s1, $v0, $zero -/* C433D0 80243620 C6200038 */ lwc1 $f0, 0x38($s1) -/* C433D4 80243624 C622003C */ lwc1 $f2, 0x3c($s1) -/* C433D8 80243628 C6240040 */ lwc1 $f4, 0x40($s1) -/* C433DC 8024362C 3C01447A */ lui $at, 0x447a -/* C433E0 80243630 44813000 */ mtc1 $at, $f6 -/* C433E4 80243634 C60C0074 */ lwc1 $f12, 0x74($s0) -/* C433E8 80243638 46806320 */ cvt.s.w $f12, $f12 -/* C433EC 8024363C E7A00028 */ swc1 $f0, 0x28($sp) -/* C433F0 80243640 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C433F4 80243644 E7A40030 */ swc1 $f4, 0x30($sp) -/* C433F8 80243648 E7A60034 */ swc1 $f6, 0x34($sp) -/* C433FC 8024364C C6000078 */ lwc1 $f0, 0x78($s0) -/* C43400 80243650 46800020 */ cvt.s.w $f0, $f0 -/* C43404 80243654 46000021 */ cvt.d.s $f0, $f0 -/* C43408 80243658 C6020088 */ lwc1 $f2, 0x88($s0) -/* C4340C 8024365C 468010A0 */ cvt.s.w $f2, $f2 -/* C43410 80243660 3C014059 */ lui $at, 0x4059 -/* C43414 80243664 44812800 */ mtc1 $at, $f5 -/* C43418 80243668 44802000 */ mtc1 $zero, $f4 -/* C4341C 8024366C 460010A1 */ cvt.d.s $f2, $f2 -/* C43420 80243670 46240003 */ div.d $f0, $f0, $f4 -/* C43424 80243674 462006A0 */ cvt.s.d $f26, $f0 -/* C43428 80243678 46241083 */ div.d $f2, $f2, $f4 -/* C4342C 8024367C 462010A0 */ cvt.s.d $f2, $f2 -/* C43430 80243680 C6000070 */ lwc1 $f0, 0x70($s0) -/* C43434 80243684 46800020 */ cvt.s.w $f0, $f0 -/* C43438 80243688 46000021 */ cvt.d.s $f0, $f0 -/* C4343C 8024368C 46240003 */ div.d $f0, $f0, $f4 -/* C43440 80243690 462005A0 */ cvt.s.d $f22, $f0 -/* C43444 80243694 0C00A8BB */ jal sin_deg -/* C43448 80243698 4602D600 */ add.s $f24, $f26, $f2 -/* C4344C 8024369C 27A50028 */ addiu $a1, $sp, 0x28 -/* C43450 802436A0 27A6002C */ addiu $a2, $sp, 0x2c -/* C43454 802436A4 27A70030 */ addiu $a3, $sp, 0x30 -/* C43458 802436A8 27A20034 */ addiu $v0, $sp, 0x34 -/* C4345C 802436AC AFA20010 */ sw $v0, 0x10($sp) -/* C43460 802436B0 8E240080 */ lw $a0, 0x80($s1) -/* C43464 802436B4 0C0372DF */ jal func_800DCB7C -/* C43468 802436B8 46000506 */ mov.s $f20, $f0 -/* C4346C 802436BC 10400007 */ beqz $v0, .L802436DC -/* C43470 802436C0 00000000 */ nop -/* C43474 802436C4 4616A082 */ mul.s $f2, $f20, $f22 -/* C43478 802436C8 00000000 */ nop -/* C4347C 802436CC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C43480 802436D0 461A0000 */ add.s $f0, $f0, $f26 -/* C43484 802436D4 08090DBA */ j .L802436E8 -/* C43488 802436D8 46020000 */ add.s $f0, $f0, $f2 -.L802436DC: -/* C4348C 802436DC 4616A002 */ mul.s $f0, $f20, $f22 -/* C43490 802436E0 00000000 */ nop -/* C43494 802436E4 4600C000 */ add.s $f0, $f24, $f0 -.L802436E8: -/* C43498 802436E8 E620003C */ swc1 $f0, 0x3c($s1) -/* C4349C 802436EC 8E020074 */ lw $v0, 0x74($s0) -/* C434A0 802436F0 2442000C */ addiu $v0, $v0, 0xc -/* C434A4 802436F4 44826000 */ mtc1 $v0, $f12 -/* C434A8 802436F8 00000000 */ nop -/* C434AC 802436FC 0C00A6C9 */ jal clamp_angle -/* C434B0 80243700 46806320 */ cvt.s.w $f12, $f12 -/* C434B4 80243704 4600020D */ trunc.w.s $f8, $f0 -/* C434B8 80243708 E6080074 */ swc1 $f8, 0x74($s0) -/* C434BC 8024370C 8E420074 */ lw $v0, 0x74($s2) -/* C434C0 80243710 1C400037 */ bgtz $v0, .L802437F0 -/* C434C4 80243714 2442FFFF */ addiu $v0, $v0, -1 -/* C434C8 80243718 8E620014 */ lw $v0, 0x14($s3) -/* C434CC 8024371C AE420074 */ sw $v0, 0x74($s2) -/* C434D0 80243720 C662000C */ lwc1 $f2, 0xc($s3) -/* C434D4 80243724 3C013FE0 */ lui $at, 0x3fe0 -/* C434D8 80243728 44812800 */ mtc1 $at, $f5 -/* C434DC 8024372C 44802000 */ mtc1 $zero, $f4 -/* C434E0 80243730 460010A1 */ cvt.d.s $f2, $f2 -/* C434E4 80243734 46241082 */ mul.d $f2, $f2, $f4 -/* C434E8 80243738 00000000 */ nop -/* C434EC 8024373C C6600010 */ lwc1 $f0, 0x10($s3) -/* C434F0 80243740 46000021 */ cvt.d.s $f0, $f0 -/* C434F4 80243744 46240002 */ mul.d $f0, $f0, $f4 -/* C434F8 80243748 00000000 */ nop -/* C434FC 8024374C 0280202D */ daddu $a0, $s4, $zero -/* C43500 80243750 462010A0 */ cvt.s.d $f2, $f2 -/* C43504 80243754 46200020 */ cvt.s.d $f0, $f0 -/* C43508 80243758 44061000 */ mfc1 $a2, $f2 -/* C4350C 8024375C 44070000 */ mfc1 $a3, $f0 -/* C43510 80243760 0200282D */ daddu $a1, $s0, $zero -/* C43514 80243764 0C01242D */ jal func_800490B4 -/* C43518 80243768 AFA00010 */ sw $zero, 0x10($sp) -/* C4351C 8024376C 1040001E */ beqz $v0, .L802437E8 -/* C43520 80243770 0000202D */ daddu $a0, $zero, $zero -/* C43524 80243774 0220282D */ daddu $a1, $s1, $zero -/* C43528 80243778 0000302D */ daddu $a2, $zero, $zero -/* C4352C 8024377C 2410000C */ addiu $s0, $zero, 0xc -/* C43530 80243780 862300A8 */ lh $v1, 0xa8($s1) -/* C43534 80243784 3C013F80 */ lui $at, 0x3f80 -/* C43538 80243788 44810000 */ mtc1 $at, $f0 -/* C4353C 8024378C 3C014000 */ lui $at, 0x4000 -/* C43540 80243790 44811000 */ mtc1 $at, $f2 -/* C43544 80243794 3C01C1A0 */ lui $at, 0xc1a0 -/* C43548 80243798 44812000 */ mtc1 $at, $f4 -/* C4354C 8024379C 44834000 */ mtc1 $v1, $f8 -/* C43550 802437A0 00000000 */ nop -/* C43554 802437A4 46804220 */ cvt.s.w $f8, $f8 -/* C43558 802437A8 44074000 */ mfc1 $a3, $f8 -/* C4355C 802437AC 27A20038 */ addiu $v0, $sp, 0x38 -/* C43560 802437B0 AFB0001C */ sw $s0, 0x1c($sp) -/* C43564 802437B4 AFA20020 */ sw $v0, 0x20($sp) -/* C43568 802437B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4356C 802437BC E7A20014 */ swc1 $f2, 0x14($sp) -/* C43570 802437C0 0C01BFA4 */ jal fx_emote -/* C43574 802437C4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C43578 802437C8 0220202D */ daddu $a0, $s1, $zero -/* C4357C 802437CC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C43580 802437D0 0C012530 */ jal func_800494C0 -/* C43584 802437D4 3C060020 */ lui $a2, 0x20 -/* C43588 802437D8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C4358C 802437DC E6200064 */ swc1 $f0, 0x64($s1) -/* C43590 802437E0 08090E30 */ j .L802438C0 -/* C43594 802437E4 AE500070 */ sw $s0, 0x70($s2) -.L802437E8: -/* C43598 802437E8 8E420074 */ lw $v0, 0x74($s2) -/* C4359C 802437EC 2442FFFF */ addiu $v0, $v0, -1 -.L802437F0: -/* C435A0 802437F0 AE420074 */ sw $v0, 0x74($s2) -/* C435A4 802437F4 8622008C */ lh $v0, 0x8c($s1) -/* C435A8 802437F8 14400031 */ bnez $v0, .L802438C0 -/* C435AC 802437FC 00000000 */ nop -/* C435B0 80243800 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C435B4 80243804 8E0200D0 */ lw $v0, 0xd0($s0) -/* C435B8 80243808 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C435BC 8024380C C4480000 */ lwc1 $f8, ($v0) -/* C435C0 80243810 46804220 */ cvt.s.w $f8, $f8 -/* C435C4 80243814 44064000 */ mfc1 $a2, $f8 -/* C435C8 80243818 C4480008 */ lwc1 $f8, 8($v0) -/* C435CC 8024381C 46804220 */ cvt.s.w $f8, $f8 -/* C435D0 80243820 44074000 */ mfc1 $a3, $f8 -/* C435D4 80243824 0C00A720 */ jal atan2 -/* C435D8 80243828 00000000 */ nop -/* C435DC 8024382C 8E250018 */ lw $a1, 0x18($s1) -/* C435E0 80243830 44060000 */ mfc1 $a2, $f0 -/* C435E4 80243834 0220202D */ daddu $a0, $s1, $zero -/* C435E8 80243838 0C00EA95 */ jal npc_move_heading -/* C435EC 8024383C AE26000C */ sw $a2, 0xc($s1) -/* C435F0 80243840 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C435F4 80243844 8E0200D0 */ lw $v0, 0xd0($s0) -/* C435F8 80243848 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C435FC 8024384C C4480000 */ lwc1 $f8, ($v0) -/* C43600 80243850 46804220 */ cvt.s.w $f8, $f8 -/* C43604 80243854 44064000 */ mfc1 $a2, $f8 -/* C43608 80243858 C4480008 */ lwc1 $f8, 8($v0) -/* C4360C 8024385C 46804220 */ cvt.s.w $f8, $f8 -/* C43610 80243860 44074000 */ mfc1 $a3, $f8 -/* C43614 80243864 0C00A7B5 */ jal dist2D -/* C43618 80243868 00000000 */ nop -/* C4361C 8024386C C6220018 */ lwc1 $f2, 0x18($s1) -/* C43620 80243870 46021080 */ add.s $f2, $f2, $f2 -/* C43624 80243874 4602003E */ c.le.s $f0, $f2 -/* C43628 80243878 00000000 */ nop -/* C4362C 8024387C 45000010 */ bc1f .L802438C0 -/* C43630 80243880 E7A00034 */ swc1 $f0, 0x34($sp) -/* C43634 80243884 0C00A67F */ jal rand_int -/* C43638 80243888 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4363C 8024388C 3C035555 */ lui $v1, 0x5555 -/* C43640 80243890 34635556 */ ori $v1, $v1, 0x5556 -/* C43644 80243894 00430018 */ mult $v0, $v1 -/* C43648 80243898 24030002 */ addiu $v1, $zero, 2 -/* C4364C 8024389C 000227C3 */ sra $a0, $v0, 0x1f -/* C43650 802438A0 AE430070 */ sw $v1, 0x70($s2) -/* C43654 802438A4 00004010 */ mfhi $t0 -/* C43658 802438A8 01042023 */ subu $a0, $t0, $a0 -/* C4365C 802438AC 00041840 */ sll $v1, $a0, 1 -/* C43660 802438B0 00641821 */ addu $v1, $v1, $a0 -/* C43664 802438B4 00431023 */ subu $v0, $v0, $v1 -/* C43668 802438B8 24420002 */ addiu $v0, $v0, 2 -/* C4366C 802438BC AE420074 */ sw $v0, 0x74($s2) -.L802438C0: -/* C43670 802438C0 8FBF0054 */ lw $ra, 0x54($sp) -/* C43674 802438C4 8FB40050 */ lw $s4, 0x50($sp) -/* C43678 802438C8 8FB3004C */ lw $s3, 0x4c($sp) -/* C4367C 802438CC 8FB20048 */ lw $s2, 0x48($sp) -/* C43680 802438D0 8FB10044 */ lw $s1, 0x44($sp) -/* C43684 802438D4 8FB00040 */ lw $s0, 0x40($sp) -/* C43688 802438D8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C4368C 802438DC D7B80068 */ ldc1 $f24, 0x68($sp) -/* C43690 802438E0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C43694 802438E4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C43698 802438E8 03E00008 */ jr $ra -/* C4369C 802438EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s deleted file mode 100644 index 9c1c4aed28..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s +++ /dev/null @@ -1,180 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438F0_C436A0 -/* C436A0 802438F0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C436A4 802438F4 AFB40050 */ sw $s4, 0x50($sp) -/* C436A8 802438F8 0080A02D */ daddu $s4, $a0, $zero -/* C436AC 802438FC AFBF0058 */ sw $ra, 0x58($sp) -/* C436B0 80243900 AFB50054 */ sw $s5, 0x54($sp) -/* C436B4 80243904 AFB3004C */ sw $s3, 0x4c($sp) -/* C436B8 80243908 AFB20048 */ sw $s2, 0x48($sp) -/* C436BC 8024390C AFB10044 */ sw $s1, 0x44($sp) -/* C436C0 80243910 AFB00040 */ sw $s0, 0x40($sp) -/* C436C4 80243914 8E920148 */ lw $s2, 0x148($s4) -/* C436C8 80243918 86440008 */ lh $a0, 8($s2) -/* C436CC 8024391C 0C00EABB */ jal get_npc_unsafe -/* C436D0 80243920 00A0802D */ daddu $s0, $a1, $zero -/* C436D4 80243924 8E83000C */ lw $v1, 0xc($s4) -/* C436D8 80243928 0280202D */ daddu $a0, $s4, $zero -/* C436DC 8024392C 8C650000 */ lw $a1, ($v1) -/* C436E0 80243930 0C0B1EAF */ jal get_variable -/* C436E4 80243934 0040A82D */ daddu $s5, $v0, $zero -/* C436E8 80243938 AFA00020 */ sw $zero, 0x20($sp) -/* C436EC 8024393C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C436F0 80243940 8C630030 */ lw $v1, 0x30($v1) -/* C436F4 80243944 AFA30024 */ sw $v1, 0x24($sp) -/* C436F8 80243948 8E4300D0 */ lw $v1, 0xd0($s2) -/* C436FC 8024394C 8C63001C */ lw $v1, 0x1c($v1) -/* C43700 80243950 AFA30028 */ sw $v1, 0x28($sp) -/* C43704 80243954 8E4300D0 */ lw $v1, 0xd0($s2) -/* C43708 80243958 8C630024 */ lw $v1, 0x24($v1) -/* C4370C 8024395C AFA3002C */ sw $v1, 0x2c($sp) -/* C43710 80243960 8E4300D0 */ lw $v1, 0xd0($s2) -/* C43714 80243964 8C630028 */ lw $v1, 0x28($v1) -/* C43718 80243968 27B30020 */ addiu $s3, $sp, 0x20 -/* C4371C 8024396C AFA30030 */ sw $v1, 0x30($sp) -/* C43720 80243970 8E4300D0 */ lw $v1, 0xd0($s2) -/* C43724 80243974 3C0142FA */ lui $at, 0x42fa -/* C43728 80243978 44810000 */ mtc1 $at, $f0 -/* C4372C 8024397C 8C63002C */ lw $v1, 0x2c($v1) -/* C43730 80243980 0040882D */ daddu $s1, $v0, $zero -/* C43734 80243984 E7A00038 */ swc1 $f0, 0x38($sp) -/* C43738 80243988 A7A0003C */ sh $zero, 0x3c($sp) -/* C4373C 8024398C 12000007 */ beqz $s0, .L802439AC -/* C43740 80243990 AFA30034 */ sw $v1, 0x34($sp) -/* C43744 80243994 AE800070 */ sw $zero, 0x70($s4) -/* C43748 80243998 02A0202D */ daddu $a0, $s5, $zero -/* C4374C 8024399C 0240282D */ daddu $a1, $s2, $zero -/* C43750 802439A0 0280302D */ daddu $a2, $s4, $zero -/* C43754 802439A4 0C090A52 */ jal func_80242948_C426F8 -/* C43758 802439A8 0220382D */ daddu $a3, $s1, $zero -.L802439AC: -/* C4375C 802439AC 8E830070 */ lw $v1, 0x70($s4) -/* C43760 802439B0 2C620020 */ sltiu $v0, $v1, 0x20 -/* C43764 802439B4 10400060 */ beqz $v0, L80243B38_C438E8 -/* C43768 802439B8 00031080 */ sll $v0, $v1, 2 -/* C4376C 802439BC 3C018024 */ lui $at, %hi(jtbl_80246DA0_C46B50) -/* C43770 802439C0 00220821 */ addu $at, $at, $v0 -/* C43774 802439C4 8C226DA0 */ lw $v0, %lo(jtbl_80246DA0_C46B50)($at) -/* C43778 802439C8 00400008 */ jr $v0 -/* C4377C 802439CC 00000000 */ nop -glabel L802439D0_C43780 -/* C43780 802439D0 0280202D */ daddu $a0, $s4, $zero -/* C43784 802439D4 0220282D */ daddu $a1, $s1, $zero -/* C43788 802439D8 0C0905D8 */ jal func_80241760_C41510 -/* C4378C 802439DC 0260302D */ daddu $a2, $s3, $zero -/* C43790 802439E0 0000282D */ daddu $a1, $zero, $zero -/* C43794 802439E4 00A0302D */ daddu $a2, $a1, $zero -/* C43798 802439E8 AFA00010 */ sw $zero, 0x10($sp) -/* C4379C 802439EC AFA00014 */ sw $zero, 0x14($sp) -/* C437A0 802439F0 AFA00018 */ sw $zero, 0x18($sp) -/* C437A4 802439F4 8EA40024 */ lw $a0, 0x24($s5) -/* C437A8 802439F8 0C0B7A25 */ jal func_802DE894 -/* C437AC 802439FC 00A0382D */ daddu $a3, $a1, $zero -glabel L80243A00_C437B0 -/* C437B0 80243A00 0280202D */ daddu $a0, $s4, $zero -/* C437B4 80243A04 0220282D */ daddu $a1, $s1, $zero -/* C437B8 80243A08 0C090644 */ jal func_80241910_C416C0 -/* C437BC 80243A0C 0260302D */ daddu $a2, $s3, $zero -/* C437C0 80243A10 08090E8E */ j .L80243A38 -/* C437C4 80243A14 00000000 */ nop -glabel L80243A18_C437C8 -/* C437C8 80243A18 0280202D */ daddu $a0, $s4, $zero -/* C437CC 80243A1C 0220282D */ daddu $a1, $s1, $zero -/* C437D0 80243A20 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 -/* C437D4 80243A24 0260302D */ daddu $a2, $s3, $zero -glabel L80243A28_C437D8 -/* C437D8 80243A28 0280202D */ daddu $a0, $s4, $zero -/* C437DC 80243A2C 0220282D */ daddu $a1, $s1, $zero -/* C437E0 80243A30 0C0907FE */ jal func_80241FF8_C41DA8 -/* C437E4 80243A34 0260302D */ daddu $a2, $s3, $zero -.L80243A38: -/* C437E8 80243A38 8E830070 */ lw $v1, 0x70($s4) -/* C437EC 80243A3C 2402000C */ addiu $v0, $zero, 0xc -/* C437F0 80243A40 1462003D */ bne $v1, $v0, L80243B38_C438E8 -/* C437F4 80243A44 24020006 */ addiu $v0, $zero, 6 -/* C437F8 80243A48 08090ECE */ j L80243B38_C438E8 -/* C437FC 80243A4C A6A2008E */ sh $v0, 0x8e($s5) -glabel L80243A50_C43800 -/* C43800 80243A50 0280202D */ daddu $a0, $s4, $zero -/* C43804 80243A54 0220282D */ daddu $a1, $s1, $zero -/* C43808 80243A58 0C090B16 */ jal func_80242C58_C42A08 -/* C4380C 80243A5C 0260302D */ daddu $a2, $s3, $zero -/* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) -/* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd -/* C43818 80243A68 14620033 */ bne $v1, $v0, L80243B38_C438E8 -/* C4381C 80243A6C 00000000 */ nop -glabel L80243A70_C43820 -/* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero -/* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero -/* C43828 80243A78 0C090B6C */ jal func_80242DB0_C42B60 -/* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero -/* C43830 80243A80 08090ECE */ j L80243B38_C438E8 -/* C43834 80243A84 00000000 */ nop -glabel L80243A88_C43838 -/* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero -/* C4383C 80243A8C 0220282D */ daddu $a1, $s1, $zero -/* C43840 80243A90 0C090BAD */ jal func_80242EB4_C42C64 -/* C43844 80243A94 0260302D */ daddu $a2, $s3, $zero -/* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) -/* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf -/* C43850 80243AA0 14620025 */ bne $v1, $v0, L80243B38_C438E8 -/* C43854 80243AA4 00000000 */ nop -glabel L80243AA8_C43858 -/* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero -/* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero -/* C43860 80243AB0 0C090BE5 */ jal func_80242F94_C42D44 -/* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero -/* C43868 80243AB8 08090ECE */ j L80243B38_C438E8 -/* C4386C 80243ABC 00000000 */ nop -glabel L80243AC0_C43870 -/* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero -/* C43874 80243AC4 0220282D */ daddu $a1, $s1, $zero -/* C43878 80243AC8 0C090C8C */ jal func_80243230_C42FE0 -/* C4387C 80243ACC 0260302D */ daddu $a2, $s3, $zero -glabel L80243AD0_C43880 -/* C43880 80243AD0 0280202D */ daddu $a0, $s4, $zero -/* C43884 80243AD4 0220282D */ daddu $a1, $s1, $zero -/* C43888 80243AD8 0C090CBA */ jal func_802432E8_C43098 -/* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero -/* C43890 80243AE0 08090ECE */ j L80243B38_C438E8 -/* C43894 80243AE4 00000000 */ nop -glabel L80243AE8_C43898 -/* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero -/* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero -/* C438A0 80243AF0 0C090D1A */ jal func_80243468_C43218 -/* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero -/* C438A8 80243AF8 08090ECE */ j L80243B38_C438E8 -/* C438AC 80243AFC 00000000 */ nop -glabel L80243B00_C438B0 -/* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero -/* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero -/* C438B8 80243B08 0C090D2C */ jal func_802434B0_C43260 -/* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero -/* C438C0 80243B10 08090ECE */ j L80243B38_C438E8 -/* C438C4 80243B14 00000000 */ nop -glabel L80243B18_C438C8 -/* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero -/* C438CC 80243B1C 0220282D */ daddu $a1, $s1, $zero -/* C438D0 80243B20 0C090D4C */ jal func_80243530_C432E0 -/* C438D4 80243B24 0260302D */ daddu $a2, $s3, $zero -glabel L80243B28_C438D8 -/* C438D8 80243B28 0280202D */ daddu $a0, $s4, $zero -/* C438DC 80243B2C 0220282D */ daddu $a1, $s1, $zero -/* C438E0 80243B30 0C090D76 */ jal func_802435D8_C43388 -/* C438E4 80243B34 0260302D */ daddu $a2, $s3, $zero -glabel L80243B38_C438E8 -/* C438E8 80243B38 8E820070 */ lw $v0, 0x70($s4) -/* C438EC 80243B3C 8FBF0058 */ lw $ra, 0x58($sp) -/* C438F0 80243B40 8FB50054 */ lw $s5, 0x54($sp) -/* C438F4 80243B44 8FB40050 */ lw $s4, 0x50($sp) -/* C438F8 80243B48 8FB3004C */ lw $s3, 0x4c($sp) -/* C438FC 80243B4C 8FB20048 */ lw $s2, 0x48($sp) -/* C43900 80243B50 8FB10044 */ lw $s1, 0x44($sp) -/* C43904 80243B54 8FB00040 */ lw $s0, 0x40($sp) -/* C43908 80243B58 38420064 */ xori $v0, $v0, 0x64 -/* C4390C 80243B5C 2C420001 */ sltiu $v0, $v0, 1 -/* C43910 80243B60 00021040 */ sll $v0, $v0, 1 -/* C43914 80243B64 03E00008 */ jr $ra -/* C43918 80243B68 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s deleted file mode 100644 index e25239efcf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B98_C43948 -/* C43948 80243B98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4394C 80243B9C AFBF0010 */ sw $ra, 0x10($sp) -/* C43950 80243BA0 0C00FB5A */ jal get_enemy_safe -/* C43954 80243BA4 24040009 */ addiu $a0, $zero, 9 -/* C43958 80243BA8 10400016 */ beqz $v0, .L80243C04 -/* C4395C 80243BAC 24020002 */ addiu $v0, $zero, 2 -/* C43960 80243BB0 0C00FB3A */ jal get_enemy -/* C43964 80243BB4 24040009 */ addiu $a0, $zero, 9 -/* C43968 80243BB8 8C4400D0 */ lw $a0, 0xd0($v0) -/* C4396C 80243BBC 24030002 */ addiu $v1, $zero, 2 -/* C43970 80243BC0 AC830000 */ sw $v1, ($a0) -/* C43974 80243BC4 8C4400D0 */ lw $a0, 0xd0($v0) -/* C43978 80243BC8 2403FE3E */ addiu $v1, $zero, -0x1c2 -/* C4397C 80243BCC AC830004 */ sw $v1, 4($a0) -/* C43980 80243BD0 8C4300D0 */ lw $v1, 0xd0($v0) -/* C43984 80243BD4 AC600008 */ sw $zero, 8($v1) -/* C43988 80243BD8 8C4300D0 */ lw $v1, 0xd0($v0) -/* C4398C 80243BDC 240500AF */ addiu $a1, $zero, 0xaf -/* C43990 80243BE0 AC65000C */ sw $a1, 0xc($v1) -/* C43994 80243BE4 8C4400D0 */ lw $a0, 0xd0($v0) -/* C43998 80243BE8 2403012C */ addiu $v1, $zero, 0x12c -/* C4399C 80243BEC AC830010 */ sw $v1, 0x10($a0) -/* C439A0 80243BF0 8C4300D0 */ lw $v1, 0xd0($v0) -/* C439A4 80243BF4 AC600014 */ sw $zero, 0x14($v1) -/* C439A8 80243BF8 8C4300D0 */ lw $v1, 0xd0($v0) -/* C439AC 80243BFC 24020002 */ addiu $v0, $zero, 2 -/* C439B0 80243C00 AC650018 */ sw $a1, 0x18($v1) -.L80243C04: -/* C439B4 80243C04 8FBF0010 */ lw $ra, 0x10($sp) -/* C439B8 80243C08 03E00008 */ jr $ra -/* C439BC 80243C0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s deleted file mode 100644 index f53166abfe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C10_C439C0 -/* C439C0 80243C10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C439C4 80243C14 AFBF0010 */ sw $ra, 0x10($sp) -/* C439C8 80243C18 0C00FB5A */ jal get_enemy_safe -/* C439CC 80243C1C 24040009 */ addiu $a0, $zero, 9 -/* C439D0 80243C20 10400008 */ beqz $v0, .L80243C44 -/* C439D4 80243C24 24020002 */ addiu $v0, $zero, 2 -/* C439D8 80243C28 0C00FB3A */ jal get_enemy -/* C439DC 80243C2C 24040009 */ addiu $a0, $zero, 9 -/* C439E0 80243C30 0040202D */ daddu $a0, $v0, $zero -/* C439E4 80243C34 8C8300B0 */ lw $v1, 0xb0($a0) -/* C439E8 80243C38 24020002 */ addiu $v0, $zero, 2 -/* C439EC 80243C3C 34630080 */ ori $v1, $v1, 0x80 -/* C439F0 80243C40 AC8300B0 */ sw $v1, 0xb0($a0) -.L80243C44: -/* C439F4 80243C44 8FBF0010 */ lw $ra, 0x10($sp) -/* C439F8 80243C48 03E00008 */ jr $ra -/* C439FC 80243C4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s deleted file mode 100644 index a4d45a525e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C50_C43A00 -/* C43A00 80243C50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C43A04 80243C54 AFBF0010 */ sw $ra, 0x10($sp) -/* C43A08 80243C58 8C820148 */ lw $v0, 0x148($a0) -/* C43A0C 80243C5C 0C00EABB */ jal get_npc_unsafe -/* C43A10 80243C60 84440008 */ lh $a0, 8($v0) -/* C43A14 80243C64 0040202D */ daddu $a0, $v0, $zero -/* C43A18 80243C68 2405032F */ addiu $a1, $zero, 0x32f -/* C43A1C 80243C6C 0C012530 */ jal func_800494C0 -/* C43A20 80243C70 0000302D */ daddu $a2, $zero, $zero -/* C43A24 80243C74 8FBF0010 */ lw $ra, 0x10($sp) -/* C43A28 80243C78 24020002 */ addiu $v0, $zero, 2 -/* C43A2C 80243C7C 03E00008 */ jr $ra -/* C43A30 80243C80 27BD0018 */ addiu $sp, $sp, 0x18 -/* C43A34 80243C84 00000000 */ nop -/* C43A38 80243C88 00000000 */ nop -/* C43A3C 80243C8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/dgb_09_func_802415D4_C481B4.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s rename to ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/dgb_09_func_802415D4_C481B4.s index d1c3ea242e..686682a2ea 100644 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s +++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/dgb_09_func_802415D4_C481B4.s @@ -1,6 +1,15 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel D_802456C8_C4C2A8 +.double 0.09 + +glabel D_802456D0_C4C2B0 +.double 0.09 + +.section .text glabel func_802415D4_C481B4 /* C481B4 802415D4 27BDFF80 */ addiu $sp, $sp, -0x80 /* C481B8 802415D8 AFB3004C */ sw $s3, 0x4c($sp) diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s deleted file mode 100644 index 4ff486d5e1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C46DE8 -/* C46DE8 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C46DEC 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C46DF0 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C46DF4 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C46DF8 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C46DFC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C46E00 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C46E04 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C46E08 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C46E0C 8024022C 86040008 */ lh $a0, 8($s0) -/* C46E10 80240230 0C00EABB */ jal get_npc_unsafe -/* C46E14 80240234 24110001 */ addiu $s1, $zero, 1 -/* C46E18 80240238 86040008 */ lh $a0, 8($s0) -/* C46E1C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C46E20 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C46E24 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C46E28 80240248 3C03800A */ lui $v1, %hi(D_8009A634) -/* C46E2C 8024024C 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C46E30 80240250 00912021 */ addu $a0, $a0, $s1 -/* C46E34 80240254 00031080 */ sll $v0, $v1, 2 -/* C46E38 80240258 00431021 */ addu $v0, $v0, $v1 -/* C46E3C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C46E40 80240260 00431023 */ subu $v0, $v0, $v1 -/* C46E44 80240264 000218C0 */ sll $v1, $v0, 3 -/* C46E48 80240268 00431021 */ addu $v0, $v0, $v1 -/* C46E4C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C46E50 80240270 0C00FB3A */ jal get_enemy -/* C46E54 80240274 00459021 */ addu $s2, $v0, $a1 -/* C46E58 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C46E5C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C46E60 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C46E64 80240284 8E830000 */ lw $v1, ($s4) -/* C46E68 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C46E6C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C46E70 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C46E74 80240294 0C00A7B5 */ jal dist2D -/* C46E78 80240298 0040982D */ daddu $s3, $v0, $zero -/* C46E7C 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C46E80 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C46E84 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C46E88 802402A8 00000000 */ nop -/* C46E8C 802402AC 45030001 */ bc1tl .L802402B4 -/* C46E90 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C46E94 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C46E98 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C46E9C 802402BC 3C014387 */ lui $at, 0x4387 -/* C46EA0 802402C0 4481A000 */ mtc1 $at, $f20 -/* C46EA4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C46EA8 802402C8 00000000 */ nop -/* C46EAC 802402CC 0C00A6C9 */ jal clamp_angle -/* C46EB0 802402D0 46000306 */ mov.s $f12, $f0 -/* C46EB4 802402D4 3C018024 */ lui $at, %hi(D_80245390_C4BF70) -/* C46EB8 802402D8 D4225390 */ ldc1 $f2, %lo(D_80245390_C4BF70)($at) -/* C46EBC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C46EC0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C46EC4 802402E4 00000000 */ nop -/* C46EC8 802402E8 45000003 */ bc1f .L802402F8 -/* C46ECC 802402EC 00000000 */ nop -/* C46ED0 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C46ED4 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C46ED8 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C46EDC 802402FC 8E820000 */ lw $v0, ($s4) -/* C46EE0 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C46EE4 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C46EE8 80240308 0C00A720 */ jal atan2 -/* C46EEC 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C46EF0 80240310 4600A306 */ mov.s $f12, $f20 -/* C46EF4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C46EF8 80240318 46000386 */ mov.s $f14, $f0 -/* C46EFC 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C46F00 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C46F04 80240324 46000005 */ abs.s $f0, $f0 -/* C46F08 80240328 4600103C */ c.lt.s $f2, $f0 -/* C46F0C 8024032C 00000000 */ nop -/* C46F10 80240330 45030001 */ bc1tl .L80240338 -/* C46F14 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C46F18 80240338 8E820000 */ lw $v0, ($s4) -/* C46F1C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C46F20 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C46F24 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C46F28 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C46F2C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C46F30 80240350 00000000 */ nop -/* C46F34 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C46F38 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C46F3C 8024035C 46000005 */ abs.s $f0, $f0 -/* C46F40 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C46F44 80240364 4620103E */ c.le.d $f2, $f0 -/* C46F48 80240368 00000000 */ nop -/* C46F4C 8024036C 45030001 */ bc1tl .L80240374 -/* C46F50 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C46F54 80240374 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C46F58 80240378 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C46F5C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C46F60 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C46F64 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C46F68 80240388 24020007 */ addiu $v0, $zero, 7 -/* C46F6C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C46F70 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C46F74 80240394 0220102D */ daddu $v0, $s1, $zero -/* C46F78 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C46F7C 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C46F80 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C46F84 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C46F88 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C46F8C 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C46F90 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C46F94 802403B4 03E00008 */ jr $ra -/* C46F98 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s deleted file mode 100644 index 5f6bbf8848..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ /dev/null @@ -1,198 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C471FC -/* C471FC 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C47200 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* C47204 80240624 0080902D */ daddu $s2, $a0, $zero -/* C47208 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* C4720C 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* C47210 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* C47214 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* C47218 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* C4721C 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* C47220 80240640 8E510148 */ lw $s1, 0x148($s2) -/* C47224 80240644 86240008 */ lh $a0, 8($s1) -/* C47228 80240648 0C00EABB */ jal get_npc_unsafe -/* C4722C 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* C47230 80240650 8E43000C */ lw $v1, 0xc($s2) -/* C47234 80240654 0240202D */ daddu $a0, $s2, $zero -/* C47238 80240658 8C650000 */ lw $a1, ($v1) -/* C4723C 8024065C 0C0B1EAF */ jal get_variable -/* C47240 80240660 0040A82D */ daddu $s5, $v0, $zero -/* C47244 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* C47248 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4724C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* C47250 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* C47254 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47258 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* C4725C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* C47260 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47264 80240684 8C630024 */ lw $v1, 0x24($v1) -/* C47268 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* C4726C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47270 80240690 8C630028 */ lw $v1, 0x28($v1) -/* C47274 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* C47278 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* C4727C 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47280 802406A0 3C014282 */ lui $at, 0x4282 -/* C47284 802406A4 44810000 */ mtc1 $at, $f0 -/* C47288 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* C4728C 802406AC 0040982D */ daddu $s3, $v0, $zero -/* C47290 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C47294 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* C47298 802406B8 16000005 */ bnez $s0, .L802406D0 -/* C4729C 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* C472A0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C472A4 802406C4 30420004 */ andi $v0, $v0, 4 -/* C472A8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C472AC 802406CC 00000000 */ nop -.L802406D0: -/* C472B0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C472B4 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* C472B8 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* C472BC 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* C472C0 802406E0 8EA30000 */ lw $v1, ($s5) -/* C472C4 802406E4 8C420000 */ lw $v0, ($v0) -/* C472C8 802406E8 00641824 */ and $v1, $v1, $a0 -/* C472CC 802406EC AEA30000 */ sw $v1, ($s5) -/* C472D0 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* C472D4 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C472D8 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* C472DC 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* C472E0 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* C472E4 80240704 34620200 */ ori $v0, $v1, 0x200 -/* C472E8 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* C472EC 8024070C 080901C7 */ j .L8024071C -/* C472F0 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* C472F4 80240714 00621024 */ and $v0, $v1, $v0 -/* C472F8 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* C472FC 8024071C AEA20000 */ sw $v0, ($s5) -/* C47300 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47304 80240724 30420004 */ andi $v0, $v0, 4 -/* C47308 80240728 10400007 */ beqz $v0, .L80240748 -/* C4730C 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* C47310 80240730 AE420070 */ sw $v0, 0x70($s2) -/* C47314 80240734 AE400074 */ sw $zero, 0x74($s2) -/* C47318 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4731C 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* C47320 80240740 00431024 */ and $v0, $v0, $v1 -/* C47324 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* C47328 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* C4732C 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* C47330 80240750 2842001E */ slti $v0, $v0, 0x1e -/* C47334 80240754 10400009 */ beqz $v0, .L8024077C -/* C47338 80240758 00000000 */ nop -/* C4733C 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* C47340 80240760 14400006 */ bnez $v0, .L8024077C -/* C47344 80240764 00000000 */ nop -/* C47348 80240768 0C090082 */ jal func_80240208_C46DE8 -/* C4734C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* C47350 80240770 10400002 */ beqz $v0, .L8024077C -/* C47354 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* C47358 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* C4735C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* C47360 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C47364 80240784 10400048 */ beqz $v0, L802408A8_C47488 -/* C47368 80240788 00031080 */ sll $v0, $v1, 2 -/* C4736C 8024078C 3C018024 */ lui $at, %hi(jtbl_80245398_C4BF78) -/* C47370 80240790 00220821 */ addu $at, $at, $v0 -/* C47374 80240794 8C225398 */ lw $v0, %lo(jtbl_80245398_C4BF78)($at) -/* C47378 80240798 00400008 */ jr $v0 -/* C4737C 8024079C 00000000 */ nop -glabel L802407A0_C47380 -/* C47380 802407A0 0240202D */ daddu $a0, $s2, $zero -/* C47384 802407A4 0260282D */ daddu $a1, $s3, $zero -/* C47388 802407A8 0C012568 */ jal func_800495A0 -/* C4738C 802407AC 0280302D */ daddu $a2, $s4, $zero -glabel L802407B0_C47390 -/* C47390 802407B0 0240202D */ daddu $a0, $s2, $zero -/* C47394 802407B4 0260282D */ daddu $a1, $s3, $zero -/* C47398 802407B8 0C0125AE */ jal func_800496B8 -/* C4739C 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C473A0 802407C0 0809022A */ j L802408A8_C47488 -/* C473A4 802407C4 00000000 */ nop -glabel L802407C8_C473A8 -/* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero -/* C473AC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C473B0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C473B4 802407D4 0280302D */ daddu $a2, $s4, $zero -glabel L802407D8_C473B8 -/* C473B8 802407D8 0240202D */ daddu $a0, $s2, $zero -/* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero -/* C473C0 802407E0 0C012701 */ jal func_80049C04 -/* C473C4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C473C8 802407E8 0809022A */ j L802408A8_C47488 -/* C473CC 802407EC 00000000 */ nop -glabel L802407F0_C473D0 -/* C473D0 802407F0 0240202D */ daddu $a0, $s2, $zero -/* C473D4 802407F4 0260282D */ daddu $a1, $s3, $zero -/* C473D8 802407F8 0C01278F */ jal func_80049E3C -/* C473DC 802407FC 0280302D */ daddu $a2, $s4, $zero -glabel L80240800_C473E0 -/* C473E0 80240800 0240202D */ daddu $a0, $s2, $zero -/* C473E4 80240804 0260282D */ daddu $a1, $s3, $zero -/* C473E8 80240808 0C0127B3 */ jal func_80049ECC -/* C473EC 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C473F0 80240810 0809022A */ j L802408A8_C47488 -/* C473F4 80240814 00000000 */ nop -glabel L80240818_C473F8 -/* C473F8 80240818 0240202D */ daddu $a0, $s2, $zero -/* C473FC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* C47400 80240820 0C0127DF */ jal func_80049F7C -/* C47404 80240824 0280302D */ daddu $a2, $s4, $zero -glabel L80240828_C47408 -/* C47408 80240828 0240202D */ daddu $a0, $s2, $zero -/* C4740C 8024082C 0260282D */ daddu $a1, $s3, $zero -/* C47410 80240830 0C012849 */ jal func_8004A124 -/* C47414 80240834 0280302D */ daddu $a2, $s4, $zero -/* C47418 80240838 0809022A */ j L802408A8_C47488 -/* C4741C 8024083C 00000000 */ nop -glabel L80240840_C47420 -/* C47420 80240840 0240202D */ daddu $a0, $s2, $zero -/* C47424 80240844 0260282D */ daddu $a1, $s3, $zero -/* C47428 80240848 0C0128FA */ jal func_8004A3E8 -/* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C47430 80240850 0809022A */ j L802408A8_C47488 -/* C47434 80240854 00000000 */ nop -glabel L80240858_C47438 -/* C47438 80240858 0C090000 */ jal dgb_09_UnkNpcAIFunc6 -/* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero -glabel L80240860_C47440 -/* C47440 80240860 0C09001B */ jal dgb_09_UnkNpcAIFunc7 -/* C47444 80240864 0240202D */ daddu $a0, $s2, $zero -/* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) -/* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C47450 80240870 1462000D */ bne $v1, $v0, L802408A8_C47488 -/* C47454 80240874 00000000 */ nop -glabel L80240878_C47458 -/* C47458 80240878 0C090037 */ jal dgb_09_UnkNpcAIFunc8 -/* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) -/* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C47468 80240888 14620007 */ bne $v1, $v0, L802408A8_C47488 -/* C4746C 8024088C 00000000 */ nop -glabel L80240890_C47470 -/* C47470 80240890 0C09006D */ jal dgb_09_UnkNpcAIFunc5 -/* C47474 80240894 0240202D */ daddu $a0, $s2, $zero -/* C47478 80240898 0809022A */ j L802408A8_C47488 -/* C4747C 8024089C 00000000 */ nop -glabel L802408A0_C47480 -/* C47480 802408A0 0C0129CF */ jal func_8004A73C -/* C47484 802408A4 0240202D */ daddu $a0, $s2, $zero -glabel L802408A8_C47488 -/* C47488 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C4748C 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* C47490 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* C47494 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C47498 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* C4749C 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* C474A0 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* C474A4 802408C4 0000102D */ daddu $v0, $zero, $zero -/* C474A8 802408C8 03E00008 */ jr $ra -/* C474AC 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s deleted file mode 100644 index 3dbc9f89ef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802408D0_C474B0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_C474B0 -/* C474B0 802408D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C474B4 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* C474B8 802408D8 0080882D */ daddu $s1, $a0, $zero -/* C474BC 802408DC AFBF0018 */ sw $ra, 0x18($sp) -/* C474C0 802408E0 AFB00010 */ sw $s0, 0x10($sp) -/* C474C4 802408E4 8E300148 */ lw $s0, 0x148($s1) -/* C474C8 802408E8 0C00EABB */ jal get_npc_unsafe -/* C474CC 802408EC 86040008 */ lh $a0, 8($s0) -/* C474D0 802408F0 0040202D */ daddu $a0, $v0, $zero -/* C474D4 802408F4 8482008E */ lh $v0, 0x8e($a0) -/* C474D8 802408F8 9483008E */ lhu $v1, 0x8e($a0) -/* C474DC 802408FC 18400002 */ blez $v0, .L80240908 -/* C474E0 80240900 2462FFFF */ addiu $v0, $v1, -1 -/* C474E4 80240904 A482008E */ sh $v0, 0x8e($a0) -.L80240908: -/* C474E8 80240908 8482008E */ lh $v0, 0x8e($a0) -/* C474EC 8024090C 24030001 */ addiu $v1, $zero, 1 -/* C474F0 80240910 14430005 */ bne $v0, $v1, .L80240928 -/* C474F4 80240914 00000000 */ nop -/* C474F8 80240918 8E0200CC */ lw $v0, 0xcc($s0) -/* C474FC 8024091C 8C420030 */ lw $v0, 0x30($v0) -/* C47500 80240920 08090251 */ j .L80240944 -/* C47504 80240924 AC820028 */ sw $v0, 0x28($a0) -.L80240928: -/* C47508 80240928 1C400006 */ bgtz $v0, .L80240944 -/* C4750C 8024092C 00000000 */ nop -/* C47510 80240930 8E0200CC */ lw $v0, 0xcc($s0) -/* C47514 80240934 8C420028 */ lw $v0, 0x28($v0) -/* C47518 80240938 A480008E */ sh $zero, 0x8e($a0) -/* C4751C 8024093C AC820028 */ sw $v0, 0x28($a0) -/* C47520 80240940 AE230070 */ sw $v1, 0x70($s1) -.L80240944: -/* C47524 80240944 8FBF0018 */ lw $ra, 0x18($sp) -/* C47528 80240948 8FB10014 */ lw $s1, 0x14($sp) -/* C4752C 8024094C 8FB00010 */ lw $s0, 0x10($sp) -/* C47530 80240950 03E00008 */ jr $ra -/* C47534 80240954 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s deleted file mode 100644 index 2c5c657327..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240958_C47538 -/* C47538 80240958 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C4753C 8024095C AFB40048 */ sw $s4, 0x48($sp) -/* C47540 80240960 0080A02D */ daddu $s4, $a0, $zero -/* C47544 80240964 AFBF004C */ sw $ra, 0x4c($sp) -/* C47548 80240968 AFB30044 */ sw $s3, 0x44($sp) -/* C4754C 8024096C AFB20040 */ sw $s2, 0x40($sp) -/* C47550 80240970 AFB1003C */ sw $s1, 0x3c($sp) -/* C47554 80240974 AFB00038 */ sw $s0, 0x38($sp) -/* C47558 80240978 8E930148 */ lw $s3, 0x148($s4) -/* C4755C 8024097C 00C0802D */ daddu $s0, $a2, $zero -/* C47560 80240980 86640008 */ lh $a0, 8($s3) -/* C47564 80240984 0C00EABB */ jal get_npc_unsafe -/* C47568 80240988 0000902D */ daddu $s2, $zero, $zero -/* C4756C 8024098C 0C039D59 */ jal get_player_data -/* C47570 80240990 0040882D */ daddu $s1, $v0, $zero -/* C47574 80240994 0200202D */ daddu $a0, $s0, $zero -/* C47578 80240998 0260282D */ daddu $a1, $s3, $zero -/* C4757C 8024099C 0000382D */ daddu $a3, $zero, $zero -/* C47580 802409A0 3C0642A0 */ lui $a2, 0x42a0 -/* C47584 802409A4 0040802D */ daddu $s0, $v0, $zero -/* C47588 802409A8 0C01242D */ jal func_800490B4 -/* C4758C 802409AC AFA00010 */ sw $zero, 0x10($sp) -/* C47590 802409B0 10400022 */ beqz $v0, .L80240A3C -/* C47594 802409B4 00000000 */ nop -/* C47598 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C4759C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C475A0 802409C0 804300B4 */ lb $v1, 0xb4($v0) -/* C475A4 802409C4 24020002 */ addiu $v0, $zero, 2 -/* C475A8 802409C8 10620013 */ beq $v1, $v0, .L80240A18 -/* C475AC 802409CC 2402001A */ addiu $v0, $zero, 0x1a -/* C475B0 802409D0 10620011 */ beq $v1, $v0, .L80240A18 -/* C475B4 802409D4 24020003 */ addiu $v0, $zero, 3 -/* C475B8 802409D8 1062000F */ beq $v1, $v0, .L80240A18 -/* C475BC 802409DC 2402000E */ addiu $v0, $zero, 0xe -/* C475C0 802409E0 1062000D */ beq $v1, $v0, .L80240A18 -/* C475C4 802409E4 24020010 */ addiu $v0, $zero, 0x10 -/* C475C8 802409E8 1062000B */ beq $v1, $v0, .L80240A18 -/* C475CC 802409EC 2402000B */ addiu $v0, $zero, 0xb -/* C475D0 802409F0 10620009 */ beq $v1, $v0, .L80240A18 -/* C475D4 802409F4 2402000A */ addiu $v0, $zero, 0xa -/* C475D8 802409F8 10620007 */ beq $v1, $v0, .L80240A18 -/* C475DC 802409FC 24020012 */ addiu $v0, $zero, 0x12 -/* C475E0 80240A00 10620005 */ beq $v1, $v0, .L80240A18 -/* C475E4 80240A04 24020013 */ addiu $v0, $zero, 0x13 -/* C475E8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 -/* C475EC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 -/* C475F0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C -/* C475F4 80240A14 00000000 */ nop -.L80240A18: -/* C475F8 80240A18 24120001 */ addiu $s2, $zero, 1 -.L80240A1C: -/* C475FC 80240A1C 82030012 */ lb $v1, 0x12($s0) -/* C47600 80240A20 24020002 */ addiu $v0, $zero, 2 -/* C47604 80240A24 14620007 */ bne $v1, $v0, .L80240A44 -/* C47608 80240A28 24020001 */ addiu $v0, $zero, 1 -/* C4760C 80240A2C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C47610 80240A30 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C47614 80240A34 50430002 */ beql $v0, $v1, .L80240A40 -/* C47618 80240A38 24120001 */ addiu $s2, $zero, 1 -.L80240A3C: -/* C4761C 80240A3C 82030012 */ lb $v1, 0x12($s0) -.L80240A40: -/* C47620 80240A40 24020001 */ addiu $v0, $zero, 1 -.L80240A44: -/* C47624 80240A44 14620006 */ bne $v1, $v0, .L80240A60 -/* C47628 80240A48 24020003 */ addiu $v0, $zero, 3 -/* C4762C 80240A4C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C47630 80240A50 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C47634 80240A54 14400008 */ bnez $v0, .L80240A78 -/* C47638 80240A58 27A40028 */ addiu $a0, $sp, 0x28 -/* C4763C 80240A5C 24020003 */ addiu $v0, $zero, 3 -.L80240A60: -/* C47640 80240A60 1462001B */ bne $v1, $v0, .L80240AD0 -/* C47644 80240A64 24020002 */ addiu $v0, $zero, 2 -/* C47648 80240A68 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C4764C 80240A6C 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C47650 80240A70 14620017 */ bne $v1, $v0, .L80240AD0 -/* C47654 80240A74 27A40028 */ addiu $a0, $sp, 0x28 -.L80240A78: -/* C47658 80240A78 27A5002C */ addiu $a1, $sp, 0x2c -/* C4765C 80240A7C 8E27000C */ lw $a3, 0xc($s1) -/* C47660 80240A80 C6200038 */ lwc1 $f0, 0x38($s1) -/* C47664 80240A84 C6220040 */ lwc1 $f2, 0x40($s1) -/* C47668 80240A88 0000302D */ daddu $a2, $zero, $zero -/* C4766C 80240A8C E7A00028 */ swc1 $f0, 0x28($sp) -/* C47670 80240A90 0C00A7E7 */ jal add_vec2D_polar -/* C47674 80240A94 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C47678 80240A98 3C028011 */ lui $v0, %hi(wPartnerNpc) -/* C4767C 80240A9C 8C42C930 */ lw $v0, %lo(wPartnerNpc)($v0) -/* C47680 80240AA0 C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C47684 80240AA4 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C47688 80240AA8 8C460038 */ lw $a2, 0x38($v0) -/* C4768C 80240AAC 0C00A7B5 */ jal dist2D -/* C47690 80240AB0 8C470040 */ lw $a3, 0x40($v0) -/* C47694 80240AB4 3C0142A0 */ lui $at, 0x42a0 -/* C47698 80240AB8 44811000 */ mtc1 $at, $f2 -/* C4769C 80240ABC 00000000 */ nop -/* C476A0 80240AC0 4602003E */ c.le.s $f0, $f2 -/* C476A4 80240AC4 00000000 */ nop -/* C476A8 80240AC8 45030001 */ bc1tl .L80240AD0 -/* C476AC 80240ACC 24120001 */ addiu $s2, $zero, 1 -.L80240AD0: -/* C476B0 80240AD0 12400026 */ beqz $s2, .L80240B6C -/* C476B4 80240AD4 0220202D */ daddu $a0, $s1, $zero -/* C476B8 80240AD8 3C05B000 */ lui $a1, 0xb000 -/* C476BC 80240ADC 34A5000E */ ori $a1, $a1, 0xe -/* C476C0 80240AE0 0C012530 */ jal func_800494C0 -/* C476C4 80240AE4 0000302D */ daddu $a2, $zero, $zero -/* C476C8 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* C476CC 80240AEC 0220282D */ daddu $a1, $s1, $zero -/* C476D0 80240AF0 0000302D */ daddu $a2, $zero, $zero -/* C476D4 80240AF4 862200A8 */ lh $v0, 0xa8($s1) -/* C476D8 80240AF8 8E6300CC */ lw $v1, 0xcc($s3) -/* C476DC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* C476E0 80240B00 44810000 */ mtc1 $at, $f0 -/* C476E4 80240B04 3C014000 */ lui $at, 0x4000 -/* C476E8 80240B08 44811000 */ mtc1 $at, $f2 -/* C476EC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C476F0 80240B10 44812000 */ mtc1 $at, $f4 -/* C476F4 80240B14 44823000 */ mtc1 $v0, $f6 -/* C476F8 80240B18 00000000 */ nop -/* C476FC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 -/* C47700 80240B20 44073000 */ mfc1 $a3, $f6 -/* C47704 80240B24 8C63002C */ lw $v1, 0x2c($v1) -/* C47708 80240B28 2402000A */ addiu $v0, $zero, 0xa -/* C4770C 80240B2C A622008E */ sh $v0, 0x8e($s1) -/* C47710 80240B30 2402000F */ addiu $v0, $zero, 0xf -/* C47714 80240B34 AE230028 */ sw $v1, 0x28($s1) -/* C47718 80240B38 AFA2001C */ sw $v0, 0x1c($sp) -/* C4771C 80240B3C 27A20030 */ addiu $v0, $sp, 0x30 -/* C47720 80240B40 E7A00010 */ swc1 $f0, 0x10($sp) -/* C47724 80240B44 E7A20014 */ swc1 $f2, 0x14($sp) -/* C47728 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* C4772C 80240B4C 0C01BFA4 */ jal fx_emote -/* C47730 80240B50 AFA20020 */ sw $v0, 0x20($sp) -/* C47734 80240B54 0220202D */ daddu $a0, $s1, $zero -/* C47738 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C4773C 80240B5C 0C012530 */ jal func_800494C0 -/* C47740 80240B60 3C060020 */ lui $a2, 0x20 -/* C47744 80240B64 24020002 */ addiu $v0, $zero, 2 -/* C47748 80240B68 AE820070 */ sw $v0, 0x70($s4) -.L80240B6C: -/* C4774C 80240B6C 9622008E */ lhu $v0, 0x8e($s1) -/* C47750 80240B70 24420001 */ addiu $v0, $v0, 1 -/* C47754 80240B74 A622008E */ sh $v0, 0x8e($s1) -/* C47758 80240B78 00021400 */ sll $v0, $v0, 0x10 -/* C4775C 80240B7C 00021C03 */ sra $v1, $v0, 0x10 -/* C47760 80240B80 2402001B */ addiu $v0, $zero, 0x1b -/* C47764 80240B84 14620005 */ bne $v1, $v0, .L80240B9C -/* C47768 80240B88 24020039 */ addiu $v0, $zero, 0x39 -/* C4776C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* C47770 80240B90 3C05B000 */ lui $a1, 0xb000 -/* C47774 80240B94 080902EC */ j .L80240BB0 -/* C47778 80240B98 34A5000C */ ori $a1, $a1, 0xc -.L80240B9C: -/* C4777C 80240B9C 14620008 */ bne $v1, $v0, .L80240BC0 -/* C47780 80240BA0 2402003B */ addiu $v0, $zero, 0x3b -/* C47784 80240BA4 0220202D */ daddu $a0, $s1, $zero -/* C47788 80240BA8 3C05B000 */ lui $a1, 0xb000 -/* C4778C 80240BAC 34A5000D */ ori $a1, $a1, 0xd -.L80240BB0: -/* C47790 80240BB0 0C012530 */ jal func_800494C0 -/* C47794 80240BB4 0000302D */ daddu $a2, $zero, $zero -/* C47798 80240BB8 080902FC */ j .L80240BF0 -/* C4779C 80240BBC 00000000 */ nop -.L80240BC0: -/* C477A0 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 -/* C477A4 80240BC4 2402003C */ addiu $v0, $zero, 0x3c -/* C477A8 80240BC8 8E6200CC */ lw $v0, 0xcc($s3) -/* C477AC 80240BCC 8C420030 */ lw $v0, 0x30($v0) -/* C477B0 80240BD0 080902FC */ j .L80240BF0 -/* C477B4 80240BD4 AE220028 */ sw $v0, 0x28($s1) -.L80240BD8: -/* C477B8 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 -/* C477BC 80240BDC 00000000 */ nop -/* C477C0 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) -/* C477C4 80240BE4 8C420028 */ lw $v0, 0x28($v0) -/* C477C8 80240BE8 A620008E */ sh $zero, 0x8e($s1) -/* C477CC 80240BEC AE220028 */ sw $v0, 0x28($s1) -.L80240BF0: -/* C477D0 80240BF0 8FBF004C */ lw $ra, 0x4c($sp) -/* C477D4 80240BF4 8FB40048 */ lw $s4, 0x48($sp) -/* C477D8 80240BF8 8FB30044 */ lw $s3, 0x44($sp) -/* C477DC 80240BFC 8FB20040 */ lw $s2, 0x40($sp) -/* C477E0 80240C00 8FB1003C */ lw $s1, 0x3c($sp) -/* C477E4 80240C04 8FB00038 */ lw $s0, 0x38($sp) -/* C477E8 80240C08 03E00008 */ jr $ra -/* C477EC 80240C0C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C10_C477F0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C10_C477F0.s deleted file mode 100644 index ac232ee665..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C10_C477F0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_C477F0 -/* C477F0 80240C10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C477F4 80240C14 AFB10014 */ sw $s1, 0x14($sp) -/* C477F8 80240C18 0080882D */ daddu $s1, $a0, $zero -/* C477FC 80240C1C AFBF0018 */ sw $ra, 0x18($sp) -/* C47800 80240C20 AFB00010 */ sw $s0, 0x10($sp) -/* C47804 80240C24 8E300148 */ lw $s0, 0x148($s1) -/* C47808 80240C28 0C00EABB */ jal get_npc_unsafe -/* C4780C 80240C2C 86040008 */ lh $a0, 8($s0) -/* C47810 80240C30 0040182D */ daddu $v1, $v0, $zero -/* C47814 80240C34 9462008E */ lhu $v0, 0x8e($v1) -/* C47818 80240C38 2442FFFF */ addiu $v0, $v0, -1 -/* C4781C 80240C3C A462008E */ sh $v0, 0x8e($v1) -/* C47820 80240C40 00021400 */ sll $v0, $v0, 0x10 -/* C47824 80240C44 1C400006 */ bgtz $v0, .L80240C60 -/* C47828 80240C48 24020001 */ addiu $v0, $zero, 1 -/* C4782C 80240C4C A462008E */ sh $v0, 0x8e($v1) -/* C47830 80240C50 24020028 */ addiu $v0, $zero, 0x28 -/* C47834 80240C54 AE020088 */ sw $v0, 0x88($s0) -/* C47838 80240C58 24020003 */ addiu $v0, $zero, 3 -/* C4783C 80240C5C AE220070 */ sw $v0, 0x70($s1) -.L80240C60: -/* C47840 80240C60 8FBF0018 */ lw $ra, 0x18($sp) -/* C47844 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* C47848 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* C4784C 80240C6C 03E00008 */ jr $ra -/* C47850 80240C70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s deleted file mode 100644 index 506213dff0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240C74_C47854.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74_C47854 -/* C47854 80240C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C47858 80240C78 AFB10014 */ sw $s1, 0x14($sp) -/* C4785C 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* C47860 80240C80 AFBF001C */ sw $ra, 0x1c($sp) -/* C47864 80240C84 AFB20018 */ sw $s2, 0x18($sp) -/* C47868 80240C88 AFB00010 */ sw $s0, 0x10($sp) -/* C4786C 80240C8C 8E320148 */ lw $s2, 0x148($s1) -/* C47870 80240C90 0C00EABB */ jal get_npc_unsafe -/* C47874 80240C94 86440008 */ lh $a0, 8($s2) -/* C47878 80240C98 240400B4 */ addiu $a0, $zero, 0xb4 -/* C4787C 80240C9C 0C00A67F */ jal rand_int -/* C47880 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* C47884 80240CA4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C47888 80240CA8 44820000 */ mtc1 $v0, $f0 -/* C4788C 80240CAC 00000000 */ nop -/* C47890 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* C47894 80240CB4 46006300 */ add.s $f12, $f12, $f0 -/* C47898 80240CB8 3C0142B4 */ lui $at, 0x42b4 -/* C4789C 80240CBC 44810000 */ mtc1 $at, $f0 -/* C478A0 80240CC0 0C00A6C9 */ jal clamp_angle -/* C478A4 80240CC4 46006301 */ sub.s $f12, $f12, $f0 -/* C478A8 80240CC8 E600000C */ swc1 $f0, 0xc($s0) -/* C478AC 80240CCC 8E4200CC */ lw $v0, 0xcc($s2) -/* C478B0 80240CD0 8C420000 */ lw $v0, ($v0) -/* C478B4 80240CD4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C478B8 80240CD8 0C00A67F */ jal rand_int -/* C478BC 80240CDC AE020028 */ sw $v0, 0x28($s0) -/* C478C0 80240CE0 00021FC2 */ srl $v1, $v0, 0x1f -/* C478C4 80240CE4 00431821 */ addu $v1, $v0, $v1 -/* C478C8 80240CE8 00031843 */ sra $v1, $v1, 1 -/* C478CC 80240CEC 00031840 */ sll $v1, $v1, 1 -/* C478D0 80240CF0 00431023 */ subu $v0, $v0, $v1 -/* C478D4 80240CF4 24420002 */ addiu $v0, $v0, 2 -/* C478D8 80240CF8 AE220074 */ sw $v0, 0x74($s1) -/* C478DC 80240CFC 24020004 */ addiu $v0, $zero, 4 -/* C478E0 80240D00 AE220070 */ sw $v0, 0x70($s1) -/* C478E4 80240D04 8FBF001C */ lw $ra, 0x1c($sp) -/* C478E8 80240D08 8FB20018 */ lw $s2, 0x18($sp) -/* C478EC 80240D0C 8FB10014 */ lw $s1, 0x14($sp) -/* C478F0 80240D10 8FB00010 */ lw $s0, 0x10($sp) -/* C478F4 80240D14 03E00008 */ jr $ra -/* C478F8 80240D18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s deleted file mode 100644 index 4f07357085..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240D1C_C478FC.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D1C_C478FC -/* C478FC 80240D1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C47900 80240D20 AFB20020 */ sw $s2, 0x20($sp) -/* C47904 80240D24 0080902D */ daddu $s2, $a0, $zero -/* C47908 80240D28 AFBF0028 */ sw $ra, 0x28($sp) -/* C4790C 80240D2C AFB30024 */ sw $s3, 0x24($sp) -/* C47910 80240D30 AFB1001C */ sw $s1, 0x1c($sp) -/* C47914 80240D34 AFB00018 */ sw $s0, 0x18($sp) -/* C47918 80240D38 8E510148 */ lw $s1, 0x148($s2) -/* C4791C 80240D3C 00A0982D */ daddu $s3, $a1, $zero -/* C47920 80240D40 86240008 */ lh $a0, 8($s1) -/* C47924 80240D44 0C00EABB */ jal get_npc_unsafe -/* C47928 80240D48 00C0802D */ daddu $s0, $a2, $zero -/* C4792C 80240D4C 0200202D */ daddu $a0, $s0, $zero -/* C47930 80240D50 0040802D */ daddu $s0, $v0, $zero -/* C47934 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C47938 80240D58 8E660024 */ lw $a2, 0x24($s3) -/* C4793C 80240D5C 8E670028 */ lw $a3, 0x28($s3) -/* C47940 80240D60 0C01242D */ jal func_800490B4 -/* C47944 80240D64 0220282D */ daddu $a1, $s1, $zero -/* C47948 80240D68 1040000C */ beqz $v0, .L80240D9C -/* C4794C 80240D6C 00000000 */ nop -/* C47950 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C47954 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C47958 80240D78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C4795C 80240D7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47960 80240D80 8C460028 */ lw $a2, 0x28($v0) -/* C47964 80240D84 0C00A720 */ jal atan2 -/* C47968 80240D88 8C470030 */ lw $a3, 0x30($v0) -/* C4796C 80240D8C 2402000C */ addiu $v0, $zero, 0xc -/* C47970 80240D90 E600000C */ swc1 $f0, 0xc($s0) -/* C47974 80240D94 0809038E */ j .L80240E38 -/* C47978 80240D98 AE420070 */ sw $v0, 0x70($s2) -.L80240D9C: -/* C4797C 80240D9C 9602008E */ lhu $v0, 0x8e($s0) -/* C47980 80240DA0 2442FFFF */ addiu $v0, $v0, -1 -/* C47984 80240DA4 A602008E */ sh $v0, 0x8e($s0) -/* C47988 80240DA8 00021400 */ sll $v0, $v0, 0x10 -/* C4798C 80240DAC 1C400022 */ bgtz $v0, .L80240E38 -/* C47990 80240DB0 00000000 */ nop -/* C47994 80240DB4 8E420074 */ lw $v0, 0x74($s2) -/* C47998 80240DB8 2442FFFF */ addiu $v0, $v0, -1 -/* C4799C 80240DBC 18400014 */ blez $v0, .L80240E10 -/* C479A0 80240DC0 AE420074 */ sw $v0, 0x74($s2) -/* C479A4 80240DC4 C600000C */ lwc1 $f0, 0xc($s0) -/* C479A8 80240DC8 3C014334 */ lui $at, 0x4334 -/* C479AC 80240DCC 44816000 */ mtc1 $at, $f12 -/* C479B0 80240DD0 0C00A6C9 */ jal clamp_angle -/* C479B4 80240DD4 460C0300 */ add.s $f12, $f0, $f12 -/* C479B8 80240DD8 E600000C */ swc1 $f0, 0xc($s0) -/* C479BC 80240DDC 8E640008 */ lw $a0, 8($s3) -/* C479C0 80240DE0 000417C2 */ srl $v0, $a0, 0x1f -/* C479C4 80240DE4 00822021 */ addu $a0, $a0, $v0 -/* C479C8 80240DE8 00042043 */ sra $a0, $a0, 1 -/* C479CC 80240DEC 0C00A67F */ jal rand_int -/* C479D0 80240DF0 24840001 */ addiu $a0, $a0, 1 -/* C479D4 80240DF4 8E630008 */ lw $v1, 8($s3) -/* C479D8 80240DF8 000327C2 */ srl $a0, $v1, 0x1f -/* C479DC 80240DFC 00641821 */ addu $v1, $v1, $a0 -/* C479E0 80240E00 00031843 */ sra $v1, $v1, 1 -/* C479E4 80240E04 00621821 */ addu $v1, $v1, $v0 -/* C479E8 80240E08 0809038E */ j .L80240E38 -/* C479EC 80240E0C A603008E */ sh $v1, 0x8e($s0) -.L80240E10: -/* C479F0 80240E10 8E250088 */ lw $a1, 0x88($s1) -/* C479F4 80240E14 24020028 */ addiu $v0, $zero, 0x28 -/* C479F8 80240E18 14A20003 */ bne $a1, $v0, .L80240E28 -/* C479FC 80240E1C 24020032 */ addiu $v0, $zero, 0x32 -/* C47A00 80240E20 0809038C */ j .L80240E30 -/* C47A04 80240E24 24020014 */ addiu $v0, $zero, 0x14 -.L80240E28: -/* C47A08 80240E28 14A20003 */ bne $a1, $v0, .L80240E38 -/* C47A0C 80240E2C 24020019 */ addiu $v0, $zero, 0x19 -.L80240E30: -/* C47A10 80240E30 A602008E */ sh $v0, 0x8e($s0) -/* C47A14 80240E34 AE450070 */ sw $a1, 0x70($s2) -.L80240E38: -/* C47A18 80240E38 8FBF0028 */ lw $ra, 0x28($sp) -/* C47A1C 80240E3C 8FB30024 */ lw $s3, 0x24($sp) -/* C47A20 80240E40 8FB20020 */ lw $s2, 0x20($sp) -/* C47A24 80240E44 8FB1001C */ lw $s1, 0x1c($sp) -/* C47A28 80240E48 8FB00018 */ lw $s0, 0x18($sp) -/* C47A2C 80240E4C 03E00008 */ jr $ra -/* C47A30 80240E50 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s deleted file mode 100644 index a77b6728b5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E54_C47A34 -/* C47A34 80240E54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C47A38 80240E58 AFB20018 */ sw $s2, 0x18($sp) -/* C47A3C 80240E5C 0080902D */ daddu $s2, $a0, $zero -/* C47A40 80240E60 AFBF001C */ sw $ra, 0x1c($sp) -/* C47A44 80240E64 AFB10014 */ sw $s1, 0x14($sp) -/* C47A48 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* C47A4C 80240E6C 8E500148 */ lw $s0, 0x148($s2) -/* C47A50 80240E70 86040008 */ lh $a0, 8($s0) -/* C47A54 80240E74 0C00EABB */ jal get_npc_unsafe -/* C47A58 80240E78 00A0882D */ daddu $s1, $a1, $zero -/* C47A5C 80240E7C 0040182D */ daddu $v1, $v0, $zero -/* C47A60 80240E80 9462008E */ lhu $v0, 0x8e($v1) -/* C47A64 80240E84 2442FFFF */ addiu $v0, $v0, -1 -/* C47A68 80240E88 A462008E */ sh $v0, 0x8e($v1) -/* C47A6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 -/* C47A70 80240E90 1C400015 */ bgtz $v0, .L80240EE8 -/* C47A74 80240E94 00000000 */ nop -/* C47A78 80240E98 8E0200CC */ lw $v0, 0xcc($s0) -/* C47A7C 80240E9C 8C420004 */ lw $v0, 4($v0) -/* C47A80 80240EA0 AC620028 */ sw $v0, 0x28($v1) -/* C47A84 80240EA4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C47A88 80240EA8 8C420014 */ lw $v0, 0x14($v0) -/* C47A8C 80240EAC 04410004 */ bgez $v0, .L80240EC0 -/* C47A90 80240EB0 00000000 */ nop -/* C47A94 80240EB4 C6200000 */ lwc1 $f0, ($s1) -/* C47A98 80240EB8 080903B8 */ j .L80240EE0 -/* C47A9C 80240EBC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EC0: -/* C47AA0 80240EC0 3C018024 */ lui $at, %hi(D_80245528_C4C108) -/* C47AA4 80240EC4 D4225528 */ ldc1 $f2, %lo(D_80245528_C4C108)($at) -/* C47AA8 80240EC8 44820000 */ mtc1 $v0, $f0 -/* C47AAC 80240ECC 00000000 */ nop -/* C47AB0 80240ED0 46800021 */ cvt.d.w $f0, $f0 -/* C47AB4 80240ED4 46220003 */ div.d $f0, $f0, $f2 -/* C47AB8 80240ED8 46200020 */ cvt.s.d $f0, $f0 -/* C47ABC 80240EDC E4600018 */ swc1 $f0, 0x18($v1) -.L80240EE0: -/* C47AC0 80240EE0 24020029 */ addiu $v0, $zero, 0x29 -/* C47AC4 80240EE4 AE420070 */ sw $v0, 0x70($s2) -.L80240EE8: -/* C47AC8 80240EE8 8FBF001C */ lw $ra, 0x1c($sp) -/* C47ACC 80240EEC 8FB20018 */ lw $s2, 0x18($sp) -/* C47AD0 80240EF0 8FB10014 */ lw $s1, 0x14($sp) -/* C47AD4 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* C47AD8 80240EF8 03E00008 */ jr $ra -/* C47ADC 80240EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s deleted file mode 100644 index 2f54b203d5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240F00_C47AE0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F00_C47AE0 -/* C47AE0 80240F00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C47AE4 80240F04 AFB3002C */ sw $s3, 0x2c($sp) -/* C47AE8 80240F08 0080982D */ daddu $s3, $a0, $zero -/* C47AEC 80240F0C AFBF0030 */ sw $ra, 0x30($sp) -/* C47AF0 80240F10 AFB20028 */ sw $s2, 0x28($sp) -/* C47AF4 80240F14 AFB10024 */ sw $s1, 0x24($sp) -/* C47AF8 80240F18 AFB00020 */ sw $s0, 0x20($sp) -/* C47AFC 80240F1C 8E720148 */ lw $s2, 0x148($s3) -/* C47B00 80240F20 00A0882D */ daddu $s1, $a1, $zero -/* C47B04 80240F24 86440008 */ lh $a0, 8($s2) -/* C47B08 80240F28 0C00EABB */ jal get_npc_unsafe -/* C47B0C 80240F2C 00C0802D */ daddu $s0, $a2, $zero -/* C47B10 80240F30 0200202D */ daddu $a0, $s0, $zero -/* C47B14 80240F34 0240282D */ daddu $a1, $s2, $zero -/* C47B18 80240F38 AFA00010 */ sw $zero, 0x10($sp) -/* C47B1C 80240F3C 8E260024 */ lw $a2, 0x24($s1) -/* C47B20 80240F40 8E270028 */ lw $a3, 0x28($s1) -/* C47B24 80240F44 0C01242D */ jal func_800490B4 -/* C47B28 80240F48 0040802D */ daddu $s0, $v0, $zero -/* C47B2C 80240F4C 1040000C */ beqz $v0, .L80240F80 -/* C47B30 80240F50 00000000 */ nop -/* C47B34 80240F54 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C47B38 80240F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C47B3C 80240F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C47B40 80240F60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47B44 80240F64 8C460028 */ lw $a2, 0x28($v0) -/* C47B48 80240F68 0C00A720 */ jal atan2 -/* C47B4C 80240F6C 8C470030 */ lw $a3, 0x30($v0) -/* C47B50 80240F70 2402000C */ addiu $v0, $zero, 0xc -/* C47B54 80240F74 E600000C */ swc1 $f0, 0xc($s0) -/* C47B58 80240F78 08090417 */ j .L8024105C -/* C47B5C 80240F7C AE620070 */ sw $v0, 0x70($s3) -.L80240F80: -/* C47B60 80240F80 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C47B64 80240F84 8E4200D0 */ lw $v0, 0xd0($s2) -/* C47B68 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47B6C 80240F8C C4440000 */ lwc1 $f4, ($v0) -/* C47B70 80240F90 46802120 */ cvt.s.w $f4, $f4 -/* C47B74 80240F94 44062000 */ mfc1 $a2, $f4 -/* C47B78 80240F98 C4440008 */ lwc1 $f4, 8($v0) -/* C47B7C 80240F9C 46802120 */ cvt.s.w $f4, $f4 -/* C47B80 80240FA0 44072000 */ mfc1 $a3, $f4 -/* C47B84 80240FA4 0C00A7B5 */ jal dist2D -/* C47B88 80240FA8 00000000 */ nop -/* C47B8C 80240FAC C6020018 */ lwc1 $f2, 0x18($s0) -/* C47B90 80240FB0 4602003E */ c.le.s $f0, $f2 -/* C47B94 80240FB4 00000000 */ nop -/* C47B98 80240FB8 4500000B */ bc1f .L80240FE8 -/* C47B9C 80240FBC 00000000 */ nop -/* C47BA0 80240FC0 8E4200CC */ lw $v0, 0xcc($s2) -/* C47BA4 80240FC4 8C430000 */ lw $v1, ($v0) -/* C47BA8 80240FC8 2402000F */ addiu $v0, $zero, 0xf -/* C47BAC 80240FCC A602008E */ sh $v0, 0x8e($s0) -/* C47BB0 80240FD0 24020032 */ addiu $v0, $zero, 0x32 -/* C47BB4 80240FD4 AE030028 */ sw $v1, 0x28($s0) -/* C47BB8 80240FD8 AE420088 */ sw $v0, 0x88($s2) -/* C47BBC 80240FDC 24020003 */ addiu $v0, $zero, 3 -/* C47BC0 80240FE0 08090417 */ j .L8024105C -/* C47BC4 80240FE4 AE620070 */ sw $v0, 0x70($s3) -.L80240FE8: -/* C47BC8 80240FE8 8602008C */ lh $v0, 0x8c($s0) -/* C47BCC 80240FEC 1440001B */ bnez $v0, .L8024105C -/* C47BD0 80240FF0 0200202D */ daddu $a0, $s0, $zero -/* C47BD4 80240FF4 27A60018 */ addiu $a2, $sp, 0x18 -/* C47BD8 80240FF8 3C0540A0 */ lui $a1, 0x40a0 -/* C47BDC 80240FFC C600000C */ lwc1 $f0, 0xc($s0) -/* C47BE0 80241000 0000382D */ daddu $a3, $zero, $zero -/* C47BE4 80241004 E7A00018 */ swc1 $f0, 0x18($sp) -/* C47BE8 80241008 AFA00010 */ sw $zero, 0x10($sp) -/* C47BEC 8024100C 0C0129E1 */ jal func_8004A784 -/* C47BF0 80241010 AFA00014 */ sw $zero, 0x14($sp) -/* C47BF4 80241014 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C47BF8 80241018 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C47BFC 8024101C E600000C */ swc1 $f0, 0xc($s0) -/* C47C00 80241020 8E4200D0 */ lw $v0, 0xd0($s2) -/* C47C04 80241024 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C47C08 80241028 C4440000 */ lwc1 $f4, ($v0) -/* C47C0C 8024102C 46802120 */ cvt.s.w $f4, $f4 -/* C47C10 80241030 44062000 */ mfc1 $a2, $f4 -/* C47C14 80241034 C4440008 */ lwc1 $f4, 8($v0) -/* C47C18 80241038 46802120 */ cvt.s.w $f4, $f4 -/* C47C1C 8024103C 44072000 */ mfc1 $a3, $f4 -/* C47C20 80241040 0C00A720 */ jal atan2 -/* C47C24 80241044 00000000 */ nop -/* C47C28 80241048 8E050018 */ lw $a1, 0x18($s0) -/* C47C2C 8024104C 44060000 */ mfc1 $a2, $f0 -/* C47C30 80241050 0200202D */ daddu $a0, $s0, $zero -/* C47C34 80241054 0C00EA95 */ jal npc_move_heading -/* C47C38 80241058 AC86000C */ sw $a2, 0xc($a0) -.L8024105C: -/* C47C3C 8024105C 8FBF0030 */ lw $ra, 0x30($sp) -/* C47C40 80241060 8FB3002C */ lw $s3, 0x2c($sp) -/* C47C44 80241064 8FB20028 */ lw $s2, 0x28($sp) -/* C47C48 80241068 8FB10024 */ lw $s1, 0x24($sp) -/* C47C4C 8024106C 8FB00020 */ lw $s0, 0x20($sp) -/* C47C50 80241070 03E00008 */ jr $ra -/* C47C54 80241074 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s deleted file mode 100644 index 16014b5dfd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241078_C47C58.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241078_C47C58 -/* C47C58 80241078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C47C5C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* C47C60 80241080 0080802D */ daddu $s0, $a0, $zero -/* C47C64 80241084 AFBF0014 */ sw $ra, 0x14($sp) -/* C47C68 80241088 8E020148 */ lw $v0, 0x148($s0) -/* C47C6C 8024108C 0C00EABB */ jal get_npc_unsafe -/* C47C70 80241090 84440008 */ lh $a0, 8($v0) -/* C47C74 80241094 0040182D */ daddu $v1, $v0, $zero -/* C47C78 80241098 8462008C */ lh $v0, 0x8c($v1) -/* C47C7C 8024109C 14400009 */ bnez $v0, .L802410C4 -/* C47C80 802410A0 00000000 */ nop -/* C47C84 802410A4 9462008E */ lhu $v0, 0x8e($v1) -/* C47C88 802410A8 2442FFFF */ addiu $v0, $v0, -1 -/* C47C8C 802410AC A462008E */ sh $v0, 0x8e($v1) -/* C47C90 802410B0 00021400 */ sll $v0, $v0, 0x10 -/* C47C94 802410B4 1C400003 */ bgtz $v0, .L802410C4 -/* C47C98 802410B8 00000000 */ nop -/* C47C9C 802410BC A460008E */ sh $zero, 0x8e($v1) -/* C47CA0 802410C0 AE000070 */ sw $zero, 0x70($s0) -.L802410C4: -/* C47CA4 802410C4 8FBF0014 */ lw $ra, 0x14($sp) -/* C47CA8 802410C8 8FB00010 */ lw $s0, 0x10($sp) -/* C47CAC 802410CC 03E00008 */ jr $ra -/* C47CB0 802410D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s deleted file mode 100644 index 58b529a924..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D4_C47CB4 -/* C47CB4 802410D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C47CB8 802410D8 AFB20038 */ sw $s2, 0x38($sp) -/* C47CBC 802410DC 0080902D */ daddu $s2, $a0, $zero -/* C47CC0 802410E0 AFBF0048 */ sw $ra, 0x48($sp) -/* C47CC4 802410E4 AFB50044 */ sw $s5, 0x44($sp) -/* C47CC8 802410E8 AFB40040 */ sw $s4, 0x40($sp) -/* C47CCC 802410EC AFB3003C */ sw $s3, 0x3c($sp) -/* C47CD0 802410F0 AFB10034 */ sw $s1, 0x34($sp) -/* C47CD4 802410F4 AFB00030 */ sw $s0, 0x30($sp) -/* C47CD8 802410F8 8E510148 */ lw $s1, 0x148($s2) -/* C47CDC 802410FC 86240008 */ lh $a0, 8($s1) -/* C47CE0 80241100 0C00EABB */ jal get_npc_unsafe -/* C47CE4 80241104 00A0802D */ daddu $s0, $a1, $zero -/* C47CE8 80241108 8E43000C */ lw $v1, 0xc($s2) -/* C47CEC 8024110C 0240202D */ daddu $a0, $s2, $zero -/* C47CF0 80241110 8C650000 */ lw $a1, ($v1) -/* C47CF4 80241114 0C0B1EAF */ jal get_variable -/* C47CF8 80241118 0040A02D */ daddu $s4, $v0, $zero -/* C47CFC 8024111C AFA00010 */ sw $zero, 0x10($sp) -/* C47D00 80241120 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D04 80241124 8C630030 */ lw $v1, 0x30($v1) -/* C47D08 80241128 AFA30014 */ sw $v1, 0x14($sp) -/* C47D0C 8024112C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D10 80241130 8C63001C */ lw $v1, 0x1c($v1) -/* C47D14 80241134 AFA30018 */ sw $v1, 0x18($sp) -/* C47D18 80241138 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D1C 8024113C 8C630024 */ lw $v1, 0x24($v1) -/* C47D20 80241140 AFA3001C */ sw $v1, 0x1c($sp) -/* C47D24 80241144 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D28 80241148 8C630028 */ lw $v1, 0x28($v1) -/* C47D2C 8024114C 27B50010 */ addiu $s5, $sp, 0x10 -/* C47D30 80241150 AFA30020 */ sw $v1, 0x20($sp) -/* C47D34 80241154 8E2300D0 */ lw $v1, 0xd0($s1) -/* C47D38 80241158 3C014220 */ lui $at, 0x4220 -/* C47D3C 8024115C 44810000 */ mtc1 $at, $f0 -/* C47D40 80241160 8C63002C */ lw $v1, 0x2c($v1) -/* C47D44 80241164 0040982D */ daddu $s3, $v0, $zero -/* C47D48 80241168 E7A00028 */ swc1 $f0, 0x28($sp) -/* C47D4C 8024116C A7A0002C */ sh $zero, 0x2c($sp) -/* C47D50 80241170 16000005 */ bnez $s0, .L80241188 -/* C47D54 80241174 AFA30024 */ sw $v1, 0x24($sp) -/* C47D58 80241178 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47D5C 8024117C 30420004 */ andi $v0, $v0, 4 -/* C47D60 80241180 10400027 */ beqz $v0, .L80241220 -/* C47D64 80241184 00000000 */ nop -.L80241188: -/* C47D68 80241188 2402001E */ addiu $v0, $zero, 0x1e -/* C47D6C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 -/* C47D70 80241190 AE400070 */ sw $zero, 0x70($s2) -/* C47D74 80241194 A682008E */ sh $v0, 0x8e($s4) -/* C47D78 80241198 8E2300CC */ lw $v1, 0xcc($s1) -/* C47D7C 8024119C 8E820000 */ lw $v0, ($s4) -/* C47D80 802411A0 8C630028 */ lw $v1, 0x28($v1) -/* C47D84 802411A4 00441024 */ and $v0, $v0, $a0 -/* C47D88 802411A8 AE820000 */ sw $v0, ($s4) -/* C47D8C 802411AC AE830028 */ sw $v1, 0x28($s4) -/* C47D90 802411B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C47D94 802411B4 AE20006C */ sw $zero, 0x6c($s1) -/* C47D98 802411B8 8C420034 */ lw $v0, 0x34($v0) -/* C47D9C 802411BC 14400006 */ bnez $v0, .L802411D8 -/* C47DA0 802411C0 2403FDFF */ addiu $v1, $zero, -0x201 -/* C47DA4 802411C4 8E820000 */ lw $v0, ($s4) -/* C47DA8 802411C8 2403FFF7 */ addiu $v1, $zero, -9 -/* C47DAC 802411CC 34420200 */ ori $v0, $v0, 0x200 -/* C47DB0 802411D0 08090479 */ j .L802411E4 -/* C47DB4 802411D4 00431024 */ and $v0, $v0, $v1 -.L802411D8: -/* C47DB8 802411D8 8E820000 */ lw $v0, ($s4) -/* C47DBC 802411DC 00431024 */ and $v0, $v0, $v1 -/* C47DC0 802411E0 34420008 */ ori $v0, $v0, 8 -.L802411E4: -/* C47DC4 802411E4 AE820000 */ sw $v0, ($s4) -/* C47DC8 802411E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47DCC 802411EC 30420004 */ andi $v0, $v0, 4 -/* C47DD0 802411F0 10400007 */ beqz $v0, .L80241210 -/* C47DD4 802411F4 24020063 */ addiu $v0, $zero, 0x63 -/* C47DD8 802411F8 AE420070 */ sw $v0, 0x70($s2) -/* C47DDC 802411FC 24020028 */ addiu $v0, $zero, 0x28 -/* C47DE0 80241200 AE420074 */ sw $v0, 0x74($s2) -/* C47DE4 80241204 8E2200CC */ lw $v0, 0xcc($s1) -/* C47DE8 80241208 8C420000 */ lw $v0, ($v0) -/* C47DEC 8024120C AE820028 */ sw $v0, 0x28($s4) -.L80241210: -/* C47DF0 80241210 8E2200B0 */ lw $v0, 0xb0($s1) -/* C47DF4 80241214 2403FFFB */ addiu $v1, $zero, -5 -/* C47DF8 80241218 00431024 */ and $v0, $v0, $v1 -/* C47DFC 8024121C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241220: -/* C47E00 80241220 8E420070 */ lw $v0, 0x70($s2) -/* C47E04 80241224 2442FFF6 */ addiu $v0, $v0, -0xa -/* C47E08 80241228 2C420014 */ sltiu $v0, $v0, 0x14 -/* C47E0C 8024122C 10400009 */ beqz $v0, .L80241254 -/* C47E10 80241230 00000000 */ nop -/* C47E14 80241234 8E22006C */ lw $v0, 0x6c($s1) -/* C47E18 80241238 14400006 */ bnez $v0, .L80241254 -/* C47E1C 8024123C 00000000 */ nop -/* C47E20 80241240 0C090082 */ jal func_80240208_C46DE8 -/* C47E24 80241244 0240202D */ daddu $a0, $s2, $zero -/* C47E28 80241248 10400002 */ beqz $v0, .L80241254 -/* C47E2C 8024124C 2402001E */ addiu $v0, $zero, 0x1e -/* C47E30 80241250 AE420070 */ sw $v0, 0x70($s2) -.L80241254: -/* C47E34 80241254 8E430070 */ lw $v1, 0x70($s2) -/* C47E38 80241258 2C620064 */ sltiu $v0, $v1, 0x64 -/* C47E3C 8024125C 10400067 */ beqz $v0, L802413FC_C47FDC -/* C47E40 80241260 00031080 */ sll $v0, $v1, 2 -/* C47E44 80241264 3C018024 */ lui $at, %hi(jtbl_80245530_C4C110) -/* C47E48 80241268 00220821 */ addu $at, $at, $v0 -/* C47E4C 8024126C 8C225530 */ lw $v0, %lo(jtbl_80245530_C4C110)($at) -/* C47E50 80241270 00400008 */ jr $v0 -/* C47E54 80241274 00000000 */ nop -glabel L80241278_C47E58 -/* C47E58 80241278 0240202D */ daddu $a0, $s2, $zero -/* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* C47E60 80241280 0C090234 */ jal func_802408D0_C474B0 -/* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero -/* C47E68 80241288 080904FF */ j L802413FC_C47FDC -/* C47E6C 8024128C 00000000 */ nop -glabel L80241290_C47E70 -/* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero -/* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero -/* C47E78 80241298 0C090256 */ jal func_80240958_C47538 -/* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero -/* C47E80 802412A0 080904FF */ j L802413FC_C47FDC -/* C47E84 802412A4 00000000 */ nop -glabel L802412A8_C47E88 -/* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero -/* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* C47E90 802412B0 0C090304 */ jal func_80240C10_C477F0 -/* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* C47E98 802412B8 080904FF */ j L802413FC_C47FDC -/* C47E9C 802412BC 00000000 */ nop -glabel L802412C0_C47EA0 -/* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero -/* C47EA8 802412C8 0C09031D */ jal func_80240C74_C47854 -/* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* C47EB0 802412D0 080904FF */ j L802413FC_C47FDC -/* C47EB4 802412D4 00000000 */ nop -glabel L802412D8_C47EB8 -/* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero -/* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero -/* C47EC0 802412E0 0C090347 */ jal func_80240D1C_C478FC -/* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* C47EC8 802412E8 080904FF */ j L802413FC_C47FDC -/* C47ECC 802412EC 00000000 */ nop -glabel L802412F0_C47ED0 -/* C47ED0 802412F0 0240202D */ daddu $a0, $s2, $zero -/* C47ED4 802412F4 0260282D */ daddu $a1, $s3, $zero -/* C47ED8 802412F8 0C0127DF */ jal func_80049F7C -/* C47EDC 802412FC 02A0302D */ daddu $a2, $s5, $zero -/* C47EE0 80241300 8E430070 */ lw $v1, 0x70($s2) -/* C47EE4 80241304 2402000D */ addiu $v0, $zero, 0xd -/* C47EE8 80241308 1462003C */ bne $v1, $v0, L802413FC_C47FDC -/* C47EEC 8024130C 00000000 */ nop -glabel L80241310_C47EF0 -/* C47EF0 80241310 0240202D */ daddu $a0, $s2, $zero -/* C47EF4 80241314 0260282D */ daddu $a1, $s3, $zero -/* C47EF8 80241318 0C012849 */ jal func_8004A124 -/* C47EFC 8024131C 02A0302D */ daddu $a2, $s5, $zero -/* C47F00 80241320 080904FF */ j L802413FC_C47FDC -/* C47F04 80241324 00000000 */ nop -glabel L80241328_C47F08 -/* C47F08 80241328 0240202D */ daddu $a0, $s2, $zero -/* C47F0C 8024132C 0260282D */ daddu $a1, $s3, $zero -/* C47F10 80241330 0C0128FA */ jal func_8004A3E8 -/* C47F14 80241334 02A0302D */ daddu $a2, $s5, $zero -/* C47F18 80241338 2402000F */ addiu $v0, $zero, 0xf -/* C47F1C 8024133C A682008E */ sh $v0, 0x8e($s4) -/* C47F20 80241340 24020028 */ addiu $v0, $zero, 0x28 -/* C47F24 80241344 AE220088 */ sw $v0, 0x88($s1) -/* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 -/* C47F2C 8024134C 080904FF */ j L802413FC_C47FDC -/* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) -glabel L80241354_C47F34 -/* C47F34 80241354 0C090000 */ jal dgb_09_UnkNpcAIFunc6 -/* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero -/* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) -/* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f -/* C47F44 80241364 14620025 */ bne $v1, $v0, L802413FC_C47FDC -/* C47F48 80241368 00000000 */ nop -glabel L8024136C_C47F4C -/* C47F4C 8024136C 0C09001B */ jal dgb_09_UnkNpcAIFunc7 -/* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero -/* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) -/* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 -/* C47F5C 8024137C 1462001F */ bne $v1, $v0, L802413FC_C47FDC -/* C47F60 80241380 00000000 */ nop -glabel L80241384_C47F64 -/* C47F64 80241384 0C090037 */ jal dgb_09_UnkNpcAIFunc8 -/* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero -/* C47F6C 8024138C 080904FF */ j L802413FC_C47FDC -/* C47F70 80241390 00000000 */ nop -glabel L80241394_C47F74 -/* C47F74 80241394 0C09006D */ jal dgb_09_UnkNpcAIFunc5 -/* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero -/* C47F7C 8024139C 080904FF */ j L802413FC_C47FDC -/* C47F80 802413A0 00000000 */ nop -glabel L802413A4_C47F84 -/* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero -/* C47F88 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C47F8C 802413AC 0C090395 */ jal func_80240E54_C47A34 -/* C47F90 802413B0 02A0302D */ daddu $a2, $s5, $zero -/* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) -/* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 -/* C47F9C 802413BC 1462000F */ bne $v1, $v0, L802413FC_C47FDC -/* C47FA0 802413C0 00000000 */ nop -glabel L802413C4_C47FA4 -/* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero -/* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero -/* C47FAC 802413CC 0C0903C0 */ jal func_80240F00_C47AE0 -/* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero -/* C47FB4 802413D4 080904FF */ j L802413FC_C47FDC -/* C47FB8 802413D8 00000000 */ nop -glabel L802413DC_C47FBC -/* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero -/* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C47FC4 802413E4 0C09041E */ jal func_80241078_C47C58 -/* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero -/* C47FCC 802413EC 080904FF */ j L802413FC_C47FDC -/* C47FD0 802413F0 00000000 */ nop -glabel L802413F4_C47FD4 -/* C47FD4 802413F4 0C0129CF */ jal func_8004A73C -/* C47FD8 802413F8 0240202D */ daddu $a0, $s2, $zero -glabel L802413FC_C47FDC -/* C47FDC 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C47FE0 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C47FE4 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C47FE8 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C47FEC 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C47FF0 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C47FF4 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C47FF8 80241418 0000102D */ daddu $v0, $zero, $zero -/* C47FFC 8024141C 03E00008 */ jr $ra -/* C48000 80241420 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s deleted file mode 100644 index e30225754a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241424_C48004 -/* C48004 80241424 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C48008 80241428 AFB3002C */ sw $s3, 0x2c($sp) -/* C4800C 8024142C 0080982D */ daddu $s3, $a0, $zero -/* C48010 80241430 AFBF0030 */ sw $ra, 0x30($sp) -/* C48014 80241434 AFB20028 */ sw $s2, 0x28($sp) -/* C48018 80241438 AFB10024 */ sw $s1, 0x24($sp) -/* C4801C 8024143C AFB00020 */ sw $s0, 0x20($sp) -/* C48020 80241440 8E710148 */ lw $s1, 0x148($s3) -/* C48024 80241444 86240008 */ lh $a0, 8($s1) -/* C48028 80241448 0C00EABB */ jal get_npc_unsafe -/* C4802C 8024144C 00A0902D */ daddu $s2, $a1, $zero -/* C48030 80241450 8E440004 */ lw $a0, 4($s2) -/* C48034 80241454 0040802D */ daddu $s0, $v0, $zero -/* C48038 80241458 00041FC2 */ srl $v1, $a0, 0x1f -/* C4803C 8024145C 00832021 */ addu $a0, $a0, $v1 -/* C48040 80241460 00042043 */ sra $a0, $a0, 1 -/* C48044 80241464 0C00A67F */ jal rand_int -/* C48048 80241468 24840001 */ addiu $a0, $a0, 1 -/* C4804C 8024146C 8E430004 */ lw $v1, 4($s2) -/* C48050 80241470 000327C2 */ srl $a0, $v1, 0x1f -/* C48054 80241474 00641821 */ addu $v1, $v1, $a0 -/* C48058 80241478 00031843 */ sra $v1, $v1, 1 -/* C4805C 8024147C 00621821 */ addu $v1, $v1, $v0 -/* C48060 80241480 A603008E */ sh $v1, 0x8e($s0) -/* C48064 80241484 8E2300D0 */ lw $v1, 0xd0($s1) -/* C48068 80241488 C6000040 */ lwc1 $f0, 0x40($s0) -/* C4806C 8024148C C4640000 */ lwc1 $f4, ($v1) -/* C48070 80241490 46802120 */ cvt.s.w $f4, $f4 -/* C48074 80241494 C4620008 */ lwc1 $f2, 8($v1) -/* C48078 80241498 468010A0 */ cvt.s.w $f2, $f2 -/* C4807C 8024149C E7A00010 */ swc1 $f0, 0x10($sp) -/* C48080 802414A0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48084 802414A4 44061000 */ mfc1 $a2, $f2 -/* C48088 802414A8 C440000C */ lwc1 $f0, 0xc($v0) -/* C4808C 802414AC 46800020 */ cvt.s.w $f0, $f0 -/* C48090 802414B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C48094 802414B4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48098 802414B8 44052000 */ mfc1 $a1, $f4 -/* C4809C 802414BC C4400010 */ lwc1 $f0, 0x10($v0) -/* C480A0 802414C0 46800020 */ cvt.s.w $f0, $f0 -/* C480A4 802414C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C480A8 802414C8 8C640018 */ lw $a0, 0x18($v1) -/* C480AC 802414CC 0C0123F5 */ jal is_point_within_region -/* C480B0 802414D0 8E070038 */ lw $a3, 0x38($s0) -/* C480B4 802414D4 1040000E */ beqz $v0, .L80241510 -/* C480B8 802414D8 00000000 */ nop -/* C480BC 802414DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C480C0 802414E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C480C4 802414E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C480C8 802414E8 C4460000 */ lwc1 $f6, ($v0) -/* C480CC 802414EC 468031A0 */ cvt.s.w $f6, $f6 -/* C480D0 802414F0 44063000 */ mfc1 $a2, $f6 -/* C480D4 802414F4 C4460008 */ lwc1 $f6, 8($v0) -/* C480D8 802414F8 468031A0 */ cvt.s.w $f6, $f6 -/* C480DC 802414FC 44073000 */ mfc1 $a3, $f6 -/* C480E0 80241500 0C00A720 */ jal atan2 -/* C480E4 80241504 00000000 */ nop -/* C480E8 80241508 08090550 */ j .L80241540 -/* C480EC 8024150C E600000C */ swc1 $f0, 0xc($s0) -.L80241510: -/* C480F0 80241510 0C00A67F */ jal rand_int -/* C480F4 80241514 2404003C */ addiu $a0, $zero, 0x3c -/* C480F8 80241518 C60C000C */ lwc1 $f12, 0xc($s0) -/* C480FC 8024151C 44820000 */ mtc1 $v0, $f0 -/* C48100 80241520 00000000 */ nop -/* C48104 80241524 46800020 */ cvt.s.w $f0, $f0 -/* C48108 80241528 46006300 */ add.s $f12, $f12, $f0 -/* C4810C 8024152C 3C0141F0 */ lui $at, 0x41f0 -/* C48110 80241530 44810000 */ mtc1 $at, $f0 -/* C48114 80241534 0C00A6C9 */ jal clamp_angle -/* C48118 80241538 46006301 */ sub.s $f12, $f12, $f0 -/* C4811C 8024153C E600000C */ swc1 $f0, 0xc($s0) -.L80241540: -/* C48120 80241540 8E2200CC */ lw $v0, 0xcc($s1) -/* C48124 80241544 8C420004 */ lw $v0, 4($v0) -/* C48128 80241548 AE020028 */ sw $v0, 0x28($s0) -/* C4812C 8024154C AE600074 */ sw $zero, 0x74($s3) -/* C48130 80241550 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48134 80241554 8C420014 */ lw $v0, 0x14($v0) -/* C48138 80241558 04410004 */ bgez $v0, .L8024156C -/* C4813C 8024155C 00000000 */ nop -/* C48140 80241560 C6400000 */ lwc1 $f0, ($s2) -/* C48144 80241564 08090563 */ j .L8024158C -/* C48148 80241568 E6000018 */ swc1 $f0, 0x18($s0) -.L8024156C: -/* C4814C 8024156C 3C018024 */ lui $at, %hi(D_802456C0_C4C2A0) -/* C48150 80241570 D42256C0 */ ldc1 $f2, %lo(D_802456C0_C4C2A0)($at) -/* C48154 80241574 44820000 */ mtc1 $v0, $f0 -/* C48158 80241578 00000000 */ nop -/* C4815C 8024157C 46800021 */ cvt.d.w $f0, $f0 -/* C48160 80241580 46220003 */ div.d $f0, $f0, $f2 -/* C48164 80241584 46200020 */ cvt.s.d $f0, $f0 -/* C48168 80241588 E6000018 */ swc1 $f0, 0x18($s0) -.L8024158C: -/* C4816C 8024158C C600003C */ lwc1 $f0, 0x3c($s0) -/* C48170 80241590 3C014059 */ lui $at, 0x4059 -/* C48174 80241594 44811800 */ mtc1 $at, $f3 -/* C48178 80241598 44801000 */ mtc1 $zero, $f2 -/* C4817C 8024159C 46000021 */ cvt.d.s $f0, $f0 -/* C48180 802415A0 46220002 */ mul.d $f0, $f0, $f2 -/* C48184 802415A4 00000000 */ nop -/* C48188 802415A8 24020001 */ addiu $v0, $zero, 1 -/* C4818C 802415AC 4620018D */ trunc.w.d $f6, $f0 -/* C48190 802415B0 E626007C */ swc1 $f6, 0x7c($s1) -/* C48194 802415B4 AE620070 */ sw $v0, 0x70($s3) -/* C48198 802415B8 8FBF0030 */ lw $ra, 0x30($sp) -/* C4819C 802415BC 8FB3002C */ lw $s3, 0x2c($sp) -/* C481A0 802415C0 8FB20028 */ lw $s2, 0x28($sp) -/* C481A4 802415C4 8FB10024 */ lw $s1, 0x24($sp) -/* C481A8 802415C8 8FB00020 */ lw $s0, 0x20($sp) -/* C481AC 802415CC 03E00008 */ jr $ra -/* C481B0 802415D0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s deleted file mode 100644 index 980c3d5860..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241CBC_C4889C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CBC_C4889C -/* C4889C 80241CBC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C488A0 80241CC0 AFB3004C */ sw $s3, 0x4c($sp) -/* C488A4 80241CC4 0080982D */ daddu $s3, $a0, $zero -/* C488A8 80241CC8 AFBF0054 */ sw $ra, 0x54($sp) -/* C488AC 80241CCC AFB40050 */ sw $s4, 0x50($sp) -/* C488B0 80241CD0 AFB20048 */ sw $s2, 0x48($sp) -/* C488B4 80241CD4 AFB10044 */ sw $s1, 0x44($sp) -/* C488B8 80241CD8 AFB00040 */ sw $s0, 0x40($sp) -/* C488BC 80241CDC F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C488C0 80241CE0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* C488C4 80241CE4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C488C8 80241CE8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C488CC 80241CEC 8E710148 */ lw $s1, 0x148($s3) -/* C488D0 80241CF0 00A0902D */ daddu $s2, $a1, $zero -/* C488D4 80241CF4 86240008 */ lh $a0, 8($s1) -/* C488D8 80241CF8 0C00EABB */ jal get_npc_unsafe -/* C488DC 80241CFC 00C0A02D */ daddu $s4, $a2, $zero -/* C488E0 80241D00 0040802D */ daddu $s0, $v0, $zero -/* C488E4 80241D04 C6200078 */ lwc1 $f0, 0x78($s1) -/* C488E8 80241D08 46800020 */ cvt.s.w $f0, $f0 -/* C488EC 80241D0C 46000021 */ cvt.d.s $f0, $f0 -/* C488F0 80241D10 3C014059 */ lui $at, 0x4059 -/* C488F4 80241D14 44811800 */ mtc1 $at, $f3 -/* C488F8 80241D18 44801000 */ mtc1 $zero, $f2 -/* C488FC 80241D1C 8602008E */ lh $v0, 0x8e($s0) -/* C48900 80241D20 9603008E */ lhu $v1, 0x8e($s0) -/* C48904 80241D24 46220003 */ div.d $f0, $f0, $f2 -/* C48908 80241D28 46200620 */ cvt.s.d $f24, $f0 -/* C4890C 80241D2C C6200088 */ lwc1 $f0, 0x88($s1) -/* C48910 80241D30 46800020 */ cvt.s.w $f0, $f0 -/* C48914 80241D34 46000021 */ cvt.d.s $f0, $f0 -/* C48918 80241D38 46220003 */ div.d $f0, $f0, $f2 -/* C4891C 80241D3C 46200020 */ cvt.s.d $f0, $f0 -/* C48920 80241D40 18400003 */ blez $v0, .L80241D50 -/* C48924 80241D44 4600C680 */ add.s $f26, $f24, $f0 -/* C48928 80241D48 2462FFFF */ addiu $v0, $v1, -1 -/* C4892C 80241D4C A602008E */ sh $v0, 0x8e($s0) -.L80241D50: -/* C48930 80241D50 8E220070 */ lw $v0, 0x70($s1) -/* C48934 80241D54 18400034 */ blez $v0, .L80241E28 -/* C48938 80241D58 00000000 */ nop -/* C4893C 80241D5C C62C0074 */ lwc1 $f12, 0x74($s1) -/* C48940 80241D60 46806320 */ cvt.s.w $f12, $f12 -/* C48944 80241D64 44820000 */ mtc1 $v0, $f0 -/* C48948 80241D68 00000000 */ nop -/* C4894C 80241D6C 46800020 */ cvt.s.w $f0, $f0 -/* C48950 80241D70 46000021 */ cvt.d.s $f0, $f0 -/* C48954 80241D74 46220003 */ div.d $f0, $f0, $f2 -/* C48958 80241D78 0C00A8BB */ jal sin_deg -/* C4895C 80241D7C 462005A0 */ cvt.s.d $f22, $f0 -/* C48960 80241D80 8E020000 */ lw $v0, ($s0) -/* C48964 80241D84 30420008 */ andi $v0, $v0, 8 -/* C48968 80241D88 10400003 */ beqz $v0, .L80241D98 -/* C4896C 80241D8C 46000506 */ mov.s $f20, $f0 -/* C48970 80241D90 08090776 */ j .L80241DD8 -/* C48974 80241D94 0000102D */ daddu $v0, $zero, $zero -.L80241D98: -/* C48978 80241D98 27A50028 */ addiu $a1, $sp, 0x28 -/* C4897C 80241D9C 27A6002C */ addiu $a2, $sp, 0x2c -/* C48980 80241DA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* C48984 80241DA4 C602003C */ lwc1 $f2, 0x3c($s0) -/* C48988 80241DA8 C6040040 */ lwc1 $f4, 0x40($s0) -/* C4898C 80241DAC 3C01447A */ lui $at, 0x447a -/* C48990 80241DB0 44813000 */ mtc1 $at, $f6 -/* C48994 80241DB4 27A20034 */ addiu $v0, $sp, 0x34 -/* C48998 80241DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C4899C 80241DBC E7A2002C */ swc1 $f2, 0x2c($sp) -/* C489A0 80241DC0 E7A40030 */ swc1 $f4, 0x30($sp) -/* C489A4 80241DC4 E7A60034 */ swc1 $f6, 0x34($sp) -/* C489A8 80241DC8 AFA20010 */ sw $v0, 0x10($sp) -/* C489AC 80241DCC 8E040080 */ lw $a0, 0x80($s0) -/* C489B0 80241DD0 0C0372DF */ jal func_800DCB7C -/* C489B4 80241DD4 27A70030 */ addiu $a3, $sp, 0x30 -.L80241DD8: -/* C489B8 80241DD8 10400007 */ beqz $v0, .L80241DF8 -/* C489BC 80241DDC 00000000 */ nop -/* C489C0 80241DE0 4616A082 */ mul.s $f2, $f20, $f22 -/* C489C4 80241DE4 00000000 */ nop -/* C489C8 80241DE8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C489CC 80241DEC 46180000 */ add.s $f0, $f0, $f24 -/* C489D0 80241DF0 08090781 */ j .L80241E04 -/* C489D4 80241DF4 46020000 */ add.s $f0, $f0, $f2 -.L80241DF8: -/* C489D8 80241DF8 4616A002 */ mul.s $f0, $f20, $f22 -/* C489DC 80241DFC 00000000 */ nop -/* C489E0 80241E00 4600D000 */ add.s $f0, $f26, $f0 -.L80241E04: -/* C489E4 80241E04 E600003C */ swc1 $f0, 0x3c($s0) -/* C489E8 80241E08 8E220074 */ lw $v0, 0x74($s1) -/* C489EC 80241E0C 2442000A */ addiu $v0, $v0, 0xa -/* C489F0 80241E10 44826000 */ mtc1 $v0, $f12 -/* C489F4 80241E14 00000000 */ nop -/* C489F8 80241E18 0C00A6C9 */ jal clamp_angle -/* C489FC 80241E1C 46806320 */ cvt.s.w $f12, $f12 -/* C48A00 80241E20 4600020D */ trunc.w.s $f8, $f0 -/* C48A04 80241E24 E6280074 */ swc1 $f8, 0x74($s1) -.L80241E28: -/* C48A08 80241E28 8E220090 */ lw $v0, 0x90($s1) -/* C48A0C 80241E2C 1C400040 */ bgtz $v0, .L80241F30 -/* C48A10 80241E30 2442FFFF */ addiu $v0, $v0, -1 -/* C48A14 80241E34 860200A8 */ lh $v0, 0xa8($s0) -/* C48A18 80241E38 C600003C */ lwc1 $f0, 0x3c($s0) -/* C48A1C 80241E3C 44821000 */ mtc1 $v0, $f2 -/* C48A20 80241E40 00000000 */ nop -/* C48A24 80241E44 468010A0 */ cvt.s.w $f2, $f2 -/* C48A28 80241E48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48A2C 80241E4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48A30 80241E50 46020000 */ add.s $f0, $f0, $f2 -/* C48A34 80241E54 3C014024 */ lui $at, 0x4024 -/* C48A38 80241E58 44812800 */ mtc1 $at, $f5 -/* C48A3C 80241E5C 44802000 */ mtc1 $zero, $f4 -/* C48A40 80241E60 C442002C */ lwc1 $f2, 0x2c($v0) -/* C48A44 80241E64 46000021 */ cvt.d.s $f0, $f0 -/* C48A48 80241E68 46240000 */ add.d $f0, $f0, $f4 -/* C48A4C 80241E6C 460010A1 */ cvt.d.s $f2, $f2 -/* C48A50 80241E70 4620103C */ c.lt.d $f2, $f0 -/* C48A54 80241E74 00000000 */ nop -/* C48A58 80241E78 4500002E */ bc1f .L80241F34 -/* C48A5C 80241E7C 0280202D */ daddu $a0, $s4, $zero -/* C48A60 80241E80 24020001 */ addiu $v0, $zero, 1 -/* C48A64 80241E84 AFA20010 */ sw $v0, 0x10($sp) -/* C48A68 80241E88 8E460024 */ lw $a2, 0x24($s2) -/* C48A6C 80241E8C 8E470028 */ lw $a3, 0x28($s2) -/* C48A70 80241E90 0C01242D */ jal func_800490B4 -/* C48A74 80241E94 0220282D */ daddu $a1, $s1, $zero -/* C48A78 80241E98 10400026 */ beqz $v0, .L80241F34 -/* C48A7C 80241E9C 0000202D */ daddu $a0, $zero, $zero -/* C48A80 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C48A84 80241EA4 0000302D */ daddu $a2, $zero, $zero -/* C48A88 80241EA8 2412000C */ addiu $s2, $zero, 0xc -/* C48A8C 80241EAC 860300A8 */ lh $v1, 0xa8($s0) -/* C48A90 80241EB0 3C013F80 */ lui $at, 0x3f80 -/* C48A94 80241EB4 44810000 */ mtc1 $at, $f0 -/* C48A98 80241EB8 3C014000 */ lui $at, 0x4000 -/* C48A9C 80241EBC 44811000 */ mtc1 $at, $f2 -/* C48AA0 80241EC0 3C01C1A0 */ lui $at, 0xc1a0 -/* C48AA4 80241EC4 44812000 */ mtc1 $at, $f4 -/* C48AA8 80241EC8 44834000 */ mtc1 $v1, $f8 -/* C48AAC 80241ECC 00000000 */ nop -/* C48AB0 80241ED0 46804220 */ cvt.s.w $f8, $f8 -/* C48AB4 80241ED4 44074000 */ mfc1 $a3, $f8 -/* C48AB8 80241ED8 27A20038 */ addiu $v0, $sp, 0x38 -/* C48ABC 80241EDC AFB2001C */ sw $s2, 0x1c($sp) -/* C48AC0 80241EE0 AFA20020 */ sw $v0, 0x20($sp) -/* C48AC4 80241EE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C48AC8 80241EE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C48ACC 80241EEC 0C01BFA4 */ jal fx_emote -/* C48AD0 80241EF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C48AD4 80241EF4 0200202D */ daddu $a0, $s0, $zero -/* C48AD8 80241EF8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C48ADC 80241EFC C480003C */ lwc1 $f0, 0x3c($a0) -/* C48AE0 80241F00 3C060020 */ lui $a2, 0x20 -/* C48AE4 80241F04 0C012530 */ jal func_800494C0 -/* C48AE8 80241F08 E4800064 */ swc1 $f0, 0x64($a0) -/* C48AEC 80241F0C 8E220018 */ lw $v0, 0x18($s1) -/* C48AF0 80241F10 9442002A */ lhu $v0, 0x2a($v0) -/* C48AF4 80241F14 30420001 */ andi $v0, $v0, 1 -/* C48AF8 80241F18 10400003 */ beqz $v0, .L80241F28 -/* C48AFC 80241F1C 2402000A */ addiu $v0, $zero, 0xa -/* C48B00 80241F20 080907F4 */ j .L80241FD0 -/* C48B04 80241F24 AE620070 */ sw $v0, 0x70($s3) -.L80241F28: -/* C48B08 80241F28 080907F4 */ j .L80241FD0 -/* C48B0C 80241F2C AE720070 */ sw $s2, 0x70($s3) -.L80241F30: -/* C48B10 80241F30 AE220090 */ sw $v0, 0x90($s1) -.L80241F34: -/* C48B14 80241F34 8602008C */ lh $v0, 0x8c($s0) -/* C48B18 80241F38 14400025 */ bnez $v0, .L80241FD0 -/* C48B1C 80241F3C 00000000 */ nop -/* C48B20 80241F40 8602008E */ lh $v0, 0x8e($s0) -/* C48B24 80241F44 1C400022 */ bgtz $v0, .L80241FD0 -/* C48B28 80241F48 00000000 */ nop -/* C48B2C 80241F4C 8E620074 */ lw $v0, 0x74($s3) -/* C48B30 80241F50 2442FFFF */ addiu $v0, $v0, -1 -/* C48B34 80241F54 1840001D */ blez $v0, .L80241FCC -/* C48B38 80241F58 AE620074 */ sw $v0, 0x74($s3) -/* C48B3C 80241F5C 8E220018 */ lw $v0, 0x18($s1) -/* C48B40 80241F60 9442002A */ lhu $v0, 0x2a($v0) -/* C48B44 80241F64 30420010 */ andi $v0, $v0, 0x10 -/* C48B48 80241F68 14400007 */ bnez $v0, .L80241F88 -/* C48B4C 80241F6C 00000000 */ nop -/* C48B50 80241F70 C600000C */ lwc1 $f0, 0xc($s0) -/* C48B54 80241F74 3C014334 */ lui $at, 0x4334 -/* C48B58 80241F78 44816000 */ mtc1 $at, $f12 -/* C48B5C 80241F7C 0C00A6C9 */ jal clamp_angle -/* C48B60 80241F80 460C0300 */ add.s $f12, $f0, $f12 -/* C48B64 80241F84 E600000C */ swc1 $f0, 0xc($s0) -.L80241F88: -/* C48B68 80241F88 0C00A67F */ jal rand_int -/* C48B6C 80241F8C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C48B70 80241F90 3C032E8B */ lui $v1, 0x2e8b -/* C48B74 80241F94 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C48B78 80241F98 00430018 */ mult $v0, $v1 -/* C48B7C 80241F9C 00021FC3 */ sra $v1, $v0, 0x1f -/* C48B80 80241FA0 00004010 */ mfhi $t0 -/* C48B84 80241FA4 00082043 */ sra $a0, $t0, 1 -/* C48B88 80241FA8 00832023 */ subu $a0, $a0, $v1 -/* C48B8C 80241FAC 00041840 */ sll $v1, $a0, 1 -/* C48B90 80241FB0 00641821 */ addu $v1, $v1, $a0 -/* C48B94 80241FB4 00031880 */ sll $v1, $v1, 2 -/* C48B98 80241FB8 00641823 */ subu $v1, $v1, $a0 -/* C48B9C 80241FBC 00431023 */ subu $v0, $v0, $v1 -/* C48BA0 80241FC0 24420005 */ addiu $v0, $v0, 5 -/* C48BA4 80241FC4 080907F4 */ j .L80241FD0 -/* C48BA8 80241FC8 A602008E */ sh $v0, 0x8e($s0) -.L80241FCC: -/* C48BAC 80241FCC AE600070 */ sw $zero, 0x70($s3) -.L80241FD0: -/* C48BB0 80241FD0 8FBF0054 */ lw $ra, 0x54($sp) -/* C48BB4 80241FD4 8FB40050 */ lw $s4, 0x50($sp) -/* C48BB8 80241FD8 8FB3004C */ lw $s3, 0x4c($sp) -/* C48BBC 80241FDC 8FB20048 */ lw $s2, 0x48($sp) -/* C48BC0 80241FE0 8FB10044 */ lw $s1, 0x44($sp) -/* C48BC4 80241FE4 8FB00040 */ lw $s0, 0x40($sp) -/* C48BC8 80241FE8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C48BCC 80241FEC D7B80068 */ ldc1 $f24, 0x68($sp) -/* C48BD0 80241FF0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C48BD4 80241FF4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C48BD8 80241FF8 03E00008 */ jr $ra -/* C48BDC 80241FFC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s deleted file mode 100644 index 1d2a304370..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242078_C48C58 -/* C48C58 80242078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C48C5C 8024207C AFB00010 */ sw $s0, 0x10($sp) -/* C48C60 80242080 0080802D */ daddu $s0, $a0, $zero -/* C48C64 80242084 AFBF0014 */ sw $ra, 0x14($sp) -/* C48C68 80242088 8E020148 */ lw $v0, 0x148($s0) -/* C48C6C 8024208C 0C00EABB */ jal get_npc_unsafe -/* C48C70 80242090 84440008 */ lh $a0, 8($v0) -/* C48C74 80242094 9443008E */ lhu $v1, 0x8e($v0) -/* C48C78 80242098 C440003C */ lwc1 $f0, 0x3c($v0) -/* C48C7C 8024209C 24640001 */ addiu $a0, $v1, 1 -/* C48C80 802420A0 00031C00 */ sll $v1, $v1, 0x10 -/* C48C84 802420A4 00031B83 */ sra $v1, $v1, 0xe -/* C48C88 802420A8 A444008E */ sh $a0, 0x8e($v0) -/* C48C8C 802420AC 3C018024 */ lui $at, %hi(D_80244358_C4AF38) -/* C48C90 802420B0 00230821 */ addu $at, $at, $v1 -/* C48C94 802420B4 C4224358 */ lwc1 $f2, %lo(D_80244358_C4AF38)($at) -/* C48C98 802420B8 8443008E */ lh $v1, 0x8e($v0) -/* C48C9C 802420BC 46020000 */ add.s $f0, $f0, $f2 -/* C48CA0 802420C0 28630005 */ slti $v1, $v1, 5 -/* C48CA4 802420C4 14600003 */ bnez $v1, .L802420D4 -/* C48CA8 802420C8 E440003C */ swc1 $f0, 0x3c($v0) -/* C48CAC 802420CC 2402000C */ addiu $v0, $zero, 0xc -/* C48CB0 802420D0 AE020070 */ sw $v0, 0x70($s0) -.L802420D4: -/* C48CB4 802420D4 8FBF0014 */ lw $ra, 0x14($sp) -/* C48CB8 802420D8 8FB00010 */ lw $s0, 0x10($sp) -/* C48CBC 802420DC 03E00008 */ jr $ra -/* C48CC0 802420E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s deleted file mode 100644 index 63eadc937a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024227C_C48E5C -/* C48E5C 8024227C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C48E60 80242280 AFB20030 */ sw $s2, 0x30($sp) -/* C48E64 80242284 0080902D */ daddu $s2, $a0, $zero -/* C48E68 80242288 AFBF0038 */ sw $ra, 0x38($sp) -/* C48E6C 8024228C AFB30034 */ sw $s3, 0x34($sp) -/* C48E70 80242290 AFB1002C */ sw $s1, 0x2c($sp) -/* C48E74 80242294 AFB00028 */ sw $s0, 0x28($sp) -/* C48E78 80242298 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C48E7C 8024229C F7B40040 */ sdc1 $f20, 0x40($sp) -/* C48E80 802422A0 8E510148 */ lw $s1, 0x148($s2) -/* C48E84 802422A4 86240008 */ lh $a0, 8($s1) -/* C48E88 802422A8 0C00EABB */ jal get_npc_unsafe -/* C48E8C 802422AC 00A0982D */ daddu $s3, $a1, $zero -/* C48E90 802422B0 0040802D */ daddu $s0, $v0, $zero -/* C48E94 802422B4 0200202D */ daddu $a0, $s0, $zero -/* C48E98 802422B8 C6220088 */ lwc1 $f2, 0x88($s1) -/* C48E9C 802422BC 468010A0 */ cvt.s.w $f2, $f2 -/* C48EA0 802422C0 460010A1 */ cvt.d.s $f2, $f2 -/* C48EA4 802422C4 C604001C */ lwc1 $f4, 0x1c($s0) -/* C48EA8 802422C8 C6000014 */ lwc1 $f0, 0x14($s0) -/* C48EAC 802422CC 8E050018 */ lw $a1, 0x18($s0) -/* C48EB0 802422D0 46002100 */ add.s $f4, $f4, $f0 -/* C48EB4 802422D4 8E06000C */ lw $a2, 0xc($s0) -/* C48EB8 802422D8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C48EBC 802422DC 46800020 */ cvt.s.w $f0, $f0 -/* C48EC0 802422E0 E604001C */ swc1 $f4, 0x1c($s0) -/* C48EC4 802422E4 3C014059 */ lui $at, 0x4059 -/* C48EC8 802422E8 44812800 */ mtc1 $at, $f5 -/* C48ECC 802422EC 44802000 */ mtc1 $zero, $f4 -/* C48ED0 802422F0 46000021 */ cvt.d.s $f0, $f0 -/* C48ED4 802422F4 46240003 */ div.d $f0, $f0, $f4 -/* C48ED8 802422F8 46200520 */ cvt.s.d $f20, $f0 -/* C48EDC 802422FC 46241083 */ div.d $f2, $f2, $f4 -/* C48EE0 80242300 0C00EA95 */ jal npc_move_heading -/* C48EE4 80242304 462015A0 */ cvt.s.d $f22, $f2 -/* C48EE8 80242308 C604001C */ lwc1 $f4, 0x1c($s0) -/* C48EEC 8024230C 44801000 */ mtc1 $zero, $f2 -/* C48EF0 80242310 44801800 */ mtc1 $zero, $f3 -/* C48EF4 80242314 46002021 */ cvt.d.s $f0, $f4 -/* C48EF8 80242318 4620103E */ c.le.d $f2, $f0 -/* C48EFC 8024231C 00000000 */ nop -/* C48F00 80242320 45000030 */ bc1f .L802423E4 -/* C48F04 80242324 00000000 */ nop -/* C48F08 80242328 C600003C */ lwc1 $f0, 0x3c($s0) -/* C48F0C 8024232C 46040000 */ add.s $f0, $f0, $f4 -/* C48F10 80242330 E600003C */ swc1 $f0, 0x3c($s0) -/* C48F14 80242334 8E2200CC */ lw $v0, 0xcc($s1) -/* C48F18 80242338 8C420024 */ lw $v0, 0x24($v0) -/* C48F1C 8024233C AE020028 */ sw $v0, 0x28($s0) -/* C48F20 80242340 A2200007 */ sb $zero, 7($s1) -/* C48F24 80242344 8E020000 */ lw $v0, ($s0) -/* C48F28 80242348 30420008 */ andi $v0, $v0, 8 -/* C48F2C 8024234C 14400011 */ bnez $v0, .L80242394 -/* C48F30 80242350 0000102D */ daddu $v0, $zero, $zero -/* C48F34 80242354 27A50018 */ addiu $a1, $sp, 0x18 -/* C48F38 80242358 27A6001C */ addiu $a2, $sp, 0x1c -/* C48F3C 8024235C C6000038 */ lwc1 $f0, 0x38($s0) -/* C48F40 80242360 C602003C */ lwc1 $f2, 0x3c($s0) -/* C48F44 80242364 C6040040 */ lwc1 $f4, 0x40($s0) -/* C48F48 80242368 3C01447A */ lui $at, 0x447a -/* C48F4C 8024236C 44813000 */ mtc1 $at, $f6 -/* C48F50 80242370 27A20024 */ addiu $v0, $sp, 0x24 -/* C48F54 80242374 E7A00018 */ swc1 $f0, 0x18($sp) -/* C48F58 80242378 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C48F5C 8024237C E7A40020 */ swc1 $f4, 0x20($sp) -/* C48F60 80242380 E7A60024 */ swc1 $f6, 0x24($sp) -/* C48F64 80242384 AFA20010 */ sw $v0, 0x10($sp) -/* C48F68 80242388 8E040080 */ lw $a0, 0x80($s0) -/* C48F6C 8024238C 0C0372DF */ jal func_800DCB7C -/* C48F70 80242390 27A70020 */ addiu $a3, $sp, 0x20 -.L80242394: -/* C48F74 80242394 1040000B */ beqz $v0, .L802423C4 -/* C48F78 80242398 00000000 */ nop -/* C48F7C 8024239C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C48F80 802423A0 46140080 */ add.s $f2, $f0, $f20 -/* C48F84 802423A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C48F88 802423A8 4600103E */ c.le.s $f2, $f0 -/* C48F8C 802423AC 00000000 */ nop -/* C48F90 802423B0 4500008D */ bc1f .L802425E8 -/* C48F94 802423B4 00000000 */ nop -/* C48F98 802423B8 E602003C */ swc1 $f2, 0x3c($s0) -/* C48F9C 802423BC 0809097A */ j .L802425E8 -/* C48FA0 802423C0 AE400070 */ sw $zero, 0x70($s2) -.L802423C4: -/* C48FA4 802423C4 C602003C */ lwc1 $f2, 0x3c($s0) -/* C48FA8 802423C8 C6000064 */ lwc1 $f0, 0x64($s0) -/* C48FAC 802423CC 4602003E */ c.le.s $f0, $f2 -/* C48FB0 802423D0 00000000 */ nop -/* C48FB4 802423D4 45030084 */ bc1tl .L802425E8 -/* C48FB8 802423D8 AE400070 */ sw $zero, 0x70($s2) -/* C48FBC 802423DC 0809097A */ j .L802425E8 -/* C48FC0 802423E0 00000000 */ nop -.L802423E4: -/* C48FC4 802423E4 4622003C */ c.lt.d $f0, $f2 -/* C48FC8 802423E8 00000000 */ nop -/* C48FCC 802423EC 4500007E */ bc1f .L802425E8 -/* C48FD0 802423F0 00000000 */ nop -/* C48FD4 802423F4 9602008E */ lhu $v0, 0x8e($s0) -/* C48FD8 802423F8 24420001 */ addiu $v0, $v0, 1 -/* C48FDC 802423FC A602008E */ sh $v0, 0x8e($s0) -/* C48FE0 80242400 00021400 */ sll $v0, $v0, 0x10 -/* C48FE4 80242404 8E630020 */ lw $v1, 0x20($s3) -/* C48FE8 80242408 00021403 */ sra $v0, $v0, 0x10 -/* C48FEC 8024240C 0043102A */ slt $v0, $v0, $v1 -/* C48FF0 80242410 14400026 */ bnez $v0, .L802424AC -/* C48FF4 80242414 00000000 */ nop -/* C48FF8 80242418 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C48FFC 8024241C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C49000 80242420 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C49004 80242424 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C49008 80242428 A600008E */ sh $zero, 0x8e($s0) -/* C4900C 8024242C 8C460028 */ lw $a2, 0x28($v0) -/* C49010 80242430 0C00A720 */ jal atan2 -/* C49014 80242434 8C470030 */ lw $a3, 0x30($v0) -/* C49018 80242438 46000506 */ mov.s $f20, $f0 -/* C4901C 8024243C C60C000C */ lwc1 $f12, 0xc($s0) -/* C49020 80242440 0C00A70A */ jal get_clamped_angle_diff -/* C49024 80242444 4600A386 */ mov.s $f14, $f20 -/* C49028 80242448 46000086 */ mov.s $f2, $f0 -/* C4902C 8024244C 8E62001C */ lw $v0, 0x1c($s3) -/* C49030 80242450 46001005 */ abs.s $f0, $f2 -/* C49034 80242454 44822000 */ mtc1 $v0, $f4 -/* C49038 80242458 00000000 */ nop -/* C4903C 8024245C 46802120 */ cvt.s.w $f4, $f4 -/* C49040 80242460 4600203C */ c.lt.s $f4, $f0 -/* C49044 80242464 00000000 */ nop -/* C49048 80242468 4500000D */ bc1f .L802424A0 -/* C4904C 8024246C 00000000 */ nop -/* C49050 80242470 44800000 */ mtc1 $zero, $f0 -/* C49054 80242474 C614000C */ lwc1 $f20, 0xc($s0) -/* C49058 80242478 4600103C */ c.lt.s $f2, $f0 -/* C4905C 8024247C 00000000 */ nop -/* C49060 80242480 45000006 */ bc1f .L8024249C -/* C49064 80242484 00021023 */ negu $v0, $v0 -/* C49068 80242488 44820000 */ mtc1 $v0, $f0 -/* C4906C 8024248C 00000000 */ nop -/* C49070 80242490 46800020 */ cvt.s.w $f0, $f0 -/* C49074 80242494 08090928 */ j .L802424A0 -/* C49078 80242498 4600A500 */ add.s $f20, $f20, $f0 -.L8024249C: -/* C4907C 8024249C 4604A500 */ add.s $f20, $f20, $f4 -.L802424A0: -/* C49080 802424A0 0C00A6C9 */ jal clamp_angle -/* C49084 802424A4 4600A306 */ mov.s $f12, $f20 -/* C49088 802424A8 E600000C */ swc1 $f0, 0xc($s0) -.L802424AC: -/* C4908C 802424AC 8E020000 */ lw $v0, ($s0) -/* C49090 802424B0 30420008 */ andi $v0, $v0, 8 -/* C49094 802424B4 1040000A */ beqz $v0, .L802424E0 -/* C49098 802424B8 27A50018 */ addiu $a1, $sp, 0x18 -/* C4909C 802424BC C602003C */ lwc1 $f2, 0x3c($s0) -/* C490A0 802424C0 C600001C */ lwc1 $f0, 0x1c($s0) -/* C490A4 802424C4 46001080 */ add.s $f2, $f2, $f0 -/* C490A8 802424C8 4616103C */ c.lt.s $f2, $f22 -/* C490AC 802424CC 00000000 */ nop -/* C490B0 802424D0 45020045 */ bc1fl .L802425E8 -/* C490B4 802424D4 E602003C */ swc1 $f2, 0x3c($s0) -/* C490B8 802424D8 08090979 */ j .L802425E4 -/* C490BC 802424DC E616003C */ swc1 $f22, 0x3c($s0) -.L802424E0: -/* C490C0 802424E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* C490C4 802424E4 27A6001C */ addiu $a2, $sp, 0x1c -/* C490C8 802424E8 E7A00018 */ swc1 $f0, 0x18($sp) -/* C490CC 802424EC 860200A8 */ lh $v0, 0xa8($s0) -/* C490D0 802424F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* C490D4 802424F4 C604003C */ lwc1 $f4, 0x3c($s0) -/* C490D8 802424F8 44821000 */ mtc1 $v0, $f2 -/* C490DC 802424FC 00000000 */ nop -/* C490E0 80242500 468010A0 */ cvt.s.w $f2, $f2 -/* C490E4 80242504 46000005 */ abs.s $f0, $f0 -/* C490E8 80242508 46020000 */ add.s $f0, $f0, $f2 -/* C490EC 8024250C C6060040 */ lwc1 $f6, 0x40($s0) -/* C490F0 80242510 27A20024 */ addiu $v0, $sp, 0x24 -/* C490F4 80242514 46022100 */ add.s $f4, $f4, $f2 -/* C490F8 80242518 3C014024 */ lui $at, 0x4024 -/* C490FC 8024251C 44811800 */ mtc1 $at, $f3 -/* C49100 80242520 44801000 */ mtc1 $zero, $f2 -/* C49104 80242524 46000021 */ cvt.d.s $f0, $f0 -/* C49108 80242528 46220000 */ add.d $f0, $f0, $f2 -/* C4910C 8024252C E7A60020 */ swc1 $f6, 0x20($sp) -/* C49110 80242530 E7A4001C */ swc1 $f4, 0x1c($sp) -/* C49114 80242534 46200020 */ cvt.s.d $f0, $f0 -/* C49118 80242538 E7A00024 */ swc1 $f0, 0x24($sp) -/* C4911C 8024253C AFA20010 */ sw $v0, 0x10($sp) -/* C49120 80242540 8E040080 */ lw $a0, 0x80($s0) -/* C49124 80242544 0C0372DF */ jal func_800DCB7C -/* C49128 80242548 27A70020 */ addiu $a3, $sp, 0x20 -/* C4912C 8024254C 10400015 */ beqz $v0, .L802425A4 -/* C49130 80242550 00000000 */ nop -/* C49134 80242554 860200A8 */ lh $v0, 0xa8($s0) -/* C49138 80242558 C604001C */ lwc1 $f4, 0x1c($s0) -/* C4913C 8024255C 44820000 */ mtc1 $v0, $f0 -/* C49140 80242560 00000000 */ nop -/* C49144 80242564 46800020 */ cvt.s.w $f0, $f0 -/* C49148 80242568 46002085 */ abs.s $f2, $f4 -/* C4914C 8024256C 46020000 */ add.s $f0, $f0, $f2 -/* C49150 80242570 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C49154 80242574 4600103E */ c.le.s $f2, $f0 -/* C49158 80242578 00000000 */ nop -/* C4915C 8024257C 45000005 */ bc1f .L80242594 -/* C49160 80242580 00000000 */ nop -/* C49164 80242584 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C49168 80242588 AE00001C */ sw $zero, 0x1c($s0) -/* C4916C 8024258C 0809097A */ j .L802425E8 -/* C49170 80242590 E600003C */ swc1 $f0, 0x3c($s0) -.L80242594: -/* C49174 80242594 C600003C */ lwc1 $f0, 0x3c($s0) -/* C49178 80242598 46040000 */ add.s $f0, $f0, $f4 -/* C4917C 8024259C 0809097A */ j .L802425E8 -/* C49180 802425A0 E600003C */ swc1 $f0, 0x3c($s0) -.L802425A4: -/* C49184 802425A4 C606003C */ lwc1 $f6, 0x3c($s0) -/* C49188 802425A8 860200A8 */ lh $v0, 0xa8($s0) -/* C4918C 802425AC 46163081 */ sub.s $f2, $f6, $f22 -/* C49190 802425B0 44820000 */ mtc1 $v0, $f0 -/* C49194 802425B4 00000000 */ nop -/* C49198 802425B8 46800020 */ cvt.s.w $f0, $f0 -/* C4919C 802425BC 46001080 */ add.s $f2, $f2, $f0 -/* C491A0 802425C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C491A4 802425C4 46002005 */ abs.s $f0, $f4 -/* C491A8 802425C8 4602003C */ c.lt.s $f0, $f2 -/* C491AC 802425CC 00000000 */ nop -/* C491B0 802425D0 45020005 */ bc1fl .L802425E8 -/* C491B4 802425D4 AE00001C */ sw $zero, 0x1c($s0) -/* C491B8 802425D8 46043000 */ add.s $f0, $f6, $f4 -/* C491BC 802425DC 0809097A */ j .L802425E8 -/* C491C0 802425E0 E600003C */ swc1 $f0, 0x3c($s0) -.L802425E4: -/* C491C4 802425E4 AE00001C */ sw $zero, 0x1c($s0) -.L802425E8: -/* C491C8 802425E8 8FBF0038 */ lw $ra, 0x38($sp) -/* C491CC 802425EC 8FB30034 */ lw $s3, 0x34($sp) -/* C491D0 802425F0 8FB20030 */ lw $s2, 0x30($sp) -/* C491D4 802425F4 8FB1002C */ lw $s1, 0x2c($sp) -/* C491D8 802425F8 8FB00028 */ lw $s0, 0x28($sp) -/* C491DC 802425FC D7B60048 */ ldc1 $f22, 0x48($sp) -/* C491E0 80242600 D7B40040 */ ldc1 $f20, 0x40($sp) -/* C491E4 80242604 03E00008 */ jr $ra -/* C491E8 80242608 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s deleted file mode 100644 index 302b57dbb2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024260C_C491EC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024260C_C491EC -/* C491EC 8024260C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C491F0 80242610 AFB00028 */ sw $s0, 0x28($sp) -/* C491F4 80242614 00A0802D */ daddu $s0, $a1, $zero -/* C491F8 80242618 AFB1002C */ sw $s1, 0x2c($sp) -/* C491FC 8024261C 00C0882D */ daddu $s1, $a2, $zero -/* C49200 80242620 AFBF0034 */ sw $ra, 0x34($sp) -/* C49204 80242624 AFB20030 */ sw $s2, 0x30($sp) -/* C49208 80242628 AE200070 */ sw $zero, 0x70($s1) -/* C4920C 8024262C 8C830000 */ lw $v1, ($a0) -/* C49210 80242630 2402FDFF */ addiu $v0, $zero, -0x201 -/* C49214 80242634 A480008E */ sh $zero, 0x8e($a0) -/* C49218 80242638 00621824 */ and $v1, $v1, $v0 -/* C4921C 8024263C 34650800 */ ori $a1, $v1, 0x800 -/* C49220 80242640 AC850000 */ sw $a1, ($a0) -/* C49224 80242644 8E0200D0 */ lw $v0, 0xd0($s0) -/* C49228 80242648 8C420034 */ lw $v0, 0x34($v0) -/* C4922C 8024264C 10400003 */ beqz $v0, .L8024265C -/* C49230 80242650 00E0902D */ daddu $s2, $a3, $zero -/* C49234 80242654 08090999 */ j .L80242664 -/* C49238 80242658 34620808 */ ori $v0, $v1, 0x808 -.L8024265C: -/* C4923C 8024265C 2402FFF7 */ addiu $v0, $zero, -9 -/* C49240 80242660 00A21024 */ and $v0, $a1, $v0 -.L80242664: -/* C49244 80242664 AC820000 */ sw $v0, ($a0) -/* C49248 80242668 27A20024 */ addiu $v0, $sp, 0x24 -/* C4924C 8024266C 27A50018 */ addiu $a1, $sp, 0x18 -/* C49250 80242670 C4800038 */ lwc1 $f0, 0x38($a0) -/* C49254 80242674 C482003C */ lwc1 $f2, 0x3c($a0) -/* C49258 80242678 C4840040 */ lwc1 $f4, 0x40($a0) -/* C4925C 8024267C 3C01447A */ lui $at, 0x447a -/* C49260 80242680 44813000 */ mtc1 $at, $f6 -/* C49264 80242684 27A6001C */ addiu $a2, $sp, 0x1c -/* C49268 80242688 E7A00018 */ swc1 $f0, 0x18($sp) -/* C4926C 8024268C E7A2001C */ swc1 $f2, 0x1c($sp) -/* C49270 80242690 E7A40020 */ swc1 $f4, 0x20($sp) -/* C49274 80242694 E7A60024 */ swc1 $f6, 0x24($sp) -/* C49278 80242698 AFA20010 */ sw $v0, 0x10($sp) -/* C4927C 8024269C 8C840080 */ lw $a0, 0x80($a0) -/* C49280 802426A0 0C0372DF */ jal func_800DCB7C -/* C49284 802426A4 27A70020 */ addiu $a3, $sp, 0x20 -/* C49288 802426A8 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C4928C 802426AC 3C014059 */ lui $at, 0x4059 -/* C49290 802426B0 44812800 */ mtc1 $at, $f5 -/* C49294 802426B4 44802000 */ mtc1 $zero, $f4 -/* C49298 802426B8 460010A1 */ cvt.d.s $f2, $f2 -/* C4929C 802426BC 46241082 */ mul.d $f2, $f2, $f4 -/* C492A0 802426C0 00000000 */ nop -/* C492A4 802426C4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C492A8 802426C8 46000021 */ cvt.d.s $f0, $f0 -/* C492AC 802426CC 46240002 */ mul.d $f0, $f0, $f4 -/* C492B0 802426D0 00000000 */ nop -/* C492B4 802426D4 3C013FE0 */ lui $at, 0x3fe0 -/* C492B8 802426D8 44812800 */ mtc1 $at, $f5 -/* C492BC 802426DC 44802000 */ mtc1 $zero, $f4 -/* C492C0 802426E0 00000000 */ nop -/* C492C4 802426E4 46241080 */ add.d $f2, $f2, $f4 -/* C492C8 802426E8 AE000074 */ sw $zero, 0x74($s0) -/* C492CC 802426EC 46240000 */ add.d $f0, $f0, $f4 -/* C492D0 802426F0 AE000090 */ sw $zero, 0x90($s0) -/* C492D4 802426F4 4620120D */ trunc.w.d $f8, $f2 -/* C492D8 802426F8 E6080078 */ swc1 $f8, 0x78($s0) -/* C492DC 802426FC 4620020D */ trunc.w.d $f8, $f0 -/* C492E0 80242700 E6080088 */ swc1 $f8, 0x88($s0) -/* C492E4 80242704 8E420014 */ lw $v0, 0x14($s2) -/* C492E8 80242708 AE220074 */ sw $v0, 0x74($s1) -/* C492EC 8024270C 8E0200B0 */ lw $v0, 0xb0($s0) -/* C492F0 80242710 34420010 */ ori $v0, $v0, 0x10 -/* C492F4 80242714 AE0200B0 */ sw $v0, 0xb0($s0) -/* C492F8 80242718 8FBF0034 */ lw $ra, 0x34($sp) -/* C492FC 8024271C 8FB20030 */ lw $s2, 0x30($sp) -/* C49300 80242720 8FB1002C */ lw $s1, 0x2c($sp) -/* C49304 80242724 8FB00028 */ lw $s0, 0x28($sp) -/* C49308 80242728 03E00008 */ jr $ra -/* C4930C 8024272C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s deleted file mode 100644 index f47ac7fe3c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242730_C49310 -/* C49310 80242730 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C49314 80242734 AFB40040 */ sw $s4, 0x40($sp) -/* C49318 80242738 0080A02D */ daddu $s4, $a0, $zero -/* C4931C 8024273C AFBF0048 */ sw $ra, 0x48($sp) -/* C49320 80242740 AFB50044 */ sw $s5, 0x44($sp) -/* C49324 80242744 AFB3003C */ sw $s3, 0x3c($sp) -/* C49328 80242748 AFB20038 */ sw $s2, 0x38($sp) -/* C4932C 8024274C AFB10034 */ sw $s1, 0x34($sp) -/* C49330 80242750 AFB00030 */ sw $s0, 0x30($sp) -/* C49334 80242754 8E920148 */ lw $s2, 0x148($s4) -/* C49338 80242758 86440008 */ lh $a0, 8($s2) -/* C4933C 8024275C 8E90000C */ lw $s0, 0xc($s4) -/* C49340 80242760 0C00EABB */ jal get_npc_unsafe -/* C49344 80242764 00A0882D */ daddu $s1, $a1, $zero -/* C49348 80242768 0280202D */ daddu $a0, $s4, $zero -/* C4934C 8024276C 8E050000 */ lw $a1, ($s0) -/* C49350 80242770 0C0B1EAF */ jal get_variable -/* C49354 80242774 0040A82D */ daddu $s5, $v0, $zero -/* C49358 80242778 AFA00010 */ sw $zero, 0x10($sp) -/* C4935C 8024277C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49360 80242780 8C630030 */ lw $v1, 0x30($v1) -/* C49364 80242784 AFA30014 */ sw $v1, 0x14($sp) -/* C49368 80242788 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4936C 8024278C 8C63001C */ lw $v1, 0x1c($v1) -/* C49370 80242790 AFA30018 */ sw $v1, 0x18($sp) -/* C49374 80242794 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49378 80242798 8C630024 */ lw $v1, 0x24($v1) -/* C4937C 8024279C AFA3001C */ sw $v1, 0x1c($sp) -/* C49380 802427A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49384 802427A4 8C630028 */ lw $v1, 0x28($v1) -/* C49388 802427A8 27B30010 */ addiu $s3, $sp, 0x10 -/* C4938C 802427AC AFA30020 */ sw $v1, 0x20($sp) -/* C49390 802427B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C49394 802427B4 3C0142F0 */ lui $at, 0x42f0 -/* C49398 802427B8 44810000 */ mtc1 $at, $f0 -/* C4939C 802427BC 8C63002C */ lw $v1, 0x2c($v1) -/* C493A0 802427C0 0040802D */ daddu $s0, $v0, $zero -/* C493A4 802427C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C493A8 802427C8 A7A0002C */ sh $zero, 0x2c($sp) -/* C493AC 802427CC 12200006 */ beqz $s1, .L802427E8 -/* C493B0 802427D0 AFA30024 */ sw $v1, 0x24($sp) -/* C493B4 802427D4 02A0202D */ daddu $a0, $s5, $zero -/* C493B8 802427D8 0240282D */ daddu $a1, $s2, $zero -/* C493BC 802427DC 0280302D */ daddu $a2, $s4, $zero -/* C493C0 802427E0 0C090983 */ jal func_8024260C_C491EC -/* C493C4 802427E4 0200382D */ daddu $a3, $s0, $zero -.L802427E8: -/* C493C8 802427E8 2402FFFE */ addiu $v0, $zero, -2 -/* C493CC 802427EC A2A200AB */ sb $v0, 0xab($s5) -/* C493D0 802427F0 8E4300B0 */ lw $v1, 0xb0($s2) -/* C493D4 802427F4 30620004 */ andi $v0, $v1, 4 -/* C493D8 802427F8 10400007 */ beqz $v0, .L80242818 -/* C493DC 802427FC 00000000 */ nop -/* C493E0 80242800 824200B4 */ lb $v0, 0xb4($s2) -/* C493E4 80242804 1440003C */ bnez $v0, .L802428F8 -/* C493E8 80242808 0000102D */ daddu $v0, $zero, $zero -/* C493EC 8024280C 2402FFFB */ addiu $v0, $zero, -5 -/* C493F0 80242810 00621024 */ and $v0, $v1, $v0 -/* C493F4 80242814 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242818: -/* C493F8 80242818 8E830070 */ lw $v1, 0x70($s4) -/* C493FC 8024281C 2C62000F */ sltiu $v0, $v1, 0xf -/* C49400 80242820 10400034 */ beqz $v0, L802428F4_C494D4 -/* C49404 80242824 00031080 */ sll $v0, $v1, 2 -/* C49408 80242828 3C018024 */ lui $at, %hi(jtbl_802456D8_C4C2B8) -/* C4940C 8024282C 00220821 */ addu $at, $at, $v0 -/* C49410 80242830 8C2256D8 */ lw $v0, %lo(jtbl_802456D8_C4C2B8)($at) -/* C49414 80242834 00400008 */ jr $v0 -/* C49418 80242838 00000000 */ nop -glabel L8024283C_C4941C -/* C4941C 8024283C 0280202D */ daddu $a0, $s4, $zero -/* C49420 80242840 0200282D */ daddu $a1, $s0, $zero -/* C49424 80242844 0C090509 */ jal func_80241424_C48004 -/* C49428 80242848 0260302D */ daddu $a2, $s3, $zero -glabel L8024284C_C4942C -/* C4942C 8024284C 0280202D */ daddu $a0, $s4, $zero -/* C49430 80242850 0200282D */ daddu $a1, $s0, $zero -/* C49434 80242854 0C090575 */ jal func_802415D4_C481B4 -/* C49438 80242858 0260302D */ daddu $a2, $s3, $zero -/* C4943C 8024285C 08090A3E */ j .L802428F8 -/* C49440 80242860 0000102D */ daddu $v0, $zero, $zero -glabel L80242864_C49444 -/* C49444 80242864 0280202D */ daddu $a0, $s4, $zero -/* C49448 80242868 0200282D */ daddu $a1, $s0, $zero -/* C4944C 8024286C 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 -/* C49450 80242870 0260302D */ daddu $a2, $s3, $zero -glabel L80242874_C49454 -/* C49454 80242874 0280202D */ daddu $a0, $s4, $zero -/* C49458 80242878 0200282D */ daddu $a1, $s0, $zero -/* C4945C 8024287C 0C09072F */ jal func_80241CBC_C4889C -/* C49460 80242880 0260302D */ daddu $a2, $s3, $zero -/* C49464 80242884 08090A3E */ j .L802428F8 -/* C49468 80242888 0000102D */ daddu $v0, $zero, $zero -glabel L8024288C_C4946C -/* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero -/* C49470 80242890 0200282D */ daddu $a1, $s0, $zero -/* C49474 80242894 0C090800 */ jal dgb_09_UnkNpcAIFunc2 -/* C49478 80242898 0260302D */ daddu $a2, $s3, $zero -glabel L8024289C_C4947C -/* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero -/* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero -/* C49484 802428A4 0C09081E */ jal func_80242078_C48C58 -/* C49488 802428A8 0260302D */ daddu $a2, $s3, $zero -/* C4948C 802428AC 08090A3E */ j .L802428F8 -/* C49490 802428B0 0000102D */ daddu $v0, $zero, $zero -glabel L802428B4_C49494 -/* C49494 802428B4 0280202D */ daddu $a0, $s4, $zero -/* C49498 802428B8 0200282D */ daddu $a1, $s0, $zero -/* C4949C 802428BC 0C090839 */ jal dgb_09_UnkNpcAIFunc14 -/* C494A0 802428C0 0260302D */ daddu $a2, $s3, $zero -/* C494A4 802428C4 08090A3E */ j .L802428F8 -/* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero -glabel L802428CC_C494AC -/* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero -/* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal dgb_09_UnkNpcAIFunc3 -/* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero -/* C494BC 802428DC 08090A3E */ j .L802428F8 -/* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero -glabel L802428E4_C494C4 -/* C494C4 802428E4 0280202D */ daddu $a0, $s4, $zero -/* C494C8 802428E8 0200282D */ daddu $a1, $s0, $zero -/* C494CC 802428EC 0C09089F */ jal func_8024227C_C48E5C -/* C494D0 802428F0 0260302D */ daddu $a2, $s3, $zero -glabel L802428F4_C494D4 -/* C494D4 802428F4 0000102D */ daddu $v0, $zero, $zero -.L802428F8: -/* C494D8 802428F8 8FBF0048 */ lw $ra, 0x48($sp) -/* C494DC 802428FC 8FB50044 */ lw $s5, 0x44($sp) -/* C494E0 80242900 8FB40040 */ lw $s4, 0x40($sp) -/* C494E4 80242904 8FB3003C */ lw $s3, 0x3c($sp) -/* C494E8 80242908 8FB20038 */ lw $s2, 0x38($sp) -/* C494EC 8024290C 8FB10034 */ lw $s1, 0x34($sp) -/* C494F0 80242910 8FB00030 */ lw $s0, 0x30($sp) -/* C494F4 80242914 03E00008 */ jr $ra -/* C494F8 80242918 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s deleted file mode 100644 index 221e569241..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024291C_C494FC -/* C494FC 8024291C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C49500 80242920 AFB3001C */ sw $s3, 0x1c($sp) -/* C49504 80242924 0080982D */ daddu $s3, $a0, $zero -/* C49508 80242928 AFBF0020 */ sw $ra, 0x20($sp) -/* C4950C 8024292C AFB20018 */ sw $s2, 0x18($sp) -/* C49510 80242930 AFB10014 */ sw $s1, 0x14($sp) -/* C49514 80242934 AFB00010 */ sw $s0, 0x10($sp) -/* C49518 80242938 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C4951C 8024293C 8E720148 */ lw $s2, 0x148($s3) -/* C49520 80242940 86440008 */ lh $a0, 8($s2) -/* C49524 80242944 0C00EABB */ jal get_npc_unsafe -/* C49528 80242948 00A0882D */ daddu $s1, $a1, $zero -/* C4952C 8024294C 0040802D */ daddu $s0, $v0, $zero -/* C49530 80242950 9602008E */ lhu $v0, 0x8e($s0) -/* C49534 80242954 2442FFFF */ addiu $v0, $v0, -1 -/* C49538 80242958 A602008E */ sh $v0, 0x8e($s0) -/* C4953C 8024295C 00021400 */ sll $v0, $v0, 0x10 -/* C49540 80242960 1C40003C */ bgtz $v0, .L80242A54 -/* C49544 80242964 3C03FFDF */ lui $v1, 0xffdf -/* C49548 80242968 8E020000 */ lw $v0, ($s0) -/* C4954C 8024296C 3463FFFF */ ori $v1, $v1, 0xffff -/* C49550 80242970 00431024 */ and $v0, $v0, $v1 -/* C49554 80242974 AE020000 */ sw $v0, ($s0) -/* C49558 80242978 8E240020 */ lw $a0, 0x20($s1) -/* C4955C 8024297C 000417C2 */ srl $v0, $a0, 0x1f -/* C49560 80242980 00822021 */ addu $a0, $a0, $v0 -/* C49564 80242984 00042043 */ sra $a0, $a0, 1 -/* C49568 80242988 0C00A67F */ jal rand_int -/* C4956C 8024298C 24840001 */ addiu $a0, $a0, 1 -/* C49570 80242990 8E230020 */ lw $v1, 0x20($s1) -/* C49574 80242994 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C49578 80242998 000327C2 */ srl $a0, $v1, 0x1f -/* C4957C 8024299C 00641821 */ addu $v1, $v1, $a0 -/* C49580 802429A0 00031843 */ sra $v1, $v1, 1 -/* C49584 802429A4 00621821 */ addu $v1, $v1, $v0 -/* C49588 802429A8 A603008E */ sh $v1, 0x8e($s0) -/* C4958C 802429AC 8E4200CC */ lw $v0, 0xcc($s2) -/* C49590 802429B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C49594 802429B4 8C420020 */ lw $v0, 0x20($v0) -/* C49598 802429B8 AE020028 */ sw $v0, 0x28($s0) -/* C4959C 802429BC C6200018 */ lwc1 $f0, 0x18($s1) -/* C495A0 802429C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C495A4 802429C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C495A8 802429C8 E6000018 */ swc1 $f0, 0x18($s0) -/* C495AC 802429CC 8C460028 */ lw $a2, 0x28($v0) -/* C495B0 802429D0 0C00A720 */ jal atan2 -/* C495B4 802429D4 8C470030 */ lw $a3, 0x30($v0) -/* C495B8 802429D8 46000506 */ mov.s $f20, $f0 -/* C495BC 802429DC C60C000C */ lwc1 $f12, 0xc($s0) -/* C495C0 802429E0 0C00A70A */ jal get_clamped_angle_diff -/* C495C4 802429E4 4600A386 */ mov.s $f14, $f20 -/* C495C8 802429E8 46000086 */ mov.s $f2, $f0 -/* C495CC 802429EC 8E22001C */ lw $v0, 0x1c($s1) -/* C495D0 802429F0 46001005 */ abs.s $f0, $f2 -/* C495D4 802429F4 44822000 */ mtc1 $v0, $f4 -/* C495D8 802429F8 00000000 */ nop -/* C495DC 802429FC 46802120 */ cvt.s.w $f4, $f4 -/* C495E0 80242A00 4600203C */ c.lt.s $f4, $f0 -/* C495E4 80242A04 00000000 */ nop -/* C495E8 80242A08 4500000D */ bc1f .L80242A40 -/* C495EC 80242A0C 00000000 */ nop -/* C495F0 80242A10 44800000 */ mtc1 $zero, $f0 -/* C495F4 80242A14 C614000C */ lwc1 $f20, 0xc($s0) -/* C495F8 80242A18 4600103C */ c.lt.s $f2, $f0 -/* C495FC 80242A1C 00000000 */ nop -/* C49600 80242A20 45000006 */ bc1f .L80242A3C -/* C49604 80242A24 00021023 */ negu $v0, $v0 -/* C49608 80242A28 44820000 */ mtc1 $v0, $f0 -/* C4960C 80242A2C 00000000 */ nop -/* C49610 80242A30 46800020 */ cvt.s.w $f0, $f0 -/* C49614 80242A34 08090A90 */ j .L80242A40 -/* C49618 80242A38 4600A500 */ add.s $f20, $f20, $f0 -.L80242A3C: -/* C4961C 80242A3C 4604A500 */ add.s $f20, $f20, $f4 -.L80242A40: -/* C49620 80242A40 0C00A6C9 */ jal clamp_angle -/* C49624 80242A44 4600A306 */ mov.s $f12, $f20 -/* C49628 80242A48 2402000D */ addiu $v0, $zero, 0xd -/* C4962C 80242A4C E600000C */ swc1 $f0, 0xc($s0) -/* C49630 80242A50 AE620070 */ sw $v0, 0x70($s3) -.L80242A54: -/* C49634 80242A54 8FBF0020 */ lw $ra, 0x20($sp) -/* C49638 80242A58 8FB3001C */ lw $s3, 0x1c($sp) -/* C4963C 80242A5C 8FB20018 */ lw $s2, 0x18($sp) -/* C49640 80242A60 8FB10014 */ lw $s1, 0x14($sp) -/* C49644 80242A64 8FB00010 */ lw $s0, 0x10($sp) -/* C49648 80242A68 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C4964C 80242A6C 03E00008 */ jr $ra -/* C49650 80242A70 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s deleted file mode 100644 index ac7b59b456..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A74_C49654 -/* C49654 80242A74 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C49658 80242A78 AFB30024 */ sw $s3, 0x24($sp) -/* C4965C 80242A7C 0080982D */ daddu $s3, $a0, $zero -/* C49660 80242A80 AFBF0028 */ sw $ra, 0x28($sp) -/* C49664 80242A84 AFB20020 */ sw $s2, 0x20($sp) -/* C49668 80242A88 AFB1001C */ sw $s1, 0x1c($sp) -/* C4966C 80242A8C AFB00018 */ sw $s0, 0x18($sp) -/* C49670 80242A90 8E700148 */ lw $s0, 0x148($s3) -/* C49674 80242A94 00A0902D */ daddu $s2, $a1, $zero -/* C49678 80242A98 86040008 */ lh $a0, 8($s0) -/* C4967C 80242A9C 0C00EABB */ jal get_npc_unsafe -/* C49680 80242AA0 00C0882D */ daddu $s1, $a2, $zero -/* C49684 80242AA4 0220202D */ daddu $a0, $s1, $zero -/* C49688 80242AA8 0200282D */ daddu $a1, $s0, $zero -/* C4968C 80242AAC 24030001 */ addiu $v1, $zero, 1 -/* C49690 80242AB0 AFA30010 */ sw $v1, 0x10($sp) -/* C49694 80242AB4 8E460024 */ lw $a2, 0x24($s2) -/* C49698 80242AB8 8E470028 */ lw $a3, 0x28($s2) -/* C4969C 80242ABC 0C01242D */ jal func_800490B4 -/* C496A0 80242AC0 0040802D */ daddu $s0, $v0, $zero -/* C496A4 80242AC4 10400024 */ beqz $v0, .L80242B58 -/* C496A8 80242AC8 24020010 */ addiu $v0, $zero, 0x10 -/* C496AC 80242ACC 8E050018 */ lw $a1, 0x18($s0) -/* C496B0 80242AD0 8E06000C */ lw $a2, 0xc($s0) -/* C496B4 80242AD4 0C00EA95 */ jal npc_move_heading -/* C496B8 80242AD8 0200202D */ daddu $a0, $s0, $zero -/* C496BC 80242ADC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C496C0 80242AE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C496C4 80242AE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C496C8 80242AE8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C496CC 80242AEC 8C460028 */ lw $a2, 0x28($v0) -/* C496D0 80242AF0 0C00A7B5 */ jal dist2D -/* C496D4 80242AF4 8C470030 */ lw $a3, 0x30($v0) -/* C496D8 80242AF8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C496DC 80242AFC 3C014004 */ lui $at, 0x4004 -/* C496E0 80242B00 44812800 */ mtc1 $at, $f5 -/* C496E4 80242B04 44802000 */ mtc1 $zero, $f4 -/* C496E8 80242B08 460010A1 */ cvt.d.s $f2, $f2 -/* C496EC 80242B0C 46241082 */ mul.d $f2, $f2, $f4 -/* C496F0 80242B10 00000000 */ nop -/* C496F4 80242B14 46000021 */ cvt.d.s $f0, $f0 -/* C496F8 80242B18 4622003E */ c.le.d $f0, $f2 -/* C496FC 80242B1C 00000000 */ nop -/* C49700 80242B20 45000003 */ bc1f .L80242B30 -/* C49704 80242B24 2402000E */ addiu $v0, $zero, 0xe -/* C49708 80242B28 08090AD6 */ j .L80242B58 -/* C4970C 80242B2C A600008E */ sh $zero, 0x8e($s0) -.L80242B30: -/* C49710 80242B30 9602008E */ lhu $v0, 0x8e($s0) -/* C49714 80242B34 2442FFFF */ addiu $v0, $v0, -1 -/* C49718 80242B38 A602008E */ sh $v0, 0x8e($s0) -/* C4971C 80242B3C 00021400 */ sll $v0, $v0, 0x10 -/* C49720 80242B40 1C400006 */ bgtz $v0, .L80242B5C -/* C49724 80242B44 3C030020 */ lui $v1, 0x20 -/* C49728 80242B48 8E020000 */ lw $v0, ($s0) -/* C4972C 80242B4C 00431025 */ or $v0, $v0, $v1 -/* C49730 80242B50 AE020000 */ sw $v0, ($s0) -/* C49734 80242B54 2402000C */ addiu $v0, $zero, 0xc -.L80242B58: -/* C49738 80242B58 AE620070 */ sw $v0, 0x70($s3) -.L80242B5C: -/* C4973C 80242B5C 8FBF0028 */ lw $ra, 0x28($sp) -/* C49740 80242B60 8FB30024 */ lw $s3, 0x24($sp) -/* C49744 80242B64 8FB20020 */ lw $s2, 0x20($sp) -/* C49748 80242B68 8FB1001C */ lw $s1, 0x1c($sp) -/* C4974C 80242B6C 8FB00018 */ lw $s0, 0x18($sp) -/* C49750 80242B70 03E00008 */ jr $ra -/* C49754 80242B74 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s deleted file mode 100644 index 2b8ba70ff0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B78_C49758 -/* C49758 80242B78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C4975C 80242B7C AFB20020 */ sw $s2, 0x20($sp) -/* C49760 80242B80 0080902D */ daddu $s2, $a0, $zero -/* C49764 80242B84 AFBF0024 */ sw $ra, 0x24($sp) -/* C49768 80242B88 AFB1001C */ sw $s1, 0x1c($sp) -/* C4976C 80242B8C AFB00018 */ sw $s0, 0x18($sp) -/* C49770 80242B90 8E500148 */ lw $s0, 0x148($s2) -/* C49774 80242B94 0C00EABB */ jal get_npc_unsafe -/* C49778 80242B98 86040008 */ lh $a0, 8($s0) -/* C4977C 80242B9C 0040882D */ daddu $s1, $v0, $zero -/* C49780 80242BA0 8E02006C */ lw $v0, 0x6c($s0) -/* C49784 80242BA4 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C49788 80242BA8 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C4978C 80242BAC 34420100 */ ori $v0, $v0, 0x100 -/* C49790 80242BB0 AE02006C */ sw $v0, 0x6c($s0) -/* C49794 80242BB4 C4600028 */ lwc1 $f0, 0x28($v1) -/* C49798 80242BB8 E6200038 */ swc1 $f0, 0x38($s1) -/* C4979C 80242BBC C4600030 */ lwc1 $f0, 0x30($v1) -/* C497A0 80242BC0 E6200040 */ swc1 $f0, 0x40($s1) -/* C497A4 80242BC4 8E03006C */ lw $v1, 0x6c($s0) -/* C497A8 80242BC8 30621000 */ andi $v0, $v1, 0x1000 -/* C497AC 80242BCC 14400003 */ bnez $v0, .L80242BDC -/* C497B0 80242BD0 3C048000 */ lui $a0, 0x8000 -/* C497B4 80242BD4 34621000 */ ori $v0, $v1, 0x1000 -/* C497B8 80242BD8 AE02006C */ sw $v0, 0x6c($s0) -.L80242BDC: -/* C497BC 80242BDC C6200040 */ lwc1 $f0, 0x40($s1) -/* C497C0 80242BE0 34840011 */ ori $a0, $a0, 0x11 -/* C497C4 80242BE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C497C8 80242BE8 8E260038 */ lw $a2, 0x38($s1) -/* C497CC 80242BEC 8E27003C */ lw $a3, 0x3c($s1) -/* C497D0 80242BF0 0C052757 */ jal sfx_play_sound_at_position -/* C497D4 80242BF4 24050002 */ addiu $a1, $zero, 2 -/* C497D8 80242BF8 2402000F */ addiu $v0, $zero, 0xf -/* C497DC 80242BFC A620008E */ sh $zero, 0x8e($s1) -/* C497E0 80242C00 AE420070 */ sw $v0, 0x70($s2) -/* C497E4 80242C04 8FBF0024 */ lw $ra, 0x24($sp) -/* C497E8 80242C08 8FB20020 */ lw $s2, 0x20($sp) -/* C497EC 80242C0C 8FB1001C */ lw $s1, 0x1c($sp) -/* C497F0 80242C10 8FB00018 */ lw $s0, 0x18($sp) -/* C497F4 80242C14 03E00008 */ jr $ra -/* C497F8 80242C18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s deleted file mode 100644 index a87c93c3e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C1C_C497FC -/* C497FC 80242C1C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C49800 80242C20 AFB40040 */ sw $s4, 0x40($sp) -/* C49804 80242C24 0080A02D */ daddu $s4, $a0, $zero -/* C49808 80242C28 AFBF0044 */ sw $ra, 0x44($sp) -/* C4980C 80242C2C AFB3003C */ sw $s3, 0x3c($sp) -/* C49810 80242C30 AFB20038 */ sw $s2, 0x38($sp) -/* C49814 80242C34 AFB10034 */ sw $s1, 0x34($sp) -/* C49818 80242C38 AFB00030 */ sw $s0, 0x30($sp) -/* C4981C 80242C3C 8E930148 */ lw $s3, 0x148($s4) -/* C49820 80242C40 00A0802D */ daddu $s0, $a1, $zero -/* C49824 80242C44 86640008 */ lh $a0, 8($s3) -/* C49828 80242C48 0C00EABB */ jal get_npc_unsafe -/* C4982C 80242C4C 00C0882D */ daddu $s1, $a2, $zero -/* C49830 80242C50 3C048000 */ lui $a0, 0x8000 -/* C49834 80242C54 0040902D */ daddu $s2, $v0, $zero -/* C49838 80242C58 C6400040 */ lwc1 $f0, 0x40($s2) -/* C4983C 80242C5C 34840011 */ ori $a0, $a0, 0x11 -/* C49840 80242C60 E7A00010 */ swc1 $f0, 0x10($sp) -/* C49844 80242C64 8E460038 */ lw $a2, 0x38($s2) -/* C49848 80242C68 8E47003C */ lw $a3, 0x3c($s2) -/* C4984C 80242C6C 0C05267B */ jal sfx_adjust_env_sound_pos -/* C49850 80242C70 24050002 */ addiu $a1, $zero, 2 -/* C49854 80242C74 0220202D */ daddu $a0, $s1, $zero -/* C49858 80242C78 24020001 */ addiu $v0, $zero, 1 -/* C4985C 80242C7C AFA20010 */ sw $v0, 0x10($sp) -/* C49860 80242C80 8E060024 */ lw $a2, 0x24($s0) -/* C49864 80242C84 8E070028 */ lw $a3, 0x28($s0) -/* C49868 80242C88 0C01242D */ jal func_800490B4 -/* C4986C 80242C8C 0260282D */ daddu $a1, $s3, $zero -/* C49870 80242C90 1440000B */ bnez $v0, .L80242CC0 -/* C49874 80242C94 3C04FFDF */ lui $a0, 0xffdf -/* C49878 80242C98 8E62006C */ lw $v0, 0x6c($s3) -/* C4987C 80242C9C 2403FEFF */ addiu $v1, $zero, -0x101 -/* C49880 80242CA0 00431024 */ and $v0, $v0, $v1 -/* C49884 80242CA4 AE62006C */ sw $v0, 0x6c($s3) -/* C49888 80242CA8 8E420000 */ lw $v0, ($s2) -/* C4988C 80242CAC 3484FFFF */ ori $a0, $a0, 0xffff -/* C49890 80242CB0 AE400048 */ sw $zero, 0x48($s2) -/* C49894 80242CB4 00441024 */ and $v0, $v0, $a0 -/* C49898 80242CB8 08090BA4 */ j .L80242E90 -/* C4989C 80242CBC AE420000 */ sw $v0, ($s2) -.L80242CC0: -/* C498A0 80242CC0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C498A4 80242CC4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C498A8 80242CC8 C6440048 */ lwc1 $f4, 0x48($s2) -/* C498AC 80242CCC 3C0141C8 */ lui $at, 0x41c8 -/* C498B0 80242CD0 44810000 */ mtc1 $at, $f0 -/* C498B4 80242CD4 8E020000 */ lw $v0, ($s0) -/* C498B8 80242CD8 46002100 */ add.s $f4, $f4, $f0 -/* C498BC 80242CDC C4420028 */ lwc1 $f2, 0x28($v0) -/* C498C0 80242CE0 3C014000 */ lui $at, 0x4000 -/* C498C4 80242CE4 44810000 */ mtc1 $at, $f0 -/* C498C8 80242CE8 E6420038 */ swc1 $f2, 0x38($s2) -/* C498CC 80242CEC C4420030 */ lwc1 $f2, 0x30($v0) -/* C498D0 80242CF0 46001080 */ add.s $f2, $f2, $f0 -/* C498D4 80242CF4 3C018024 */ lui $at, %hi(D_80245718_C4C2F8) -/* C498D8 80242CF8 D4265718 */ ldc1 $f6, %lo(D_80245718_C4C2F8)($at) -/* C498DC 80242CFC 46002021 */ cvt.d.s $f0, $f4 -/* C498E0 80242D00 4620303C */ c.lt.d $f6, $f0 -/* C498E4 80242D04 E6440048 */ swc1 $f4, 0x48($s2) -/* C498E8 80242D08 45000004 */ bc1f .L80242D1C -/* C498EC 80242D0C E6420040 */ swc1 $f2, 0x40($s2) -/* C498F0 80242D10 46260001 */ sub.d $f0, $f0, $f6 -/* C498F4 80242D14 46200020 */ cvt.s.d $f0, $f0 -/* C498F8 80242D18 E6400048 */ swc1 $f0, 0x48($s2) -.L80242D1C: -/* C498FC 80242D1C 3C02B60B */ lui $v0, 0xb60b -/* C49900 80242D20 C6400048 */ lwc1 $f0, 0x48($s2) -/* C49904 80242D24 344260B7 */ ori $v0, $v0, 0x60b7 -/* C49908 80242D28 4600020D */ trunc.w.s $f8, $f0 -/* C4990C 80242D2C 44044000 */ mfc1 $a0, $f8 -/* C49910 80242D30 00000000 */ nop -/* C49914 80242D34 00820018 */ mult $a0, $v0 -/* C49918 80242D38 00041FC3 */ sra $v1, $a0, 0x1f -/* C4991C 80242D3C 00004010 */ mfhi $t0 -/* C49920 80242D40 01041021 */ addu $v0, $t0, $a0 -/* C49924 80242D44 000211C3 */ sra $v0, $v0, 7 -/* C49928 80242D48 00431023 */ subu $v0, $v0, $v1 -/* C4992C 80242D4C 00021840 */ sll $v1, $v0, 1 -/* C49930 80242D50 00621821 */ addu $v1, $v1, $v0 -/* C49934 80242D54 00031100 */ sll $v0, $v1, 4 -/* C49938 80242D58 00431023 */ subu $v0, $v0, $v1 -/* C4993C 80242D5C 00021080 */ sll $v0, $v0, 2 -/* C49940 80242D60 00822023 */ subu $a0, $a0, $v0 -/* C49944 80242D64 00042400 */ sll $a0, $a0, 0x10 -/* C49948 80242D68 0C00A4F5 */ jal cosine -/* C4994C 80242D6C 00042403 */ sra $a0, $a0, 0x10 -/* C49950 80242D70 3C014260 */ lui $at, 0x4260 -/* C49954 80242D74 44811000 */ mtc1 $at, $f2 -/* C49958 80242D78 00000000 */ nop -/* C4995C 80242D7C 46020002 */ mul.s $f0, $f0, $f2 -/* C49960 80242D80 00000000 */ nop -/* C49964 80242D84 24050006 */ addiu $a1, $zero, 6 -/* C49968 80242D88 3C01437F */ lui $at, 0x437f -/* C4996C 80242D8C 44811000 */ mtc1 $at, $f2 -/* C49970 80242D90 240200FF */ addiu $v0, $zero, 0xff -/* C49974 80242D94 46001081 */ sub.s $f2, $f2, $f0 -/* C49978 80242D98 AFA20014 */ sw $v0, 0x14($sp) -/* C4997C 80242D9C AFA00018 */ sw $zero, 0x18($sp) -/* C49980 80242DA0 4600120D */ trunc.w.s $f8, $f2 -/* C49984 80242DA4 44064000 */ mfc1 $a2, $f8 -/* C49988 80242DA8 00000000 */ nop -/* C4998C 80242DAC AFA60010 */ sw $a2, 0x10($sp) -/* C49990 80242DB0 8E440024 */ lw $a0, 0x24($s2) -/* C49994 80242DB4 0C0B7A25 */ jal func_802DE894 -/* C49998 80242DB8 00C0382D */ daddu $a3, $a2, $zero -/* C4999C 80242DBC 27A50020 */ addiu $a1, $sp, 0x20 -/* C499A0 80242DC0 27A60024 */ addiu $a2, $sp, 0x24 -/* C499A4 80242DC4 8E020000 */ lw $v0, ($s0) -/* C499A8 80242DC8 3C01447A */ lui $at, 0x447a -/* C499AC 80242DCC 44810000 */ mtc1 $at, $f0 -/* C499B0 80242DD0 C4420028 */ lwc1 $f2, 0x28($v0) -/* C499B4 80242DD4 C444002C */ lwc1 $f4, 0x2c($v0) -/* C499B8 80242DD8 C4460030 */ lwc1 $f6, 0x30($v0) -/* C499BC 80242DDC 27A2002C */ addiu $v0, $sp, 0x2c -/* C499C0 80242DE0 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C499C4 80242DE4 E7A20020 */ swc1 $f2, 0x20($sp) -/* C499C8 80242DE8 E7A40024 */ swc1 $f4, 0x24($sp) -/* C499CC 80242DEC E7A60028 */ swc1 $f6, 0x28($sp) -/* C499D0 80242DF0 AFA20010 */ sw $v0, 0x10($sp) -/* C499D4 80242DF4 8E440080 */ lw $a0, 0x80($s2) -/* C499D8 80242DF8 0C0372DF */ jal func_800DCB7C -/* C499DC 80242DFC 27A70028 */ addiu $a3, $sp, 0x28 -/* C499E0 80242E00 C644003C */ lwc1 $f4, 0x3c($s2) -/* C499E4 80242E04 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C499E8 80242E08 46002001 */ sub.s $f0, $f4, $f0 -/* C499EC 80242E0C 3C014038 */ lui $at, 0x4038 -/* C499F0 80242E10 44811800 */ mtc1 $at, $f3 -/* C499F4 80242E14 44801000 */ mtc1 $zero, $f2 -/* C499F8 80242E18 46000005 */ abs.s $f0, $f0 -/* C499FC 80242E1C 46000021 */ cvt.d.s $f0, $f0 -/* C49A00 80242E20 4620103C */ c.lt.d $f2, $f0 -/* C49A04 80242E24 00000000 */ nop -/* C49A08 80242E28 45000008 */ bc1f .L80242E4C -/* C49A0C 80242E2C 3C03FFDF */ lui $v1, 0xffdf -/* C49A10 80242E30 3C018024 */ lui $at, %hi(D_80245720_C4C300) -/* C49A14 80242E34 D4225720 */ ldc1 $f2, %lo(D_80245720_C4C300)($at) -/* C49A18 80242E38 46002021 */ cvt.d.s $f0, $f4 -/* C49A1C 80242E3C 46220001 */ sub.d $f0, $f0, $f2 -/* C49A20 80242E40 46200020 */ cvt.s.d $f0, $f0 -/* C49A24 80242E44 08090BA6 */ j .L80242E98 -/* C49A28 80242E48 E640003C */ swc1 $f0, 0x3c($s2) -.L80242E4C: -/* C49A2C 80242E4C 8E420000 */ lw $v0, ($s2) -/* C49A30 80242E50 3463FFFF */ ori $v1, $v1, 0xffff -/* C49A34 80242E54 AE400048 */ sw $zero, 0x48($s2) -/* C49A38 80242E58 00431024 */ and $v0, $v0, $v1 -/* C49A3C 80242E5C AE420000 */ sw $v0, ($s2) -/* C49A40 80242E60 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C49A44 80242E64 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C49A48 80242E68 24020009 */ addiu $v0, $zero, 9 -/* C49A4C 80242E6C 10620009 */ beq $v1, $v0, .L80242E94 -/* C49A50 80242E70 24020010 */ addiu $v0, $zero, 0x10 -/* C49A54 80242E74 0C03805E */ jal disable_player_input -/* C49A58 80242E78 00000000 */ nop -/* C49A5C 80242E7C 0C03BD8A */ jal func_800EF628 -/* C49A60 80242E80 00000000 */ nop -/* C49A64 80242E84 24020014 */ addiu $v0, $zero, 0x14 -/* C49A68 80242E88 08090BA5 */ j .L80242E94 -/* C49A6C 80242E8C A640008E */ sh $zero, 0x8e($s2) -.L80242E90: -/* C49A70 80242E90 24020010 */ addiu $v0, $zero, 0x10 -.L80242E94: -/* C49A74 80242E94 AE820070 */ sw $v0, 0x70($s4) -.L80242E98: -/* C49A78 80242E98 8FBF0044 */ lw $ra, 0x44($sp) -/* C49A7C 80242E9C 8FB40040 */ lw $s4, 0x40($sp) -/* C49A80 80242EA0 8FB3003C */ lw $s3, 0x3c($sp) -/* C49A84 80242EA4 8FB20038 */ lw $s2, 0x38($sp) -/* C49A88 80242EA8 8FB10034 */ lw $s1, 0x34($sp) -/* C49A8C 80242EAC 8FB00030 */ lw $s0, 0x30($sp) -/* C49A90 80242EB0 03E00008 */ jr $ra -/* C49A94 80242EB4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s deleted file mode 100644 index 2d93cb4d7f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EB8_C49A98 -/* C49A98 80242EB8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C49A9C 80242EBC AFB20028 */ sw $s2, 0x28($sp) -/* C49AA0 80242EC0 0080902D */ daddu $s2, $a0, $zero -/* C49AA4 80242EC4 AFBF002C */ sw $ra, 0x2c($sp) -/* C49AA8 80242EC8 AFB10024 */ sw $s1, 0x24($sp) -/* C49AAC 80242ECC AFB00020 */ sw $s0, 0x20($sp) -/* C49AB0 80242ED0 8E500148 */ lw $s0, 0x148($s2) -/* C49AB4 80242ED4 0C00EABB */ jal get_npc_unsafe -/* C49AB8 80242ED8 86040008 */ lh $a0, 8($s0) -/* C49ABC 80242EDC 2404FEFF */ addiu $a0, $zero, -0x101 -/* C49AC0 80242EE0 0040882D */ daddu $s1, $v0, $zero -/* C49AC4 80242EE4 0000282D */ daddu $a1, $zero, $zero -/* C49AC8 80242EE8 8E03006C */ lw $v1, 0x6c($s0) -/* C49ACC 80242EEC 00A0302D */ daddu $a2, $a1, $zero -/* C49AD0 80242EF0 00641824 */ and $v1, $v1, $a0 -/* C49AD4 80242EF4 AE03006C */ sw $v1, 0x6c($s0) -/* C49AD8 80242EF8 AFA00010 */ sw $zero, 0x10($sp) -/* C49ADC 80242EFC AFA00014 */ sw $zero, 0x14($sp) -/* C49AE0 80242F00 AFA00018 */ sw $zero, 0x18($sp) -/* C49AE4 80242F04 8E240024 */ lw $a0, 0x24($s1) -/* C49AE8 80242F08 0C0B7A25 */ jal func_802DE894 -/* C49AEC 80242F0C 00A0382D */ daddu $a3, $a1, $zero -/* C49AF0 80242F10 8E02006C */ lw $v0, 0x6c($s0) -/* C49AF4 80242F14 30421000 */ andi $v0, $v0, 0x1000 -/* C49AF8 80242F18 10400008 */ beqz $v0, .L80242F3C -/* C49AFC 80242F1C 00000000 */ nop -/* C49B00 80242F20 3C048000 */ lui $a0, 0x8000 -/* C49B04 80242F24 0C05271B */ jal sfx_stop_sound -/* C49B08 80242F28 34840011 */ ori $a0, $a0, 0x11 -/* C49B0C 80242F2C 8E02006C */ lw $v0, 0x6c($s0) -/* C49B10 80242F30 2403EFFF */ addiu $v1, $zero, -0x1001 -/* C49B14 80242F34 00431024 */ and $v0, $v0, $v1 -/* C49B18 80242F38 AE02006C */ sw $v0, 0x6c($s0) -.L80242F3C: -/* C49B1C 80242F3C 8E0200CC */ lw $v0, 0xcc($s0) -/* C49B20 80242F40 8C430024 */ lw $v1, 0x24($v0) -/* C49B24 80242F44 24020014 */ addiu $v0, $zero, 0x14 -/* C49B28 80242F48 A622008E */ sh $v0, 0x8e($s1) -/* C49B2C 80242F4C 24020011 */ addiu $v0, $zero, 0x11 -/* C49B30 80242F50 AE230028 */ sw $v1, 0x28($s1) -/* C49B34 80242F54 AE420070 */ sw $v0, 0x70($s2) -/* C49B38 80242F58 8FBF002C */ lw $ra, 0x2c($sp) -/* C49B3C 80242F5C 8FB20028 */ lw $s2, 0x28($sp) -/* C49B40 80242F60 8FB10024 */ lw $s1, 0x24($sp) -/* C49B44 80242F64 8FB00020 */ lw $s0, 0x20($sp) -/* C49B48 80242F68 03E00008 */ jr $ra -/* C49B4C 80242F6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s deleted file mode 100644 index 5cc3703862..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F70_C49B50 -/* C49B50 80242F70 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C49B54 80242F74 AFB20048 */ sw $s2, 0x48($sp) -/* C49B58 80242F78 0080902D */ daddu $s2, $a0, $zero -/* C49B5C 80242F7C AFBF004C */ sw $ra, 0x4c($sp) -/* C49B60 80242F80 AFB10044 */ sw $s1, 0x44($sp) -/* C49B64 80242F84 AFB00040 */ sw $s0, 0x40($sp) -/* C49B68 80242F88 F7B40050 */ sdc1 $f20, 0x50($sp) -/* C49B6C 80242F8C 8E500148 */ lw $s0, 0x148($s2) -/* C49B70 80242F90 0C00EABB */ jal get_npc_unsafe -/* C49B74 80242F94 86040008 */ lh $a0, 8($s0) -/* C49B78 80242F98 27A50028 */ addiu $a1, $sp, 0x28 -/* C49B7C 80242F9C 0040882D */ daddu $s1, $v0, $zero -/* C49B80 80242FA0 27A6002C */ addiu $a2, $sp, 0x2c -/* C49B84 80242FA4 27A70030 */ addiu $a3, $sp, 0x30 -/* C49B88 80242FA8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C49B8C 80242FAC 3C014004 */ lui $at, 0x4004 -/* C49B90 80242FB0 44811800 */ mtc1 $at, $f3 -/* C49B94 80242FB4 44801000 */ mtc1 $zero, $f2 -/* C49B98 80242FB8 C6260038 */ lwc1 $f6, 0x38($s1) -/* C49B9C 80242FBC 46000021 */ cvt.d.s $f0, $f0 -/* C49BA0 80242FC0 46220000 */ add.d $f0, $f0, $f2 -/* C49BA4 80242FC4 3C01447A */ lui $at, 0x447a -/* C49BA8 80242FC8 44812000 */ mtc1 $at, $f4 -/* C49BAC 80242FCC C6020078 */ lwc1 $f2, 0x78($s0) -/* C49BB0 80242FD0 468010A0 */ cvt.s.w $f2, $f2 -/* C49BB4 80242FD4 46200020 */ cvt.s.d $f0, $f0 -/* C49BB8 80242FD8 E620003C */ swc1 $f0, 0x3c($s1) -/* C49BBC 80242FDC 46000206 */ mov.s $f8, $f0 -/* C49BC0 80242FE0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C49BC4 80242FE4 27A20034 */ addiu $v0, $sp, 0x34 -/* C49BC8 80242FE8 E7A00030 */ swc1 $f0, 0x30($sp) -/* C49BCC 80242FEC 3C014059 */ lui $at, 0x4059 -/* C49BD0 80242FF0 44810800 */ mtc1 $at, $f1 -/* C49BD4 80242FF4 44800000 */ mtc1 $zero, $f0 -/* C49BD8 80242FF8 460010A1 */ cvt.d.s $f2, $f2 -/* C49BDC 80242FFC E7A60028 */ swc1 $f6, 0x28($sp) -/* C49BE0 80243000 E7A40034 */ swc1 $f4, 0x34($sp) -/* C49BE4 80243004 E7A8002C */ swc1 $f8, 0x2c($sp) -/* C49BE8 80243008 AFA20010 */ sw $v0, 0x10($sp) -/* C49BEC 8024300C 8E240080 */ lw $a0, 0x80($s1) -/* C49BF0 80243010 46201083 */ div.d $f2, $f2, $f0 -/* C49BF4 80243014 0C0372DF */ jal func_800DCB7C -/* C49BF8 80243018 46201520 */ cvt.s.d $f20, $f2 -/* C49BFC 8024301C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C49C00 80243020 46140000 */ add.s $f0, $f0, $f20 -/* C49C04 80243024 C622003C */ lwc1 $f2, 0x3c($s1) -/* C49C08 80243028 4600103C */ c.lt.s $f2, $f0 -/* C49C0C 8024302C 00000000 */ nop -/* C49C10 80243030 45010028 */ bc1t .L802430D4 -/* C49C14 80243034 00000000 */ nop -/* C49C18 80243038 8E0200D0 */ lw $v0, 0xd0($s0) -/* C49C1C 8024303C C62C0038 */ lwc1 $f12, 0x38($s1) -/* C49C20 80243040 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C49C24 80243044 C44A0000 */ lwc1 $f10, ($v0) -/* C49C28 80243048 468052A0 */ cvt.s.w $f10, $f10 -/* C49C2C 8024304C 44065000 */ mfc1 $a2, $f10 -/* C49C30 80243050 C44A0008 */ lwc1 $f10, 8($v0) -/* C49C34 80243054 468052A0 */ cvt.s.w $f10, $f10 -/* C49C38 80243058 44075000 */ mfc1 $a3, $f10 -/* C49C3C 8024305C 0C00A720 */ jal atan2 -/* C49C40 80243060 2410000A */ addiu $s0, $zero, 0xa -/* C49C44 80243064 24040002 */ addiu $a0, $zero, 2 -/* C49C48 80243068 0220282D */ daddu $a1, $s1, $zero -/* C49C4C 8024306C 0000302D */ daddu $a2, $zero, $zero -/* C49C50 80243070 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* C49C54 80243074 862200A8 */ lh $v0, 0xa8($s1) -/* C49C58 80243078 E620000C */ swc1 $f0, 0xc($s1) -/* C49C5C 8024307C 3C013F80 */ lui $at, 0x3f80 -/* C49C60 80243080 44810000 */ mtc1 $at, $f0 -/* C49C64 80243084 3C014000 */ lui $at, 0x4000 -/* C49C68 80243088 44812000 */ mtc1 $at, $f4 -/* C49C6C 8024308C 3C01C1A0 */ lui $at, 0xc1a0 -/* C49C70 80243090 44813000 */ mtc1 $at, $f6 -/* C49C74 80243094 44825000 */ mtc1 $v0, $f10 -/* C49C78 80243098 00000000 */ nop -/* C49C7C 8024309C 468052A0 */ cvt.s.w $f10, $f10 -/* C49C80 802430A0 46141080 */ add.s $f2, $f2, $f20 -/* C49C84 802430A4 44075000 */ mfc1 $a3, $f10 -/* C49C88 802430A8 27A20038 */ addiu $v0, $sp, 0x38 -/* C49C8C 802430AC E622003C */ swc1 $f2, 0x3c($s1) -/* C49C90 802430B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C49C94 802430B4 E7A40014 */ swc1 $f4, 0x14($sp) -/* C49C98 802430B8 E7A60018 */ swc1 $f6, 0x18($sp) -/* C49C9C 802430BC AFB0001C */ sw $s0, 0x1c($sp) -/* C49CA0 802430C0 0C01BFA4 */ jal fx_emote -/* C49CA4 802430C4 AFA20020 */ sw $v0, 0x20($sp) -/* C49CA8 802430C8 24020012 */ addiu $v0, $zero, 0x12 -/* C49CAC 802430CC A630008E */ sh $s0, 0x8e($s1) -/* C49CB0 802430D0 AE420070 */ sw $v0, 0x70($s2) -.L802430D4: -/* C49CB4 802430D4 8FBF004C */ lw $ra, 0x4c($sp) -/* C49CB8 802430D8 8FB20048 */ lw $s2, 0x48($sp) -/* C49CBC 802430DC 8FB10044 */ lw $s1, 0x44($sp) -/* C49CC0 802430E0 8FB00040 */ lw $s0, 0x40($sp) -/* C49CC4 802430E4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* C49CC8 802430E8 03E00008 */ jr $ra -/* C49CCC 802430EC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802430F0_C49CD0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802430F0_C49CD0.s deleted file mode 100644 index 9556a309e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802430F0_C49CD0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430F0_C49CD0 -/* C49CD0 802430F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C49CD4 802430F4 AFB00010 */ sw $s0, 0x10($sp) -/* C49CD8 802430F8 0080802D */ daddu $s0, $a0, $zero -/* C49CDC 802430FC AFBF0014 */ sw $ra, 0x14($sp) -/* C49CE0 80243100 8E020148 */ lw $v0, 0x148($s0) -/* C49CE4 80243104 0C00EABB */ jal get_npc_unsafe -/* C49CE8 80243108 84440008 */ lh $a0, 8($v0) -/* C49CEC 8024310C 9443008E */ lhu $v1, 0x8e($v0) -/* C49CF0 80243110 2463FFFF */ addiu $v1, $v1, -1 -/* C49CF4 80243114 A443008E */ sh $v1, 0x8e($v0) -/* C49CF8 80243118 00031C00 */ sll $v1, $v1, 0x10 -/* C49CFC 8024311C 1C600002 */ bgtz $v1, .L80243128 -/* C49D00 80243120 2402001E */ addiu $v0, $zero, 0x1e -/* C49D04 80243124 AE020070 */ sw $v0, 0x70($s0) -.L80243128: -/* C49D08 80243128 8FBF0014 */ lw $ra, 0x14($sp) -/* C49D0C 8024312C 8FB00010 */ lw $s0, 0x10($sp) -/* C49D10 80243130 03E00008 */ jr $ra -/* C49D14 80243134 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s deleted file mode 100644 index 0ba7da725e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243138_C49D18 -/* C49D18 80243138 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C49D1C 8024313C AFB00010 */ sw $s0, 0x10($sp) -/* C49D20 80243140 0080802D */ daddu $s0, $a0, $zero -/* C49D24 80243144 AFBF0014 */ sw $ra, 0x14($sp) -/* C49D28 80243148 8E020148 */ lw $v0, 0x148($s0) -/* C49D2C 8024314C 0C00EABB */ jal get_npc_unsafe -/* C49D30 80243150 84440008 */ lh $a0, 8($v0) -/* C49D34 80243154 0040202D */ daddu $a0, $v0, $zero -/* C49D38 80243158 9482008E */ lhu $v0, 0x8e($a0) -/* C49D3C 8024315C 24420001 */ addiu $v0, $v0, 1 -/* C49D40 80243160 A482008E */ sh $v0, 0x8e($a0) -/* C49D44 80243164 00021400 */ sll $v0, $v0, 0x10 -/* C49D48 80243168 00021403 */ sra $v0, $v0, 0x10 -/* C49D4C 8024316C 28420003 */ slti $v0, $v0, 3 -/* C49D50 80243170 1440000D */ bnez $v0, .L802431A8 -/* C49D54 80243174 24020009 */ addiu $v0, $zero, 9 -/* C49D58 80243178 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C49D5C 8024317C 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C49D60 80243180 10620003 */ beq $v1, $v0, .L80243190 -/* C49D64 80243184 24020064 */ addiu $v0, $zero, 0x64 -/* C49D68 80243188 08090C69 */ j .L802431A4 -/* C49D6C 8024318C A480008E */ sh $zero, 0x8e($a0) -.L80243190: -/* C49D70 80243190 0C038069 */ jal enable_player_input -/* C49D74 80243194 00000000 */ nop -/* C49D78 80243198 0C03BD80 */ jal func_800EF600 -/* C49D7C 8024319C 00000000 */ nop -/* C49D80 802431A0 24020010 */ addiu $v0, $zero, 0x10 -.L802431A4: -/* C49D84 802431A4 AE020070 */ sw $v0, 0x70($s0) -.L802431A8: -/* C49D88 802431A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C49D8C 802431AC 8FB00010 */ lw $s0, 0x10($sp) -/* C49D90 802431B0 03E00008 */ jr $ra -/* C49D94 802431B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s deleted file mode 100644 index 900f2c1c25..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431B8_C49D98 -/* C49D98 802431B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C49D9C 802431BC AFB20018 */ sw $s2, 0x18($sp) -/* C49DA0 802431C0 0080902D */ daddu $s2, $a0, $zero -/* C49DA4 802431C4 AFBF001C */ sw $ra, 0x1c($sp) -/* C49DA8 802431C8 AFB10014 */ sw $s1, 0x14($sp) -/* C49DAC 802431CC AFB00010 */ sw $s0, 0x10($sp) -/* C49DB0 802431D0 8E500148 */ lw $s0, 0x148($s2) -/* C49DB4 802431D4 86040008 */ lh $a0, 8($s0) -/* C49DB8 802431D8 0C00EABB */ jal get_npc_unsafe -/* C49DBC 802431DC 00A0882D */ daddu $s1, $a1, $zero -/* C49DC0 802431E0 3C05FFDF */ lui $a1, 0xffdf -/* C49DC4 802431E4 8E03006C */ lw $v1, 0x6c($s0) -/* C49DC8 802431E8 2404FEFF */ addiu $a0, $zero, -0x101 -/* C49DCC 802431EC 00641824 */ and $v1, $v1, $a0 -/* C49DD0 802431F0 AE03006C */ sw $v1, 0x6c($s0) -/* C49DD4 802431F4 8C430000 */ lw $v1, ($v0) -/* C49DD8 802431F8 34A5FFFF */ ori $a1, $a1, 0xffff -/* C49DDC 802431FC 00651824 */ and $v1, $v1, $a1 -/* C49DE0 80243200 AC430000 */ sw $v1, ($v0) -/* C49DE4 80243204 C6200000 */ lwc1 $f0, ($s1) -/* C49DE8 80243208 46000021 */ cvt.d.s $f0, $f0 -/* C49DEC 8024320C 46200000 */ add.d $f0, $f0, $f0 -/* C49DF0 80243210 46200020 */ cvt.s.d $f0, $f0 -/* C49DF4 80243214 E4400018 */ swc1 $f0, 0x18($v0) -/* C49DF8 80243218 AE000074 */ sw $zero, 0x74($s0) -/* C49DFC 8024321C C440003C */ lwc1 $f0, 0x3c($v0) -/* C49E00 80243220 3C014059 */ lui $at, 0x4059 -/* C49E04 80243224 44811800 */ mtc1 $at, $f3 -/* C49E08 80243228 44801000 */ mtc1 $zero, $f2 -/* C49E0C 8024322C 46000021 */ cvt.d.s $f0, $f0 -/* C49E10 80243230 46220002 */ mul.d $f0, $f0, $f2 -/* C49E14 80243234 00000000 */ nop -/* C49E18 80243238 2402001E */ addiu $v0, $zero, 0x1e -/* C49E1C 8024323C 4620010D */ trunc.w.d $f4, $f0 -/* C49E20 80243240 E604007C */ swc1 $f4, 0x7c($s0) -/* C49E24 80243244 AE420074 */ sw $v0, 0x74($s2) -/* C49E28 80243248 8FBF001C */ lw $ra, 0x1c($sp) -/* C49E2C 8024324C 8FB20018 */ lw $s2, 0x18($sp) -/* C49E30 80243250 8FB10014 */ lw $s1, 0x14($sp) -/* C49E34 80243254 8FB00010 */ lw $s0, 0x10($sp) -/* C49E38 80243258 03E00008 */ jr $ra -/* C49E3C 8024325C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s deleted file mode 100644 index a7c6399796..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243260_C49E40 -/* C49E40 80243260 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C49E44 80243264 AFB20048 */ sw $s2, 0x48($sp) -/* C49E48 80243268 0080902D */ daddu $s2, $a0, $zero -/* C49E4C 8024326C AFBF0054 */ sw $ra, 0x54($sp) -/* C49E50 80243270 AFB40050 */ sw $s4, 0x50($sp) -/* C49E54 80243274 AFB3004C */ sw $s3, 0x4c($sp) -/* C49E58 80243278 AFB10044 */ sw $s1, 0x44($sp) -/* C49E5C 8024327C AFB00040 */ sw $s0, 0x40($sp) -/* C49E60 80243280 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C49E64 80243284 F7B80068 */ sdc1 $f24, 0x68($sp) -/* C49E68 80243288 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C49E6C 8024328C F7B40058 */ sdc1 $f20, 0x58($sp) -/* C49E70 80243290 8E500148 */ lw $s0, 0x148($s2) -/* C49E74 80243294 00A0982D */ daddu $s3, $a1, $zero -/* C49E78 80243298 86040008 */ lh $a0, 8($s0) -/* C49E7C 8024329C 0C00EABB */ jal get_npc_unsafe -/* C49E80 802432A0 00C0A02D */ daddu $s4, $a2, $zero -/* C49E84 802432A4 0040882D */ daddu $s1, $v0, $zero -/* C49E88 802432A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C49E8C 802432AC C622003C */ lwc1 $f2, 0x3c($s1) -/* C49E90 802432B0 C6240040 */ lwc1 $f4, 0x40($s1) -/* C49E94 802432B4 3C01447A */ lui $at, 0x447a -/* C49E98 802432B8 44813000 */ mtc1 $at, $f6 -/* C49E9C 802432BC C60C0074 */ lwc1 $f12, 0x74($s0) -/* C49EA0 802432C0 46806320 */ cvt.s.w $f12, $f12 -/* C49EA4 802432C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C49EA8 802432C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C49EAC 802432CC E7A40030 */ swc1 $f4, 0x30($sp) -/* C49EB0 802432D0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C49EB4 802432D4 C6000078 */ lwc1 $f0, 0x78($s0) -/* C49EB8 802432D8 46800020 */ cvt.s.w $f0, $f0 -/* C49EBC 802432DC 46000021 */ cvt.d.s $f0, $f0 -/* C49EC0 802432E0 C6020088 */ lwc1 $f2, 0x88($s0) -/* C49EC4 802432E4 468010A0 */ cvt.s.w $f2, $f2 -/* C49EC8 802432E8 3C014059 */ lui $at, 0x4059 -/* C49ECC 802432EC 44812800 */ mtc1 $at, $f5 -/* C49ED0 802432F0 44802000 */ mtc1 $zero, $f4 -/* C49ED4 802432F4 460010A1 */ cvt.d.s $f2, $f2 -/* C49ED8 802432F8 46240003 */ div.d $f0, $f0, $f4 -/* C49EDC 802432FC 462006A0 */ cvt.s.d $f26, $f0 -/* C49EE0 80243300 46241083 */ div.d $f2, $f2, $f4 -/* C49EE4 80243304 462010A0 */ cvt.s.d $f2, $f2 -/* C49EE8 80243308 C6000070 */ lwc1 $f0, 0x70($s0) -/* C49EEC 8024330C 46800020 */ cvt.s.w $f0, $f0 -/* C49EF0 80243310 46000021 */ cvt.d.s $f0, $f0 -/* C49EF4 80243314 46240003 */ div.d $f0, $f0, $f4 -/* C49EF8 80243318 462005A0 */ cvt.s.d $f22, $f0 -/* C49EFC 8024331C 0C00A8BB */ jal sin_deg -/* C49F00 80243320 4602D600 */ add.s $f24, $f26, $f2 -/* C49F04 80243324 27A50028 */ addiu $a1, $sp, 0x28 -/* C49F08 80243328 27A6002C */ addiu $a2, $sp, 0x2c -/* C49F0C 8024332C 27A70030 */ addiu $a3, $sp, 0x30 -/* C49F10 80243330 27A20034 */ addiu $v0, $sp, 0x34 -/* C49F14 80243334 AFA20010 */ sw $v0, 0x10($sp) -/* C49F18 80243338 8E240080 */ lw $a0, 0x80($s1) -/* C49F1C 8024333C 0C0372DF */ jal func_800DCB7C -/* C49F20 80243340 46000506 */ mov.s $f20, $f0 -/* C49F24 80243344 10400007 */ beqz $v0, .L80243364 -/* C49F28 80243348 00000000 */ nop -/* C49F2C 8024334C 4616A082 */ mul.s $f2, $f20, $f22 -/* C49F30 80243350 00000000 */ nop -/* C49F34 80243354 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C49F38 80243358 461A0000 */ add.s $f0, $f0, $f26 -/* C49F3C 8024335C 08090CDC */ j .L80243370 -/* C49F40 80243360 46020000 */ add.s $f0, $f0, $f2 -.L80243364: -/* C49F44 80243364 4616A002 */ mul.s $f0, $f20, $f22 -/* C49F48 80243368 00000000 */ nop -/* C49F4C 8024336C 4600C000 */ add.s $f0, $f24, $f0 -.L80243370: -/* C49F50 80243370 E620003C */ swc1 $f0, 0x3c($s1) -/* C49F54 80243374 8E020074 */ lw $v0, 0x74($s0) -/* C49F58 80243378 2442000C */ addiu $v0, $v0, 0xc -/* C49F5C 8024337C 44826000 */ mtc1 $v0, $f12 -/* C49F60 80243380 00000000 */ nop -/* C49F64 80243384 0C00A6C9 */ jal clamp_angle -/* C49F68 80243388 46806320 */ cvt.s.w $f12, $f12 -/* C49F6C 8024338C 4600020D */ trunc.w.s $f8, $f0 -/* C49F70 80243390 E6080074 */ swc1 $f8, 0x74($s0) -/* C49F74 80243394 8E420074 */ lw $v0, 0x74($s2) -/* C49F78 80243398 1C400037 */ bgtz $v0, .L80243478 -/* C49F7C 8024339C 2442FFFF */ addiu $v0, $v0, -1 -/* C49F80 802433A0 8E620014 */ lw $v0, 0x14($s3) -/* C49F84 802433A4 AE420074 */ sw $v0, 0x74($s2) -/* C49F88 802433A8 C662000C */ lwc1 $f2, 0xc($s3) -/* C49F8C 802433AC 3C013FE0 */ lui $at, 0x3fe0 -/* C49F90 802433B0 44812800 */ mtc1 $at, $f5 -/* C49F94 802433B4 44802000 */ mtc1 $zero, $f4 -/* C49F98 802433B8 460010A1 */ cvt.d.s $f2, $f2 -/* C49F9C 802433BC 46241082 */ mul.d $f2, $f2, $f4 -/* C49FA0 802433C0 00000000 */ nop -/* C49FA4 802433C4 C6600010 */ lwc1 $f0, 0x10($s3) -/* C49FA8 802433C8 46000021 */ cvt.d.s $f0, $f0 -/* C49FAC 802433CC 46240002 */ mul.d $f0, $f0, $f4 -/* C49FB0 802433D0 00000000 */ nop -/* C49FB4 802433D4 0280202D */ daddu $a0, $s4, $zero -/* C49FB8 802433D8 462010A0 */ cvt.s.d $f2, $f2 -/* C49FBC 802433DC 46200020 */ cvt.s.d $f0, $f0 -/* C49FC0 802433E0 44061000 */ mfc1 $a2, $f2 -/* C49FC4 802433E4 44070000 */ mfc1 $a3, $f0 -/* C49FC8 802433E8 0200282D */ daddu $a1, $s0, $zero -/* C49FCC 802433EC 0C01242D */ jal func_800490B4 -/* C49FD0 802433F0 AFA00010 */ sw $zero, 0x10($sp) -/* C49FD4 802433F4 1040001E */ beqz $v0, .L80243470 -/* C49FD8 802433F8 0000202D */ daddu $a0, $zero, $zero -/* C49FDC 802433FC 0220282D */ daddu $a1, $s1, $zero -/* C49FE0 80243400 0000302D */ daddu $a2, $zero, $zero -/* C49FE4 80243404 2410000C */ addiu $s0, $zero, 0xc -/* C49FE8 80243408 862300A8 */ lh $v1, 0xa8($s1) -/* C49FEC 8024340C 3C013F80 */ lui $at, 0x3f80 -/* C49FF0 80243410 44810000 */ mtc1 $at, $f0 -/* C49FF4 80243414 3C014000 */ lui $at, 0x4000 -/* C49FF8 80243418 44811000 */ mtc1 $at, $f2 -/* C49FFC 8024341C 3C01C1A0 */ lui $at, 0xc1a0 -/* C4A000 80243420 44812000 */ mtc1 $at, $f4 -/* C4A004 80243424 44834000 */ mtc1 $v1, $f8 -/* C4A008 80243428 00000000 */ nop -/* C4A00C 8024342C 46804220 */ cvt.s.w $f8, $f8 -/* C4A010 80243430 44074000 */ mfc1 $a3, $f8 -/* C4A014 80243434 27A20038 */ addiu $v0, $sp, 0x38 -/* C4A018 80243438 AFB0001C */ sw $s0, 0x1c($sp) -/* C4A01C 8024343C AFA20020 */ sw $v0, 0x20($sp) -/* C4A020 80243440 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4A024 80243444 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4A028 80243448 0C01BFA4 */ jal fx_emote -/* C4A02C 8024344C E7A40018 */ swc1 $f4, 0x18($sp) -/* C4A030 80243450 0220202D */ daddu $a0, $s1, $zero -/* C4A034 80243454 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C4A038 80243458 0C012530 */ jal func_800494C0 -/* C4A03C 8024345C 3C060020 */ lui $a2, 0x20 -/* C4A040 80243460 C620003C */ lwc1 $f0, 0x3c($s1) -/* C4A044 80243464 E6200064 */ swc1 $f0, 0x64($s1) -/* C4A048 80243468 08090D52 */ j .L80243548 -/* C4A04C 8024346C AE500070 */ sw $s0, 0x70($s2) -.L80243470: -/* C4A050 80243470 8E420074 */ lw $v0, 0x74($s2) -/* C4A054 80243474 2442FFFF */ addiu $v0, $v0, -1 -.L80243478: -/* C4A058 80243478 AE420074 */ sw $v0, 0x74($s2) -/* C4A05C 8024347C 8622008C */ lh $v0, 0x8c($s1) -/* C4A060 80243480 14400031 */ bnez $v0, .L80243548 -/* C4A064 80243484 00000000 */ nop -/* C4A068 80243488 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C4A06C 8024348C 8E0200D0 */ lw $v0, 0xd0($s0) -/* C4A070 80243490 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C4A074 80243494 C4480000 */ lwc1 $f8, ($v0) -/* C4A078 80243498 46804220 */ cvt.s.w $f8, $f8 -/* C4A07C 8024349C 44064000 */ mfc1 $a2, $f8 -/* C4A080 802434A0 C4480008 */ lwc1 $f8, 8($v0) -/* C4A084 802434A4 46804220 */ cvt.s.w $f8, $f8 -/* C4A088 802434A8 44074000 */ mfc1 $a3, $f8 -/* C4A08C 802434AC 0C00A720 */ jal atan2 -/* C4A090 802434B0 00000000 */ nop -/* C4A094 802434B4 8E250018 */ lw $a1, 0x18($s1) -/* C4A098 802434B8 44060000 */ mfc1 $a2, $f0 -/* C4A09C 802434BC 0220202D */ daddu $a0, $s1, $zero -/* C4A0A0 802434C0 0C00EA95 */ jal npc_move_heading -/* C4A0A4 802434C4 AE26000C */ sw $a2, 0xc($s1) -/* C4A0A8 802434C8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C4A0AC 802434CC 8E0200D0 */ lw $v0, 0xd0($s0) -/* C4A0B0 802434D0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C4A0B4 802434D4 C4480000 */ lwc1 $f8, ($v0) -/* C4A0B8 802434D8 46804220 */ cvt.s.w $f8, $f8 -/* C4A0BC 802434DC 44064000 */ mfc1 $a2, $f8 -/* C4A0C0 802434E0 C4480008 */ lwc1 $f8, 8($v0) -/* C4A0C4 802434E4 46804220 */ cvt.s.w $f8, $f8 -/* C4A0C8 802434E8 44074000 */ mfc1 $a3, $f8 -/* C4A0CC 802434EC 0C00A7B5 */ jal dist2D -/* C4A0D0 802434F0 00000000 */ nop -/* C4A0D4 802434F4 C6220018 */ lwc1 $f2, 0x18($s1) -/* C4A0D8 802434F8 46021080 */ add.s $f2, $f2, $f2 -/* C4A0DC 802434FC 4602003E */ c.le.s $f0, $f2 -/* C4A0E0 80243500 00000000 */ nop -/* C4A0E4 80243504 45000010 */ bc1f .L80243548 -/* C4A0E8 80243508 E7A00034 */ swc1 $f0, 0x34($sp) -/* C4A0EC 8024350C 0C00A67F */ jal rand_int -/* C4A0F0 80243510 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4A0F4 80243514 3C035555 */ lui $v1, 0x5555 -/* C4A0F8 80243518 34635556 */ ori $v1, $v1, 0x5556 -/* C4A0FC 8024351C 00430018 */ mult $v0, $v1 -/* C4A100 80243520 24030002 */ addiu $v1, $zero, 2 -/* C4A104 80243524 000227C3 */ sra $a0, $v0, 0x1f -/* C4A108 80243528 AE430070 */ sw $v1, 0x70($s2) -/* C4A10C 8024352C 00004010 */ mfhi $t0 -/* C4A110 80243530 01042023 */ subu $a0, $t0, $a0 -/* C4A114 80243534 00041840 */ sll $v1, $a0, 1 -/* C4A118 80243538 00641821 */ addu $v1, $v1, $a0 -/* C4A11C 8024353C 00431023 */ subu $v0, $v0, $v1 -/* C4A120 80243540 24420002 */ addiu $v0, $v0, 2 -/* C4A124 80243544 AE420074 */ sw $v0, 0x74($s2) -.L80243548: -/* C4A128 80243548 8FBF0054 */ lw $ra, 0x54($sp) -/* C4A12C 8024354C 8FB40050 */ lw $s4, 0x50($sp) -/* C4A130 80243550 8FB3004C */ lw $s3, 0x4c($sp) -/* C4A134 80243554 8FB20048 */ lw $s2, 0x48($sp) -/* C4A138 80243558 8FB10044 */ lw $s1, 0x44($sp) -/* C4A13C 8024355C 8FB00040 */ lw $s0, 0x40($sp) -/* C4A140 80243560 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C4A144 80243564 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C4A148 80243568 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C4A14C 8024356C D7B40058 */ ldc1 $f20, 0x58($sp) -/* C4A150 80243570 03E00008 */ jr $ra -/* C4A154 80243574 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s deleted file mode 100644 index 10ebbd1056..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243578_C4A158 -/* C4A158 80243578 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C4A15C 8024357C AFB40050 */ sw $s4, 0x50($sp) -/* C4A160 80243580 0080A02D */ daddu $s4, $a0, $zero -/* C4A164 80243584 AFBF0058 */ sw $ra, 0x58($sp) -/* C4A168 80243588 AFB50054 */ sw $s5, 0x54($sp) -/* C4A16C 8024358C AFB3004C */ sw $s3, 0x4c($sp) -/* C4A170 80243590 AFB20048 */ sw $s2, 0x48($sp) -/* C4A174 80243594 AFB10044 */ sw $s1, 0x44($sp) -/* C4A178 80243598 AFB00040 */ sw $s0, 0x40($sp) -/* C4A17C 8024359C 8E920148 */ lw $s2, 0x148($s4) -/* C4A180 802435A0 86440008 */ lh $a0, 8($s2) -/* C4A184 802435A4 0C00EABB */ jal get_npc_unsafe -/* C4A188 802435A8 00A0802D */ daddu $s0, $a1, $zero -/* C4A18C 802435AC 8E83000C */ lw $v1, 0xc($s4) -/* C4A190 802435B0 0280202D */ daddu $a0, $s4, $zero -/* C4A194 802435B4 8C650000 */ lw $a1, ($v1) -/* C4A198 802435B8 0C0B1EAF */ jal get_variable -/* C4A19C 802435BC 0040A82D */ daddu $s5, $v0, $zero -/* C4A1A0 802435C0 AFA00020 */ sw $zero, 0x20($sp) -/* C4A1A4 802435C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1A8 802435C8 8C630030 */ lw $v1, 0x30($v1) -/* C4A1AC 802435CC AFA30024 */ sw $v1, 0x24($sp) -/* C4A1B0 802435D0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1B4 802435D4 8C63001C */ lw $v1, 0x1c($v1) -/* C4A1B8 802435D8 AFA30028 */ sw $v1, 0x28($sp) -/* C4A1BC 802435DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1C0 802435E0 8C630024 */ lw $v1, 0x24($v1) -/* C4A1C4 802435E4 AFA3002C */ sw $v1, 0x2c($sp) -/* C4A1C8 802435E8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1CC 802435EC 8C630028 */ lw $v1, 0x28($v1) -/* C4A1D0 802435F0 27B30020 */ addiu $s3, $sp, 0x20 -/* C4A1D4 802435F4 AFA30030 */ sw $v1, 0x30($sp) -/* C4A1D8 802435F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C4A1DC 802435FC 3C0142FA */ lui $at, 0x42fa -/* C4A1E0 80243600 44810000 */ mtc1 $at, $f0 -/* C4A1E4 80243604 8C63002C */ lw $v1, 0x2c($v1) -/* C4A1E8 80243608 0040882D */ daddu $s1, $v0, $zero -/* C4A1EC 8024360C E7A00038 */ swc1 $f0, 0x38($sp) -/* C4A1F0 80243610 A7A0003C */ sh $zero, 0x3c($sp) -/* C4A1F4 80243614 12000007 */ beqz $s0, .L80243634 -/* C4A1F8 80243618 AFA30034 */ sw $v1, 0x34($sp) -/* C4A1FC 8024361C AE800070 */ sw $zero, 0x70($s4) -/* C4A200 80243620 02A0202D */ daddu $a0, $s5, $zero -/* C4A204 80243624 0240282D */ daddu $a1, $s2, $zero -/* C4A208 80243628 0280302D */ daddu $a2, $s4, $zero -/* C4A20C 8024362C 0C090983 */ jal func_8024260C_C491EC -/* C4A210 80243630 0220382D */ daddu $a3, $s1, $zero -.L80243634: -/* C4A214 80243634 8E830070 */ lw $v1, 0x70($s4) -/* C4A218 80243638 2C620020 */ sltiu $v0, $v1, 0x20 -/* C4A21C 8024363C 10400060 */ beqz $v0, L802437C0_C4A3A0 -/* C4A220 80243640 00031080 */ sll $v0, $v1, 2 -/* C4A224 80243644 3C018024 */ lui $at, %hi(jtbl_80245728_C4C308) -/* C4A228 80243648 00220821 */ addu $at, $at, $v0 -/* C4A22C 8024364C 8C225728 */ lw $v0, %lo(jtbl_80245728_C4C308)($at) -/* C4A230 80243650 00400008 */ jr $v0 -/* C4A234 80243654 00000000 */ nop -glabel L80243658_C4A238 -/* C4A238 80243658 0280202D */ daddu $a0, $s4, $zero -/* C4A23C 8024365C 0220282D */ daddu $a1, $s1, $zero -/* C4A240 80243660 0C090509 */ jal func_80241424_C48004 -/* C4A244 80243664 0260302D */ daddu $a2, $s3, $zero -/* C4A248 80243668 0000282D */ daddu $a1, $zero, $zero -/* C4A24C 8024366C 00A0302D */ daddu $a2, $a1, $zero -/* C4A250 80243670 AFA00010 */ sw $zero, 0x10($sp) -/* C4A254 80243674 AFA00014 */ sw $zero, 0x14($sp) -/* C4A258 80243678 AFA00018 */ sw $zero, 0x18($sp) -/* C4A25C 8024367C 8EA40024 */ lw $a0, 0x24($s5) -/* C4A260 80243680 0C0B7A25 */ jal func_802DE894 -/* C4A264 80243684 00A0382D */ daddu $a3, $a1, $zero -glabel L80243688_C4A268 -/* C4A268 80243688 0280202D */ daddu $a0, $s4, $zero -/* C4A26C 8024368C 0220282D */ daddu $a1, $s1, $zero -/* C4A270 80243690 0C090575 */ jal func_802415D4_C481B4 -/* C4A274 80243694 0260302D */ daddu $a2, $s3, $zero -/* C4A278 80243698 08090DB0 */ j .L802436C0 -/* C4A27C 8024369C 00000000 */ nop -glabel L802436A0_C4A280 -/* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero -/* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero -/* C4A288 802436A8 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 -/* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero -glabel L802436B0_C4A290 -/* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero -/* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero -/* C4A298 802436B8 0C09072F */ jal func_80241CBC_C4889C -/* C4A29C 802436BC 0260302D */ daddu $a2, $s3, $zero -.L802436C0: -/* C4A2A0 802436C0 8E830070 */ lw $v1, 0x70($s4) -/* C4A2A4 802436C4 2402000C */ addiu $v0, $zero, 0xc -/* C4A2A8 802436C8 1462003D */ bne $v1, $v0, L802437C0_C4A3A0 -/* C4A2AC 802436CC 24020006 */ addiu $v0, $zero, 6 -/* C4A2B0 802436D0 08090DF0 */ j L802437C0_C4A3A0 -/* C4A2B4 802436D4 A6A2008E */ sh $v0, 0x8e($s5) -glabel L802436D8_C4A2B8 -/* C4A2B8 802436D8 0280202D */ daddu $a0, $s4, $zero -/* C4A2BC 802436DC 0220282D */ daddu $a1, $s1, $zero -/* C4A2C0 802436E0 0C090A47 */ jal func_8024291C_C494FC -/* C4A2C4 802436E4 0260302D */ daddu $a2, $s3, $zero -/* C4A2C8 802436E8 8E830070 */ lw $v1, 0x70($s4) -/* C4A2CC 802436EC 2402000D */ addiu $v0, $zero, 0xd -/* C4A2D0 802436F0 14620033 */ bne $v1, $v0, L802437C0_C4A3A0 -/* C4A2D4 802436F4 00000000 */ nop -glabel L802436F8_C4A2D8 -/* C4A2D8 802436F8 0280202D */ daddu $a0, $s4, $zero -/* C4A2DC 802436FC 0220282D */ daddu $a1, $s1, $zero -/* C4A2E0 80243700 0C090A9D */ jal func_80242A74_C49654 -/* C4A2E4 80243704 0260302D */ daddu $a2, $s3, $zero -/* C4A2E8 80243708 08090DF0 */ j L802437C0_C4A3A0 -/* C4A2EC 8024370C 00000000 */ nop -glabel L80243710_C4A2F0 -/* C4A2F0 80243710 0280202D */ daddu $a0, $s4, $zero -/* C4A2F4 80243714 0220282D */ daddu $a1, $s1, $zero -/* C4A2F8 80243718 0C090ADE */ jal func_80242B78_C49758 -/* C4A2FC 8024371C 0260302D */ daddu $a2, $s3, $zero -/* C4A300 80243720 8E830070 */ lw $v1, 0x70($s4) -/* C4A304 80243724 2402000F */ addiu $v0, $zero, 0xf -/* C4A308 80243728 14620025 */ bne $v1, $v0, L802437C0_C4A3A0 -/* C4A30C 8024372C 00000000 */ nop -glabel L80243730_C4A310 -/* C4A310 80243730 0280202D */ daddu $a0, $s4, $zero -/* C4A314 80243734 0220282D */ daddu $a1, $s1, $zero -/* C4A318 80243738 0C090B07 */ jal func_80242C1C_C497FC -/* C4A31C 8024373C 0260302D */ daddu $a2, $s3, $zero -/* C4A320 80243740 08090DF0 */ j L802437C0_C4A3A0 -/* C4A324 80243744 00000000 */ nop -glabel L80243748_C4A328 -/* C4A328 80243748 0280202D */ daddu $a0, $s4, $zero -/* C4A32C 8024374C 0220282D */ daddu $a1, $s1, $zero -/* C4A330 80243750 0C090BAE */ jal func_80242EB8_C49A98 -/* C4A334 80243754 0260302D */ daddu $a2, $s3, $zero -glabel L80243758_C4A338 -/* C4A338 80243758 0280202D */ daddu $a0, $s4, $zero -/* C4A33C 8024375C 0220282D */ daddu $a1, $s1, $zero -/* C4A340 80243760 0C090BDC */ jal func_80242F70_C49B50 -/* C4A344 80243764 0260302D */ daddu $a2, $s3, $zero -/* C4A348 80243768 08090DF0 */ j L802437C0_C4A3A0 -/* C4A34C 8024376C 00000000 */ nop -glabel L80243770_C4A350 -/* C4A350 80243770 0280202D */ daddu $a0, $s4, $zero -/* C4A354 80243774 0220282D */ daddu $a1, $s1, $zero -/* C4A358 80243778 0C090C3C */ jal func_802430F0_C49CD0 -/* C4A35C 8024377C 0260302D */ daddu $a2, $s3, $zero -/* C4A360 80243780 08090DF0 */ j L802437C0_C4A3A0 -/* C4A364 80243784 00000000 */ nop -glabel L80243788_C4A368 -/* C4A368 80243788 0280202D */ daddu $a0, $s4, $zero -/* C4A36C 8024378C 0220282D */ daddu $a1, $s1, $zero -/* C4A370 80243790 0C090C4E */ jal func_80243138_C49D18 -/* C4A374 80243794 0260302D */ daddu $a2, $s3, $zero -/* C4A378 80243798 08090DF0 */ j L802437C0_C4A3A0 -/* C4A37C 8024379C 00000000 */ nop -glabel L802437A0_C4A380 -/* C4A380 802437A0 0280202D */ daddu $a0, $s4, $zero -/* C4A384 802437A4 0220282D */ daddu $a1, $s1, $zero -/* C4A388 802437A8 0C090C6E */ jal func_802431B8_C49D98 -/* C4A38C 802437AC 0260302D */ daddu $a2, $s3, $zero -glabel L802437B0_C4A390 -/* C4A390 802437B0 0280202D */ daddu $a0, $s4, $zero -/* C4A394 802437B4 0220282D */ daddu $a1, $s1, $zero -/* C4A398 802437B8 0C090C98 */ jal func_80243260_C49E40 -/* C4A39C 802437BC 0260302D */ daddu $a2, $s3, $zero -glabel L802437C0_C4A3A0 -/* C4A3A0 802437C0 8E820070 */ lw $v0, 0x70($s4) -/* C4A3A4 802437C4 8FBF0058 */ lw $ra, 0x58($sp) -/* C4A3A8 802437C8 8FB50054 */ lw $s5, 0x54($sp) -/* C4A3AC 802437CC 8FB40050 */ lw $s4, 0x50($sp) -/* C4A3B0 802437D0 8FB3004C */ lw $s3, 0x4c($sp) -/* C4A3B4 802437D4 8FB20048 */ lw $s2, 0x48($sp) -/* C4A3B8 802437D8 8FB10044 */ lw $s1, 0x44($sp) -/* C4A3BC 802437DC 8FB00040 */ lw $s0, 0x40($sp) -/* C4A3C0 802437E0 38420064 */ xori $v0, $v0, 0x64 -/* C4A3C4 802437E4 2C420001 */ sltiu $v0, $v0, 1 -/* C4A3C8 802437E8 00021040 */ sll $v0, $v0, 1 -/* C4A3CC 802437EC 03E00008 */ jr $ra -/* C4A3D0 802437F0 27BD0060 */ addiu $sp, $sp, 0x60 -/* C4A3D4 802437F4 00000000 */ nop -/* C4A3D8 802437F8 00000000 */ nop -/* C4A3DC 802437FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s deleted file mode 100644 index 082b86dfa0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/update_starpoints_display_C46F9C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C46F9C -/* C46F9C 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C46FA0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C46FA4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C46FA8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C46FAC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C46FB0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C46FB4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C46FB8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C46FBC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C46FC0 802403E0 86240008 */ lh $a0, 8($s1) -/* C46FC4 802403E4 0C00EABB */ jal get_npc_unsafe -/* C46FC8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C46FCC 802403EC 16000005 */ bnez $s0, .L80240404 -/* C46FD0 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C46FD4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C46FD8 802403F8 30420004 */ andi $v0, $v0, 4 -/* C46FDC 802403FC 10400015 */ beqz $v0, .L80240454 -/* C46FE0 80240400 00000000 */ nop -.L80240404: -/* C46FE4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C46FE8 80240408 8E420000 */ lw $v0, ($s2) -/* C46FEC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C46FF0 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C46FF4 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C46FF8 80240418 AE420000 */ sw $v0, ($s2) -/* C46FFC 8024041C 8E220000 */ lw $v0, ($s1) -/* C47000 80240420 3C01C47A */ lui $at, 0xc47a -/* C47004 80240424 44810000 */ mtc1 $at, $f0 -/* C47008 80240428 00431025 */ or $v0, $v0, $v1 -/* C4700C 8024042C AE220000 */ sw $v0, ($s1) -/* C47010 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C47014 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C47018 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C4701C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C47020 80240440 30620004 */ andi $v0, $v1, 4 -/* C47024 80240444 10400003 */ beqz $v0, .L80240454 -/* C47028 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C4702C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C47030 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C47034 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C47038 80240458 12600005 */ beqz $s3, .L80240470 -/* C4703C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C47040 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C47044 80240464 00000000 */ nop -/* C47048 80240468 0809017E */ j .L802405F8 -/* C4704C 8024046C 00000000 */ nop -.L80240470: -/* C47050 80240470 86240008 */ lh $a0, 8($s1) -/* C47054 80240474 0C00FB3A */ jal get_enemy -/* C47058 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C4705C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C47060 80240480 0C00EABB */ jal get_npc_unsafe -/* C47064 80240484 86040008 */ lh $a0, 8($s0) -/* C47068 80240488 24030001 */ addiu $v1, $zero, 1 -/* C4706C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C47070 80240490 A2230007 */ sb $v1, 7($s1) -/* C47074 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C47078 80240498 24020003 */ addiu $v0, $zero, 3 -/* C4707C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C47080 802404A0 00000000 */ nop -/* C47084 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C47088 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C4708C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C47090 802404B0 0C012530 */ jal func_800494C0 -/* C47094 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C47098 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C4709C 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C470A0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C470A4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C470A8 802404C8 3C014387 */ lui $at, 0x4387 -/* C470AC 802404CC 44810000 */ mtc1 $at, $f0 -/* C470B0 802404D0 44064000 */ mfc1 $a2, $f8 -/* C470B4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C470B8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C470BC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C470C0 802404E0 44070000 */ mfc1 $a3, $f0 -/* C470C4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C470C8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C470CC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C470D0 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C470D4 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C470D8 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C470DC 802404FC 44024000 */ mfc1 $v0, $f8 -/* C470E0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C470E4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C470E8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C470EC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C470F0 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C470F4 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C470F8 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C470FC 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C47100 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C47104 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C47108 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C4710C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C47110 80240530 00000000 */ nop -/* C47114 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C47118 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C4711C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C47120 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C47124 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C47128 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C4712C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C47130 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C47134 80240554 0C00A720 */ jal atan2 -/* C47138 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4713C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C47140 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C47144 80240564 8E220000 */ lw $v0, ($s1) -/* C47148 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C4714C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C47150 80240570 AE220000 */ sw $v0, ($s1) -/* C47154 80240574 24020001 */ addiu $v0, $zero, 1 -/* C47158 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C4715C 8024057C 0809017E */ j .L802405F8 -/* C47160 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C47164 80240584 86240008 */ lh $a0, 8($s1) -/* C47168 80240588 0C00FB3A */ jal get_enemy -/* C4716C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C47170 80240590 0040802D */ daddu $s0, $v0, $zero -/* C47174 80240594 0C00EABB */ jal get_npc_unsafe -/* C47178 80240598 86040008 */ lh $a0, 8($s0) -/* C4717C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C47180 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C47184 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C47188 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C4718C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C47190 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C47194 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C47198 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C4719C 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C471A0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C471A4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C471A8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C471AC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C471B0 802405D0 8E230000 */ lw $v1, ($s1) -/* C471B4 802405D4 3C01C47A */ lui $at, 0xc47a -/* C471B8 802405D8 44810000 */ mtc1 $at, $f0 -/* C471BC 802405DC 00621825 */ or $v1, $v1, $v0 -/* C471C0 802405E0 AE230000 */ sw $v1, ($s1) -/* C471C4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C471C8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C471CC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C471D0 802405F0 A2330007 */ sb $s3, 7($s1) -/* C471D4 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C471D8 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C471DC 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C471E0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C471E4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C471E8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C471EC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C471F0 80240610 0000102D */ daddu $v0, $zero, $zero -/* C471F4 80240614 03E00008 */ jr $ra -/* C471F8 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s deleted file mode 100644 index 1b050ad97e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_80240000_C4C390.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C4C390 -/* C4C390 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4C394 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* C4C398 80240008 0080882D */ daddu $s1, $a0, $zero -/* C4C39C 8024000C AFB00010 */ sw $s0, 0x10($sp) -/* C4C3A0 80240010 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C4C3A4 80240014 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C4C3A8 80240018 AFBF0018 */ sw $ra, 0x18($sp) -/* C4C3AC 8024001C 8E22013C */ lw $v0, 0x13c($s1) -/* C4C3B0 80240020 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C4C3B4 80240024 C60E0030 */ lwc1 $f14, 0x30($s0) -/* C4C3B8 80240028 C4440008 */ lwc1 $f4, 8($v0) -/* C4C3BC 8024002C 46802120 */ cvt.s.w $f4, $f4 -/* C4C3C0 80240030 44062000 */ mfc1 $a2, $f4 -/* C4C3C4 80240034 C444000C */ lwc1 $f4, 0xc($v0) -/* C4C3C8 80240038 46802120 */ cvt.s.w $f4, $f4 -/* C4C3CC 8024003C 44072000 */ mfc1 $a3, $f4 -/* C4C3D0 80240040 0C00A7B5 */ jal dist2D -/* C4C3D4 80240044 00000000 */ nop -/* C4C3D8 80240048 24020001 */ addiu $v0, $zero, 1 -/* C4C3DC 8024004C AE220084 */ sw $v0, 0x84($s1) -/* C4C3E0 80240050 820300B4 */ lb $v1, 0xb4($s0) -/* C4C3E4 80240054 2402000E */ addiu $v0, $zero, 0xe -/* C4C3E8 80240058 10620004 */ beq $v1, $v0, .L8024006C -/* C4C3EC 8024005C 46000086 */ mov.s $f2, $f0 -/* C4C3F0 80240060 24020010 */ addiu $v0, $zero, 0x10 -/* C4C3F4 80240064 54620001 */ bnel $v1, $v0, .L8024006C -/* C4C3F8 80240068 AE200084 */ sw $zero, 0x84($s1) -.L8024006C: -/* C4C3FC 8024006C 8E22013C */ lw $v0, 0x13c($s1) -/* C4C400 80240070 C4400010 */ lwc1 $f0, 0x10($v0) -/* C4C404 80240074 46800020 */ cvt.s.w $f0, $f0 -/* C4C408 80240078 4602003E */ c.le.s $f0, $f2 -/* C4C40C 8024007C 00000000 */ nop -/* C4C410 80240080 45030001 */ bc1tl .L80240088 -/* C4C414 80240084 AE200084 */ sw $zero, 0x84($s1) -.L80240088: -/* C4C418 80240088 8FBF0018 */ lw $ra, 0x18($sp) -/* C4C41C 8024008C 8FB10014 */ lw $s1, 0x14($sp) -/* C4C420 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* C4C424 80240094 24020002 */ addiu $v0, $zero, 2 -/* C4C428 80240098 03E00008 */ jr $ra -/* C4C42C 8024009C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s deleted file mode 100644 index 5b8ef0a88e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802400A0_C4C430.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_C4C430 -/* C4C430 802400A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4C434 802400A4 AFB00010 */ sw $s0, 0x10($sp) -/* C4C438 802400A8 0080802D */ daddu $s0, $a0, $zero -/* C4C43C 802400AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* C4C440 802400B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* C4C444 802400B4 AFBF0014 */ sw $ra, 0x14($sp) -/* C4C448 802400B8 8E02013C */ lw $v0, 0x13c($s0) -/* C4C44C 802400BC C46C0028 */ lwc1 $f12, 0x28($v1) -/* C4C450 802400C0 C46E0030 */ lwc1 $f14, 0x30($v1) -/* C4C454 802400C4 C4460008 */ lwc1 $f6, 8($v0) -/* C4C458 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* C4C45C 802400CC 44063000 */ mfc1 $a2, $f6 -/* C4C460 802400D0 C4460010 */ lwc1 $f6, 0x10($v0) -/* C4C464 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* C4C468 802400D8 44073000 */ mfc1 $a3, $f6 -/* C4C46C 802400DC 0C00A7B5 */ jal dist2D -/* C4C470 802400E0 00000000 */ nop -/* C4C474 802400E4 3C0142E1 */ lui $at, 0x42e1 -/* C4C478 802400E8 44811000 */ mtc1 $at, $f2 -/* C4C47C 802400EC 46000106 */ mov.s $f4, $f0 -/* C4C480 802400F0 4602203C */ c.lt.s $f4, $f2 -/* C4C484 802400F4 00000000 */ nop -/* C4C488 802400F8 45000003 */ bc1f .L80240108 -/* C4C48C 802400FC AE000084 */ sw $zero, 0x84($s0) -/* C4C490 80240100 24020002 */ addiu $v0, $zero, 2 -/* C4C494 80240104 AE020084 */ sw $v0, 0x84($s0) -.L80240108: -/* C4C498 80240108 3C014216 */ lui $at, 0x4216 -/* C4C49C 8024010C 44810000 */ mtc1 $at, $f0 -/* C4C4A0 80240110 00000000 */ nop -/* C4C4A4 80240114 4600203C */ c.lt.s $f4, $f0 -/* C4C4A8 80240118 00000000 */ nop -/* C4C4AC 8024011C 45000002 */ bc1f .L80240128 -/* C4C4B0 80240120 24020001 */ addiu $v0, $zero, 1 -/* C4C4B4 80240124 AE020084 */ sw $v0, 0x84($s0) -.L80240128: -/* C4C4B8 80240128 8FBF0014 */ lw $ra, 0x14($sp) -/* C4C4BC 8024012C 8FB00010 */ lw $s0, 0x10($sp) -/* C4C4C0 80240130 24020002 */ addiu $v0, $zero, 2 -/* C4C4C4 80240134 03E00008 */ jr $ra -/* C4C4C8 80240138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s deleted file mode 100644 index 9c7b7feb78..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_8024013C_C4C4CC.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024013C_C4C4CC -/* C4C4CC 8024013C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C4C4D0 80240140 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C4C4D4 80240144 C442002C */ lwc1 $f2, 0x2c($v0) -/* C4C4D8 80240148 44800000 */ mtc1 $zero, $f0 -/* C4C4DC 8024014C 00000000 */ nop -/* C4C4E0 80240150 4602003E */ c.le.s $f0, $f2 -/* C4C4E4 80240154 00000000 */ nop -/* C4C4E8 80240158 45000003 */ bc1f .L80240168 -/* C4C4EC 8024015C 0040182D */ daddu $v1, $v0, $zero -/* C4C4F0 80240160 03E00008 */ jr $ra -/* C4C4F4 80240164 0000102D */ daddu $v0, $zero, $zero -.L80240168: -/* C4C4F8 80240168 C4420028 */ lwc1 $f2, 0x28($v0) -/* C4C4FC 8024016C 3C0143DC */ lui $at, 0x43dc -/* C4C500 80240170 44810000 */ mtc1 $at, $f0 -/* C4C504 80240174 00000000 */ nop -/* C4C508 80240178 4600103C */ c.lt.s $f2, $f0 -/* C4C50C 8024017C 00000000 */ nop -/* C4C510 80240180 45000003 */ bc1f .L80240190 -/* C4C514 80240184 00000000 */ nop -/* C4C518 80240188 0809006D */ j .L802401B4 -/* C4C51C 8024018C 24020003 */ addiu $v0, $zero, 3 -.L80240190: -/* C4C520 80240190 C4620030 */ lwc1 $f2, 0x30($v1) -/* C4C524 80240194 3C01C32A */ lui $at, 0xc32a -/* C4C528 80240198 44810000 */ mtc1 $at, $f0 -/* C4C52C 8024019C 00000000 */ nop -/* C4C530 802401A0 4600103C */ c.lt.s $f2, $f0 -/* C4C534 802401A4 00000000 */ nop -/* C4C538 802401A8 45000002 */ bc1f .L802401B4 -/* C4C53C 802401AC 24020001 */ addiu $v0, $zero, 1 -/* C4C540 802401B0 24020002 */ addiu $v0, $zero, 2 -.L802401B4: -/* C4C544 802401B4 AC820084 */ sw $v0, 0x84($a0) -/* C4C548 802401B8 03E00008 */ jr $ra -/* C4C54C 802401BC 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s deleted file mode 100644 index 23dd1b8fdd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_10/C4C390/func_802401C0_C4C550.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C0_C4C550 -/* C4C550 802401C0 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) -/* C4C554 802401C4 C422EFF4 */ lwc1 $f2, %lo(gPlayerStatus+0x2C)($at) -/* C4C558 802401C8 3C01C270 */ lui $at, 0xc270 -/* C4C55C 802401CC 44810000 */ mtc1 $at, $f0 -/* C4C560 802401D0 00000000 */ nop -/* C4C564 802401D4 4602003C */ c.lt.s $f0, $f2 -/* C4C568 802401D8 00000000 */ nop -/* C4C56C 802401DC 45010002 */ bc1t .L802401E8 -/* C4C570 802401E0 0000102D */ daddu $v0, $zero, $zero -/* C4C574 802401E4 24020002 */ addiu $v0, $zero, 2 -.L802401E8: -/* C4C578 802401E8 03E00008 */ jr $ra -/* C4C57C 802401EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s deleted file mode 100644 index 886907e10f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_11/C4D3E0/func_80240000_C4D3E0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C4D3E0 -/* C4D3E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4D3E4 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* C4D3E8 80240008 0000202D */ daddu $a0, $zero, $zero -/* C4D3EC 8024000C 3C05FD05 */ lui $a1, 0xfd05 -/* C4D3F0 80240010 0C0B1EAF */ jal get_variable -/* C4D3F4 80240014 34A50F80 */ ori $a1, $a1, 0xf80 -/* C4D3F8 80240018 0C04417A */ jal get_entity_by_index -/* C4D3FC 8024001C 0040202D */ daddu $a0, $v0, $zero -/* C4D400 80240020 50400007 */ beql $v0, $zero, .L80240040 -/* C4D404 80240024 0000102D */ daddu $v0, $zero, $zero -/* C4D408 80240028 84440014 */ lh $a0, 0x14($v0) -/* C4D40C 8024002C 3C050000 */ lui $a1, 0 -/* C4D410 80240030 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* C4D414 80240034 0C048052 */ jal play_model_animation -/* C4D418 80240038 00000000 */ nop -/* C4D41C 8024003C 24020002 */ addiu $v0, $zero, 2 -.L80240040: -/* C4D420 80240040 8FBF0010 */ lw $ra, 0x10($sp) -/* C4D424 80240044 03E00008 */ jr $ra -/* C4D428 80240048 27BD0018 */ addiu $sp, $sp, 0x18 -/* C4D42C 8024004C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s deleted file mode 100644 index b92f31deca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C4DEF0 -/* C4DEF0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C4DEF4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C4DEF8 80240008 3C108024 */ lui $s0, %hi(D_80240870_C4E760) -/* C4DEFC 8024000C 26100870 */ addiu $s0, $s0, %lo(D_80240870_C4E760) -/* C4DF00 80240010 AFBF0018 */ sw $ra, 0x18($sp) -/* C4DF04 80240014 AFB10014 */ sw $s1, 0x14($sp) -/* C4DF08 80240018 8E020000 */ lw $v0, ($s0) -/* C4DF0C 8024001C 14400010 */ bnez $v0, .L80240060 -/* C4DF10 80240020 0080882D */ daddu $s1, $a0, $zero -/* C4DF14 80240024 0C00AB39 */ jal heap_malloc -/* C4DF18 80240028 24040040 */ addiu $a0, $zero, 0x40 -/* C4DF1C 8024002C AE020000 */ sw $v0, ($s0) -/* C4DF20 80240030 0000182D */ daddu $v1, $zero, $zero -/* C4DF24 80240034 0040282D */ daddu $a1, $v0, $zero -/* C4DF28 80240038 0220202D */ daddu $a0, $s1, $zero -.L8024003C: -/* C4DF2C 8024003C 8C820084 */ lw $v0, 0x84($a0) -/* C4DF30 80240040 24840004 */ addiu $a0, $a0, 4 -/* C4DF34 80240044 24630001 */ addiu $v1, $v1, 1 -/* C4DF38 80240048 ACA20000 */ sw $v0, ($a1) -/* C4DF3C 8024004C 28620010 */ slti $v0, $v1, 0x10 -/* C4DF40 80240050 1440FFFA */ bnez $v0, .L8024003C -/* C4DF44 80240054 24A50004 */ addiu $a1, $a1, 4 -/* C4DF48 80240058 08090027 */ j .L8024009C -/* C4DF4C 8024005C 00000000 */ nop -.L80240060: -/* C4DF50 80240060 0000182D */ daddu $v1, $zero, $zero -/* C4DF54 80240064 0040282D */ daddu $a1, $v0, $zero -/* C4DF58 80240068 0220202D */ daddu $a0, $s1, $zero -.L8024006C: -/* C4DF5C 8024006C 8CA20000 */ lw $v0, ($a1) -/* C4DF60 80240070 24A50004 */ addiu $a1, $a1, 4 -/* C4DF64 80240074 24630001 */ addiu $v1, $v1, 1 -/* C4DF68 80240078 AC820084 */ sw $v0, 0x84($a0) -/* C4DF6C 8024007C 28620010 */ slti $v0, $v1, 0x10 -/* C4DF70 80240080 1440FFFA */ bnez $v0, .L8024006C -/* C4DF74 80240084 24840004 */ addiu $a0, $a0, 4 -/* C4DF78 80240088 3C108024 */ lui $s0, %hi(D_80240870_C4E760) -/* C4DF7C 8024008C 26100870 */ addiu $s0, $s0, %lo(D_80240870_C4E760) -/* C4DF80 80240090 0C00AB4B */ jal heap_free -/* C4DF84 80240094 8E040000 */ lw $a0, ($s0) -/* C4DF88 80240098 AE000000 */ sw $zero, ($s0) -.L8024009C: -/* C4DF8C 8024009C 8FBF0018 */ lw $ra, 0x18($sp) -/* C4DF90 802400A0 8FB10014 */ lw $s1, 0x14($sp) -/* C4DF94 802400A4 8FB00010 */ lw $s0, 0x10($sp) -/* C4DF98 802400A8 24020002 */ addiu $v0, $zero, 2 -/* C4DF9C 802400AC 03E00008 */ jr $ra -/* C4DFA0 802400B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s deleted file mode 100644 index fc4e223939..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C4F718 -/* C4F718 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C4F71C 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C4F720 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C4F724 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C4F728 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C4F72C 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C4F730 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C4F734 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C4F738 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C4F73C 8024022C 86040008 */ lh $a0, 8($s0) -/* C4F740 80240230 0C00EABB */ jal get_npc_unsafe -/* C4F744 80240234 24110001 */ addiu $s1, $zero, 1 -/* C4F748 80240238 86040008 */ lh $a0, 8($s0) -/* C4F74C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C4F750 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C4F754 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C4F758 80240248 3C03800A */ lui $v1, %hi(D_8009A634) -/* C4F75C 8024024C 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C4F760 80240250 00912021 */ addu $a0, $a0, $s1 -/* C4F764 80240254 00031080 */ sll $v0, $v1, 2 -/* C4F768 80240258 00431021 */ addu $v0, $v0, $v1 -/* C4F76C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C4F770 80240260 00431023 */ subu $v0, $v0, $v1 -/* C4F774 80240264 000218C0 */ sll $v1, $v0, 3 -/* C4F778 80240268 00431021 */ addu $v0, $v0, $v1 -/* C4F77C 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C4F780 80240270 0C00FB3A */ jal get_enemy -/* C4F784 80240274 00459021 */ addu $s2, $v0, $a1 -/* C4F788 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C4F78C 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C4F790 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C4F794 80240284 8E830000 */ lw $v1, ($s4) -/* C4F798 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4F79C 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C4F7A0 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C4F7A4 80240294 0C00A7B5 */ jal dist2D -/* C4F7A8 80240298 0040982D */ daddu $s3, $v0, $zero -/* C4F7AC 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C4F7B0 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C4F7B4 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C4F7B8 802402A8 00000000 */ nop -/* C4F7BC 802402AC 45030001 */ bc1tl .L802402B4 -/* C4F7C0 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C4F7C4 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C4F7C8 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C4F7CC 802402BC 3C014387 */ lui $at, 0x4387 -/* C4F7D0 802402C0 4481A000 */ mtc1 $at, $f20 -/* C4F7D4 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C4F7D8 802402C8 00000000 */ nop -/* C4F7DC 802402CC 0C00A6C9 */ jal clamp_angle -/* C4F7E0 802402D0 46000306 */ mov.s $f12, $f0 -/* C4F7E4 802402D4 3C018024 */ lui $at, %hi(D_80242CF0_C52200) -/* C4F7E8 802402D8 D4222CF0 */ ldc1 $f2, %lo(D_80242CF0_C52200)($at) -/* C4F7EC 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C4F7F0 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C4F7F4 802402E4 00000000 */ nop -/* C4F7F8 802402E8 45000003 */ bc1f .L802402F8 -/* C4F7FC 802402EC 00000000 */ nop -/* C4F800 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C4F804 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C4F808 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C4F80C 802402FC 8E820000 */ lw $v0, ($s4) -/* C4F810 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4F814 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C4F818 80240308 0C00A720 */ jal atan2 -/* C4F81C 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C4F820 80240310 4600A306 */ mov.s $f12, $f20 -/* C4F824 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C4F828 80240318 46000386 */ mov.s $f14, $f0 -/* C4F82C 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C4F830 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C4F834 80240324 46000005 */ abs.s $f0, $f0 -/* C4F838 80240328 4600103C */ c.lt.s $f2, $f0 -/* C4F83C 8024032C 00000000 */ nop -/* C4F840 80240330 45030001 */ bc1tl .L80240338 -/* C4F844 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C4F848 80240338 8E820000 */ lw $v0, ($s4) -/* C4F84C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C4F850 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C4F854 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C4F858 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C4F85C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C4F860 80240350 00000000 */ nop -/* C4F864 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C4F868 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C4F86C 8024035C 46000005 */ abs.s $f0, $f0 -/* C4F870 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C4F874 80240364 4620103E */ c.le.d $f2, $f0 -/* C4F878 80240368 00000000 */ nop -/* C4F87C 8024036C 45030001 */ bc1tl .L80240374 -/* C4F880 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C4F884 80240374 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C4F888 80240378 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C4F88C 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C4F890 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C4F894 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C4F898 80240388 24020007 */ addiu $v0, $zero, 7 -/* C4F89C 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C4F8A0 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C4F8A4 80240394 0220102D */ daddu $v0, $s1, $zero -/* C4F8A8 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C4F8AC 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C4F8B0 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C4F8B4 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C4F8B8 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C4F8BC 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C4F8C0 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C4F8C4 802403B4 03E00008 */ jr $ra -/* C4F8C8 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s deleted file mode 100644 index fbd4668a65..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ /dev/null @@ -1,198 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C4FB2C -/* C4FB2C 8024061C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C4FB30 80240620 AFB20038 */ sw $s2, 0x38($sp) -/* C4FB34 80240624 0080902D */ daddu $s2, $a0, $zero -/* C4FB38 80240628 AFBF0048 */ sw $ra, 0x48($sp) -/* C4FB3C 8024062C AFB50044 */ sw $s5, 0x44($sp) -/* C4FB40 80240630 AFB40040 */ sw $s4, 0x40($sp) -/* C4FB44 80240634 AFB3003C */ sw $s3, 0x3c($sp) -/* C4FB48 80240638 AFB10034 */ sw $s1, 0x34($sp) -/* C4FB4C 8024063C AFB00030 */ sw $s0, 0x30($sp) -/* C4FB50 80240640 8E510148 */ lw $s1, 0x148($s2) -/* C4FB54 80240644 86240008 */ lh $a0, 8($s1) -/* C4FB58 80240648 0C00EABB */ jal get_npc_unsafe -/* C4FB5C 8024064C 00A0802D */ daddu $s0, $a1, $zero -/* C4FB60 80240650 8E43000C */ lw $v1, 0xc($s2) -/* C4FB64 80240654 0240202D */ daddu $a0, $s2, $zero -/* C4FB68 80240658 8C650000 */ lw $a1, ($v1) -/* C4FB6C 8024065C 0C0B1EAF */ jal get_variable -/* C4FB70 80240660 0040A82D */ daddu $s5, $v0, $zero -/* C4FB74 80240664 AFA00010 */ sw $zero, 0x10($sp) -/* C4FB78 80240668 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FB7C 8024066C 8C630030 */ lw $v1, 0x30($v1) -/* C4FB80 80240670 AFA30014 */ sw $v1, 0x14($sp) -/* C4FB84 80240674 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FB88 80240678 8C63001C */ lw $v1, 0x1c($v1) -/* C4FB8C 8024067C AFA30018 */ sw $v1, 0x18($sp) -/* C4FB90 80240680 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FB94 80240684 8C630024 */ lw $v1, 0x24($v1) -/* C4FB98 80240688 AFA3001C */ sw $v1, 0x1c($sp) -/* C4FB9C 8024068C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FBA0 80240690 8C630028 */ lw $v1, 0x28($v1) -/* C4FBA4 80240694 27B40010 */ addiu $s4, $sp, 0x10 -/* C4FBA8 80240698 AFA30020 */ sw $v1, 0x20($sp) -/* C4FBAC 8024069C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C4FBB0 802406A0 3C014282 */ lui $at, 0x4282 -/* C4FBB4 802406A4 44810000 */ mtc1 $at, $f0 -/* C4FBB8 802406A8 8C63002C */ lw $v1, 0x2c($v1) -/* C4FBBC 802406AC 0040982D */ daddu $s3, $v0, $zero -/* C4FBC0 802406B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C4FBC4 802406B4 A7A0002C */ sh $zero, 0x2c($sp) -/* C4FBC8 802406B8 16000005 */ bnez $s0, .L802406D0 -/* C4FBCC 802406BC AFA30024 */ sw $v1, 0x24($sp) -/* C4FBD0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4FBD4 802406C4 30420004 */ andi $v0, $v0, 4 -/* C4FBD8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C4FBDC 802406CC 00000000 */ nop -.L802406D0: -/* C4FBE0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C4FBE4 802406D4 AE400070 */ sw $zero, 0x70($s2) -/* C4FBE8 802406D8 A6A0008E */ sh $zero, 0x8e($s5) -/* C4FBEC 802406DC 8E2200CC */ lw $v0, 0xcc($s1) -/* C4FBF0 802406E0 8EA30000 */ lw $v1, ($s5) -/* C4FBF4 802406E4 8C420000 */ lw $v0, ($v0) -/* C4FBF8 802406E8 00641824 */ and $v1, $v1, $a0 -/* C4FBFC 802406EC AEA30000 */ sw $v1, ($s5) -/* C4FC00 802406F0 AEA20028 */ sw $v0, 0x28($s5) -/* C4FC04 802406F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C4FC08 802406F8 8C420034 */ lw $v0, 0x34($v0) -/* C4FC0C 802406FC 54400005 */ bnel $v0, $zero, .L80240714 -/* C4FC10 80240700 2402FDFF */ addiu $v0, $zero, -0x201 -/* C4FC14 80240704 34620200 */ ori $v0, $v1, 0x200 -/* C4FC18 80240708 2403FFF7 */ addiu $v1, $zero, -9 -/* C4FC1C 8024070C 080901C7 */ j .L8024071C -/* C4FC20 80240710 00431024 */ and $v0, $v0, $v1 -.L80240714: -/* C4FC24 80240714 00621024 */ and $v0, $v1, $v0 -/* C4FC28 80240718 34420008 */ ori $v0, $v0, 8 -.L8024071C: -/* C4FC2C 8024071C AEA20000 */ sw $v0, ($s5) -/* C4FC30 80240720 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4FC34 80240724 30420004 */ andi $v0, $v0, 4 -/* C4FC38 80240728 10400007 */ beqz $v0, .L80240748 -/* C4FC3C 8024072C 24020063 */ addiu $v0, $zero, 0x63 -/* C4FC40 80240730 AE420070 */ sw $v0, 0x70($s2) -/* C4FC44 80240734 AE400074 */ sw $zero, 0x74($s2) -/* C4FC48 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4FC4C 8024073C 2403FFFB */ addiu $v1, $zero, -5 -/* C4FC50 80240740 00431024 */ and $v0, $v0, $v1 -/* C4FC54 80240744 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240748: -/* C4FC58 80240748 AE20006C */ sw $zero, 0x6c($s1) -.L8024074C: -/* C4FC5C 8024074C 8E420070 */ lw $v0, 0x70($s2) -/* C4FC60 80240750 2842001E */ slti $v0, $v0, 0x1e -/* C4FC64 80240754 10400009 */ beqz $v0, .L8024077C -/* C4FC68 80240758 00000000 */ nop -/* C4FC6C 8024075C 8E22006C */ lw $v0, 0x6c($s1) -/* C4FC70 80240760 14400006 */ bnez $v0, .L8024077C -/* C4FC74 80240764 00000000 */ nop -/* C4FC78 80240768 0C090082 */ jal func_80240208_C4F718 -/* C4FC7C 8024076C 0240202D */ daddu $a0, $s2, $zero -/* C4FC80 80240770 10400002 */ beqz $v0, .L8024077C -/* C4FC84 80240774 2402001E */ addiu $v0, $zero, 0x1e -/* C4FC88 80240778 AE420070 */ sw $v0, 0x70($s2) -.L8024077C: -/* C4FC8C 8024077C 8E430070 */ lw $v1, 0x70($s2) -/* C4FC90 80240780 2C620064 */ sltiu $v0, $v1, 0x64 -/* C4FC94 80240784 10400048 */ beqz $v0, L802408A8_C4FDB8 -/* C4FC98 80240788 00031080 */ sll $v0, $v1, 2 -/* C4FC9C 8024078C 3C018024 */ lui $at, %hi(jtbl_80242CF8_C52208) -/* C4FCA0 80240790 00220821 */ addu $at, $at, $v0 -/* C4FCA4 80240794 8C222CF8 */ lw $v0, %lo(jtbl_80242CF8_C52208)($at) -/* C4FCA8 80240798 00400008 */ jr $v0 -/* C4FCAC 8024079C 00000000 */ nop -glabel L802407A0_C4FCB0 -/* C4FCB0 802407A0 0240202D */ daddu $a0, $s2, $zero -/* C4FCB4 802407A4 0260282D */ daddu $a1, $s3, $zero -/* C4FCB8 802407A8 0C012568 */ jal func_800495A0 -/* C4FCBC 802407AC 0280302D */ daddu $a2, $s4, $zero -glabel L802407B0_C4FCC0 -/* C4FCC0 802407B0 0240202D */ daddu $a0, $s2, $zero -/* C4FCC4 802407B4 0260282D */ daddu $a1, $s3, $zero -/* C4FCC8 802407B8 0C0125AE */ jal func_800496B8 -/* C4FCCC 802407BC 0280302D */ daddu $a2, $s4, $zero -/* C4FCD0 802407C0 0809022A */ j L802408A8_C4FDB8 -/* C4FCD4 802407C4 00000000 */ nop -glabel L802407C8_C4FCD8 -/* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero -/* C4FCDC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C4FCE0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C4FCE4 802407D4 0280302D */ daddu $a2, $s4, $zero -glabel L802407D8_C4FCE8 -/* C4FCE8 802407D8 0240202D */ daddu $a0, $s2, $zero -/* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero -/* C4FCF0 802407E0 0C012701 */ jal func_80049C04 -/* C4FCF4 802407E4 0280302D */ daddu $a2, $s4, $zero -/* C4FCF8 802407E8 0809022A */ j L802408A8_C4FDB8 -/* C4FCFC 802407EC 00000000 */ nop -glabel L802407F0_C4FD00 -/* C4FD00 802407F0 0240202D */ daddu $a0, $s2, $zero -/* C4FD04 802407F4 0260282D */ daddu $a1, $s3, $zero -/* C4FD08 802407F8 0C01278F */ jal func_80049E3C -/* C4FD0C 802407FC 0280302D */ daddu $a2, $s4, $zero -glabel L80240800_C4FD10 -/* C4FD10 80240800 0240202D */ daddu $a0, $s2, $zero -/* C4FD14 80240804 0260282D */ daddu $a1, $s3, $zero -/* C4FD18 80240808 0C0127B3 */ jal func_80049ECC -/* C4FD1C 8024080C 0280302D */ daddu $a2, $s4, $zero -/* C4FD20 80240810 0809022A */ j L802408A8_C4FDB8 -/* C4FD24 80240814 00000000 */ nop -glabel L80240818_C4FD28 -/* C4FD28 80240818 0240202D */ daddu $a0, $s2, $zero -/* C4FD2C 8024081C 0260282D */ daddu $a1, $s3, $zero -/* C4FD30 80240820 0C0127DF */ jal func_80049F7C -/* C4FD34 80240824 0280302D */ daddu $a2, $s4, $zero -glabel L80240828_C4FD38 -/* C4FD38 80240828 0240202D */ daddu $a0, $s2, $zero -/* C4FD3C 8024082C 0260282D */ daddu $a1, $s3, $zero -/* C4FD40 80240830 0C012849 */ jal func_8004A124 -/* C4FD44 80240834 0280302D */ daddu $a2, $s4, $zero -/* C4FD48 80240838 0809022A */ j L802408A8_C4FDB8 -/* C4FD4C 8024083C 00000000 */ nop -glabel L80240840_C4FD50 -/* C4FD50 80240840 0240202D */ daddu $a0, $s2, $zero -/* C4FD54 80240844 0260282D */ daddu $a1, $s3, $zero -/* C4FD58 80240848 0C0128FA */ jal func_8004A3E8 -/* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero -/* C4FD60 80240850 0809022A */ j L802408A8_C4FDB8 -/* C4FD64 80240854 00000000 */ nop -glabel L80240858_C4FD68 -/* C4FD68 80240858 0C090000 */ jal dgb_15_UnkNpcAIFunc6 -/* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero -glabel L80240860_C4FD70 -/* C4FD70 80240860 0C09001B */ jal dgb_15_UnkNpcAIFunc7 -/* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero -/* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) -/* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 -/* C4FD80 80240870 1462000D */ bne $v1, $v0, L802408A8_C4FDB8 -/* C4FD84 80240874 00000000 */ nop -glabel L80240878_C4FD88 -/* C4FD88 80240878 0C090037 */ jal dgb_15_UnkNpcAIFunc8 -/* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero -/* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) -/* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 -/* C4FD98 80240888 14620007 */ bne $v1, $v0, L802408A8_C4FDB8 -/* C4FD9C 8024088C 00000000 */ nop -glabel L80240890_C4FDA0 -/* C4FDA0 80240890 0C09006D */ jal dgb_15_UnkNpcAIFunc5 -/* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero -/* C4FDA8 80240898 0809022A */ j L802408A8_C4FDB8 -/* C4FDAC 8024089C 00000000 */ nop -glabel L802408A0_C4FDB0 -/* C4FDB0 802408A0 0C0129CF */ jal func_8004A73C -/* C4FDB4 802408A4 0240202D */ daddu $a0, $s2, $zero -glabel L802408A8_C4FDB8 -/* C4FDB8 802408A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C4FDBC 802408AC 8FB50044 */ lw $s5, 0x44($sp) -/* C4FDC0 802408B0 8FB40040 */ lw $s4, 0x40($sp) -/* C4FDC4 802408B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C4FDC8 802408B8 8FB20038 */ lw $s2, 0x38($sp) -/* C4FDCC 802408BC 8FB10034 */ lw $s1, 0x34($sp) -/* C4FDD0 802408C0 8FB00030 */ lw $s0, 0x30($sp) -/* C4FDD4 802408C4 0000102D */ daddu $v0, $zero, $zero -/* C4FDD8 802408C8 03E00008 */ jr $ra -/* C4FDDC 802408CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s deleted file mode 100644 index 22390b5f09..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_C4FDE0 -/* C4FDE0 802408D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C4FDE4 802408D4 AFB50024 */ sw $s5, 0x24($sp) -/* C4FDE8 802408D8 0080A82D */ daddu $s5, $a0, $zero -/* C4FDEC 802408DC AFBF002C */ sw $ra, 0x2c($sp) -/* C4FDF0 802408E0 AFB60028 */ sw $s6, 0x28($sp) -/* C4FDF4 802408E4 AFB40020 */ sw $s4, 0x20($sp) -/* C4FDF8 802408E8 AFB3001C */ sw $s3, 0x1c($sp) -/* C4FDFC 802408EC AFB20018 */ sw $s2, 0x18($sp) -/* C4FE00 802408F0 AFB10014 */ sw $s1, 0x14($sp) -/* C4FE04 802408F4 AFB00010 */ sw $s0, 0x10($sp) -/* C4FE08 802408F8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C4FE0C 802408FC F7B60038 */ sdc1 $f22, 0x38($sp) -/* C4FE10 80240900 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C4FE14 80240904 8EB30148 */ lw $s3, 0x148($s5) -/* C4FE18 80240908 86640008 */ lh $a0, 8($s3) -/* C4FE1C 8024090C 0C00EABB */ jal get_npc_unsafe -/* C4FE20 80240910 00A0B02D */ daddu $s6, $a1, $zero -/* C4FE24 80240914 0040A02D */ daddu $s4, $v0, $zero -/* C4FE28 80240918 AEA00074 */ sw $zero, 0x74($s5) -/* C4FE2C 8024091C C6980038 */ lwc1 $f24, 0x38($s4) -/* C4FE30 80240920 C6960040 */ lwc1 $f22, 0x40($s4) -/* C4FE34 80240924 0000902D */ daddu $s2, $zero, $zero -/* C4FE38 80240928 AEA00078 */ sw $zero, 0x78($s5) -/* C4FE3C 8024092C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C4FE40 80240930 8C620000 */ lw $v0, ($v1) -/* C4FE44 80240934 3C0146FF */ lui $at, 0x46ff -/* C4FE48 80240938 3421FE00 */ ori $at, $at, 0xfe00 -/* C4FE4C 8024093C 4481A000 */ mtc1 $at, $f20 -/* C4FE50 80240940 18400018 */ blez $v0, .L802409A4 -/* C4FE54 80240944 0240802D */ daddu $s0, $s2, $zero -/* C4FE58 80240948 0240882D */ daddu $s1, $s2, $zero -.L8024094C: -/* C4FE5C 8024094C 02231021 */ addu $v0, $s1, $v1 -/* C4FE60 80240950 4600C306 */ mov.s $f12, $f24 -/* C4FE64 80240954 C4440004 */ lwc1 $f4, 4($v0) -/* C4FE68 80240958 46802120 */ cvt.s.w $f4, $f4 -/* C4FE6C 8024095C 44062000 */ mfc1 $a2, $f4 -/* C4FE70 80240960 C444000C */ lwc1 $f4, 0xc($v0) -/* C4FE74 80240964 46802120 */ cvt.s.w $f4, $f4 -/* C4FE78 80240968 44072000 */ mfc1 $a3, $f4 -/* C4FE7C 8024096C 0C00A7B5 */ jal dist2D -/* C4FE80 80240970 4600B386 */ mov.s $f14, $f22 -/* C4FE84 80240974 4614003C */ c.lt.s $f0, $f20 -/* C4FE88 80240978 00000000 */ nop -/* C4FE8C 8024097C 45000003 */ bc1f .L8024098C -/* C4FE90 80240980 2631000C */ addiu $s1, $s1, 0xc -/* C4FE94 80240984 46000506 */ mov.s $f20, $f0 -/* C4FE98 80240988 AEB20078 */ sw $s2, 0x78($s5) -.L8024098C: -/* C4FE9C 8024098C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C4FEA0 80240990 26100001 */ addiu $s0, $s0, 1 -/* C4FEA4 80240994 8C620000 */ lw $v0, ($v1) -/* C4FEA8 80240998 0202102A */ slt $v0, $s0, $v0 -/* C4FEAC 8024099C 1440FFEB */ bnez $v0, .L8024094C -/* C4FEB0 802409A0 26520001 */ addiu $s2, $s2, 1 -.L802409A4: -/* C4FEB4 802409A4 8E6200CC */ lw $v0, 0xcc($s3) -/* C4FEB8 802409A8 8C420004 */ lw $v0, 4($v0) -/* C4FEBC 802409AC AE820028 */ sw $v0, 0x28($s4) -/* C4FEC0 802409B0 8E6200D0 */ lw $v0, 0xd0($s3) -/* C4FEC4 802409B4 8C42007C */ lw $v0, 0x7c($v0) -/* C4FEC8 802409B8 04410004 */ bgez $v0, .L802409CC -/* C4FECC 802409BC 00000000 */ nop -/* C4FED0 802409C0 C6C00000 */ lwc1 $f0, ($s6) -/* C4FED4 802409C4 0809027B */ j .L802409EC -/* C4FED8 802409C8 E6800018 */ swc1 $f0, 0x18($s4) -.L802409CC: -/* C4FEDC 802409CC 3C018024 */ lui $at, %hi(D_80242E88_C52398) -/* C4FEE0 802409D0 D4222E88 */ ldc1 $f2, %lo(D_80242E88_C52398)($at) -/* C4FEE4 802409D4 44820000 */ mtc1 $v0, $f0 -/* C4FEE8 802409D8 00000000 */ nop -/* C4FEEC 802409DC 46800021 */ cvt.d.w $f0, $f0 -/* C4FEF0 802409E0 46220003 */ div.d $f0, $f0, $f2 -/* C4FEF4 802409E4 46200020 */ cvt.s.d $f0, $f0 -/* C4FEF8 802409E8 E6800018 */ swc1 $f0, 0x18($s4) -.L802409EC: -/* C4FEFC 802409EC 24020001 */ addiu $v0, $zero, 1 -/* C4FF00 802409F0 AEA20070 */ sw $v0, 0x70($s5) -/* C4FF04 802409F4 8FBF002C */ lw $ra, 0x2c($sp) -/* C4FF08 802409F8 8FB60028 */ lw $s6, 0x28($sp) -/* C4FF0C 802409FC 8FB50024 */ lw $s5, 0x24($sp) -/* C4FF10 80240A00 8FB40020 */ lw $s4, 0x20($sp) -/* C4FF14 80240A04 8FB3001C */ lw $s3, 0x1c($sp) -/* C4FF18 80240A08 8FB20018 */ lw $s2, 0x18($sp) -/* C4FF1C 80240A0C 8FB10014 */ lw $s1, 0x14($sp) -/* C4FF20 80240A10 8FB00010 */ lw $s0, 0x10($sp) -/* C4FF24 80240A14 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C4FF28 80240A18 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C4FF2C 80240A1C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C4FF30 80240A20 03E00008 */ jr $ra -/* C4FF34 80240A24 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s deleted file mode 100644 index 368cee895f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240A28_C4FF38.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A28_C4FF38 -/* C4FF38 80240A28 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C4FF3C 80240A2C AFB20038 */ sw $s2, 0x38($sp) -/* C4FF40 80240A30 0080902D */ daddu $s2, $a0, $zero -/* C4FF44 80240A34 AFBF0044 */ sw $ra, 0x44($sp) -/* C4FF48 80240A38 AFB40040 */ sw $s4, 0x40($sp) -/* C4FF4C 80240A3C AFB3003C */ sw $s3, 0x3c($sp) -/* C4FF50 80240A40 AFB10034 */ sw $s1, 0x34($sp) -/* C4FF54 80240A44 AFB00030 */ sw $s0, 0x30($sp) -/* C4FF58 80240A48 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C4FF5C 80240A4C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C4FF60 80240A50 8E510148 */ lw $s1, 0x148($s2) -/* C4FF64 80240A54 00A0982D */ daddu $s3, $a1, $zero -/* C4FF68 80240A58 86240008 */ lh $a0, 8($s1) -/* C4FF6C 80240A5C 0C00EABB */ jal get_npc_unsafe -/* C4FF70 80240A60 00C0A02D */ daddu $s4, $a2, $zero -/* C4FF74 80240A64 8E630014 */ lw $v1, 0x14($s3) -/* C4FF78 80240A68 04600030 */ bltz $v1, .L80240B2C -/* C4FF7C 80240A6C 0040802D */ daddu $s0, $v0, $zero -/* C4FF80 80240A70 8E420074 */ lw $v0, 0x74($s2) -/* C4FF84 80240A74 1C40002C */ bgtz $v0, .L80240B28 -/* C4FF88 80240A78 2442FFFF */ addiu $v0, $v0, -1 -/* C4FF8C 80240A7C 0280202D */ daddu $a0, $s4, $zero -/* C4FF90 80240A80 AE430074 */ sw $v1, 0x74($s2) -/* C4FF94 80240A84 AFA00010 */ sw $zero, 0x10($sp) -/* C4FF98 80240A88 8E66000C */ lw $a2, 0xc($s3) -/* C4FF9C 80240A8C 8E670010 */ lw $a3, 0x10($s3) -/* C4FFA0 80240A90 0C01242D */ jal func_800490B4 -/* C4FFA4 80240A94 0220282D */ daddu $a1, $s1, $zero -/* C4FFA8 80240A98 10400021 */ beqz $v0, .L80240B20 -/* C4FFAC 80240A9C 0000202D */ daddu $a0, $zero, $zero -/* C4FFB0 80240AA0 0200282D */ daddu $a1, $s0, $zero -/* C4FFB4 80240AA4 0000302D */ daddu $a2, $zero, $zero -/* C4FFB8 80240AA8 860300A8 */ lh $v1, 0xa8($s0) -/* C4FFBC 80240AAC 3C013F80 */ lui $at, 0x3f80 -/* C4FFC0 80240AB0 44810000 */ mtc1 $at, $f0 -/* C4FFC4 80240AB4 3C014000 */ lui $at, 0x4000 -/* C4FFC8 80240AB8 44811000 */ mtc1 $at, $f2 -/* C4FFCC 80240ABC 3C01C1A0 */ lui $at, 0xc1a0 -/* C4FFD0 80240AC0 44812000 */ mtc1 $at, $f4 -/* C4FFD4 80240AC4 2402000F */ addiu $v0, $zero, 0xf -/* C4FFD8 80240AC8 AFA2001C */ sw $v0, 0x1c($sp) -/* C4FFDC 80240ACC 44833000 */ mtc1 $v1, $f6 -/* C4FFE0 80240AD0 00000000 */ nop -/* C4FFE4 80240AD4 468031A0 */ cvt.s.w $f6, $f6 -/* C4FFE8 80240AD8 44073000 */ mfc1 $a3, $f6 -/* C4FFEC 80240ADC 27A20028 */ addiu $v0, $sp, 0x28 -/* C4FFF0 80240AE0 AFA20020 */ sw $v0, 0x20($sp) -/* C4FFF4 80240AE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4FFF8 80240AE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4FFFC 80240AEC 0C01BFA4 */ jal fx_emote -/* C50000 80240AF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C50004 80240AF4 0200202D */ daddu $a0, $s0, $zero -/* C50008 80240AF8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5000C 80240AFC 0C012530 */ jal func_800494C0 -/* C50010 80240B00 3C060020 */ lui $a2, 0x20 -/* C50014 80240B04 8E220018 */ lw $v0, 0x18($s1) -/* C50018 80240B08 9442002A */ lhu $v0, 0x2a($v0) -/* C5001C 80240B0C 30420001 */ andi $v0, $v0, 1 -/* C50020 80240B10 14400064 */ bnez $v0, .L80240CA4 -/* C50024 80240B14 2402000A */ addiu $v0, $zero, 0xa -/* C50028 80240B18 08090329 */ j .L80240CA4 -/* C5002C 80240B1C 2402000C */ addiu $v0, $zero, 0xc -.L80240B20: -/* C50030 80240B20 8E420074 */ lw $v0, 0x74($s2) -/* C50034 80240B24 2442FFFF */ addiu $v0, $v0, -1 -.L80240B28: -/* C50038 80240B28 AE420074 */ sw $v0, 0x74($s2) -.L80240B2C: -/* C5003C 80240B2C 8602008C */ lh $v0, 0x8c($s0) -/* C50040 80240B30 1440005D */ bnez $v0, .L80240CA8 -/* C50044 80240B34 00000000 */ nop -/* C50048 80240B38 C6000018 */ lwc1 $f0, 0x18($s0) -/* C5004C 80240B3C 3C014010 */ lui $at, 0x4010 -/* C50050 80240B40 44811800 */ mtc1 $at, $f3 -/* C50054 80240B44 44801000 */ mtc1 $zero, $f2 -/* C50058 80240B48 46000021 */ cvt.d.s $f0, $f0 -/* C5005C 80240B4C 4622003C */ c.lt.d $f0, $f2 -/* C50060 80240B50 00000000 */ nop -/* C50064 80240B54 45000003 */ bc1f .L80240B64 -/* C50068 80240B58 0200202D */ daddu $a0, $s0, $zero -/* C5006C 80240B5C 080902DA */ j .L80240B68 -/* C50070 80240B60 0000282D */ daddu $a1, $zero, $zero -.L80240B64: -/* C50074 80240B64 24050001 */ addiu $a1, $zero, 1 -.L80240B68: -/* C50078 80240B68 0C00F598 */ jal func_8003D660 -/* C5007C 80240B6C 00000000 */ nop -/* C50080 80240B70 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C50084 80240B74 8E430078 */ lw $v1, 0x78($s2) -/* C50088 80240B78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5008C 80240B7C 00031040 */ sll $v0, $v1, 1 -/* C50090 80240B80 00431021 */ addu $v0, $v0, $v1 -/* C50094 80240B84 8E2300D0 */ lw $v1, 0xd0($s1) -/* C50098 80240B88 00021080 */ sll $v0, $v0, 2 -/* C5009C 80240B8C 00431021 */ addu $v0, $v0, $v1 -/* C500A0 80240B90 C4560004 */ lwc1 $f22, 4($v0) -/* C500A4 80240B94 4680B5A0 */ cvt.s.w $f22, $f22 -/* C500A8 80240B98 C454000C */ lwc1 $f20, 0xc($v0) -/* C500AC 80240B9C 4680A520 */ cvt.s.w $f20, $f20 -/* C500B0 80240BA0 4406B000 */ mfc1 $a2, $f22 -/* C500B4 80240BA4 4407A000 */ mfc1 $a3, $f20 -/* C500B8 80240BA8 0C00A720 */ jal atan2 -/* C500BC 80240BAC 00000000 */ nop -/* C500C0 80240BB0 8E050018 */ lw $a1, 0x18($s0) -/* C500C4 80240BB4 44060000 */ mfc1 $a2, $f0 -/* C500C8 80240BB8 0200202D */ daddu $a0, $s0, $zero -/* C500CC 80240BBC 0C00EA95 */ jal npc_move_heading -/* C500D0 80240BC0 AE06000C */ sw $a2, 0xc($s0) -/* C500D4 80240BC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C500D8 80240BC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C500DC 80240BCC 4406B000 */ mfc1 $a2, $f22 -/* C500E0 80240BD0 4407A000 */ mfc1 $a3, $f20 -/* C500E4 80240BD4 0C00A7B5 */ jal dist2D -/* C500E8 80240BD8 00000000 */ nop -/* C500EC 80240BDC C6020018 */ lwc1 $f2, 0x18($s0) -/* C500F0 80240BE0 4602003E */ c.le.s $f0, $f2 -/* C500F4 80240BE4 00000000 */ nop -/* C500F8 80240BE8 4500002F */ bc1f .L80240CA8 -/* C500FC 80240BEC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C50100 80240BF0 24020002 */ addiu $v0, $zero, 2 -/* C50104 80240BF4 0C00A67F */ jal rand_int -/* C50108 80240BF8 AE420070 */ sw $v0, 0x70($s2) -/* C5010C 80240BFC 3C035555 */ lui $v1, 0x5555 -/* C50110 80240C00 34635556 */ ori $v1, $v1, 0x5556 -/* C50114 80240C04 00430018 */ mult $v0, $v1 -/* C50118 80240C08 000227C3 */ sra $a0, $v0, 0x1f -/* C5011C 80240C0C 00004010 */ mfhi $t0 -/* C50120 80240C10 01042023 */ subu $a0, $t0, $a0 -/* C50124 80240C14 00041840 */ sll $v1, $a0, 1 -/* C50128 80240C18 00641821 */ addu $v1, $v1, $a0 -/* C5012C 80240C1C 00431023 */ subu $v0, $v0, $v1 -/* C50130 80240C20 24430002 */ addiu $v1, $v0, 2 -/* C50134 80240C24 AE430074 */ sw $v1, 0x74($s2) -/* C50138 80240C28 8E62002C */ lw $v0, 0x2c($s3) -/* C5013C 80240C2C 18400009 */ blez $v0, .L80240C54 -/* C50140 80240C30 24020004 */ addiu $v0, $zero, 4 -/* C50144 80240C34 8E620004 */ lw $v0, 4($s3) -/* C50148 80240C38 18400006 */ blez $v0, .L80240C54 -/* C5014C 80240C3C 24020004 */ addiu $v0, $zero, 4 -/* C50150 80240C40 8E620008 */ lw $v0, 8($s3) -/* C50154 80240C44 18400003 */ blez $v0, .L80240C54 -/* C50158 80240C48 24020004 */ addiu $v0, $zero, 4 -/* C5015C 80240C4C 14600002 */ bnez $v1, .L80240C58 -/* C50160 80240C50 00000000 */ nop -.L80240C54: -/* C50164 80240C54 AE420070 */ sw $v0, 0x70($s2) -.L80240C58: -/* C50168 80240C58 0C00A67F */ jal rand_int -/* C5016C 80240C5C 24042710 */ addiu $a0, $zero, 0x2710 -/* C50170 80240C60 3C0351EB */ lui $v1, 0x51eb -/* C50174 80240C64 3463851F */ ori $v1, $v1, 0x851f -/* C50178 80240C68 00430018 */ mult $v0, $v1 -/* C5017C 80240C6C 00021FC3 */ sra $v1, $v0, 0x1f -/* C50180 80240C70 00004010 */ mfhi $t0 -/* C50184 80240C74 00082143 */ sra $a0, $t0, 5 -/* C50188 80240C78 00832023 */ subu $a0, $a0, $v1 -/* C5018C 80240C7C 00041840 */ sll $v1, $a0, 1 -/* C50190 80240C80 00641821 */ addu $v1, $v1, $a0 -/* C50194 80240C84 000318C0 */ sll $v1, $v1, 3 -/* C50198 80240C88 00641821 */ addu $v1, $v1, $a0 -/* C5019C 80240C8C 00031880 */ sll $v1, $v1, 2 -/* C501A0 80240C90 8E640004 */ lw $a0, 4($s3) -/* C501A4 80240C94 00431023 */ subu $v0, $v0, $v1 -/* C501A8 80240C98 0044102A */ slt $v0, $v0, $a0 -/* C501AC 80240C9C 10400002 */ beqz $v0, .L80240CA8 -/* C501B0 80240CA0 24020004 */ addiu $v0, $zero, 4 -.L80240CA4: -/* C501B4 80240CA4 AE420070 */ sw $v0, 0x70($s2) -.L80240CA8: -/* C501B8 80240CA8 8FBF0044 */ lw $ra, 0x44($sp) -/* C501BC 80240CAC 8FB40040 */ lw $s4, 0x40($sp) -/* C501C0 80240CB0 8FB3003C */ lw $s3, 0x3c($sp) -/* C501C4 80240CB4 8FB20038 */ lw $s2, 0x38($sp) -/* C501C8 80240CB8 8FB10034 */ lw $s1, 0x34($sp) -/* C501CC 80240CBC 8FB00030 */ lw $s0, 0x30($sp) -/* C501D0 80240CC0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C501D4 80240CC4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C501D8 80240CC8 03E00008 */ jr $ra -/* C501DC 80240CCC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s deleted file mode 100644 index 6979c0043b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240D90_C502A0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D90_C502A0 -/* C502A0 80240D90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C502A4 80240D94 AFB40040 */ sw $s4, 0x40($sp) -/* C502A8 80240D98 0080A02D */ daddu $s4, $a0, $zero -/* C502AC 80240D9C AFBF0044 */ sw $ra, 0x44($sp) -/* C502B0 80240DA0 AFB3003C */ sw $s3, 0x3c($sp) -/* C502B4 80240DA4 AFB20038 */ sw $s2, 0x38($sp) -/* C502B8 80240DA8 AFB10034 */ sw $s1, 0x34($sp) -/* C502BC 80240DAC AFB00030 */ sw $s0, 0x30($sp) -/* C502C0 80240DB0 8E910148 */ lw $s1, 0x148($s4) -/* C502C4 80240DB4 00A0902D */ daddu $s2, $a1, $zero -/* C502C8 80240DB8 86240008 */ lh $a0, 8($s1) -/* C502CC 80240DBC 0C00EABB */ jal get_npc_unsafe -/* C502D0 80240DC0 00C0982D */ daddu $s3, $a2, $zero -/* C502D4 80240DC4 8E430014 */ lw $v1, 0x14($s2) -/* C502D8 80240DC8 04600031 */ bltz $v1, .L80240E90 -/* C502DC 80240DCC 0040802D */ daddu $s0, $v0, $zero -/* C502E0 80240DD0 0260202D */ daddu $a0, $s3, $zero -/* C502E4 80240DD4 AFA00010 */ sw $zero, 0x10($sp) -/* C502E8 80240DD8 8E460024 */ lw $a2, 0x24($s2) -/* C502EC 80240DDC 8E470028 */ lw $a3, 0x28($s2) -/* C502F0 80240DE0 0C01242D */ jal func_800490B4 -/* C502F4 80240DE4 0220282D */ daddu $a1, $s1, $zero -/* C502F8 80240DE8 10400029 */ beqz $v0, .L80240E90 -/* C502FC 80240DEC 0000202D */ daddu $a0, $zero, $zero -/* C50300 80240DF0 0200282D */ daddu $a1, $s0, $zero -/* C50304 80240DF4 0000302D */ daddu $a2, $zero, $zero -/* C50308 80240DF8 860300A8 */ lh $v1, 0xa8($s0) -/* C5030C 80240DFC 3C013F80 */ lui $at, 0x3f80 -/* C50310 80240E00 44810000 */ mtc1 $at, $f0 -/* C50314 80240E04 3C014000 */ lui $at, 0x4000 -/* C50318 80240E08 44811000 */ mtc1 $at, $f2 -/* C5031C 80240E0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C50320 80240E10 44812000 */ mtc1 $at, $f4 -/* C50324 80240E14 2402000F */ addiu $v0, $zero, 0xf -/* C50328 80240E18 AFA2001C */ sw $v0, 0x1c($sp) -/* C5032C 80240E1C 44833000 */ mtc1 $v1, $f6 -/* C50330 80240E20 00000000 */ nop -/* C50334 80240E24 468031A0 */ cvt.s.w $f6, $f6 -/* C50338 80240E28 44073000 */ mfc1 $a3, $f6 -/* C5033C 80240E2C 27A20028 */ addiu $v0, $sp, 0x28 -/* C50340 80240E30 AFA20020 */ sw $v0, 0x20($sp) -/* C50344 80240E34 E7A00010 */ swc1 $f0, 0x10($sp) -/* C50348 80240E38 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5034C 80240E3C 0C01BFA4 */ jal fx_emote -/* C50350 80240E40 E7A40018 */ swc1 $f4, 0x18($sp) -/* C50354 80240E44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C50358 80240E48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5035C 80240E4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C50360 80240E50 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C50364 80240E54 8C460028 */ lw $a2, 0x28($v0) -/* C50368 80240E58 0C00A720 */ jal atan2 -/* C5036C 80240E5C 8C470030 */ lw $a3, 0x30($v0) -/* C50370 80240E60 0200202D */ daddu $a0, $s0, $zero -/* C50374 80240E64 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C50378 80240E68 3C060020 */ lui $a2, 0x20 -/* C5037C 80240E6C 0C012530 */ jal func_800494C0 -/* C50380 80240E70 E480000C */ swc1 $f0, 0xc($a0) -/* C50384 80240E74 8E220018 */ lw $v0, 0x18($s1) -/* C50388 80240E78 9442002A */ lhu $v0, 0x2a($v0) -/* C5038C 80240E7C 30420001 */ andi $v0, $v0, 1 -/* C50390 80240E80 14400029 */ bnez $v0, .L80240F28 -/* C50394 80240E84 2402000A */ addiu $v0, $zero, 0xa -/* C50398 80240E88 080903CA */ j .L80240F28 -/* C5039C 80240E8C 2402000C */ addiu $v0, $zero, 0xc -.L80240E90: -/* C503A0 80240E90 8602008C */ lh $v0, 0x8c($s0) -/* C503A4 80240E94 14400025 */ bnez $v0, .L80240F2C -/* C503A8 80240E98 00000000 */ nop -/* C503AC 80240E9C 9602008E */ lhu $v0, 0x8e($s0) -/* C503B0 80240EA0 2442FFFF */ addiu $v0, $v0, -1 -/* C503B4 80240EA4 A602008E */ sh $v0, 0x8e($s0) -/* C503B8 80240EA8 00021400 */ sll $v0, $v0, 0x10 -/* C503BC 80240EAC 1440001F */ bnez $v0, .L80240F2C -/* C503C0 80240EB0 00000000 */ nop -/* C503C4 80240EB4 8E820074 */ lw $v0, 0x74($s4) -/* C503C8 80240EB8 2442FFFF */ addiu $v0, $v0, -1 -/* C503CC 80240EBC 10400019 */ beqz $v0, .L80240F24 -/* C503D0 80240EC0 AE820074 */ sw $v0, 0x74($s4) -/* C503D4 80240EC4 8E220018 */ lw $v0, 0x18($s1) -/* C503D8 80240EC8 9442002A */ lhu $v0, 0x2a($v0) -/* C503DC 80240ECC 30420010 */ andi $v0, $v0, 0x10 -/* C503E0 80240ED0 14400007 */ bnez $v0, .L80240EF0 -/* C503E4 80240ED4 00000000 */ nop -/* C503E8 80240ED8 C600000C */ lwc1 $f0, 0xc($s0) -/* C503EC 80240EDC 3C014334 */ lui $at, 0x4334 -/* C503F0 80240EE0 44816000 */ mtc1 $at, $f12 -/* C503F4 80240EE4 0C00A6C9 */ jal clamp_angle -/* C503F8 80240EE8 460C0300 */ add.s $f12, $f0, $f12 -/* C503FC 80240EEC E600000C */ swc1 $f0, 0xc($s0) -.L80240EF0: -/* C50400 80240EF0 8E440008 */ lw $a0, 8($s2) -/* C50404 80240EF4 000417C2 */ srl $v0, $a0, 0x1f -/* C50408 80240EF8 00822021 */ addu $a0, $a0, $v0 -/* C5040C 80240EFC 00042043 */ sra $a0, $a0, 1 -/* C50410 80240F00 0C00A67F */ jal rand_int -/* C50414 80240F04 24840001 */ addiu $a0, $a0, 1 -/* C50418 80240F08 8E430008 */ lw $v1, 8($s2) -/* C5041C 80240F0C 000327C2 */ srl $a0, $v1, 0x1f -/* C50420 80240F10 00641821 */ addu $v1, $v1, $a0 -/* C50424 80240F14 00031843 */ sra $v1, $v1, 1 -/* C50428 80240F18 00621821 */ addu $v1, $v1, $v0 -/* C5042C 80240F1C 080903CB */ j .L80240F2C -/* C50430 80240F20 A603008E */ sh $v1, 0x8e($s0) -.L80240F24: -/* C50434 80240F24 24020004 */ addiu $v0, $zero, 4 -.L80240F28: -/* C50438 80240F28 AE820070 */ sw $v0, 0x70($s4) -.L80240F2C: -/* C5043C 80240F2C 8FBF0044 */ lw $ra, 0x44($sp) -/* C50440 80240F30 8FB40040 */ lw $s4, 0x40($sp) -/* C50444 80240F34 8FB3003C */ lw $s3, 0x3c($sp) -/* C50448 80240F38 8FB20038 */ lw $s2, 0x38($sp) -/* C5044C 80240F3C 8FB10034 */ lw $s1, 0x34($sp) -/* C50450 80240F40 8FB00030 */ lw $s0, 0x30($sp) -/* C50454 80240F44 03E00008 */ jr $ra -/* C50458 80240F48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s deleted file mode 100644 index 4be0744bdc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F4C_C5045C -/* C5045C 80240F4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50460 80240F50 AFB10014 */ sw $s1, 0x14($sp) -/* C50464 80240F54 0080882D */ daddu $s1, $a0, $zero -/* C50468 80240F58 AFBF001C */ sw $ra, 0x1c($sp) -/* C5046C 80240F5C AFB20018 */ sw $s2, 0x18($sp) -/* C50470 80240F60 AFB00010 */ sw $s0, 0x10($sp) -/* C50474 80240F64 8E300148 */ lw $s0, 0x148($s1) -/* C50478 80240F68 86040008 */ lh $a0, 8($s0) -/* C5047C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* C50480 80240F70 00A0902D */ daddu $s2, $a1, $zero -/* C50484 80240F74 8E230078 */ lw $v1, 0x78($s1) -/* C50488 80240F78 24630001 */ addiu $v1, $v1, 1 -/* C5048C 80240F7C AE230078 */ sw $v1, 0x78($s1) -/* C50490 80240F80 8E0400D0 */ lw $a0, 0xd0($s0) -/* C50494 80240F84 8C840000 */ lw $a0, ($a0) -/* C50498 80240F88 0064182A */ slt $v1, $v1, $a0 -/* C5049C 80240F8C 14600002 */ bnez $v1, .L80240F98 -/* C504A0 80240F90 0040282D */ daddu $a1, $v0, $zero -/* C504A4 80240F94 AE200078 */ sw $zero, 0x78($s1) -.L80240F98: -/* C504A8 80240F98 8E0200CC */ lw $v0, 0xcc($s0) -/* C504AC 80240F9C 8C420004 */ lw $v0, 4($v0) -/* C504B0 80240FA0 ACA20028 */ sw $v0, 0x28($a1) -/* C504B4 80240FA4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C504B8 80240FA8 8C42007C */ lw $v0, 0x7c($v0) -/* C504BC 80240FAC 04410004 */ bgez $v0, .L80240FC0 -/* C504C0 80240FB0 00000000 */ nop -/* C504C4 80240FB4 C6400000 */ lwc1 $f0, ($s2) -/* C504C8 80240FB8 080903F8 */ j .L80240FE0 -/* C504CC 80240FBC E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FC0: -/* C504D0 80240FC0 3C018024 */ lui $at, %hi(D_80242E90_C523A0) -/* C504D4 80240FC4 D4222E90 */ ldc1 $f2, %lo(D_80242E90_C523A0)($at) -/* C504D8 80240FC8 44820000 */ mtc1 $v0, $f0 -/* C504DC 80240FCC 00000000 */ nop -/* C504E0 80240FD0 46800021 */ cvt.d.w $f0, $f0 -/* C504E4 80240FD4 46220003 */ div.d $f0, $f0, $f2 -/* C504E8 80240FD8 46200020 */ cvt.s.d $f0, $f0 -/* C504EC 80240FDC E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FE0: -/* C504F0 80240FE0 24020001 */ addiu $v0, $zero, 1 -/* C504F4 80240FE4 AE220070 */ sw $v0, 0x70($s1) -/* C504F8 80240FE8 8FBF001C */ lw $ra, 0x1c($sp) -/* C504FC 80240FEC 8FB20018 */ lw $s2, 0x18($sp) -/* C50500 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* C50504 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C50508 80240FF8 03E00008 */ jr $ra -/* C5050C 80240FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s deleted file mode 100644 index 45f74b33ca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024121C_C5072C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024121C_C5072C -/* C5072C 8024121C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C50730 80241220 AFB3003C */ sw $s3, 0x3c($sp) -/* C50734 80241224 0080982D */ daddu $s3, $a0, $zero -/* C50738 80241228 AFBF0040 */ sw $ra, 0x40($sp) -/* C5073C 8024122C AFB20038 */ sw $s2, 0x38($sp) -/* C50740 80241230 AFB10034 */ sw $s1, 0x34($sp) -/* C50744 80241234 AFB00030 */ sw $s0, 0x30($sp) -/* C50748 80241238 8E720148 */ lw $s2, 0x148($s3) -/* C5074C 8024123C 00A0882D */ daddu $s1, $a1, $zero -/* C50750 80241240 86440008 */ lh $a0, 8($s2) -/* C50754 80241244 0C00EABB */ jal get_npc_unsafe -/* C50758 80241248 00C0802D */ daddu $s0, $a2, $zero -/* C5075C 8024124C 0200202D */ daddu $a0, $s0, $zero -/* C50760 80241250 0240282D */ daddu $a1, $s2, $zero -/* C50764 80241254 24030001 */ addiu $v1, $zero, 1 -/* C50768 80241258 AFA30010 */ sw $v1, 0x10($sp) -/* C5076C 8024125C 8E260024 */ lw $a2, 0x24($s1) -/* C50770 80241260 8E270028 */ lw $a3, 0x28($s1) -/* C50774 80241264 0C01242D */ jal func_800490B4 -/* C50778 80241268 0040802D */ daddu $s0, $v0, $zero -/* C5077C 8024126C 1440001E */ bnez $v0, .L802412E8 -/* C50780 80241270 0200202D */ daddu $a0, $s0, $zero -/* C50784 80241274 24040002 */ addiu $a0, $zero, 2 -/* C50788 80241278 0200282D */ daddu $a1, $s0, $zero -/* C5078C 8024127C 0000302D */ daddu $a2, $zero, $zero -/* C50790 80241280 860300A8 */ lh $v1, 0xa8($s0) -/* C50794 80241284 3C013F80 */ lui $at, 0x3f80 -/* C50798 80241288 44810000 */ mtc1 $at, $f0 -/* C5079C 8024128C 3C014000 */ lui $at, 0x4000 -/* C507A0 80241290 44811000 */ mtc1 $at, $f2 -/* C507A4 80241294 3C01C1A0 */ lui $at, 0xc1a0 -/* C507A8 80241298 44812000 */ mtc1 $at, $f4 -/* C507AC 8024129C 2402000F */ addiu $v0, $zero, 0xf -/* C507B0 802412A0 AFA2001C */ sw $v0, 0x1c($sp) -/* C507B4 802412A4 44833000 */ mtc1 $v1, $f6 -/* C507B8 802412A8 00000000 */ nop -/* C507BC 802412AC 468031A0 */ cvt.s.w $f6, $f6 -/* C507C0 802412B0 44073000 */ mfc1 $a3, $f6 -/* C507C4 802412B4 27A20028 */ addiu $v0, $sp, 0x28 -/* C507C8 802412B8 AFA20020 */ sw $v0, 0x20($sp) -/* C507CC 802412BC E7A00010 */ swc1 $f0, 0x10($sp) -/* C507D0 802412C0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C507D4 802412C4 0C01BFA4 */ jal fx_emote -/* C507D8 802412C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C507DC 802412CC 8E4200CC */ lw $v0, 0xcc($s2) -/* C507E0 802412D0 8C430000 */ lw $v1, ($v0) -/* C507E4 802412D4 24020019 */ addiu $v0, $zero, 0x19 -/* C507E8 802412D8 A602008E */ sh $v0, 0x8e($s0) -/* C507EC 802412DC 2402000E */ addiu $v0, $zero, 0xe -/* C507F0 802412E0 080904C7 */ j .L8024131C -/* C507F4 802412E4 AE030028 */ sw $v1, 0x28($s0) -.L802412E8: -/* C507F8 802412E8 0C00F598 */ jal func_8003D660 -/* C507FC 802412EC 24050001 */ addiu $a1, $zero, 1 -/* C50800 802412F0 8E050018 */ lw $a1, 0x18($s0) -/* C50804 802412F4 8E06000C */ lw $a2, 0xc($s0) -/* C50808 802412F8 0C00EA95 */ jal npc_move_heading -/* C5080C 802412FC 0200202D */ daddu $a0, $s0, $zero -/* C50810 80241300 8602008E */ lh $v0, 0x8e($s0) -/* C50814 80241304 9603008E */ lhu $v1, 0x8e($s0) -/* C50818 80241308 18400003 */ blez $v0, .L80241318 -/* C5081C 8024130C 2462FFFF */ addiu $v0, $v1, -1 -/* C50820 80241310 080904C8 */ j .L80241320 -/* C50824 80241314 A602008E */ sh $v0, 0x8e($s0) -.L80241318: -/* C50828 80241318 2402000C */ addiu $v0, $zero, 0xc -.L8024131C: -/* C5082C 8024131C AE620070 */ sw $v0, 0x70($s3) -.L80241320: -/* C50830 80241320 8FBF0040 */ lw $ra, 0x40($sp) -/* C50834 80241324 8FB3003C */ lw $s3, 0x3c($sp) -/* C50838 80241328 8FB20038 */ lw $s2, 0x38($sp) -/* C5083C 8024132C 8FB10034 */ lw $s1, 0x34($sp) -/* C50840 80241330 8FB00030 */ lw $s0, 0x30($sp) -/* C50844 80241334 03E00008 */ jr $ra -/* C50848 80241338 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s deleted file mode 100644 index 4e3c19e24d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A4_C508B4 -/* C508B4 802413A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C508B8 802413A8 AFB10014 */ sw $s1, 0x14($sp) -/* C508BC 802413AC 0080882D */ daddu $s1, $a0, $zero -/* C508C0 802413B0 AFBF001C */ sw $ra, 0x1c($sp) -/* C508C4 802413B4 AFB20018 */ sw $s2, 0x18($sp) -/* C508C8 802413B8 AFB00010 */ sw $s0, 0x10($sp) -/* C508CC 802413BC 8E300148 */ lw $s0, 0x148($s1) -/* C508D0 802413C0 86040008 */ lh $a0, 8($s0) -/* C508D4 802413C4 0C00EABB */ jal get_npc_unsafe -/* C508D8 802413C8 00A0902D */ daddu $s2, $a1, $zero -/* C508DC 802413CC 8E0300D0 */ lw $v1, 0xd0($s0) -/* C508E0 802413D0 8E240078 */ lw $a0, 0x78($s1) -/* C508E4 802413D4 8C630000 */ lw $v1, ($v1) -/* C508E8 802413D8 0083182A */ slt $v1, $a0, $v1 -/* C508EC 802413DC 10600013 */ beqz $v1, .L8024142C -/* C508F0 802413E0 0040302D */ daddu $a2, $v0, $zero -/* C508F4 802413E4 00041040 */ sll $v0, $a0, 1 -/* C508F8 802413E8 00441021 */ addu $v0, $v0, $a0 -/* C508FC 802413EC 00022880 */ sll $a1, $v0, 2 -.L802413F0: -/* C50900 802413F0 8E0300D0 */ lw $v1, 0xd0($s0) -/* C50904 802413F4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C50908 802413F8 00A31021 */ addu $v0, $a1, $v1 -/* C5090C 802413FC C4400008 */ lwc1 $f0, 8($v0) -/* C50910 80241400 46800020 */ cvt.s.w $f0, $f0 -/* C50914 80241404 4602003E */ c.le.s $f0, $f2 -/* C50918 80241408 00000000 */ nop -/* C5091C 8024140C 45020003 */ bc1fl .L8024141C -/* C50920 80241410 24840001 */ addiu $a0, $a0, 1 -/* C50924 80241414 0809050B */ j .L8024142C -/* C50928 80241418 AE240078 */ sw $a0, 0x78($s1) -.L8024141C: -/* C5092C 8024141C 8C620000 */ lw $v0, ($v1) -/* C50930 80241420 0082102A */ slt $v0, $a0, $v0 -/* C50934 80241424 1440FFF2 */ bnez $v0, .L802413F0 -/* C50938 80241428 24A5000C */ addiu $a1, $a1, 0xc -.L8024142C: -/* C5093C 8024142C C6400000 */ lwc1 $f0, ($s2) -/* C50940 80241430 E4C00018 */ swc1 $f0, 0x18($a2) -/* C50944 80241434 8E0200CC */ lw $v0, 0xcc($s0) -/* C50948 80241438 8C420004 */ lw $v0, 4($v0) -/* C5094C 8024143C ACC20028 */ sw $v0, 0x28($a2) -/* C50950 80241440 24020001 */ addiu $v0, $zero, 1 -/* C50954 80241444 AE200074 */ sw $zero, 0x74($s1) -/* C50958 80241448 AE220070 */ sw $v0, 0x70($s1) -/* C5095C 8024144C 8FBF001C */ lw $ra, 0x1c($sp) -/* C50960 80241450 8FB20018 */ lw $s2, 0x18($sp) -/* C50964 80241454 8FB10014 */ lw $s1, 0x14($sp) -/* C50968 80241458 8FB00010 */ lw $s0, 0x10($sp) -/* C5096C 8024145C 03E00008 */ jr $ra -/* C50970 80241460 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s deleted file mode 100644 index 83e4531905..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ /dev/null @@ -1,214 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241464_C50974 -/* C50974 80241464 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C50978 80241468 AFB40058 */ sw $s4, 0x58($sp) -/* C5097C 8024146C 0080A02D */ daddu $s4, $a0, $zero -/* C50980 80241470 AFBF0060 */ sw $ra, 0x60($sp) -/* C50984 80241474 AFB5005C */ sw $s5, 0x5c($sp) -/* C50988 80241478 AFB30054 */ sw $s3, 0x54($sp) -/* C5098C 8024147C AFB20050 */ sw $s2, 0x50($sp) -/* C50990 80241480 AFB1004C */ sw $s1, 0x4c($sp) -/* C50994 80241484 AFB00048 */ sw $s0, 0x48($sp) -/* C50998 80241488 8E910148 */ lw $s1, 0x148($s4) -/* C5099C 8024148C 86240008 */ lh $a0, 8($s1) -/* C509A0 80241490 0C00EABB */ jal get_npc_unsafe -/* C509A4 80241494 00A0802D */ daddu $s0, $a1, $zero -/* C509A8 80241498 8E83000C */ lw $v1, 0xc($s4) -/* C509AC 8024149C 0280202D */ daddu $a0, $s4, $zero -/* C509B0 802414A0 8C650000 */ lw $a1, ($v1) -/* C509B4 802414A4 0C0B1EAF */ jal get_variable -/* C509B8 802414A8 0040902D */ daddu $s2, $v0, $zero -/* C509BC 802414AC AFA00018 */ sw $zero, 0x18($sp) -/* C509C0 802414B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509C4 802414B4 8C630094 */ lw $v1, 0x94($v1) -/* C509C8 802414B8 AFA3001C */ sw $v1, 0x1c($sp) -/* C509CC 802414BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509D0 802414C0 8C630080 */ lw $v1, 0x80($v1) -/* C509D4 802414C4 AFA30020 */ sw $v1, 0x20($sp) -/* C509D8 802414C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509DC 802414CC 8C630088 */ lw $v1, 0x88($v1) -/* C509E0 802414D0 AFA30024 */ sw $v1, 0x24($sp) -/* C509E4 802414D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509E8 802414D8 8C63008C */ lw $v1, 0x8c($v1) -/* C509EC 802414DC 27B50018 */ addiu $s5, $sp, 0x18 -/* C509F0 802414E0 AFA30028 */ sw $v1, 0x28($sp) -/* C509F4 802414E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509F8 802414E8 3C014282 */ lui $at, 0x4282 -/* C509FC 802414EC 44810000 */ mtc1 $at, $f0 -/* C50A00 802414F0 8C630090 */ lw $v1, 0x90($v1) -/* C50A04 802414F4 0040982D */ daddu $s3, $v0, $zero -/* C50A08 802414F8 E7A00030 */ swc1 $f0, 0x30($sp) -/* C50A0C 802414FC A7A00034 */ sh $zero, 0x34($sp) -/* C50A10 80241500 16000005 */ bnez $s0, .L80241518 -/* C50A14 80241504 AFA3002C */ sw $v1, 0x2c($sp) -/* C50A18 80241508 8E2200B0 */ lw $v0, 0xb0($s1) -/* C50A1C 8024150C 30420004 */ andi $v0, $v0, 4 -/* C50A20 80241510 10400044 */ beqz $v0, .L80241624 -/* C50A24 80241514 00000000 */ nop -.L80241518: -/* C50A28 80241518 2404F7FF */ addiu $a0, $zero, -0x801 -/* C50A2C 8024151C AE800070 */ sw $zero, 0x70($s4) -/* C50A30 80241520 A640008E */ sh $zero, 0x8e($s2) -/* C50A34 80241524 8E2200CC */ lw $v0, 0xcc($s1) -/* C50A38 80241528 8E430000 */ lw $v1, ($s2) -/* C50A3C 8024152C 8C420000 */ lw $v0, ($v0) -/* C50A40 80241530 00641824 */ and $v1, $v1, $a0 -/* C50A44 80241534 AE430000 */ sw $v1, ($s2) -/* C50A48 80241538 AE420028 */ sw $v0, 0x28($s2) -/* C50A4C 8024153C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C50A50 80241540 8C420098 */ lw $v0, 0x98($v0) -/* C50A54 80241544 54400005 */ bnel $v0, $zero, .L8024155C -/* C50A58 80241548 2402FDFF */ addiu $v0, $zero, -0x201 -/* C50A5C 8024154C 34620200 */ ori $v0, $v1, 0x200 -/* C50A60 80241550 2403FFF7 */ addiu $v1, $zero, -9 -/* C50A64 80241554 08090559 */ j .L80241564 -/* C50A68 80241558 00431024 */ and $v0, $v0, $v1 -.L8024155C: -/* C50A6C 8024155C 00621024 */ and $v0, $v1, $v0 -/* C50A70 80241560 34420008 */ ori $v0, $v0, 8 -.L80241564: -/* C50A74 80241564 AE420000 */ sw $v0, ($s2) -/* C50A78 80241568 8E2200B0 */ lw $v0, 0xb0($s1) -/* C50A7C 8024156C 30420004 */ andi $v0, $v0, 4 -/* C50A80 80241570 10400008 */ beqz $v0, .L80241594 -/* C50A84 80241574 24020063 */ addiu $v0, $zero, 0x63 -/* C50A88 80241578 AE820070 */ sw $v0, 0x70($s4) -/* C50A8C 8024157C AE800074 */ sw $zero, 0x74($s4) -/* C50A90 80241580 8E2200B0 */ lw $v0, 0xb0($s1) -/* C50A94 80241584 2403FFFB */ addiu $v1, $zero, -5 -/* C50A98 80241588 00431024 */ and $v0, $v0, $v1 -/* C50A9C 8024158C 08090570 */ j .L802415C0 -/* C50AA0 80241590 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241594: -/* C50AA4 80241594 8E220000 */ lw $v0, ($s1) -/* C50AA8 80241598 3C034000 */ lui $v1, 0x4000 -/* C50AAC 8024159C 00431024 */ and $v0, $v0, $v1 -/* C50AB0 802415A0 10400007 */ beqz $v0, .L802415C0 -/* C50AB4 802415A4 3C03BFFF */ lui $v1, 0xbfff -/* C50AB8 802415A8 2402000C */ addiu $v0, $zero, 0xc -/* C50ABC 802415AC AE820070 */ sw $v0, 0x70($s4) -/* C50AC0 802415B0 8E220000 */ lw $v0, ($s1) -/* C50AC4 802415B4 3463FFFF */ ori $v1, $v1, 0xffff -/* C50AC8 802415B8 00431024 */ and $v0, $v0, $v1 -/* C50ACC 802415BC AE220000 */ sw $v0, ($s1) -.L802415C0: -/* C50AD0 802415C0 27A50038 */ addiu $a1, $sp, 0x38 -/* C50AD4 802415C4 27A6003C */ addiu $a2, $sp, 0x3c -/* C50AD8 802415C8 C6400038 */ lwc1 $f0, 0x38($s2) -/* C50ADC 802415CC 864200A8 */ lh $v0, 0xa8($s2) -/* C50AE0 802415D0 3C0142C8 */ lui $at, 0x42c8 -/* C50AE4 802415D4 44812000 */ mtc1 $at, $f4 -/* C50AE8 802415D8 44823000 */ mtc1 $v0, $f6 -/* C50AEC 802415DC 00000000 */ nop -/* C50AF0 802415E0 468031A0 */ cvt.s.w $f6, $f6 -/* C50AF4 802415E4 27A20044 */ addiu $v0, $sp, 0x44 -/* C50AF8 802415E8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C50AFC 802415EC C640003C */ lwc1 $f0, 0x3c($s2) -/* C50B00 802415F0 C6420040 */ lwc1 $f2, 0x40($s2) -/* C50B04 802415F4 46060000 */ add.s $f0, $f0, $f6 -/* C50B08 802415F8 E7A40044 */ swc1 $f4, 0x44($sp) -/* C50B0C 802415FC E7A20040 */ swc1 $f2, 0x40($sp) -/* C50B10 80241600 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C50B14 80241604 AFA20010 */ sw $v0, 0x10($sp) -/* C50B18 80241608 8E440080 */ lw $a0, 0x80($s2) -/* C50B1C 8024160C 0C0372DF */ jal func_800DCB7C -/* C50B20 80241610 27A70040 */ addiu $a3, $sp, 0x40 -/* C50B24 80241614 10400003 */ beqz $v0, .L80241624 -/* C50B28 80241618 00000000 */ nop -/* C50B2C 8024161C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C50B30 80241620 E640003C */ swc1 $f0, 0x3c($s2) -.L80241624: -/* C50B34 80241624 8E830070 */ lw $v1, 0x70($s4) -/* C50B38 80241628 2C620064 */ sltiu $v0, $v1, 0x64 -/* C50B3C 8024162C 10400042 */ beqz $v0, L80241738_C50C48 -/* C50B40 80241630 00031080 */ sll $v0, $v1, 2 -/* C50B44 80241634 3C018024 */ lui $at, %hi(jtbl_80242E98_C523A8) -/* C50B48 80241638 00220821 */ addu $at, $at, $v0 -/* C50B4C 8024163C 8C222E98 */ lw $v0, %lo(jtbl_80242E98_C523A8)($at) -/* C50B50 80241640 00400008 */ jr $v0 -/* C50B54 80241644 00000000 */ nop -glabel L80241648_C50B58 -/* C50B58 80241648 0280202D */ daddu $a0, $s4, $zero -/* C50B5C 8024164C 0260282D */ daddu $a1, $s3, $zero -/* C50B60 80241650 0C090234 */ jal func_802408D0_C4FDE0 -/* C50B64 80241654 02A0302D */ daddu $a2, $s5, $zero -glabel L80241658_C50B68 -/* C50B68 80241658 0280202D */ daddu $a0, $s4, $zero -/* C50B6C 8024165C 0260282D */ daddu $a1, $s3, $zero -/* C50B70 80241660 0C09028A */ jal func_80240A28_C4FF38 -/* C50B74 80241664 02A0302D */ daddu $a2, $s5, $zero -/* C50B78 80241668 080905CE */ j L80241738_C50C48 -/* C50B7C 8024166C 00000000 */ nop -glabel L80241670_C50B80 -/* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero -/* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero -/* C50B88 80241678 0C090334 */ jal dgb_15_UnkNpcAIFunc1 -/* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero -glabel L80241680_C50B90 -/* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero -/* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero -/* C50B98 80241688 0C090364 */ jal func_80240D90_C502A0 -/* C50B9C 8024168C 02A0302D */ daddu $a2, $s5, $zero -/* C50BA0 80241690 080905CE */ j L80241738_C50C48 -/* C50BA4 80241694 00000000 */ nop -glabel L80241698_C50BA8 -/* C50BA8 80241698 0280202D */ daddu $a0, $s4, $zero -/* C50BAC 8024169C 0260282D */ daddu $a1, $s3, $zero -/* C50BB0 802416A0 0C0903D3 */ jal func_80240F4C_C5045C -/* C50BB4 802416A4 02A0302D */ daddu $a2, $s5, $zero -/* C50BB8 802416A8 080905CE */ j L80241738_C50C48 -/* C50BBC 802416AC 00000000 */ nop -glabel L802416B0_C50BC0 -/* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero -/* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero -/* C50BC8 802416B8 0C090400 */ jal dgb_15_NpcJumpFunc2 -/* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero -glabel L802416C0_C50BD0 -/* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero -/* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero -/* C50BD8 802416C8 0C09041D */ jal dgb_15_NpcJumpFunc -/* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero -/* C50BE0 802416D0 080905CE */ j L80241738_C50C48 -/* C50BE4 802416D4 00000000 */ nop -glabel L802416D8_C50BE8 -/* C50BE8 802416D8 0280202D */ daddu $a0, $s4, $zero -/* C50BEC 802416DC 0260282D */ daddu $a1, $s3, $zero -/* C50BF0 802416E0 0C09043B */ jal dgb_15_UnkNpcAIFunc13 -/* C50BF4 802416E4 02A0302D */ daddu $a2, $s5, $zero -glabel L802416E8_C50BF8 -/* C50BF8 802416E8 0280202D */ daddu $a0, $s4, $zero -/* C50BFC 802416EC 0260282D */ daddu $a1, $s3, $zero -/* C50C00 802416F0 0C090487 */ jal func_8024121C_C5072C -/* C50C04 802416F4 02A0302D */ daddu $a2, $s5, $zero -/* C50C08 802416F8 080905CE */ j L80241738_C50C48 -/* C50C0C 802416FC 00000000 */ nop -glabel L80241700_C50C10 -/* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero -/* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero -/* C50C18 80241708 0C0904CF */ jal dgb_15_UnkNpcDurationFlagFunc -/* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero -/* C50C20 80241710 080905CE */ j L80241738_C50C48 -/* C50C24 80241714 00000000 */ nop -glabel L80241718_C50C28 -/* C50C28 80241718 0280202D */ daddu $a0, $s4, $zero -/* C50C2C 8024171C 0260282D */ daddu $a1, $s3, $zero -/* C50C30 80241720 0C0904E9 */ jal func_802413A4_C508B4 -/* C50C34 80241724 02A0302D */ daddu $a2, $s5, $zero -/* C50C38 80241728 080905CE */ j L80241738_C50C48 -/* C50C3C 8024172C 00000000 */ nop -glabel L80241730_C50C40 -/* C50C40 80241730 0C0129CF */ jal func_8004A73C -/* C50C44 80241734 0280202D */ daddu $a0, $s4, $zero -glabel L80241738_C50C48 -/* C50C48 80241738 8FBF0060 */ lw $ra, 0x60($sp) -/* C50C4C 8024173C 8FB5005C */ lw $s5, 0x5c($sp) -/* C50C50 80241740 8FB40058 */ lw $s4, 0x58($sp) -/* C50C54 80241744 8FB30054 */ lw $s3, 0x54($sp) -/* C50C58 80241748 8FB20050 */ lw $s2, 0x50($sp) -/* C50C5C 8024174C 8FB1004C */ lw $s1, 0x4c($sp) -/* C50C60 80241750 8FB00048 */ lw $s0, 0x48($sp) -/* C50C64 80241754 0000102D */ daddu $v0, $zero, $zero -/* C50C68 80241758 03E00008 */ jr $ra -/* C50C6C 8024175C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s deleted file mode 100644 index b616655563..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/update_starpoints_display_C4F8CC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C4F8CC -/* C4F8CC 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C4F8D0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C4F8D4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C4F8D8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C4F8DC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C4F8E0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C4F8E4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C4F8E8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C4F8EC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C4F8F0 802403E0 86240008 */ lh $a0, 8($s1) -/* C4F8F4 802403E4 0C00EABB */ jal get_npc_unsafe -/* C4F8F8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C4F8FC 802403EC 16000005 */ bnez $s0, .L80240404 -/* C4F900 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C4F904 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4F908 802403F8 30420004 */ andi $v0, $v0, 4 -/* C4F90C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C4F910 80240400 00000000 */ nop -.L80240404: -/* C4F914 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C4F918 80240408 8E420000 */ lw $v0, ($s2) -/* C4F91C 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C4F920 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C4F924 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C4F928 80240418 AE420000 */ sw $v0, ($s2) -/* C4F92C 8024041C 8E220000 */ lw $v0, ($s1) -/* C4F930 80240420 3C01C47A */ lui $at, 0xc47a -/* C4F934 80240424 44810000 */ mtc1 $at, $f0 -/* C4F938 80240428 00431025 */ or $v0, $v0, $v1 -/* C4F93C 8024042C AE220000 */ sw $v0, ($s1) -/* C4F940 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C4F944 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C4F948 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C4F94C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C4F950 80240440 30620004 */ andi $v0, $v1, 4 -/* C4F954 80240444 10400003 */ beqz $v0, .L80240454 -/* C4F958 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C4F95C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C4F960 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C4F964 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C4F968 80240458 12600005 */ beqz $s3, .L80240470 -/* C4F96C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C4F970 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C4F974 80240464 00000000 */ nop -/* C4F978 80240468 0809017E */ j .L802405F8 -/* C4F97C 8024046C 00000000 */ nop -.L80240470: -/* C4F980 80240470 86240008 */ lh $a0, 8($s1) -/* C4F984 80240474 0C00FB3A */ jal get_enemy -/* C4F988 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C4F98C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C4F990 80240480 0C00EABB */ jal get_npc_unsafe -/* C4F994 80240484 86040008 */ lh $a0, 8($s0) -/* C4F998 80240488 24030001 */ addiu $v1, $zero, 1 -/* C4F99C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C4F9A0 80240490 A2230007 */ sb $v1, 7($s1) -/* C4F9A4 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C4F9A8 80240498 24020003 */ addiu $v0, $zero, 3 -/* C4F9AC 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C4F9B0 802404A0 00000000 */ nop -/* C4F9B4 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C4F9B8 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C4F9BC 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C4F9C0 802404B0 0C012530 */ jal func_800494C0 -/* C4F9C4 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C4F9C8 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C4F9CC 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C4F9D0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C4F9D4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C4F9D8 802404C8 3C014387 */ lui $at, 0x4387 -/* C4F9DC 802404CC 44810000 */ mtc1 $at, $f0 -/* C4F9E0 802404D0 44064000 */ mfc1 $a2, $f8 -/* C4F9E4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C4F9E8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C4F9EC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C4F9F0 802404E0 44070000 */ mfc1 $a3, $f0 -/* C4F9F4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C4F9F8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C4F9FC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C4FA00 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C4FA04 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C4FA08 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C4FA0C 802404FC 44024000 */ mfc1 $v0, $f8 -/* C4FA10 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C4FA14 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C4FA18 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C4FA1C 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C4FA20 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C4FA24 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C4FA28 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C4FA2C 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C4FA30 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C4FA34 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C4FA38 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C4FA3C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C4FA40 80240530 00000000 */ nop -/* C4FA44 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C4FA48 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C4FA4C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C4FA50 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C4FA54 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C4FA58 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C4FA5C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C4FA60 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C4FA64 80240554 0C00A720 */ jal atan2 -/* C4FA68 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C4FA6C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C4FA70 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C4FA74 80240564 8E220000 */ lw $v0, ($s1) -/* C4FA78 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C4FA7C 8024056C 00431024 */ and $v0, $v0, $v1 -/* C4FA80 80240570 AE220000 */ sw $v0, ($s1) -/* C4FA84 80240574 24020001 */ addiu $v0, $zero, 1 -/* C4FA88 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C4FA8C 8024057C 0809017E */ j .L802405F8 -/* C4FA90 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C4FA94 80240584 86240008 */ lh $a0, 8($s1) -/* C4FA98 80240588 0C00FB3A */ jal get_enemy -/* C4FA9C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C4FAA0 80240590 0040802D */ daddu $s0, $v0, $zero -/* C4FAA4 80240594 0C00EABB */ jal get_npc_unsafe -/* C4FAA8 80240598 86040008 */ lh $a0, 8($s0) -/* C4FAAC 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C4FAB0 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C4FAB4 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C4FAB8 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C4FABC 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C4FAC0 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C4FAC4 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C4FAC8 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C4FACC 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C4FAD0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C4FAD4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C4FAD8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C4FADC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C4FAE0 802405D0 8E230000 */ lw $v1, ($s1) -/* C4FAE4 802405D4 3C01C47A */ lui $at, 0xc47a -/* C4FAE8 802405D8 44810000 */ mtc1 $at, $f0 -/* C4FAEC 802405DC 00621825 */ or $v1, $v1, $v0 -/* C4FAF0 802405E0 AE230000 */ sw $v1, ($s1) -/* C4FAF4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C4FAF8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C4FAFC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C4FB00 802405F0 A2330007 */ sb $s3, 7($s1) -/* C4FB04 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C4FB08 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C4FB0C 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C4FB10 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C4FB14 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C4FB18 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C4FB1C 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C4FB20 80240610 0000102D */ daddu $v0, $zero, $zero -/* C4FB24 80240614 03E00008 */ jr $ra -/* C4FB28 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s deleted file mode 100644 index 383e395ae8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_C52748 -/* C52748 80240208 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C5274C 8024020C AFBF0024 */ sw $ra, 0x24($sp) -/* C52750 80240210 AFB40020 */ sw $s4, 0x20($sp) -/* C52754 80240214 AFB3001C */ sw $s3, 0x1c($sp) -/* C52758 80240218 AFB20018 */ sw $s2, 0x18($sp) -/* C5275C 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* C52760 80240220 AFB00010 */ sw $s0, 0x10($sp) -/* C52764 80240224 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C52768 80240228 8C900148 */ lw $s0, 0x148($a0) -/* C5276C 8024022C 86040008 */ lh $a0, 8($s0) -/* C52770 80240230 0C00EABB */ jal get_npc_unsafe -/* C52774 80240234 24110001 */ addiu $s1, $zero, 1 -/* C52778 80240238 86040008 */ lh $a0, 8($s0) -/* C5277C 8024023C 0040802D */ daddu $s0, $v0, $zero -/* C52780 80240240 3C05800B */ lui $a1, %hi(gCameras) -/* C52784 80240244 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C52788 80240248 3C03800A */ lui $v1, %hi(D_8009A634) -/* C5278C 8024024C 8463A634 */ lh $v1, %lo(D_8009A634)($v1) -/* C52790 80240250 00912021 */ addu $a0, $a0, $s1 -/* C52794 80240254 00031080 */ sll $v0, $v1, 2 -/* C52798 80240258 00431021 */ addu $v0, $v0, $v1 -/* C5279C 8024025C 00021080 */ sll $v0, $v0, 2 -/* C527A0 80240260 00431023 */ subu $v0, $v0, $v1 -/* C527A4 80240264 000218C0 */ sll $v1, $v0, 3 -/* C527A8 80240268 00431021 */ addu $v0, $v0, $v1 -/* C527AC 8024026C 000210C0 */ sll $v0, $v0, 3 -/* C527B0 80240270 0C00FB3A */ jal get_enemy -/* C527B4 80240274 00459021 */ addu $s2, $v0, $a1 -/* C527B8 80240278 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C527BC 8024027C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C527C0 80240280 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C527C4 80240284 8E830000 */ lw $v1, ($s4) -/* C527C8 80240288 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C527CC 8024028C 8C660028 */ lw $a2, 0x28($v1) -/* C527D0 80240290 8C670030 */ lw $a3, 0x30($v1) -/* C527D4 80240294 0C00A7B5 */ jal dist2D -/* C527D8 80240298 0040982D */ daddu $s3, $v0, $zero -/* C527DC 8024029C C6620074 */ lwc1 $f2, 0x74($s3) -/* C527E0 802402A0 468010A0 */ cvt.s.w $f2, $f2 -/* C527E4 802402A4 4600103C */ c.lt.s $f2, $f0 -/* C527E8 802402A8 00000000 */ nop -/* C527EC 802402AC 45030001 */ bc1tl .L802402B4 -/* C527F0 802402B0 0000882D */ daddu $s1, $zero, $zero -.L802402B4: -/* C527F4 802402B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C527F8 802402B8 C60E000C */ lwc1 $f14, 0xc($s0) -/* C527FC 802402BC 3C014387 */ lui $at, 0x4387 -/* C52800 802402C0 4481A000 */ mtc1 $at, $f20 -/* C52804 802402C4 0C00A70A */ jal get_clamped_angle_diff -/* C52808 802402C8 00000000 */ nop -/* C5280C 802402CC 0C00A6C9 */ jal clamp_angle -/* C52810 802402D0 46000306 */ mov.s $f12, $f0 -/* C52814 802402D4 3C018024 */ lui $at, %hi(D_802431F0_C55730) -/* C52818 802402D8 D42231F0 */ ldc1 $f2, %lo(D_802431F0_C55730)($at) -/* C5281C 802402DC 46000021 */ cvt.d.s $f0, $f0 -/* C52820 802402E0 4622003C */ c.lt.d $f0, $f2 -/* C52824 802402E4 00000000 */ nop -/* C52828 802402E8 45000003 */ bc1f .L802402F8 -/* C5282C 802402EC 00000000 */ nop -/* C52830 802402F0 3C0142B4 */ lui $at, 0x42b4 -/* C52834 802402F4 4481A000 */ mtc1 $at, $f20 -.L802402F8: -/* C52838 802402F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5283C 802402FC 8E820000 */ lw $v0, ($s4) -/* C52840 80240300 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C52844 80240304 8C460028 */ lw $a2, 0x28($v0) -/* C52848 80240308 0C00A720 */ jal atan2 -/* C5284C 8024030C 8C470030 */ lw $a3, 0x30($v0) -/* C52850 80240310 4600A306 */ mov.s $f12, $f20 -/* C52854 80240314 0C00A70A */ jal get_clamped_angle_diff -/* C52858 80240318 46000386 */ mov.s $f14, $f0 -/* C5285C 8024031C C6620078 */ lwc1 $f2, 0x78($s3) -/* C52860 80240320 468010A0 */ cvt.s.w $f2, $f2 -/* C52864 80240324 46000005 */ abs.s $f0, $f0 -/* C52868 80240328 4600103C */ c.lt.s $f2, $f0 -/* C5286C 8024032C 00000000 */ nop -/* C52870 80240330 45030001 */ bc1tl .L80240338 -/* C52874 80240334 0000882D */ daddu $s1, $zero, $zero -.L80240338: -/* C52878 80240338 8E820000 */ lw $v0, ($s4) -/* C5287C 8024033C C600003C */ lwc1 $f0, 0x3c($s0) -/* C52880 80240340 C442002C */ lwc1 $f2, 0x2c($v0) -/* C52884 80240344 860200A8 */ lh $v0, 0xa8($s0) -/* C52888 80240348 46020001 */ sub.s $f0, $f0, $f2 -/* C5288C 8024034C 44821000 */ mtc1 $v0, $f2 -/* C52890 80240350 00000000 */ nop -/* C52894 80240354 468010A1 */ cvt.d.w $f2, $f2 -/* C52898 80240358 46221080 */ add.d $f2, $f2, $f2 -/* C5289C 8024035C 46000005 */ abs.s $f0, $f0 -/* C528A0 80240360 46000021 */ cvt.d.s $f0, $f0 -/* C528A4 80240364 4620103E */ c.le.d $f2, $f0 -/* C528A8 80240368 00000000 */ nop -/* C528AC 8024036C 45030001 */ bc1tl .L80240374 -/* C528B0 80240370 0000882D */ daddu $s1, $zero, $zero -.L80240374: -/* C528B4 80240374 3C038011 */ lui $v1, %hi(D_8010EBB0+0x3) -/* C528B8 80240378 8063EBB3 */ lb $v1, %lo(D_8010EBB0+0x3)($v1) -/* C528BC 8024037C 24020009 */ addiu $v0, $zero, 9 -/* C528C0 80240380 50620001 */ beql $v1, $v0, .L80240388 -/* C528C4 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* C528C8 80240388 24020007 */ addiu $v0, $zero, 7 -/* C528CC 8024038C 50620001 */ beql $v1, $v0, .L80240394 -/* C528D0 80240390 0000882D */ daddu $s1, $zero, $zero -.L80240394: -/* C528D4 80240394 0220102D */ daddu $v0, $s1, $zero -/* C528D8 80240398 8FBF0024 */ lw $ra, 0x24($sp) -/* C528DC 8024039C 8FB40020 */ lw $s4, 0x20($sp) -/* C528E0 802403A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C528E4 802403A4 8FB20018 */ lw $s2, 0x18($sp) -/* C528E8 802403A8 8FB10014 */ lw $s1, 0x14($sp) -/* C528EC 802403AC 8FB00010 */ lw $s0, 0x10($sp) -/* C528F0 802403B0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C528F4 802403B4 03E00008 */ jr $ra -/* C528F8 802403B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s deleted file mode 100644 index 355df56af3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024061C_C52B5C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C_C52B5C -/* C52B5C 8024061C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52B60 80240620 AFB10014 */ sw $s1, 0x14($sp) -/* C52B64 80240624 0080882D */ daddu $s1, $a0, $zero -/* C52B68 80240628 AFBF0018 */ sw $ra, 0x18($sp) -/* C52B6C 8024062C AFB00010 */ sw $s0, 0x10($sp) -/* C52B70 80240630 8E300148 */ lw $s0, 0x148($s1) -/* C52B74 80240634 0C00EABB */ jal get_npc_unsafe -/* C52B78 80240638 86040008 */ lh $a0, 8($s0) -/* C52B7C 8024063C 0040202D */ daddu $a0, $v0, $zero -/* C52B80 80240640 8482008E */ lh $v0, 0x8e($a0) -/* C52B84 80240644 9483008E */ lhu $v1, 0x8e($a0) -/* C52B88 80240648 18400002 */ blez $v0, .L80240654 -/* C52B8C 8024064C 2462FFFF */ addiu $v0, $v1, -1 -/* C52B90 80240650 A482008E */ sh $v0, 0x8e($a0) -.L80240654: -/* C52B94 80240654 8482008E */ lh $v0, 0x8e($a0) -/* C52B98 80240658 24030001 */ addiu $v1, $zero, 1 -/* C52B9C 8024065C 14430005 */ bne $v0, $v1, .L80240674 -/* C52BA0 80240660 00000000 */ nop -/* C52BA4 80240664 8E0200CC */ lw $v0, 0xcc($s0) -/* C52BA8 80240668 8C420030 */ lw $v0, 0x30($v0) -/* C52BAC 8024066C 080901A4 */ j .L80240690 -/* C52BB0 80240670 AC820028 */ sw $v0, 0x28($a0) -.L80240674: -/* C52BB4 80240674 1C400006 */ bgtz $v0, .L80240690 -/* C52BB8 80240678 00000000 */ nop -/* C52BBC 8024067C 8E0200CC */ lw $v0, 0xcc($s0) -/* C52BC0 80240680 8C420028 */ lw $v0, 0x28($v0) -/* C52BC4 80240684 A480008E */ sh $zero, 0x8e($a0) -/* C52BC8 80240688 AC820028 */ sw $v0, 0x28($a0) -/* C52BCC 8024068C AE230070 */ sw $v1, 0x70($s1) -.L80240690: -/* C52BD0 80240690 8FBF0018 */ lw $ra, 0x18($sp) -/* C52BD4 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* C52BD8 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* C52BDC 8024069C 03E00008 */ jr $ra -/* C52BE0 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s deleted file mode 100644 index ccb9e32de9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4_C52BE4 -/* C52BE4 802406A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C52BE8 802406A8 AFB40048 */ sw $s4, 0x48($sp) -/* C52BEC 802406AC 0080A02D */ daddu $s4, $a0, $zero -/* C52BF0 802406B0 AFBF004C */ sw $ra, 0x4c($sp) -/* C52BF4 802406B4 AFB30044 */ sw $s3, 0x44($sp) -/* C52BF8 802406B8 AFB20040 */ sw $s2, 0x40($sp) -/* C52BFC 802406BC AFB1003C */ sw $s1, 0x3c($sp) -/* C52C00 802406C0 AFB00038 */ sw $s0, 0x38($sp) -/* C52C04 802406C4 8E930148 */ lw $s3, 0x148($s4) -/* C52C08 802406C8 00C0802D */ daddu $s0, $a2, $zero -/* C52C0C 802406CC 86640008 */ lh $a0, 8($s3) -/* C52C10 802406D0 0C00EABB */ jal get_npc_unsafe -/* C52C14 802406D4 0000902D */ daddu $s2, $zero, $zero -/* C52C18 802406D8 0C039D59 */ jal get_player_data -/* C52C1C 802406DC 0040882D */ daddu $s1, $v0, $zero -/* C52C20 802406E0 0200202D */ daddu $a0, $s0, $zero -/* C52C24 802406E4 0260282D */ daddu $a1, $s3, $zero -/* C52C28 802406E8 0000382D */ daddu $a3, $zero, $zero -/* C52C2C 802406EC 3C0642A0 */ lui $a2, 0x42a0 -/* C52C30 802406F0 0040802D */ daddu $s0, $v0, $zero -/* C52C34 802406F4 0C01242D */ jal func_800490B4 -/* C52C38 802406F8 AFA00010 */ sw $zero, 0x10($sp) -/* C52C3C 802406FC 10400022 */ beqz $v0, .L80240788 -/* C52C40 80240700 00000000 */ nop -/* C52C44 80240704 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C52C48 80240708 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C52C4C 8024070C 804300B4 */ lb $v1, 0xb4($v0) -/* C52C50 80240710 24020002 */ addiu $v0, $zero, 2 -/* C52C54 80240714 10620013 */ beq $v1, $v0, .L80240764 -/* C52C58 80240718 2402001A */ addiu $v0, $zero, 0x1a -/* C52C5C 8024071C 10620011 */ beq $v1, $v0, .L80240764 -/* C52C60 80240720 24020003 */ addiu $v0, $zero, 3 -/* C52C64 80240724 1062000F */ beq $v1, $v0, .L80240764 -/* C52C68 80240728 2402000E */ addiu $v0, $zero, 0xe -/* C52C6C 8024072C 1062000D */ beq $v1, $v0, .L80240764 -/* C52C70 80240730 24020010 */ addiu $v0, $zero, 0x10 -/* C52C74 80240734 1062000B */ beq $v1, $v0, .L80240764 -/* C52C78 80240738 2402000B */ addiu $v0, $zero, 0xb -/* C52C7C 8024073C 10620009 */ beq $v1, $v0, .L80240764 -/* C52C80 80240740 2402000A */ addiu $v0, $zero, 0xa -/* C52C84 80240744 10620007 */ beq $v1, $v0, .L80240764 -/* C52C88 80240748 24020012 */ addiu $v0, $zero, 0x12 -/* C52C8C 8024074C 10620005 */ beq $v1, $v0, .L80240764 -/* C52C90 80240750 24020013 */ addiu $v0, $zero, 0x13 -/* C52C94 80240754 10620003 */ beq $v1, $v0, .L80240764 -/* C52C98 80240758 24020025 */ addiu $v0, $zero, 0x25 -/* C52C9C 8024075C 14620002 */ bne $v1, $v0, .L80240768 -/* C52CA0 80240760 00000000 */ nop -.L80240764: -/* C52CA4 80240764 24120001 */ addiu $s2, $zero, 1 -.L80240768: -/* C52CA8 80240768 82030012 */ lb $v1, 0x12($s0) -/* C52CAC 8024076C 24020002 */ addiu $v0, $zero, 2 -/* C52CB0 80240770 14620007 */ bne $v1, $v0, .L80240790 -/* C52CB4 80240774 24020001 */ addiu $v0, $zero, 1 -/* C52CB8 80240778 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C52CBC 8024077C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C52CC0 80240780 50430002 */ beql $v0, $v1, .L8024078C -/* C52CC4 80240784 24120001 */ addiu $s2, $zero, 1 -.L80240788: -/* C52CC8 80240788 82030012 */ lb $v1, 0x12($s0) -.L8024078C: -/* C52CCC 8024078C 24020001 */ addiu $v0, $zero, 1 -.L80240790: -/* C52CD0 80240790 14620006 */ bne $v1, $v0, .L802407AC -/* C52CD4 80240794 24020003 */ addiu $v0, $zero, 3 -/* C52CD8 80240798 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C52CDC 8024079C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C52CE0 802407A0 14400008 */ bnez $v0, .L802407C4 -/* C52CE4 802407A4 27A40028 */ addiu $a0, $sp, 0x28 -/* C52CE8 802407A8 24020003 */ addiu $v0, $zero, 3 -.L802407AC: -/* C52CEC 802407AC 1462001B */ bne $v1, $v0, .L8024081C -/* C52CF0 802407B0 24020002 */ addiu $v0, $zero, 2 -/* C52CF4 802407B4 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C52CF8 802407B8 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C52CFC 802407BC 14620017 */ bne $v1, $v0, .L8024081C -/* C52D00 802407C0 27A40028 */ addiu $a0, $sp, 0x28 -.L802407C4: -/* C52D04 802407C4 27A5002C */ addiu $a1, $sp, 0x2c -/* C52D08 802407C8 8E27000C */ lw $a3, 0xc($s1) -/* C52D0C 802407CC C6200038 */ lwc1 $f0, 0x38($s1) -/* C52D10 802407D0 C6220040 */ lwc1 $f2, 0x40($s1) -/* C52D14 802407D4 0000302D */ daddu $a2, $zero, $zero -/* C52D18 802407D8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C52D1C 802407DC 0C00A7E7 */ jal add_vec2D_polar -/* C52D20 802407E0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C52D24 802407E4 3C028011 */ lui $v0, %hi(wPartnerNpc) -/* C52D28 802407E8 8C42C930 */ lw $v0, %lo(wPartnerNpc)($v0) -/* C52D2C 802407EC C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C52D30 802407F0 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C52D34 802407F4 8C460038 */ lw $a2, 0x38($v0) -/* C52D38 802407F8 0C00A7B5 */ jal dist2D -/* C52D3C 802407FC 8C470040 */ lw $a3, 0x40($v0) -/* C52D40 80240800 3C0142A0 */ lui $at, 0x42a0 -/* C52D44 80240804 44811000 */ mtc1 $at, $f2 -/* C52D48 80240808 00000000 */ nop -/* C52D4C 8024080C 4602003E */ c.le.s $f0, $f2 -/* C52D50 80240810 00000000 */ nop -/* C52D54 80240814 45030001 */ bc1tl .L8024081C -/* C52D58 80240818 24120001 */ addiu $s2, $zero, 1 -.L8024081C: -/* C52D5C 8024081C 12400026 */ beqz $s2, .L802408B8 -/* C52D60 80240820 0220202D */ daddu $a0, $s1, $zero -/* C52D64 80240824 3C05B000 */ lui $a1, 0xb000 -/* C52D68 80240828 34A5000E */ ori $a1, $a1, 0xe -/* C52D6C 8024082C 0C012530 */ jal func_800494C0 -/* C52D70 80240830 0000302D */ daddu $a2, $zero, $zero -/* C52D74 80240834 0000202D */ daddu $a0, $zero, $zero -/* C52D78 80240838 0220282D */ daddu $a1, $s1, $zero -/* C52D7C 8024083C 0000302D */ daddu $a2, $zero, $zero -/* C52D80 80240840 862200A8 */ lh $v0, 0xa8($s1) -/* C52D84 80240844 8E6300CC */ lw $v1, 0xcc($s3) -/* C52D88 80240848 3C013F80 */ lui $at, 0x3f80 -/* C52D8C 8024084C 44810000 */ mtc1 $at, $f0 -/* C52D90 80240850 3C014000 */ lui $at, 0x4000 -/* C52D94 80240854 44811000 */ mtc1 $at, $f2 -/* C52D98 80240858 3C01C1A0 */ lui $at, 0xc1a0 -/* C52D9C 8024085C 44812000 */ mtc1 $at, $f4 -/* C52DA0 80240860 44823000 */ mtc1 $v0, $f6 -/* C52DA4 80240864 00000000 */ nop -/* C52DA8 80240868 468031A0 */ cvt.s.w $f6, $f6 -/* C52DAC 8024086C 44073000 */ mfc1 $a3, $f6 -/* C52DB0 80240870 8C63002C */ lw $v1, 0x2c($v1) -/* C52DB4 80240874 2402000A */ addiu $v0, $zero, 0xa -/* C52DB8 80240878 A622008E */ sh $v0, 0x8e($s1) -/* C52DBC 8024087C 2402000F */ addiu $v0, $zero, 0xf -/* C52DC0 80240880 AE230028 */ sw $v1, 0x28($s1) -/* C52DC4 80240884 AFA2001C */ sw $v0, 0x1c($sp) -/* C52DC8 80240888 27A20030 */ addiu $v0, $sp, 0x30 -/* C52DCC 8024088C E7A00010 */ swc1 $f0, 0x10($sp) -/* C52DD0 80240890 E7A20014 */ swc1 $f2, 0x14($sp) -/* C52DD4 80240894 E7A40018 */ swc1 $f4, 0x18($sp) -/* C52DD8 80240898 0C01BFA4 */ jal fx_emote -/* C52DDC 8024089C AFA20020 */ sw $v0, 0x20($sp) -/* C52DE0 802408A0 0220202D */ daddu $a0, $s1, $zero -/* C52DE4 802408A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C52DE8 802408A8 0C012530 */ jal func_800494C0 -/* C52DEC 802408AC 3C060020 */ lui $a2, 0x20 -/* C52DF0 802408B0 24020002 */ addiu $v0, $zero, 2 -/* C52DF4 802408B4 AE820070 */ sw $v0, 0x70($s4) -.L802408B8: -/* C52DF8 802408B8 9622008E */ lhu $v0, 0x8e($s1) -/* C52DFC 802408BC 24420001 */ addiu $v0, $v0, 1 -/* C52E00 802408C0 A622008E */ sh $v0, 0x8e($s1) -/* C52E04 802408C4 00021400 */ sll $v0, $v0, 0x10 -/* C52E08 802408C8 00021C03 */ sra $v1, $v0, 0x10 -/* C52E0C 802408CC 2402001B */ addiu $v0, $zero, 0x1b -/* C52E10 802408D0 14620005 */ bne $v1, $v0, .L802408E8 -/* C52E14 802408D4 24020039 */ addiu $v0, $zero, 0x39 -/* C52E18 802408D8 0220202D */ daddu $a0, $s1, $zero -/* C52E1C 802408DC 3C05B000 */ lui $a1, 0xb000 -/* C52E20 802408E0 0809023F */ j .L802408FC -/* C52E24 802408E4 34A5000C */ ori $a1, $a1, 0xc -.L802408E8: -/* C52E28 802408E8 14620008 */ bne $v1, $v0, .L8024090C -/* C52E2C 802408EC 2402003B */ addiu $v0, $zero, 0x3b -/* C52E30 802408F0 0220202D */ daddu $a0, $s1, $zero -/* C52E34 802408F4 3C05B000 */ lui $a1, 0xb000 -/* C52E38 802408F8 34A5000D */ ori $a1, $a1, 0xd -.L802408FC: -/* C52E3C 802408FC 0C012530 */ jal func_800494C0 -/* C52E40 80240900 0000302D */ daddu $a2, $zero, $zero -/* C52E44 80240904 0809024F */ j .L8024093C -/* C52E48 80240908 00000000 */ nop -.L8024090C: -/* C52E4C 8024090C 14620005 */ bne $v1, $v0, .L80240924 -/* C52E50 80240910 2402003C */ addiu $v0, $zero, 0x3c -/* C52E54 80240914 8E6200CC */ lw $v0, 0xcc($s3) -/* C52E58 80240918 8C420030 */ lw $v0, 0x30($v0) -/* C52E5C 8024091C 0809024F */ j .L8024093C -/* C52E60 80240920 AE220028 */ sw $v0, 0x28($s1) -.L80240924: -/* C52E64 80240924 14620005 */ bne $v1, $v0, .L8024093C -/* C52E68 80240928 00000000 */ nop -/* C52E6C 8024092C 8E6200CC */ lw $v0, 0xcc($s3) -/* C52E70 80240930 8C420028 */ lw $v0, 0x28($v0) -/* C52E74 80240934 A620008E */ sh $zero, 0x8e($s1) -/* C52E78 80240938 AE220028 */ sw $v0, 0x28($s1) -.L8024093C: -/* C52E7C 8024093C 8FBF004C */ lw $ra, 0x4c($sp) -/* C52E80 80240940 8FB40048 */ lw $s4, 0x48($sp) -/* C52E84 80240944 8FB30044 */ lw $s3, 0x44($sp) -/* C52E88 80240948 8FB20040 */ lw $s2, 0x40($sp) -/* C52E8C 8024094C 8FB1003C */ lw $s1, 0x3c($sp) -/* C52E90 80240950 8FB00038 */ lw $s0, 0x38($sp) -/* C52E94 80240954 03E00008 */ jr $ra -/* C52E98 80240958 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024095C_C52E9C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024095C_C52E9C.s deleted file mode 100644 index 5d2cd6306f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_8024095C_C52E9C.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C_C52E9C -/* C52E9C 8024095C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52EA0 80240960 AFB10014 */ sw $s1, 0x14($sp) -/* C52EA4 80240964 0080882D */ daddu $s1, $a0, $zero -/* C52EA8 80240968 AFBF0018 */ sw $ra, 0x18($sp) -/* C52EAC 8024096C AFB00010 */ sw $s0, 0x10($sp) -/* C52EB0 80240970 8E300148 */ lw $s0, 0x148($s1) -/* C52EB4 80240974 0C00EABB */ jal get_npc_unsafe -/* C52EB8 80240978 86040008 */ lh $a0, 8($s0) -/* C52EBC 8024097C 0040182D */ daddu $v1, $v0, $zero -/* C52EC0 80240980 9462008E */ lhu $v0, 0x8e($v1) -/* C52EC4 80240984 2442FFFF */ addiu $v0, $v0, -1 -/* C52EC8 80240988 A462008E */ sh $v0, 0x8e($v1) -/* C52ECC 8024098C 00021400 */ sll $v0, $v0, 0x10 -/* C52ED0 80240990 1C400006 */ bgtz $v0, .L802409AC -/* C52ED4 80240994 24020001 */ addiu $v0, $zero, 1 -/* C52ED8 80240998 A462008E */ sh $v0, 0x8e($v1) -/* C52EDC 8024099C 24020028 */ addiu $v0, $zero, 0x28 -/* C52EE0 802409A0 AE020088 */ sw $v0, 0x88($s0) -/* C52EE4 802409A4 24020003 */ addiu $v0, $zero, 3 -/* C52EE8 802409A8 AE220070 */ sw $v0, 0x70($s1) -.L802409AC: -/* C52EEC 802409AC 8FBF0018 */ lw $ra, 0x18($sp) -/* C52EF0 802409B0 8FB10014 */ lw $s1, 0x14($sp) -/* C52EF4 802409B4 8FB00010 */ lw $s0, 0x10($sp) -/* C52EF8 802409B8 03E00008 */ jr $ra -/* C52EFC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s deleted file mode 100644 index 3115c98662..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802409C0_C52F00.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0_C52F00 -/* C52F00 802409C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C52F04 802409C4 AFB10014 */ sw $s1, 0x14($sp) -/* C52F08 802409C8 0080882D */ daddu $s1, $a0, $zero -/* C52F0C 802409CC AFBF001C */ sw $ra, 0x1c($sp) -/* C52F10 802409D0 AFB20018 */ sw $s2, 0x18($sp) -/* C52F14 802409D4 AFB00010 */ sw $s0, 0x10($sp) -/* C52F18 802409D8 8E320148 */ lw $s2, 0x148($s1) -/* C52F1C 802409DC 0C00EABB */ jal get_npc_unsafe -/* C52F20 802409E0 86440008 */ lh $a0, 8($s2) -/* C52F24 802409E4 240400B4 */ addiu $a0, $zero, 0xb4 -/* C52F28 802409E8 0C00A67F */ jal rand_int -/* C52F2C 802409EC 0040802D */ daddu $s0, $v0, $zero -/* C52F30 802409F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C52F34 802409F4 44820000 */ mtc1 $v0, $f0 -/* C52F38 802409F8 00000000 */ nop -/* C52F3C 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* C52F40 80240A00 46006300 */ add.s $f12, $f12, $f0 -/* C52F44 80240A04 3C0142B4 */ lui $at, 0x42b4 -/* C52F48 80240A08 44810000 */ mtc1 $at, $f0 -/* C52F4C 80240A0C 0C00A6C9 */ jal clamp_angle -/* C52F50 80240A10 46006301 */ sub.s $f12, $f12, $f0 -/* C52F54 80240A14 E600000C */ swc1 $f0, 0xc($s0) -/* C52F58 80240A18 8E4200CC */ lw $v0, 0xcc($s2) -/* C52F5C 80240A1C 8C420000 */ lw $v0, ($v0) -/* C52F60 80240A20 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C52F64 80240A24 0C00A67F */ jal rand_int -/* C52F68 80240A28 AE020028 */ sw $v0, 0x28($s0) -/* C52F6C 80240A2C 00021FC2 */ srl $v1, $v0, 0x1f -/* C52F70 80240A30 00431821 */ addu $v1, $v0, $v1 -/* C52F74 80240A34 00031843 */ sra $v1, $v1, 1 -/* C52F78 80240A38 00031840 */ sll $v1, $v1, 1 -/* C52F7C 80240A3C 00431023 */ subu $v0, $v0, $v1 -/* C52F80 80240A40 24420002 */ addiu $v0, $v0, 2 -/* C52F84 80240A44 AE220074 */ sw $v0, 0x74($s1) -/* C52F88 80240A48 24020004 */ addiu $v0, $zero, 4 -/* C52F8C 80240A4C AE220070 */ sw $v0, 0x70($s1) -/* C52F90 80240A50 8FBF001C */ lw $ra, 0x1c($sp) -/* C52F94 80240A54 8FB20018 */ lw $s2, 0x18($sp) -/* C52F98 80240A58 8FB10014 */ lw $s1, 0x14($sp) -/* C52F9C 80240A5C 8FB00010 */ lw $s0, 0x10($sp) -/* C52FA0 80240A60 03E00008 */ jr $ra -/* C52FA4 80240A64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s deleted file mode 100644 index 62e1bebae2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240A68_C52FA8.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A68_C52FA8 -/* C52FA8 80240A68 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C52FAC 80240A6C AFB20020 */ sw $s2, 0x20($sp) -/* C52FB0 80240A70 0080902D */ daddu $s2, $a0, $zero -/* C52FB4 80240A74 AFBF0028 */ sw $ra, 0x28($sp) -/* C52FB8 80240A78 AFB30024 */ sw $s3, 0x24($sp) -/* C52FBC 80240A7C AFB1001C */ sw $s1, 0x1c($sp) -/* C52FC0 80240A80 AFB00018 */ sw $s0, 0x18($sp) -/* C52FC4 80240A84 8E510148 */ lw $s1, 0x148($s2) -/* C52FC8 80240A88 00A0982D */ daddu $s3, $a1, $zero -/* C52FCC 80240A8C 86240008 */ lh $a0, 8($s1) -/* C52FD0 80240A90 0C00EABB */ jal get_npc_unsafe -/* C52FD4 80240A94 00C0802D */ daddu $s0, $a2, $zero -/* C52FD8 80240A98 0200202D */ daddu $a0, $s0, $zero -/* C52FDC 80240A9C 0040802D */ daddu $s0, $v0, $zero -/* C52FE0 80240AA0 AFA00010 */ sw $zero, 0x10($sp) -/* C52FE4 80240AA4 8E660024 */ lw $a2, 0x24($s3) -/* C52FE8 80240AA8 8E670028 */ lw $a3, 0x28($s3) -/* C52FEC 80240AAC 0C01242D */ jal func_800490B4 -/* C52FF0 80240AB0 0220282D */ daddu $a1, $s1, $zero -/* C52FF4 80240AB4 1040000C */ beqz $v0, .L80240AE8 -/* C52FF8 80240AB8 00000000 */ nop -/* C52FFC 80240ABC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C53000 80240AC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C53004 80240AC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C53008 80240AC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5300C 80240ACC 8C460028 */ lw $a2, 0x28($v0) -/* C53010 80240AD0 0C00A720 */ jal atan2 -/* C53014 80240AD4 8C470030 */ lw $a3, 0x30($v0) -/* C53018 80240AD8 2402000C */ addiu $v0, $zero, 0xc -/* C5301C 80240ADC E600000C */ swc1 $f0, 0xc($s0) -/* C53020 80240AE0 080902E1 */ j .L80240B84 -/* C53024 80240AE4 AE420070 */ sw $v0, 0x70($s2) -.L80240AE8: -/* C53028 80240AE8 9602008E */ lhu $v0, 0x8e($s0) -/* C5302C 80240AEC 2442FFFF */ addiu $v0, $v0, -1 -/* C53030 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* C53034 80240AF4 00021400 */ sll $v0, $v0, 0x10 -/* C53038 80240AF8 1C400022 */ bgtz $v0, .L80240B84 -/* C5303C 80240AFC 00000000 */ nop -/* C53040 80240B00 8E420074 */ lw $v0, 0x74($s2) -/* C53044 80240B04 2442FFFF */ addiu $v0, $v0, -1 -/* C53048 80240B08 18400014 */ blez $v0, .L80240B5C -/* C5304C 80240B0C AE420074 */ sw $v0, 0x74($s2) -/* C53050 80240B10 C600000C */ lwc1 $f0, 0xc($s0) -/* C53054 80240B14 3C014334 */ lui $at, 0x4334 -/* C53058 80240B18 44816000 */ mtc1 $at, $f12 -/* C5305C 80240B1C 0C00A6C9 */ jal clamp_angle -/* C53060 80240B20 460C0300 */ add.s $f12, $f0, $f12 -/* C53064 80240B24 E600000C */ swc1 $f0, 0xc($s0) -/* C53068 80240B28 8E640008 */ lw $a0, 8($s3) -/* C5306C 80240B2C 000417C2 */ srl $v0, $a0, 0x1f -/* C53070 80240B30 00822021 */ addu $a0, $a0, $v0 -/* C53074 80240B34 00042043 */ sra $a0, $a0, 1 -/* C53078 80240B38 0C00A67F */ jal rand_int -/* C5307C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* C53080 80240B40 8E630008 */ lw $v1, 8($s3) -/* C53084 80240B44 000327C2 */ srl $a0, $v1, 0x1f -/* C53088 80240B48 00641821 */ addu $v1, $v1, $a0 -/* C5308C 80240B4C 00031843 */ sra $v1, $v1, 1 -/* C53090 80240B50 00621821 */ addu $v1, $v1, $v0 -/* C53094 80240B54 080902E1 */ j .L80240B84 -/* C53098 80240B58 A603008E */ sh $v1, 0x8e($s0) -.L80240B5C: -/* C5309C 80240B5C 8E250088 */ lw $a1, 0x88($s1) -/* C530A0 80240B60 24020028 */ addiu $v0, $zero, 0x28 -/* C530A4 80240B64 14A20003 */ bne $a1, $v0, .L80240B74 -/* C530A8 80240B68 24020032 */ addiu $v0, $zero, 0x32 -/* C530AC 80240B6C 080902DF */ j .L80240B7C -/* C530B0 80240B70 24020014 */ addiu $v0, $zero, 0x14 -.L80240B74: -/* C530B4 80240B74 14A20003 */ bne $a1, $v0, .L80240B84 -/* C530B8 80240B78 24020019 */ addiu $v0, $zero, 0x19 -.L80240B7C: -/* C530BC 80240B7C A602008E */ sh $v0, 0x8e($s0) -/* C530C0 80240B80 AE450070 */ sw $a1, 0x70($s2) -.L80240B84: -/* C530C4 80240B84 8FBF0028 */ lw $ra, 0x28($sp) -/* C530C8 80240B88 8FB30024 */ lw $s3, 0x24($sp) -/* C530CC 80240B8C 8FB20020 */ lw $s2, 0x20($sp) -/* C530D0 80240B90 8FB1001C */ lw $s1, 0x1c($sp) -/* C530D4 80240B94 8FB00018 */ lw $s0, 0x18($sp) -/* C530D8 80240B98 03E00008 */ jr $ra -/* C530DC 80240B9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s deleted file mode 100644 index 0629e57c0d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA0_C530E0 -/* C530E0 80240BA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C530E4 80240BA4 AFB20018 */ sw $s2, 0x18($sp) -/* C530E8 80240BA8 0080902D */ daddu $s2, $a0, $zero -/* C530EC 80240BAC AFBF001C */ sw $ra, 0x1c($sp) -/* C530F0 80240BB0 AFB10014 */ sw $s1, 0x14($sp) -/* C530F4 80240BB4 AFB00010 */ sw $s0, 0x10($sp) -/* C530F8 80240BB8 8E500148 */ lw $s0, 0x148($s2) -/* C530FC 80240BBC 86040008 */ lh $a0, 8($s0) -/* C53100 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C53104 80240BC4 00A0882D */ daddu $s1, $a1, $zero -/* C53108 80240BC8 0040182D */ daddu $v1, $v0, $zero -/* C5310C 80240BCC 9462008E */ lhu $v0, 0x8e($v1) -/* C53110 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* C53114 80240BD4 A462008E */ sh $v0, 0x8e($v1) -/* C53118 80240BD8 00021400 */ sll $v0, $v0, 0x10 -/* C5311C 80240BDC 1C400015 */ bgtz $v0, .L80240C34 -/* C53120 80240BE0 00000000 */ nop -/* C53124 80240BE4 8E0200CC */ lw $v0, 0xcc($s0) -/* C53128 80240BE8 8C420004 */ lw $v0, 4($v0) -/* C5312C 80240BEC AC620028 */ sw $v0, 0x28($v1) -/* C53130 80240BF0 8E0200D0 */ lw $v0, 0xd0($s0) -/* C53134 80240BF4 8C420014 */ lw $v0, 0x14($v0) -/* C53138 80240BF8 04410004 */ bgez $v0, .L80240C0C -/* C5313C 80240BFC 00000000 */ nop -/* C53140 80240C00 C6200000 */ lwc1 $f0, ($s1) -/* C53144 80240C04 0809030B */ j .L80240C2C -/* C53148 80240C08 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C0C: -/* C5314C 80240C0C 3C018024 */ lui $at, %hi(D_802431F8_C55738) -/* C53150 80240C10 D42231F8 */ ldc1 $f2, %lo(D_802431F8_C55738)($at) -/* C53154 80240C14 44820000 */ mtc1 $v0, $f0 -/* C53158 80240C18 00000000 */ nop -/* C5315C 80240C1C 46800021 */ cvt.d.w $f0, $f0 -/* C53160 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* C53164 80240C24 46200020 */ cvt.s.d $f0, $f0 -/* C53168 80240C28 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C2C: -/* C5316C 80240C2C 24020029 */ addiu $v0, $zero, 0x29 -/* C53170 80240C30 AE420070 */ sw $v0, 0x70($s2) -.L80240C34: -/* C53174 80240C34 8FBF001C */ lw $ra, 0x1c($sp) -/* C53178 80240C38 8FB20018 */ lw $s2, 0x18($sp) -/* C5317C 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* C53180 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* C53184 80240C44 03E00008 */ jr $ra -/* C53188 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s deleted file mode 100644 index fa4a77f6c9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240C4C_C5318C.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C_C5318C -/* C5318C 80240C4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C53190 80240C50 AFB3002C */ sw $s3, 0x2c($sp) -/* C53194 80240C54 0080982D */ daddu $s3, $a0, $zero -/* C53198 80240C58 AFBF0030 */ sw $ra, 0x30($sp) -/* C5319C 80240C5C AFB20028 */ sw $s2, 0x28($sp) -/* C531A0 80240C60 AFB10024 */ sw $s1, 0x24($sp) -/* C531A4 80240C64 AFB00020 */ sw $s0, 0x20($sp) -/* C531A8 80240C68 8E720148 */ lw $s2, 0x148($s3) -/* C531AC 80240C6C 00A0882D */ daddu $s1, $a1, $zero -/* C531B0 80240C70 86440008 */ lh $a0, 8($s2) -/* C531B4 80240C74 0C00EABB */ jal get_npc_unsafe -/* C531B8 80240C78 00C0802D */ daddu $s0, $a2, $zero -/* C531BC 80240C7C 0200202D */ daddu $a0, $s0, $zero -/* C531C0 80240C80 0240282D */ daddu $a1, $s2, $zero -/* C531C4 80240C84 AFA00010 */ sw $zero, 0x10($sp) -/* C531C8 80240C88 8E260024 */ lw $a2, 0x24($s1) -/* C531CC 80240C8C 8E270028 */ lw $a3, 0x28($s1) -/* C531D0 80240C90 0C01242D */ jal func_800490B4 -/* C531D4 80240C94 0040802D */ daddu $s0, $v0, $zero -/* C531D8 80240C98 1040000C */ beqz $v0, .L80240CCC -/* C531DC 80240C9C 00000000 */ nop -/* C531E0 80240CA0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C531E4 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C531E8 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C531EC 80240CAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C531F0 80240CB0 8C460028 */ lw $a2, 0x28($v0) -/* C531F4 80240CB4 0C00A720 */ jal atan2 -/* C531F8 80240CB8 8C470030 */ lw $a3, 0x30($v0) -/* C531FC 80240CBC 2402000C */ addiu $v0, $zero, 0xc -/* C53200 80240CC0 E600000C */ swc1 $f0, 0xc($s0) -/* C53204 80240CC4 0809036A */ j .L80240DA8 -/* C53208 80240CC8 AE620070 */ sw $v0, 0x70($s3) -.L80240CCC: -/* C5320C 80240CCC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C53210 80240CD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* C53214 80240CD4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C53218 80240CD8 C4440000 */ lwc1 $f4, ($v0) -/* C5321C 80240CDC 46802120 */ cvt.s.w $f4, $f4 -/* C53220 80240CE0 44062000 */ mfc1 $a2, $f4 -/* C53224 80240CE4 C4440008 */ lwc1 $f4, 8($v0) -/* C53228 80240CE8 46802120 */ cvt.s.w $f4, $f4 -/* C5322C 80240CEC 44072000 */ mfc1 $a3, $f4 -/* C53230 80240CF0 0C00A7B5 */ jal dist2D -/* C53234 80240CF4 00000000 */ nop -/* C53238 80240CF8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C5323C 80240CFC 4602003E */ c.le.s $f0, $f2 -/* C53240 80240D00 00000000 */ nop -/* C53244 80240D04 4500000B */ bc1f .L80240D34 -/* C53248 80240D08 00000000 */ nop -/* C5324C 80240D0C 8E4200CC */ lw $v0, 0xcc($s2) -/* C53250 80240D10 8C430000 */ lw $v1, ($v0) -/* C53254 80240D14 2402000F */ addiu $v0, $zero, 0xf -/* C53258 80240D18 A602008E */ sh $v0, 0x8e($s0) -/* C5325C 80240D1C 24020032 */ addiu $v0, $zero, 0x32 -/* C53260 80240D20 AE030028 */ sw $v1, 0x28($s0) -/* C53264 80240D24 AE420088 */ sw $v0, 0x88($s2) -/* C53268 80240D28 24020003 */ addiu $v0, $zero, 3 -/* C5326C 80240D2C 0809036A */ j .L80240DA8 -/* C53270 80240D30 AE620070 */ sw $v0, 0x70($s3) -.L80240D34: -/* C53274 80240D34 8602008C */ lh $v0, 0x8c($s0) -/* C53278 80240D38 1440001B */ bnez $v0, .L80240DA8 -/* C5327C 80240D3C 0200202D */ daddu $a0, $s0, $zero -/* C53280 80240D40 27A60018 */ addiu $a2, $sp, 0x18 -/* C53284 80240D44 3C0540A0 */ lui $a1, 0x40a0 -/* C53288 80240D48 C600000C */ lwc1 $f0, 0xc($s0) -/* C5328C 80240D4C 0000382D */ daddu $a3, $zero, $zero -/* C53290 80240D50 E7A00018 */ swc1 $f0, 0x18($sp) -/* C53294 80240D54 AFA00010 */ sw $zero, 0x10($sp) -/* C53298 80240D58 0C0129E1 */ jal func_8004A784 -/* C5329C 80240D5C AFA00014 */ sw $zero, 0x14($sp) -/* C532A0 80240D60 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C532A4 80240D64 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C532A8 80240D68 E600000C */ swc1 $f0, 0xc($s0) -/* C532AC 80240D6C 8E4200D0 */ lw $v0, 0xd0($s2) -/* C532B0 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C532B4 80240D74 C4440000 */ lwc1 $f4, ($v0) -/* C532B8 80240D78 46802120 */ cvt.s.w $f4, $f4 -/* C532BC 80240D7C 44062000 */ mfc1 $a2, $f4 -/* C532C0 80240D80 C4440008 */ lwc1 $f4, 8($v0) -/* C532C4 80240D84 46802120 */ cvt.s.w $f4, $f4 -/* C532C8 80240D88 44072000 */ mfc1 $a3, $f4 -/* C532CC 80240D8C 0C00A720 */ jal atan2 -/* C532D0 80240D90 00000000 */ nop -/* C532D4 80240D94 8E050018 */ lw $a1, 0x18($s0) -/* C532D8 80240D98 44060000 */ mfc1 $a2, $f0 -/* C532DC 80240D9C 0200202D */ daddu $a0, $s0, $zero -/* C532E0 80240DA0 0C00EA95 */ jal npc_move_heading -/* C532E4 80240DA4 AC86000C */ sw $a2, 0xc($a0) -.L80240DA8: -/* C532E8 80240DA8 8FBF0030 */ lw $ra, 0x30($sp) -/* C532EC 80240DAC 8FB3002C */ lw $s3, 0x2c($sp) -/* C532F0 80240DB0 8FB20028 */ lw $s2, 0x28($sp) -/* C532F4 80240DB4 8FB10024 */ lw $s1, 0x24($sp) -/* C532F8 80240DB8 8FB00020 */ lw $s0, 0x20($sp) -/* C532FC 80240DBC 03E00008 */ jr $ra -/* C53300 80240DC0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s deleted file mode 100644 index b005504091..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240DC4_C53304.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4_C53304 -/* C53304 80240DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C53308 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* C5330C 80240DCC 0080802D */ daddu $s0, $a0, $zero -/* C53310 80240DD0 AFBF0014 */ sw $ra, 0x14($sp) -/* C53314 80240DD4 8E020148 */ lw $v0, 0x148($s0) -/* C53318 80240DD8 0C00EABB */ jal get_npc_unsafe -/* C5331C 80240DDC 84440008 */ lh $a0, 8($v0) -/* C53320 80240DE0 0040182D */ daddu $v1, $v0, $zero -/* C53324 80240DE4 8462008C */ lh $v0, 0x8c($v1) -/* C53328 80240DE8 14400009 */ bnez $v0, .L80240E10 -/* C5332C 80240DEC 00000000 */ nop -/* C53330 80240DF0 9462008E */ lhu $v0, 0x8e($v1) -/* C53334 80240DF4 2442FFFF */ addiu $v0, $v0, -1 -/* C53338 80240DF8 A462008E */ sh $v0, 0x8e($v1) -/* C5333C 80240DFC 00021400 */ sll $v0, $v0, 0x10 -/* C53340 80240E00 1C400003 */ bgtz $v0, .L80240E10 -/* C53344 80240E04 00000000 */ nop -/* C53348 80240E08 A460008E */ sh $zero, 0x8e($v1) -/* C5334C 80240E0C AE000070 */ sw $zero, 0x70($s0) -.L80240E10: -/* C53350 80240E10 8FBF0014 */ lw $ra, 0x14($sp) -/* C53354 80240E14 8FB00010 */ lw $s0, 0x10($sp) -/* C53358 80240E18 03E00008 */ jr $ra -/* C5335C 80240E1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s deleted file mode 100644 index 5563bc24c7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E20_C53360 -/* C53360 80240E20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C53364 80240E24 AFB20038 */ sw $s2, 0x38($sp) -/* C53368 80240E28 0080902D */ daddu $s2, $a0, $zero -/* C5336C 80240E2C AFBF0048 */ sw $ra, 0x48($sp) -/* C53370 80240E30 AFB50044 */ sw $s5, 0x44($sp) -/* C53374 80240E34 AFB40040 */ sw $s4, 0x40($sp) -/* C53378 80240E38 AFB3003C */ sw $s3, 0x3c($sp) -/* C5337C 80240E3C AFB10034 */ sw $s1, 0x34($sp) -/* C53380 80240E40 AFB00030 */ sw $s0, 0x30($sp) -/* C53384 80240E44 8E510148 */ lw $s1, 0x148($s2) -/* C53388 80240E48 86240008 */ lh $a0, 8($s1) -/* C5338C 80240E4C 0C00EABB */ jal get_npc_unsafe -/* C53390 80240E50 00A0802D */ daddu $s0, $a1, $zero -/* C53394 80240E54 8E43000C */ lw $v1, 0xc($s2) -/* C53398 80240E58 0240202D */ daddu $a0, $s2, $zero -/* C5339C 80240E5C 8C650000 */ lw $a1, ($v1) -/* C533A0 80240E60 0C0B1EAF */ jal get_variable -/* C533A4 80240E64 0040A02D */ daddu $s4, $v0, $zero -/* C533A8 80240E68 AFA00010 */ sw $zero, 0x10($sp) -/* C533AC 80240E6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533B0 80240E70 8C630030 */ lw $v1, 0x30($v1) -/* C533B4 80240E74 AFA30014 */ sw $v1, 0x14($sp) -/* C533B8 80240E78 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533BC 80240E7C 8C63001C */ lw $v1, 0x1c($v1) -/* C533C0 80240E80 AFA30018 */ sw $v1, 0x18($sp) -/* C533C4 80240E84 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533C8 80240E88 8C630024 */ lw $v1, 0x24($v1) -/* C533CC 80240E8C AFA3001C */ sw $v1, 0x1c($sp) -/* C533D0 80240E90 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533D4 80240E94 8C630028 */ lw $v1, 0x28($v1) -/* C533D8 80240E98 27B50010 */ addiu $s5, $sp, 0x10 -/* C533DC 80240E9C AFA30020 */ sw $v1, 0x20($sp) -/* C533E0 80240EA0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C533E4 80240EA4 3C014220 */ lui $at, 0x4220 -/* C533E8 80240EA8 44810000 */ mtc1 $at, $f0 -/* C533EC 80240EAC 8C63002C */ lw $v1, 0x2c($v1) -/* C533F0 80240EB0 0040982D */ daddu $s3, $v0, $zero -/* C533F4 80240EB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C533F8 80240EB8 A7A0002C */ sh $zero, 0x2c($sp) -/* C533FC 80240EBC 16000005 */ bnez $s0, .L80240ED4 -/* C53400 80240EC0 AFA30024 */ sw $v1, 0x24($sp) -/* C53404 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C53408 80240EC8 30420004 */ andi $v0, $v0, 4 -/* C5340C 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C53410 80240ED0 00000000 */ nop -.L80240ED4: -/* C53414 80240ED4 2402001E */ addiu $v0, $zero, 0x1e -/* C53418 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 -/* C5341C 80240EDC AE400070 */ sw $zero, 0x70($s2) -/* C53420 80240EE0 A682008E */ sh $v0, 0x8e($s4) -/* C53424 80240EE4 8E2300CC */ lw $v1, 0xcc($s1) -/* C53428 80240EE8 8E820000 */ lw $v0, ($s4) -/* C5342C 80240EEC 8C630028 */ lw $v1, 0x28($v1) -/* C53430 80240EF0 00441024 */ and $v0, $v0, $a0 -/* C53434 80240EF4 AE820000 */ sw $v0, ($s4) -/* C53438 80240EF8 AE830028 */ sw $v1, 0x28($s4) -/* C5343C 80240EFC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C53440 80240F00 AE20006C */ sw $zero, 0x6c($s1) -/* C53444 80240F04 8C420034 */ lw $v0, 0x34($v0) -/* C53448 80240F08 14400006 */ bnez $v0, .L80240F24 -/* C5344C 80240F0C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C53450 80240F10 8E820000 */ lw $v0, ($s4) -/* C53454 80240F14 2403FFF7 */ addiu $v1, $zero, -9 -/* C53458 80240F18 34420200 */ ori $v0, $v0, 0x200 -/* C5345C 80240F1C 080903CC */ j .L80240F30 -/* C53460 80240F20 00431024 */ and $v0, $v0, $v1 -.L80240F24: -/* C53464 80240F24 8E820000 */ lw $v0, ($s4) -/* C53468 80240F28 00431024 */ and $v0, $v0, $v1 -/* C5346C 80240F2C 34420008 */ ori $v0, $v0, 8 -.L80240F30: -/* C53470 80240F30 AE820000 */ sw $v0, ($s4) -/* C53474 80240F34 8E2200B0 */ lw $v0, 0xb0($s1) -/* C53478 80240F38 30420004 */ andi $v0, $v0, 4 -/* C5347C 80240F3C 10400007 */ beqz $v0, .L80240F5C -/* C53480 80240F40 24020063 */ addiu $v0, $zero, 0x63 -/* C53484 80240F44 AE420070 */ sw $v0, 0x70($s2) -/* C53488 80240F48 24020028 */ addiu $v0, $zero, 0x28 -/* C5348C 80240F4C AE420074 */ sw $v0, 0x74($s2) -/* C53490 80240F50 8E2200CC */ lw $v0, 0xcc($s1) -/* C53494 80240F54 8C420000 */ lw $v0, ($v0) -/* C53498 80240F58 AE820028 */ sw $v0, 0x28($s4) -.L80240F5C: -/* C5349C 80240F5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C534A0 80240F60 2403FFFB */ addiu $v1, $zero, -5 -/* C534A4 80240F64 00431024 */ and $v0, $v0, $v1 -/* C534A8 80240F68 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240F6C: -/* C534AC 80240F6C 8E420070 */ lw $v0, 0x70($s2) -/* C534B0 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa -/* C534B4 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 -/* C534B8 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C534BC 80240F7C 00000000 */ nop -/* C534C0 80240F80 8E22006C */ lw $v0, 0x6c($s1) -/* C534C4 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C534C8 80240F88 00000000 */ nop -/* C534CC 80240F8C 0C090082 */ jal func_80240208_C52748 -/* C534D0 80240F90 0240202D */ daddu $a0, $s2, $zero -/* C534D4 80240F94 10400002 */ beqz $v0, .L80240FA0 -/* C534D8 80240F98 2402001E */ addiu $v0, $zero, 0x1e -/* C534DC 80240F9C AE420070 */ sw $v0, 0x70($s2) -.L80240FA0: -/* C534E0 80240FA0 8E430070 */ lw $v1, 0x70($s2) -/* C534E4 80240FA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C534E8 80240FA8 10400067 */ beqz $v0, L80241148_C53688 -/* C534EC 80240FAC 00031080 */ sll $v0, $v1, 2 -/* C534F0 80240FB0 3C018024 */ lui $at, %hi(jtbl_80243200_C55740) -/* C534F4 80240FB4 00220821 */ addu $at, $at, $v0 -/* C534F8 80240FB8 8C223200 */ lw $v0, %lo(jtbl_80243200_C55740)($at) -/* C534FC 80240FBC 00400008 */ jr $v0 -/* C53500 80240FC0 00000000 */ nop -glabel L80240FC4_C53504 -/* C53504 80240FC4 0240202D */ daddu $a0, $s2, $zero -/* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero -/* C5350C 80240FCC 0C090187 */ jal func_8024061C_C52B5C -/* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* C53514 80240FD4 08090452 */ j L80241148_C53688 -/* C53518 80240FD8 00000000 */ nop -glabel L80240FDC_C5351C -/* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero -/* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero -/* C53524 80240FE4 0C0901A9 */ jal func_802406A4_C52BE4 -/* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero -/* C5352C 80240FEC 08090452 */ j L80241148_C53688 -/* C53530 80240FF0 00000000 */ nop -glabel L80240FF4_C53534 -/* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero -/* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero -/* C5353C 80240FFC 0C090257 */ jal func_8024095C_C52E9C -/* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero -/* C53544 80241004 08090452 */ j L80241148_C53688 -/* C53548 80241008 00000000 */ nop -glabel L8024100C_C5354C -/* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero -/* C53550 80241010 0260282D */ daddu $a1, $s3, $zero -/* C53554 80241014 0C090270 */ jal func_802409C0_C52F00 -/* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero -/* C5355C 8024101C 08090452 */ j L80241148_C53688 -/* C53560 80241020 00000000 */ nop -glabel L80241024_C53564 -/* C53564 80241024 0240202D */ daddu $a0, $s2, $zero -/* C53568 80241028 0260282D */ daddu $a1, $s3, $zero -/* C5356C 8024102C 0C09029A */ jal func_80240A68_C52FA8 -/* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero -/* C53574 80241034 08090452 */ j L80241148_C53688 -/* C53578 80241038 00000000 */ nop -glabel L8024103C_C5357C -/* C5357C 8024103C 0240202D */ daddu $a0, $s2, $zero -/* C53580 80241040 0260282D */ daddu $a1, $s3, $zero -/* C53584 80241044 0C0127DF */ jal func_80049F7C -/* C53588 80241048 02A0302D */ daddu $a2, $s5, $zero -/* C5358C 8024104C 8E430070 */ lw $v1, 0x70($s2) -/* C53590 80241050 2402000D */ addiu $v0, $zero, 0xd -/* C53594 80241054 1462003C */ bne $v1, $v0, L80241148_C53688 -/* C53598 80241058 00000000 */ nop -glabel L8024105C_C5359C -/* C5359C 8024105C 0240202D */ daddu $a0, $s2, $zero -/* C535A0 80241060 0260282D */ daddu $a1, $s3, $zero -/* C535A4 80241064 0C012849 */ jal func_8004A124 -/* C535A8 80241068 02A0302D */ daddu $a2, $s5, $zero -/* C535AC 8024106C 08090452 */ j L80241148_C53688 -/* C535B0 80241070 00000000 */ nop -glabel L80241074_C535B4 -/* C535B4 80241074 0240202D */ daddu $a0, $s2, $zero -/* C535B8 80241078 0260282D */ daddu $a1, $s3, $zero -/* C535BC 8024107C 0C0128FA */ jal func_8004A3E8 -/* C535C0 80241080 02A0302D */ daddu $a2, $s5, $zero -/* C535C4 80241084 2402000F */ addiu $v0, $zero, 0xf -/* C535C8 80241088 A682008E */ sh $v0, 0x8e($s4) -/* C535CC 8024108C 24020028 */ addiu $v0, $zero, 0x28 -/* C535D0 80241090 AE220088 */ sw $v0, 0x88($s1) -/* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 -/* C535D8 80241098 08090452 */ j L80241148_C53688 -/* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) -glabel L802410A0_C535E0 -/* C535E0 802410A0 0C090000 */ jal dgb_16_UnkNpcAIFunc6 -/* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero -/* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) -/* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f -/* C535F0 802410B0 14620025 */ bne $v1, $v0, L80241148_C53688 -/* C535F4 802410B4 00000000 */ nop -glabel L802410B8_C535F8 -/* C535F8 802410B8 0C09001B */ jal dgb_16_UnkNpcAIFunc7 -/* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero -/* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) -/* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 -/* C53608 802410C8 1462001F */ bne $v1, $v0, L80241148_C53688 -/* C5360C 802410CC 00000000 */ nop -glabel L802410D0_C53610 -/* C53610 802410D0 0C090037 */ jal dgb_16_UnkNpcAIFunc8 -/* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero -/* C53618 802410D8 08090452 */ j L80241148_C53688 -/* C5361C 802410DC 00000000 */ nop -glabel L802410E0_C53620 -/* C53620 802410E0 0C09006D */ jal dgb_16_UnkNpcAIFunc5 -/* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero -/* C53628 802410E8 08090452 */ j L80241148_C53688 -/* C5362C 802410EC 00000000 */ nop -glabel L802410F0_C53630 -/* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero -/* C53634 802410F4 0260282D */ daddu $a1, $s3, $zero -/* C53638 802410F8 0C0902E8 */ jal func_80240BA0_C530E0 -/* C5363C 802410FC 02A0302D */ daddu $a2, $s5, $zero -/* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) -/* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 -/* C53648 80241108 1462000F */ bne $v1, $v0, L80241148_C53688 -/* C5364C 8024110C 00000000 */ nop -glabel L80241110_C53650 -/* C53650 80241110 0240202D */ daddu $a0, $s2, $zero -/* C53654 80241114 0260282D */ daddu $a1, $s3, $zero -/* C53658 80241118 0C090313 */ jal func_80240C4C_C5318C -/* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* C53660 80241120 08090452 */ j L80241148_C53688 -/* C53664 80241124 00000000 */ nop -glabel L80241128_C53668 -/* C53668 80241128 0240202D */ daddu $a0, $s2, $zero -/* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero -/* C53670 80241130 0C090371 */ jal func_80240DC4_C53304 -/* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero -/* C53678 80241138 08090452 */ j L80241148_C53688 -/* C5367C 8024113C 00000000 */ nop -glabel L80241140_C53680 -/* C53680 80241140 0C0129CF */ jal func_8004A73C -/* C53684 80241144 0240202D */ daddu $a0, $s2, $zero -glabel L80241148_C53688 -/* C53688 80241148 8FBF0048 */ lw $ra, 0x48($sp) -/* C5368C 8024114C 8FB50044 */ lw $s5, 0x44($sp) -/* C53690 80241150 8FB40040 */ lw $s4, 0x40($sp) -/* C53694 80241154 8FB3003C */ lw $s3, 0x3c($sp) -/* C53698 80241158 8FB20038 */ lw $s2, 0x38($sp) -/* C5369C 8024115C 8FB10034 */ lw $s1, 0x34($sp) -/* C536A0 80241160 8FB00030 */ lw $s0, 0x30($sp) -/* C536A4 80241164 0000102D */ daddu $v0, $zero, $zero -/* C536A8 80241168 03E00008 */ jr $ra -/* C536AC 8024116C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s deleted file mode 100644 index 2427fe7409..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ /dev/null @@ -1,201 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170_C536B0 -/* C536B0 80241170 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C536B4 80241174 AFB20038 */ sw $s2, 0x38($sp) -/* C536B8 80241178 0080902D */ daddu $s2, $a0, $zero -/* C536BC 8024117C AFBF0048 */ sw $ra, 0x48($sp) -/* C536C0 80241180 AFB50044 */ sw $s5, 0x44($sp) -/* C536C4 80241184 AFB40040 */ sw $s4, 0x40($sp) -/* C536C8 80241188 AFB3003C */ sw $s3, 0x3c($sp) -/* C536CC 8024118C AFB10034 */ sw $s1, 0x34($sp) -/* C536D0 80241190 AFB00030 */ sw $s0, 0x30($sp) -/* C536D4 80241194 8E510148 */ lw $s1, 0x148($s2) -/* C536D8 80241198 86240008 */ lh $a0, 8($s1) -/* C536DC 8024119C 0C00EABB */ jal get_npc_unsafe -/* C536E0 802411A0 00A0802D */ daddu $s0, $a1, $zero -/* C536E4 802411A4 8E43000C */ lw $v1, 0xc($s2) -/* C536E8 802411A8 0240202D */ daddu $a0, $s2, $zero -/* C536EC 802411AC 8C650000 */ lw $a1, ($v1) -/* C536F0 802411B0 0C0B1EAF */ jal get_variable -/* C536F4 802411B4 0040A82D */ daddu $s5, $v0, $zero -/* C536F8 802411B8 AFA00010 */ sw $zero, 0x10($sp) -/* C536FC 802411BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53700 802411C0 8C630030 */ lw $v1, 0x30($v1) -/* C53704 802411C4 AFA30014 */ sw $v1, 0x14($sp) -/* C53708 802411C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C5370C 802411CC 8C63001C */ lw $v1, 0x1c($v1) -/* C53710 802411D0 AFA30018 */ sw $v1, 0x18($sp) -/* C53714 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53718 802411D8 8C630024 */ lw $v1, 0x24($v1) -/* C5371C 802411DC AFA3001C */ sw $v1, 0x1c($sp) -/* C53720 802411E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53724 802411E4 8C630028 */ lw $v1, 0x28($v1) -/* C53728 802411E8 27B40010 */ addiu $s4, $sp, 0x10 -/* C5372C 802411EC AFA30020 */ sw $v1, 0x20($sp) -/* C53730 802411F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C53734 802411F4 3C014282 */ lui $at, 0x4282 -/* C53738 802411F8 44810000 */ mtc1 $at, $f0 -/* C5373C 802411FC 8C63002C */ lw $v1, 0x2c($v1) -/* C53740 80241200 0040982D */ daddu $s3, $v0, $zero -/* C53744 80241204 E7A00028 */ swc1 $f0, 0x28($sp) -/* C53748 80241208 A7A0002C */ sh $zero, 0x2c($sp) -/* C5374C 8024120C 16000005 */ bnez $s0, .L80241224 -/* C53750 80241210 AFA30024 */ sw $v1, 0x24($sp) -/* C53754 80241214 8E2200B0 */ lw $v0, 0xb0($s1) -/* C53758 80241218 30420004 */ andi $v0, $v0, 4 -/* C5375C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C53760 80241220 00000000 */ nop -.L80241224: -/* C53764 80241224 2404F7FF */ addiu $a0, $zero, -0x801 -/* C53768 80241228 AE400070 */ sw $zero, 0x70($s2) -/* C5376C 8024122C A6A0008E */ sh $zero, 0x8e($s5) -/* C53770 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* C53774 80241234 8EA30000 */ lw $v1, ($s5) -/* C53778 80241238 8C420000 */ lw $v0, ($v0) -/* C5377C 8024123C 00641824 */ and $v1, $v1, $a0 -/* C53780 80241240 AEA30000 */ sw $v1, ($s5) -/* C53784 80241244 AEA20028 */ sw $v0, 0x28($s5) -/* C53788 80241248 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5378C 8024124C 8C420034 */ lw $v0, 0x34($v0) -/* C53790 80241250 54400005 */ bnel $v0, $zero, .L80241268 -/* C53794 80241254 2402FDFF */ addiu $v0, $zero, -0x201 -/* C53798 80241258 34620200 */ ori $v0, $v1, 0x200 -/* C5379C 8024125C 2403FFF7 */ addiu $v1, $zero, -9 -/* C537A0 80241260 0809049C */ j .L80241270 -/* C537A4 80241264 00431024 */ and $v0, $v0, $v1 -.L80241268: -/* C537A8 80241268 00621024 */ and $v0, $v1, $v0 -/* C537AC 8024126C 34420008 */ ori $v0, $v0, 8 -.L80241270: -/* C537B0 80241270 AEA20000 */ sw $v0, ($s5) -/* C537B4 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* C537B8 80241278 30420004 */ andi $v0, $v0, 4 -/* C537BC 8024127C 10400007 */ beqz $v0, .L8024129C -/* C537C0 80241280 24020063 */ addiu $v0, $zero, 0x63 -/* C537C4 80241284 AE420070 */ sw $v0, 0x70($s2) -/* C537C8 80241288 AE400074 */ sw $zero, 0x74($s2) -/* C537CC 8024128C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C537D0 80241290 2403FFFB */ addiu $v1, $zero, -5 -/* C537D4 80241294 00431024 */ and $v0, $v0, $v1 -/* C537D8 80241298 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024129C: -/* C537DC 8024129C AE20006C */ sw $zero, 0x6c($s1) -.L802412A0: -/* C537E0 802412A0 8E420070 */ lw $v0, 0x70($s2) -/* C537E4 802412A4 2842001E */ slti $v0, $v0, 0x1e -/* C537E8 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C537EC 802412AC 00000000 */ nop -/* C537F0 802412B0 8E22006C */ lw $v0, 0x6c($s1) -/* C537F4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C537F8 802412B8 00000000 */ nop -/* C537FC 802412BC 0C090082 */ jal func_80240208_C52748 -/* C53800 802412C0 0240202D */ daddu $a0, $s2, $zero -/* C53804 802412C4 10400002 */ beqz $v0, .L802412D0 -/* C53808 802412C8 2402001E */ addiu $v0, $zero, 0x1e -/* C5380C 802412CC AE420070 */ sw $v0, 0x70($s2) -.L802412D0: -/* C53810 802412D0 8E430070 */ lw $v1, 0x70($s2) -/* C53814 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 -/* C53818 802412D8 10400048 */ beqz $v0, L802413FC_C5393C -/* C5381C 802412DC 00031080 */ sll $v0, $v1, 2 -/* C53820 802412E0 3C018024 */ lui $at, %hi(jtbl_80243390_C558D0) -/* C53824 802412E4 00220821 */ addu $at, $at, $v0 -/* C53828 802412E8 8C223390 */ lw $v0, %lo(jtbl_80243390_C558D0)($at) -/* C5382C 802412EC 00400008 */ jr $v0 -/* C53830 802412F0 00000000 */ nop -glabel L802412F4_C53834 -/* C53834 802412F4 0240202D */ daddu $a0, $s2, $zero -/* C53838 802412F8 0260282D */ daddu $a1, $s3, $zero -/* C5383C 802412FC 0C012568 */ jal func_800495A0 -/* C53840 80241300 0280302D */ daddu $a2, $s4, $zero -glabel L80241304_C53844 -/* C53844 80241304 0240202D */ daddu $a0, $s2, $zero -/* C53848 80241308 0260282D */ daddu $a1, $s3, $zero -/* C5384C 8024130C 0C0125AE */ jal func_800496B8 -/* C53850 80241310 0280302D */ daddu $a2, $s4, $zero -/* C53854 80241314 080904FF */ j L802413FC_C5393C -/* C53858 80241318 00000000 */ nop -glabel L8024131C_C5385C -/* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero -/* C53860 80241320 0260282D */ daddu $a1, $s3, $zero -/* C53864 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 -/* C53868 80241328 0280302D */ daddu $a2, $s4, $zero -glabel L8024132C_C5386C -/* C5386C 8024132C 0240202D */ daddu $a0, $s2, $zero -/* C53870 80241330 0260282D */ daddu $a1, $s3, $zero -/* C53874 80241334 0C012701 */ jal func_80049C04 -/* C53878 80241338 0280302D */ daddu $a2, $s4, $zero -/* C5387C 8024133C 080904FF */ j L802413FC_C5393C -/* C53880 80241340 00000000 */ nop -glabel L80241344_C53884 -/* C53884 80241344 0240202D */ daddu $a0, $s2, $zero -/* C53888 80241348 0260282D */ daddu $a1, $s3, $zero -/* C5388C 8024134C 0C01278F */ jal func_80049E3C -/* C53890 80241350 0280302D */ daddu $a2, $s4, $zero -glabel L80241354_C53894 -/* C53894 80241354 0240202D */ daddu $a0, $s2, $zero -/* C53898 80241358 0260282D */ daddu $a1, $s3, $zero -/* C5389C 8024135C 0C0127B3 */ jal func_80049ECC -/* C538A0 80241360 0280302D */ daddu $a2, $s4, $zero -/* C538A4 80241364 080904FF */ j L802413FC_C5393C -/* C538A8 80241368 00000000 */ nop -glabel L8024136C_C538AC -/* C538AC 8024136C 0240202D */ daddu $a0, $s2, $zero -/* C538B0 80241370 0260282D */ daddu $a1, $s3, $zero -/* C538B4 80241374 0C0127DF */ jal func_80049F7C -/* C538B8 80241378 0280302D */ daddu $a2, $s4, $zero -glabel L8024137C_C538BC -/* C538BC 8024137C 0240202D */ daddu $a0, $s2, $zero -/* C538C0 80241380 0260282D */ daddu $a1, $s3, $zero -/* C538C4 80241384 0C012849 */ jal func_8004A124 -/* C538C8 80241388 0280302D */ daddu $a2, $s4, $zero -/* C538CC 8024138C 080904FF */ j L802413FC_C5393C -/* C538D0 80241390 00000000 */ nop -glabel L80241394_C538D4 -/* C538D4 80241394 0240202D */ daddu $a0, $s2, $zero -/* C538D8 80241398 0260282D */ daddu $a1, $s3, $zero -/* C538DC 8024139C 0C0128FA */ jal func_8004A3E8 -/* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero -/* C538E4 802413A4 080904FF */ j L802413FC_C5393C -/* C538E8 802413A8 00000000 */ nop -glabel L802413AC_C538EC -/* C538EC 802413AC 0C090000 */ jal dgb_16_UnkNpcAIFunc6 -/* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero -glabel L802413B4_C538F4 -/* C538F4 802413B4 0C09001B */ jal dgb_16_UnkNpcAIFunc7 -/* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero -/* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) -/* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 -/* C53904 802413C4 1462000D */ bne $v1, $v0, L802413FC_C5393C -/* C53908 802413C8 00000000 */ nop -glabel L802413CC_C5390C -/* C5390C 802413CC 0C090037 */ jal dgb_16_UnkNpcAIFunc8 -/* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero -/* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) -/* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 -/* C5391C 802413DC 14620007 */ bne $v1, $v0, L802413FC_C5393C -/* C53920 802413E0 00000000 */ nop -glabel L802413E4_C53924 -/* C53924 802413E4 0C09006D */ jal dgb_16_UnkNpcAIFunc5 -/* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero -/* C5392C 802413EC 080904FF */ j L802413FC_C5393C -/* C53930 802413F0 00000000 */ nop -glabel L802413F4_C53934 -/* C53934 802413F4 0C0129CF */ jal func_8004A73C -/* C53938 802413F8 0240202D */ daddu $a0, $s2, $zero -glabel L802413FC_C5393C -/* C5393C 802413FC 8FBF0048 */ lw $ra, 0x48($sp) -/* C53940 80241400 8FB50044 */ lw $s5, 0x44($sp) -/* C53944 80241404 8FB40040 */ lw $s4, 0x40($sp) -/* C53948 80241408 8FB3003C */ lw $s3, 0x3c($sp) -/* C5394C 8024140C 8FB20038 */ lw $s2, 0x38($sp) -/* C53950 80241410 8FB10034 */ lw $s1, 0x34($sp) -/* C53954 80241414 8FB00030 */ lw $s0, 0x30($sp) -/* C53958 80241418 0000102D */ daddu $v0, $zero, $zero -/* C5395C 8024141C 03E00008 */ jr $ra -/* C53960 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C53964 80241424 00000000 */ nop -/* C53968 80241428 00000000 */ nop -/* C5396C 8024142C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s deleted file mode 100644 index cb98fd7d4c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/update_starpoints_display_C528FC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_C528FC -/* C528FC 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C52900 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* C52904 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* C52908 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* C5290C 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* C52910 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* C52914 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* C52918 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* C5291C 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* C52920 802403E0 86240008 */ lh $a0, 8($s1) -/* C52924 802403E4 0C00EABB */ jal get_npc_unsafe -/* C52928 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* C5292C 802403EC 16000005 */ bnez $s0, .L80240404 -/* C52930 802403F0 0040902D */ daddu $s2, $v0, $zero -/* C52934 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C52938 802403F8 30420004 */ andi $v0, $v0, 4 -/* C5293C 802403FC 10400015 */ beqz $v0, .L80240454 -/* C52940 80240400 00000000 */ nop -.L80240404: -/* C52944 80240404 AE800070 */ sw $zero, 0x70($s4) -/* C52948 80240408 8E420000 */ lw $v0, ($s2) -/* C5294C 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* C52950 80240410 A640008E */ sh $zero, 0x8e($s2) -/* C52954 80240414 34420102 */ ori $v0, $v0, 0x102 -/* C52958 80240418 AE420000 */ sw $v0, ($s2) -/* C5295C 8024041C 8E220000 */ lw $v0, ($s1) -/* C52960 80240420 3C01C47A */ lui $at, 0xc47a -/* C52964 80240424 44810000 */ mtc1 $at, $f0 -/* C52968 80240428 00431025 */ or $v0, $v0, $v1 -/* C5296C 8024042C AE220000 */ sw $v0, ($s1) -/* C52970 80240430 AE400038 */ sw $zero, 0x38($s2) -/* C52974 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* C52978 80240438 AE400040 */ sw $zero, 0x40($s2) -/* C5297C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C52980 80240440 30620004 */ andi $v0, $v1, 4 -/* C52984 80240444 10400003 */ beqz $v0, .L80240454 -/* C52988 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* C5298C 8024044C 00621024 */ and $v0, $v1, $v0 -/* C52990 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* C52994 80240454 8E930070 */ lw $s3, 0x70($s4) -/* C52998 80240458 12600005 */ beqz $s3, .L80240470 -/* C5299C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* C529A0 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* C529A4 80240464 00000000 */ nop -/* C529A8 80240468 0809017E */ j .L802405F8 -/* C529AC 8024046C 00000000 */ nop -.L80240470: -/* C529B0 80240470 86240008 */ lh $a0, 8($s1) -/* C529B4 80240474 0C00FB3A */ jal get_enemy -/* C529B8 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* C529BC 8024047C 0040802D */ daddu $s0, $v0, $zero -/* C529C0 80240480 0C00EABB */ jal get_npc_unsafe -/* C529C4 80240484 86040008 */ lh $a0, 8($s0) -/* C529C8 80240488 24030001 */ addiu $v1, $zero, 1 -/* C529CC 8024048C 0040982D */ daddu $s3, $v0, $zero -/* C529D0 80240490 A2230007 */ sb $v1, 7($s1) -/* C529D4 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* C529D8 80240498 24020003 */ addiu $v0, $zero, 3 -/* C529DC 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* C529E0 802404A0 00000000 */ nop -/* C529E4 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C529E8 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* C529EC 802404AC 0260202D */ daddu $a0, $s3, $zero -/* C529F0 802404B0 0C012530 */ jal func_800494C0 -/* C529F4 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* C529F8 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* C529FC 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* C52A00 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* C52A04 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C52A08 802404C8 3C014387 */ lui $at, 0x4387 -/* C52A0C 802404CC 44810000 */ mtc1 $at, $f0 -/* C52A10 802404D0 44064000 */ mfc1 $a2, $f8 -/* C52A14 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* C52A18 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C52A1C 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* C52A20 802404E0 44070000 */ mfc1 $a3, $f0 -/* C52A24 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* C52A28 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C52A2C 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* C52A30 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* C52A34 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C52A38 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* C52A3C 802404FC 44024000 */ mfc1 $v0, $f8 -/* C52A40 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* C52A44 80240504 A6220010 */ sh $v0, 0x10($s1) -/* C52A48 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* C52A4C 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* C52A50 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* C52A54 80240514 46020000 */ add.s $f0, $f0, $f2 -/* C52A58 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C52A5C 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C52A60 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* C52A64 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C52A68 80240528 4600020D */ trunc.w.s $f8, $f0 -/* C52A6C 8024052C 44024000 */ mfc1 $v0, $f8 -/* C52A70 80240530 00000000 */ nop -/* C52A74 80240534 A6220012 */ sh $v0, 0x12($s1) -/* C52A78 80240538 4600120D */ trunc.w.s $f8, $f2 -/* C52A7C 8024053C 44024000 */ mfc1 $v0, $f8 -/* C52A80 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* C52A84 80240544 A6220014 */ sh $v0, 0x14($s1) -/* C52A88 80240548 8C660028 */ lw $a2, 0x28($v1) -/* C52A8C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* C52A90 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C52A94 80240554 0C00A720 */ jal atan2 -/* C52A98 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C52A9C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* C52AA0 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* C52AA4 80240564 8E220000 */ lw $v0, ($s1) -/* C52AA8 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* C52AAC 8024056C 00431024 */ and $v0, $v0, $v1 -/* C52AB0 80240570 AE220000 */ sw $v0, ($s1) -/* C52AB4 80240574 24020001 */ addiu $v0, $zero, 1 -/* C52AB8 80240578 A640008E */ sh $zero, 0x8e($s2) -/* C52ABC 8024057C 0809017E */ j .L802405F8 -/* C52AC0 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* C52AC4 80240584 86240008 */ lh $a0, 8($s1) -/* C52AC8 80240588 0C00FB3A */ jal get_enemy -/* C52ACC 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* C52AD0 80240590 0040802D */ daddu $s0, $v0, $zero -/* C52AD4 80240594 0C00EABB */ jal get_npc_unsafe -/* C52AD8 80240598 86040008 */ lh $a0, 8($s0) -/* C52ADC 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* C52AE0 802405A0 24420001 */ addiu $v0, $v0, 1 -/* C52AE4 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* C52AE8 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* C52AEC 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* C52AF0 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* C52AF4 802405B4 0043102A */ slt $v0, $v0, $v1 -/* C52AF8 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* C52AFC 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* C52B00 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* C52B04 802405C4 24020004 */ addiu $v0, $zero, 4 -/* C52B08 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* C52B0C 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* C52B10 802405D0 8E230000 */ lw $v1, ($s1) -/* C52B14 802405D4 3C01C47A */ lui $at, 0xc47a -/* C52B18 802405D8 44810000 */ mtc1 $at, $f0 -/* C52B1C 802405DC 00621825 */ or $v1, $v1, $v0 -/* C52B20 802405E0 AE230000 */ sw $v1, ($s1) -/* C52B24 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* C52B28 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* C52B2C 802405EC AE400040 */ sw $zero, 0x40($s2) -/* C52B30 802405F0 A2330007 */ sb $s3, 7($s1) -/* C52B34 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* C52B38 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* C52B3C 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* C52B40 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* C52B44 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* C52B48 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* C52B4C 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* C52B50 80240610 0000102D */ daddu $v0, $zero, $zero -/* C52B54 80240614 03E00008 */ jr $ra -/* C52B58 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s deleted file mode 100644 index 0651be2a50..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_C55F40 -/* C55F40 80240000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C55F44 80240004 AFB50024 */ sw $s5, 0x24($sp) -/* C55F48 80240008 0080A82D */ daddu $s5, $a0, $zero -/* C55F4C 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* C55F50 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* C55F54 80240014 AFB40020 */ sw $s4, 0x20($sp) -/* C55F58 80240018 AFB3001C */ sw $s3, 0x1c($sp) -/* C55F5C 8024001C AFB20018 */ sw $s2, 0x18($sp) -/* C55F60 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* C55F64 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* C55F68 80240028 F7B80040 */ sdc1 $f24, 0x40($sp) -/* C55F6C 8024002C F7B60038 */ sdc1 $f22, 0x38($sp) -/* C55F70 80240030 F7B40030 */ sdc1 $f20, 0x30($sp) -/* C55F74 80240034 8EB30148 */ lw $s3, 0x148($s5) -/* C55F78 80240038 86640008 */ lh $a0, 8($s3) -/* C55F7C 8024003C 0C00EABB */ jal get_npc_unsafe -/* C55F80 80240040 00A0B02D */ daddu $s6, $a1, $zero -/* C55F84 80240044 0040A02D */ daddu $s4, $v0, $zero -/* C55F88 80240048 AEA00074 */ sw $zero, 0x74($s5) -/* C55F8C 8024004C C6980038 */ lwc1 $f24, 0x38($s4) -/* C55F90 80240050 C6960040 */ lwc1 $f22, 0x40($s4) -/* C55F94 80240054 0000902D */ daddu $s2, $zero, $zero -/* C55F98 80240058 AEA00078 */ sw $zero, 0x78($s5) -/* C55F9C 8024005C 8E6300D0 */ lw $v1, 0xd0($s3) -/* C55FA0 80240060 8C620000 */ lw $v0, ($v1) -/* C55FA4 80240064 3C0146FF */ lui $at, 0x46ff -/* C55FA8 80240068 3421FE00 */ ori $at, $at, 0xfe00 -/* C55FAC 8024006C 4481A000 */ mtc1 $at, $f20 -/* C55FB0 80240070 18400018 */ blez $v0, .L802400D4 -/* C55FB4 80240074 0240802D */ daddu $s0, $s2, $zero -/* C55FB8 80240078 0240882D */ daddu $s1, $s2, $zero -.L8024007C: -/* C55FBC 8024007C 02231021 */ addu $v0, $s1, $v1 -/* C55FC0 80240080 4600C306 */ mov.s $f12, $f24 -/* C55FC4 80240084 C4440004 */ lwc1 $f4, 4($v0) -/* C55FC8 80240088 46802120 */ cvt.s.w $f4, $f4 -/* C55FCC 8024008C 44062000 */ mfc1 $a2, $f4 -/* C55FD0 80240090 C444000C */ lwc1 $f4, 0xc($v0) -/* C55FD4 80240094 46802120 */ cvt.s.w $f4, $f4 -/* C55FD8 80240098 44072000 */ mfc1 $a3, $f4 -/* C55FDC 8024009C 0C00A7B5 */ jal dist2D -/* C55FE0 802400A0 4600B386 */ mov.s $f14, $f22 -/* C55FE4 802400A4 4614003C */ c.lt.s $f0, $f20 -/* C55FE8 802400A8 00000000 */ nop -/* C55FEC 802400AC 45000003 */ bc1f .L802400BC -/* C55FF0 802400B0 2631000C */ addiu $s1, $s1, 0xc -/* C55FF4 802400B4 46000506 */ mov.s $f20, $f0 -/* C55FF8 802400B8 AEB20078 */ sw $s2, 0x78($s5) -.L802400BC: -/* C55FFC 802400BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* C56000 802400C0 26100001 */ addiu $s0, $s0, 1 -/* C56004 802400C4 8C620000 */ lw $v0, ($v1) -/* C56008 802400C8 0202102A */ slt $v0, $s0, $v0 -/* C5600C 802400CC 1440FFEB */ bnez $v0, .L8024007C -/* C56010 802400D0 26520001 */ addiu $s2, $s2, 1 -.L802400D4: -/* C56014 802400D4 8E6200CC */ lw $v0, 0xcc($s3) -/* C56018 802400D8 8C420004 */ lw $v0, 4($v0) -/* C5601C 802400DC AE820028 */ sw $v0, 0x28($s4) -/* C56020 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* C56024 802400E4 8C42007C */ lw $v0, 0x7c($v0) -/* C56028 802400E8 04410004 */ bgez $v0, .L802400FC -/* C5602C 802400EC 00000000 */ nop -/* C56030 802400F0 C6C00000 */ lwc1 $f0, ($s6) -/* C56034 802400F4 08090047 */ j .L8024011C -/* C56038 802400F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802400FC: -/* C5603C 802400FC 3C018024 */ lui $at, %hi(D_802438E0_C59820) -/* C56040 80240100 D42238E0 */ ldc1 $f2, %lo(D_802438E0_C59820)($at) -/* C56044 80240104 44820000 */ mtc1 $v0, $f0 -/* C56048 80240108 00000000 */ nop -/* C5604C 8024010C 46800021 */ cvt.d.w $f0, $f0 -/* C56050 80240110 46220003 */ div.d $f0, $f0, $f2 -/* C56054 80240114 46200020 */ cvt.s.d $f0, $f0 -/* C56058 80240118 E6800018 */ swc1 $f0, 0x18($s4) -.L8024011C: -/* C5605C 8024011C 24020001 */ addiu $v0, $zero, 1 -/* C56060 80240120 AEA20070 */ sw $v0, 0x70($s5) -/* C56064 80240124 8FBF002C */ lw $ra, 0x2c($sp) -/* C56068 80240128 8FB60028 */ lw $s6, 0x28($sp) -/* C5606C 8024012C 8FB50024 */ lw $s5, 0x24($sp) -/* C56070 80240130 8FB40020 */ lw $s4, 0x20($sp) -/* C56074 80240134 8FB3001C */ lw $s3, 0x1c($sp) -/* C56078 80240138 8FB20018 */ lw $s2, 0x18($sp) -/* C5607C 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* C56080 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* C56084 80240144 D7B80040 */ ldc1 $f24, 0x40($sp) -/* C56088 80240148 D7B60038 */ ldc1 $f22, 0x38($sp) -/* C5608C 8024014C D7B40030 */ ldc1 $f20, 0x30($sp) -/* C56090 80240150 03E00008 */ jr $ra -/* C56094 80240154 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s deleted file mode 100644 index 90e80a2560..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240158_C56098.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_C56098 -/* C56098 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C5609C 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* C560A0 80240160 0080902D */ daddu $s2, $a0, $zero -/* C560A4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* C560A8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* C560AC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* C560B0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* C560B4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* C560B8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C560BC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C560C0 80240180 8E510148 */ lw $s1, 0x148($s2) -/* C560C4 80240184 00A0982D */ daddu $s3, $a1, $zero -/* C560C8 80240188 86240008 */ lh $a0, 8($s1) -/* C560CC 8024018C 0C00EABB */ jal get_npc_unsafe -/* C560D0 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* C560D4 80240194 8E630014 */ lw $v1, 0x14($s3) -/* C560D8 80240198 04600030 */ bltz $v1, .L8024025C -/* C560DC 8024019C 0040802D */ daddu $s0, $v0, $zero -/* C560E0 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* C560E4 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* C560E8 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* C560EC 802401AC 0280202D */ daddu $a0, $s4, $zero -/* C560F0 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* C560F4 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* C560F8 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* C560FC 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* C56100 802401C0 0C01242D */ jal func_800490B4 -/* C56104 802401C4 0220282D */ daddu $a1, $s1, $zero -/* C56108 802401C8 10400021 */ beqz $v0, .L80240250 -/* C5610C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* C56110 802401D0 0200282D */ daddu $a1, $s0, $zero -/* C56114 802401D4 0000302D */ daddu $a2, $zero, $zero -/* C56118 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* C5611C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* C56120 802401E0 44810000 */ mtc1 $at, $f0 -/* C56124 802401E4 3C014000 */ lui $at, 0x4000 -/* C56128 802401E8 44811000 */ mtc1 $at, $f2 -/* C5612C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C56130 802401F0 44812000 */ mtc1 $at, $f4 -/* C56134 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* C56138 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* C5613C 802401FC 44833000 */ mtc1 $v1, $f6 -/* C56140 80240200 00000000 */ nop -/* C56144 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* C56148 80240208 44073000 */ mfc1 $a3, $f6 -/* C5614C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* C56150 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* C56154 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* C56158 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5615C 8024021C 0C01BFA4 */ jal fx_emote -/* C56160 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* C56164 80240224 0200202D */ daddu $a0, $s0, $zero -/* C56168 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5616C 8024022C 0C012530 */ jal func_800494C0 -/* C56170 80240230 3C060020 */ lui $a2, 0x20 -/* C56174 80240234 8E220018 */ lw $v0, 0x18($s1) -/* C56178 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* C5617C 8024023C 30420001 */ andi $v0, $v0, 1 -/* C56180 80240240 14400064 */ bnez $v0, .L802403D4 -/* C56184 80240244 2402000A */ addiu $v0, $zero, 0xa -/* C56188 80240248 080900F5 */ j .L802403D4 -/* C5618C 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* C56190 80240250 8E420074 */ lw $v0, 0x74($s2) -/* C56194 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* C56198 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* C5619C 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* C561A0 80240260 1440005D */ bnez $v0, .L802403D8 -/* C561A4 80240264 00000000 */ nop -/* C561A8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* C561AC 8024026C 3C014010 */ lui $at, 0x4010 -/* C561B0 80240270 44811800 */ mtc1 $at, $f3 -/* C561B4 80240274 44801000 */ mtc1 $zero, $f2 -/* C561B8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* C561BC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* C561C0 80240280 00000000 */ nop -/* C561C4 80240284 45000003 */ bc1f .L80240294 -/* C561C8 80240288 0200202D */ daddu $a0, $s0, $zero -/* C561CC 8024028C 080900A6 */ j .L80240298 -/* C561D0 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* C561D4 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* C561D8 80240298 0C00F598 */ jal func_8003D660 -/* C561DC 8024029C 00000000 */ nop -/* C561E0 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C561E4 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* C561E8 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C561EC 802402AC 00031040 */ sll $v0, $v1, 1 -/* C561F0 802402B0 00431021 */ addu $v0, $v0, $v1 -/* C561F4 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C561F8 802402B8 00021080 */ sll $v0, $v0, 2 -/* C561FC 802402BC 00431021 */ addu $v0, $v0, $v1 -/* C56200 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* C56204 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* C56208 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* C5620C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* C56210 802402D0 4406B000 */ mfc1 $a2, $f22 -/* C56214 802402D4 4407A000 */ mfc1 $a3, $f20 -/* C56218 802402D8 0C00A720 */ jal atan2 -/* C5621C 802402DC 00000000 */ nop -/* C56220 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* C56224 802402E4 44060000 */ mfc1 $a2, $f0 -/* C56228 802402E8 0200202D */ daddu $a0, $s0, $zero -/* C5622C 802402EC 0C00EA95 */ jal npc_move_heading -/* C56230 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* C56234 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C56238 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5623C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* C56240 80240300 4407A000 */ mfc1 $a3, $f20 -/* C56244 80240304 0C00A7B5 */ jal dist2D -/* C56248 80240308 00000000 */ nop -/* C5624C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* C56250 80240310 4602003E */ c.le.s $f0, $f2 -/* C56254 80240314 00000000 */ nop -/* C56258 80240318 4500002F */ bc1f .L802403D8 -/* C5625C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C56260 80240320 24020002 */ addiu $v0, $zero, 2 -/* C56264 80240324 0C00A67F */ jal rand_int -/* C56268 80240328 AE420070 */ sw $v0, 0x70($s2) -/* C5626C 8024032C 3C035555 */ lui $v1, 0x5555 -/* C56270 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* C56274 80240334 00430018 */ mult $v0, $v1 -/* C56278 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* C5627C 8024033C 00004010 */ mfhi $t0 -/* C56280 80240340 01042023 */ subu $a0, $t0, $a0 -/* C56284 80240344 00041840 */ sll $v1, $a0, 1 -/* C56288 80240348 00641821 */ addu $v1, $v1, $a0 -/* C5628C 8024034C 00431023 */ subu $v0, $v0, $v1 -/* C56290 80240350 24430002 */ addiu $v1, $v0, 2 -/* C56294 80240354 AE430074 */ sw $v1, 0x74($s2) -/* C56298 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* C5629C 8024035C 18400009 */ blez $v0, .L80240384 -/* C562A0 80240360 24020004 */ addiu $v0, $zero, 4 -/* C562A4 80240364 8E620004 */ lw $v0, 4($s3) -/* C562A8 80240368 18400006 */ blez $v0, .L80240384 -/* C562AC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* C562B0 80240370 8E620008 */ lw $v0, 8($s3) -/* C562B4 80240374 18400003 */ blez $v0, .L80240384 -/* C562B8 80240378 24020004 */ addiu $v0, $zero, 4 -/* C562BC 8024037C 14600002 */ bnez $v1, .L80240388 -/* C562C0 80240380 00000000 */ nop -.L80240384: -/* C562C4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* C562C8 80240388 0C00A67F */ jal rand_int -/* C562CC 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* C562D0 80240390 3C0351EB */ lui $v1, 0x51eb -/* C562D4 80240394 3463851F */ ori $v1, $v1, 0x851f -/* C562D8 80240398 00430018 */ mult $v0, $v1 -/* C562DC 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* C562E0 802403A0 00004010 */ mfhi $t0 -/* C562E4 802403A4 00082143 */ sra $a0, $t0, 5 -/* C562E8 802403A8 00832023 */ subu $a0, $a0, $v1 -/* C562EC 802403AC 00041840 */ sll $v1, $a0, 1 -/* C562F0 802403B0 00641821 */ addu $v1, $v1, $a0 -/* C562F4 802403B4 000318C0 */ sll $v1, $v1, 3 -/* C562F8 802403B8 00641821 */ addu $v1, $v1, $a0 -/* C562FC 802403BC 00031880 */ sll $v1, $v1, 2 -/* C56300 802403C0 8E640004 */ lw $a0, 4($s3) -/* C56304 802403C4 00431023 */ subu $v0, $v0, $v1 -/* C56308 802403C8 0044102A */ slt $v0, $v0, $a0 -/* C5630C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* C56310 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* C56314 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* C56318 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* C5631C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* C56320 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* C56324 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* C56328 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* C5632C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* C56330 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C56334 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C56338 802403F8 03E00008 */ jr $ra -/* C5633C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s deleted file mode 100644 index 80ba7ef140..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_802404C0_C56400.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_C56400 -/* C56400 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C56404 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* C56408 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* C5640C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* C56410 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* C56414 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* C56418 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* C5641C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* C56420 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* C56424 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* C56428 802404E8 86240008 */ lh $a0, 8($s1) -/* C5642C 802404EC 0C00EABB */ jal get_npc_unsafe -/* C56430 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* C56434 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* C56438 802404F8 04600031 */ bltz $v1, .L802405C0 -/* C5643C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* C56440 80240500 0260202D */ daddu $a0, $s3, $zero -/* C56444 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* C56448 80240508 8E460024 */ lw $a2, 0x24($s2) -/* C5644C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* C56450 80240510 0C01242D */ jal func_800490B4 -/* C56454 80240514 0220282D */ daddu $a1, $s1, $zero -/* C56458 80240518 10400029 */ beqz $v0, .L802405C0 -/* C5645C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* C56460 80240520 0200282D */ daddu $a1, $s0, $zero -/* C56464 80240524 0000302D */ daddu $a2, $zero, $zero -/* C56468 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* C5646C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* C56470 80240530 44810000 */ mtc1 $at, $f0 -/* C56474 80240534 3C014000 */ lui $at, 0x4000 -/* C56478 80240538 44811000 */ mtc1 $at, $f2 -/* C5647C 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* C56480 80240540 44812000 */ mtc1 $at, $f4 -/* C56484 80240544 2402000F */ addiu $v0, $zero, 0xf -/* C56488 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* C5648C 8024054C 44833000 */ mtc1 $v1, $f6 -/* C56490 80240550 00000000 */ nop -/* C56494 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* C56498 80240558 44073000 */ mfc1 $a3, $f6 -/* C5649C 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* C564A0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* C564A4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* C564A8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* C564AC 8024056C 0C01BFA4 */ jal fx_emote -/* C564B0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* C564B4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C564B8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C564BC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C564C0 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C564C4 80240584 8C460028 */ lw $a2, 0x28($v0) -/* C564C8 80240588 0C00A720 */ jal atan2 -/* C564CC 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* C564D0 80240590 0200202D */ daddu $a0, $s0, $zero -/* C564D4 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C564D8 80240598 3C060020 */ lui $a2, 0x20 -/* C564DC 8024059C 0C012530 */ jal func_800494C0 -/* C564E0 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* C564E4 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* C564E8 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* C564EC 802405AC 30420001 */ andi $v0, $v0, 1 -/* C564F0 802405B0 14400029 */ bnez $v0, .L80240658 -/* C564F4 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* C564F8 802405B8 08090196 */ j .L80240658 -/* C564FC 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* C56500 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* C56504 802405C4 14400025 */ bnez $v0, .L8024065C -/* C56508 802405C8 00000000 */ nop -/* C5650C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* C56510 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* C56514 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* C56518 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* C5651C 802405DC 1440001F */ bnez $v0, .L8024065C -/* C56520 802405E0 00000000 */ nop -/* C56524 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* C56528 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* C5652C 802405EC 10400019 */ beqz $v0, .L80240654 -/* C56530 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* C56534 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* C56538 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* C5653C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* C56540 80240600 14400007 */ bnez $v0, .L80240620 -/* C56544 80240604 00000000 */ nop -/* C56548 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* C5654C 8024060C 3C014334 */ lui $at, 0x4334 -/* C56550 80240610 44816000 */ mtc1 $at, $f12 -/* C56554 80240614 0C00A6C9 */ jal clamp_angle -/* C56558 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* C5655C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* C56560 80240620 8E440008 */ lw $a0, 8($s2) -/* C56564 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* C56568 80240628 00822021 */ addu $a0, $a0, $v0 -/* C5656C 8024062C 00042043 */ sra $a0, $a0, 1 -/* C56570 80240630 0C00A67F */ jal rand_int -/* C56574 80240634 24840001 */ addiu $a0, $a0, 1 -/* C56578 80240638 8E430008 */ lw $v1, 8($s2) -/* C5657C 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* C56580 80240640 00641821 */ addu $v1, $v1, $a0 -/* C56584 80240644 00031843 */ sra $v1, $v1, 1 -/* C56588 80240648 00621821 */ addu $v1, $v1, $v0 -/* C5658C 8024064C 08090197 */ j .L8024065C -/* C56590 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* C56594 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* C56598 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* C5659C 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* C565A0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* C565A4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* C565A8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* C565AC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* C565B0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* C565B4 80240674 03E00008 */ jr $ra -/* C565B8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s deleted file mode 100644 index e4b474570f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_C565BC -/* C565BC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C565C0 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* C565C4 80240684 0080882D */ daddu $s1, $a0, $zero -/* C565C8 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* C565CC 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* C565D0 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* C565D4 80240694 8E300148 */ lw $s0, 0x148($s1) -/* C565D8 80240698 86040008 */ lh $a0, 8($s0) -/* C565DC 8024069C 0C00EABB */ jal get_npc_unsafe -/* C565E0 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* C565E4 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* C565E8 802406A8 24630001 */ addiu $v1, $v1, 1 -/* C565EC 802406AC AE230078 */ sw $v1, 0x78($s1) -/* C565F0 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* C565F4 802406B4 8C840000 */ lw $a0, ($a0) -/* C565F8 802406B8 0064182A */ slt $v1, $v1, $a0 -/* C565FC 802406BC 14600002 */ bnez $v1, .L802406C8 -/* C56600 802406C0 0040282D */ daddu $a1, $v0, $zero -/* C56604 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* C56608 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* C5660C 802406CC 8C420004 */ lw $v0, 4($v0) -/* C56610 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* C56614 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C56618 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* C5661C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* C56620 802406E0 00000000 */ nop -/* C56624 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* C56628 802406E8 080901C4 */ j .L80240710 -/* C5662C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* C56630 802406F0 3C018024 */ lui $at, %hi(D_802438E8_C59828) -/* C56634 802406F4 D42238E8 */ ldc1 $f2, %lo(D_802438E8_C59828)($at) -/* C56638 802406F8 44820000 */ mtc1 $v0, $f0 -/* C5663C 802406FC 00000000 */ nop -/* C56640 80240700 46800021 */ cvt.d.w $f0, $f0 -/* C56644 80240704 46220003 */ div.d $f0, $f0, $f2 -/* C56648 80240708 46200020 */ cvt.s.d $f0, $f0 -/* C5664C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* C56650 80240710 24020001 */ addiu $v0, $zero, 1 -/* C56654 80240714 AE220070 */ sw $v0, 0x70($s1) -/* C56658 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* C5665C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* C56660 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* C56664 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* C56668 80240728 03E00008 */ jr $ra -/* C5666C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s deleted file mode 100644 index 531a476cac..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024094C_C5688C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_C5688C -/* C5688C 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C56890 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* C56894 80240954 0080982D */ daddu $s3, $a0, $zero -/* C56898 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* C5689C 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* C568A0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* C568A4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* C568A8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* C568AC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* C568B0 80240970 86440008 */ lh $a0, 8($s2) -/* C568B4 80240974 0C00EABB */ jal get_npc_unsafe -/* C568B8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* C568BC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* C568C0 80240980 0240282D */ daddu $a1, $s2, $zero -/* C568C4 80240984 24030001 */ addiu $v1, $zero, 1 -/* C568C8 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* C568CC 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* C568D0 80240990 8E270028 */ lw $a3, 0x28($s1) -/* C568D4 80240994 0C01242D */ jal func_800490B4 -/* C568D8 80240998 0040802D */ daddu $s0, $v0, $zero -/* C568DC 8024099C 1440001E */ bnez $v0, .L80240A18 -/* C568E0 802409A0 0200202D */ daddu $a0, $s0, $zero -/* C568E4 802409A4 24040002 */ addiu $a0, $zero, 2 -/* C568E8 802409A8 0200282D */ daddu $a1, $s0, $zero -/* C568EC 802409AC 0000302D */ daddu $a2, $zero, $zero -/* C568F0 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* C568F4 802409B4 3C013F80 */ lui $at, 0x3f80 -/* C568F8 802409B8 44810000 */ mtc1 $at, $f0 -/* C568FC 802409BC 3C014000 */ lui $at, 0x4000 -/* C56900 802409C0 44811000 */ mtc1 $at, $f2 -/* C56904 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* C56908 802409C8 44812000 */ mtc1 $at, $f4 -/* C5690C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* C56910 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* C56914 802409D4 44833000 */ mtc1 $v1, $f6 -/* C56918 802409D8 00000000 */ nop -/* C5691C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* C56920 802409E0 44073000 */ mfc1 $a3, $f6 -/* C56924 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* C56928 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* C5692C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* C56930 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C56934 802409F4 0C01BFA4 */ jal fx_emote -/* C56938 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C5693C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* C56940 80240A00 8C430000 */ lw $v1, ($v0) -/* C56944 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* C56948 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* C5694C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* C56950 80240A10 08090293 */ j .L80240A4C -/* C56954 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* C56958 80240A18 0C00F598 */ jal func_8003D660 -/* C5695C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* C56960 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* C56964 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* C56968 80240A28 0C00EA95 */ jal npc_move_heading -/* C5696C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* C56970 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* C56974 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* C56978 80240A38 18400003 */ blez $v0, .L80240A48 -/* C5697C 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* C56980 80240A40 08090294 */ j .L80240A50 -/* C56984 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* C56988 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* C5698C 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* C56990 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* C56994 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* C56998 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* C5699C 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* C569A0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* C569A4 80240A64 03E00008 */ jr $ra -/* C569A8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s deleted file mode 100644 index c9b47fb370..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240AD4_C56A14.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_C56A14 -/* C56A14 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56A18 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* C56A1C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* C56A20 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* C56A24 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* C56A28 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* C56A2C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* C56A30 80240AF0 86040008 */ lh $a0, 8($s0) -/* C56A34 80240AF4 0C00EABB */ jal get_npc_unsafe -/* C56A38 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* C56A3C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* C56A40 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* C56A44 80240B04 8C630000 */ lw $v1, ($v1) -/* C56A48 80240B08 0083182A */ slt $v1, $a0, $v1 -/* C56A4C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* C56A50 80240B10 0040302D */ daddu $a2, $v0, $zero -/* C56A54 80240B14 00041040 */ sll $v0, $a0, 1 -/* C56A58 80240B18 00441021 */ addu $v0, $v0, $a0 -/* C56A5C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* C56A60 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* C56A64 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C56A68 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* C56A6C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* C56A70 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* C56A74 80240B34 4602003E */ c.le.s $f0, $f2 -/* C56A78 80240B38 00000000 */ nop -/* C56A7C 80240B3C 45020003 */ bc1fl .L80240B4C -/* C56A80 80240B40 24840001 */ addiu $a0, $a0, 1 -/* C56A84 80240B44 080902D7 */ j .L80240B5C -/* C56A88 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* C56A8C 80240B4C 8C620000 */ lw $v0, ($v1) -/* C56A90 80240B50 0082102A */ slt $v0, $a0, $v0 -/* C56A94 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* C56A98 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* C56A9C 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* C56AA0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* C56AA4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* C56AA8 80240B68 8C420004 */ lw $v0, 4($v0) -/* C56AAC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* C56AB0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* C56AB4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* C56AB8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* C56ABC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* C56AC0 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* C56AC4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* C56AC8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* C56ACC 80240B8C 03E00008 */ jr $ra -/* C56AD0 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s deleted file mode 100644 index 75a2b555bc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ /dev/null @@ -1,214 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94_C56AD4 -/* C56AD4 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C56AD8 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* C56ADC 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* C56AE0 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* C56AE4 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* C56AE8 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* C56AEC 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* C56AF0 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* C56AF4 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* C56AF8 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* C56AFC 80240BBC 86240008 */ lh $a0, 8($s1) -/* C56B00 80240BC0 0C00EABB */ jal get_npc_unsafe -/* C56B04 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* C56B08 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* C56B0C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* C56B10 80240BD0 8C650000 */ lw $a1, ($v1) -/* C56B14 80240BD4 0C0B1EAF */ jal get_variable -/* C56B18 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* C56B1C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* C56B20 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B24 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* C56B28 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* C56B2C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B30 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* C56B34 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* C56B38 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B3C 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* C56B40 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* C56B44 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B48 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* C56B4C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* C56B50 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* C56B54 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* C56B58 80240C18 3C014282 */ lui $at, 0x4282 -/* C56B5C 80240C1C 44810000 */ mtc1 $at, $f0 -/* C56B60 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* C56B64 80240C24 0040982D */ daddu $s3, $v0, $zero -/* C56B68 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* C56B6C 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* C56B70 80240C30 16000005 */ bnez $s0, .L80240C48 -/* C56B74 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* C56B78 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* C56B7C 80240C3C 30420004 */ andi $v0, $v0, 4 -/* C56B80 80240C40 10400044 */ beqz $v0, .L80240D54 -/* C56B84 80240C44 00000000 */ nop -.L80240C48: -/* C56B88 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* C56B8C 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* C56B90 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* C56B94 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* C56B98 80240C58 8E430000 */ lw $v1, ($s2) -/* C56B9C 80240C5C 8C420000 */ lw $v0, ($v0) -/* C56BA0 80240C60 00641824 */ and $v1, $v1, $a0 -/* C56BA4 80240C64 AE430000 */ sw $v1, ($s2) -/* C56BA8 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* C56BAC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C56BB0 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* C56BB4 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* C56BB8 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* C56BBC 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* C56BC0 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* C56BC4 80240C84 08090325 */ j .L80240C94 -/* C56BC8 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* C56BCC 80240C8C 00621024 */ and $v0, $v1, $v0 -/* C56BD0 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* C56BD4 80240C94 AE420000 */ sw $v0, ($s2) -/* C56BD8 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* C56BDC 80240C9C 30420004 */ andi $v0, $v0, 4 -/* C56BE0 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* C56BE4 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* C56BE8 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* C56BEC 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* C56BF0 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C56BF4 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* C56BF8 80240CB8 00431024 */ and $v0, $v0, $v1 -/* C56BFC 80240CBC 0809033C */ j .L80240CF0 -/* C56C00 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* C56C04 80240CC4 8E220000 */ lw $v0, ($s1) -/* C56C08 80240CC8 3C034000 */ lui $v1, 0x4000 -/* C56C0C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* C56C10 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* C56C14 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* C56C18 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* C56C1C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* C56C20 80240CE0 8E220000 */ lw $v0, ($s1) -/* C56C24 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* C56C28 80240CE8 00431024 */ and $v0, $v0, $v1 -/* C56C2C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* C56C30 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* C56C34 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* C56C38 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* C56C3C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* C56C40 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* C56C44 80240D04 44812000 */ mtc1 $at, $f4 -/* C56C48 80240D08 44823000 */ mtc1 $v0, $f6 -/* C56C4C 80240D0C 00000000 */ nop -/* C56C50 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* C56C54 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* C56C58 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* C56C5C 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* C56C60 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* C56C64 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* C56C68 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* C56C6C 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* C56C70 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C56C74 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* C56C78 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* C56C7C 80240D3C 0C0372DF */ jal func_800DCB7C -/* C56C80 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* C56C84 80240D44 10400003 */ beqz $v0, .L80240D54 -/* C56C88 80240D48 00000000 */ nop -/* C56C8C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C56C90 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* C56C94 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* C56C98 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* C56C9C 80240D5C 10400042 */ beqz $v0, L80240E68_C56DA8 -/* C56CA0 80240D60 00031080 */ sll $v0, $v1, 2 -/* C56CA4 80240D64 3C018024 */ lui $at, %hi(jtbl_802438F0_C59830) -/* C56CA8 80240D68 00220821 */ addu $at, $at, $v0 -/* C56CAC 80240D6C 8C2238F0 */ lw $v0, %lo(jtbl_802438F0_C59830)($at) -/* C56CB0 80240D70 00400008 */ jr $v0 -/* C56CB4 80240D74 00000000 */ nop -glabel L80240D78_C56CB8 -/* C56CB8 80240D78 0280202D */ daddu $a0, $s4, $zero -/* C56CBC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* C56CC0 80240D80 0C090000 */ jal func_80240000_C55F40 -/* C56CC4 80240D84 02A0302D */ daddu $a2, $s5, $zero -glabel L80240D88_C56CC8 -/* C56CC8 80240D88 0280202D */ daddu $a0, $s4, $zero -/* C56CCC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* C56CD0 80240D90 0C090056 */ jal func_80240158_C56098 -/* C56CD4 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* C56CD8 80240D98 0809039A */ j L80240E68_C56DA8 -/* C56CDC 80240D9C 00000000 */ nop -glabel L80240DA0_C56CE0 -/* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C56CE8 80240DA8 0C090100 */ jal dgb_18_UnkNpcAIFunc1 -/* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero -glabel L80240DB0_C56CF0 -/* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* C56CF8 80240DB8 0C090130 */ jal func_802404C0_C56400 -/* C56CFC 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* C56D00 80240DC0 0809039A */ j L80240E68_C56DA8 -/* C56D04 80240DC4 00000000 */ nop -glabel L80240DC8_C56D08 -/* C56D08 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* C56D0C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C56D10 80240DD0 0C09019F */ jal func_8024067C_C565BC -/* C56D14 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* C56D18 80240DD8 0809039A */ j L80240E68_C56DA8 -/* C56D1C 80240DDC 00000000 */ nop -glabel L80240DE0_C56D20 -/* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C56D28 80240DE8 0C0901CC */ jal dgb_18_NpcJumpFunc2 -/* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -glabel L80240DF0_C56D30 -/* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C56D38 80240DF8 0C0901E9 */ jal dgb_18_NpcJumpFunc -/* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* C56D40 80240E00 0809039A */ j L80240E68_C56DA8 -/* C56D44 80240E04 00000000 */ nop -glabel L80240E08_C56D48 -/* C56D48 80240E08 0280202D */ daddu $a0, $s4, $zero -/* C56D4C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C56D50 80240E10 0C090207 */ jal dgb_18_UnkNpcAIFunc13 -/* C56D54 80240E14 02A0302D */ daddu $a2, $s5, $zero -glabel L80240E18_C56D58 -/* C56D58 80240E18 0280202D */ daddu $a0, $s4, $zero -/* C56D5C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* C56D60 80240E20 0C090253 */ jal func_8024094C_C5688C -/* C56D64 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* C56D68 80240E28 0809039A */ j L80240E68_C56DA8 -/* C56D6C 80240E2C 00000000 */ nop -glabel L80240E30_C56D70 -/* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero -/* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal dgb_18_UnkNpcDurationFlagFunc -/* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* C56D80 80240E40 0809039A */ j L80240E68_C56DA8 -/* C56D84 80240E44 00000000 */ nop -glabel L80240E48_C56D88 -/* C56D88 80240E48 0280202D */ daddu $a0, $s4, $zero -/* C56D8C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C56D90 80240E50 0C0902B5 */ jal func_80240AD4_C56A14 -/* C56D94 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* C56D98 80240E58 0809039A */ j L80240E68_C56DA8 -/* C56D9C 80240E5C 00000000 */ nop -glabel L80240E60_C56DA0 -/* C56DA0 80240E60 0C0129CF */ jal func_8004A73C -/* C56DA4 80240E64 0280202D */ daddu $a0, $s4, $zero -glabel L80240E68_C56DA8 -/* C56DA8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* C56DAC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* C56DB0 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* C56DB4 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* C56DB8 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* C56DBC 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* C56DC0 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* C56DC4 80240E84 0000102D */ daddu $v0, $zero, $zero -/* C56DC8 80240E88 03E00008 */ jr $ra -/* C56DCC 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s deleted file mode 100644 index f6ce713194..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240EBC_C56DFC.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EBC_C56DFC -/* C56DFC 80240EBC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C56E00 80240EC0 AFB3001C */ sw $s3, 0x1c($sp) -/* C56E04 80240EC4 0080982D */ daddu $s3, $a0, $zero -/* C56E08 80240EC8 AFB00010 */ sw $s0, 0x10($sp) -/* C56E0C 80240ECC 00A0802D */ daddu $s0, $a1, $zero -/* C56E10 80240ED0 0000202D */ daddu $a0, $zero, $zero -/* C56E14 80240ED4 AFBF0024 */ sw $ra, 0x24($sp) -/* C56E18 80240ED8 AFB40020 */ sw $s4, 0x20($sp) -/* C56E1C 80240EDC AFB20018 */ sw $s2, 0x18($sp) -/* C56E20 80240EE0 0C00EABB */ jal get_npc_unsafe -/* C56E24 80240EE4 AFB10014 */ sw $s1, 0x14($sp) -/* C56E28 80240EE8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* C56E2C 80240EEC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* C56E30 80240EF0 0240A02D */ daddu $s4, $s2, $zero -/* C56E34 80240EF4 1200000E */ beqz $s0, .L80240F30 -/* C56E38 80240EF8 0040882D */ daddu $s1, $v0, $zero -/* C56E3C 80240EFC 3C01406C */ lui $at, 0x406c -/* C56E40 80240F00 3421CCCD */ ori $at, $at, 0xcccd -/* C56E44 80240F04 44810000 */ mtc1 $at, $f0 -/* C56E48 80240F08 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C56E4C 80240F0C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C56E50 80240F10 E6200018 */ swc1 $f0, 0x18($s1) -/* C56E54 80240F14 8E460028 */ lw $a2, 0x28($s2) -/* C56E58 80240F18 0C00A720 */ jal atan2 -/* C56E5C 80240F1C 8E470030 */ lw $a3, 0x30($s2) -/* C56E60 80240F20 2402000F */ addiu $v0, $zero, 0xf -/* C56E64 80240F24 E620000C */ swc1 $f0, 0xc($s1) -/* C56E68 80240F28 AE600074 */ sw $zero, 0x74($s3) -/* C56E6C 80240F2C A622008E */ sh $v0, 0x8e($s1) -.L80240F30: -/* C56E70 80240F30 8E620074 */ lw $v0, 0x74($s3) -/* C56E74 80240F34 1440000F */ bnez $v0, .L80240F74 -/* C56E78 80240F38 00000000 */ nop -/* C56E7C 80240F3C 8622008E */ lh $v0, 0x8e($s1) -/* C56E80 80240F40 14400009 */ bnez $v0, .L80240F68 -/* C56E84 80240F44 00000000 */ nop -/* C56E88 80240F48 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C56E8C 80240F4C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C56E90 80240F50 8E860028 */ lw $a2, 0x28($s4) -/* C56E94 80240F54 0C00A720 */ jal atan2 -/* C56E98 80240F58 8E870030 */ lw $a3, 0x30($s4) -/* C56E9C 80240F5C 2402000F */ addiu $v0, $zero, 0xf -/* C56EA0 80240F60 E620000C */ swc1 $f0, 0xc($s1) -/* C56EA4 80240F64 A622008E */ sh $v0, 0x8e($s1) -.L80240F68: -/* C56EA8 80240F68 9622008E */ lhu $v0, 0x8e($s1) -/* C56EAC 80240F6C 2442FFFF */ addiu $v0, $v0, -1 -/* C56EB0 80240F70 A622008E */ sh $v0, 0x8e($s1) -.L80240F74: -/* C56EB4 80240F74 8E26000C */ lw $a2, 0xc($s1) -/* C56EB8 80240F78 8E250018 */ lw $a1, 0x18($s1) -/* C56EBC 80240F7C 0C00EA95 */ jal npc_move_heading -/* C56EC0 80240F80 0220202D */ daddu $a0, $s1, $zero -/* C56EC4 80240F84 8FBF0024 */ lw $ra, 0x24($sp) -/* C56EC8 80240F88 8FB40020 */ lw $s4, 0x20($sp) -/* C56ECC 80240F8C 8FB3001C */ lw $s3, 0x1c($sp) -/* C56ED0 80240F90 8FB20018 */ lw $s2, 0x18($sp) -/* C56ED4 80240F94 8FB10014 */ lw $s1, 0x14($sp) -/* C56ED8 80240F98 8FB00010 */ lw $s0, 0x10($sp) -/* C56EDC 80240F9C 0000102D */ daddu $v0, $zero, $zero -/* C56EE0 80240FA0 03E00008 */ jr $ra -/* C56EE4 80240FA4 27BD0028 */ addiu $sp, $sp, 0x28 -/* C56EE8 80240FA8 00000000 */ nop -/* C56EEC 80240FAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s deleted file mode 100644 index f965209434..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB0_C56EF0 -/* C56EF0 80240FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C56EF4 80240FB4 AFB00010 */ sw $s0, 0x10($sp) -/* C56EF8 80240FB8 3C108024 */ lui $s0, %hi(D_802436E0_C59620) -/* C56EFC 80240FBC 261036E0 */ addiu $s0, $s0, %lo(D_802436E0_C59620) -/* C56F00 80240FC0 AFBF0018 */ sw $ra, 0x18($sp) -/* C56F04 80240FC4 AFB10014 */ sw $s1, 0x14($sp) -/* C56F08 80240FC8 8E020000 */ lw $v0, ($s0) -/* C56F0C 80240FCC 14400010 */ bnez $v0, .L80241010 -/* C56F10 80240FD0 0080882D */ daddu $s1, $a0, $zero -/* C56F14 80240FD4 0C00AB39 */ jal heap_malloc -/* C56F18 80240FD8 24040040 */ addiu $a0, $zero, 0x40 -/* C56F1C 80240FDC AE020000 */ sw $v0, ($s0) -/* C56F20 80240FE0 0000182D */ daddu $v1, $zero, $zero -/* C56F24 80240FE4 0040282D */ daddu $a1, $v0, $zero -/* C56F28 80240FE8 0220202D */ daddu $a0, $s1, $zero -.L80240FEC: -/* C56F2C 80240FEC 8C820084 */ lw $v0, 0x84($a0) -/* C56F30 80240FF0 24840004 */ addiu $a0, $a0, 4 -/* C56F34 80240FF4 24630001 */ addiu $v1, $v1, 1 -/* C56F38 80240FF8 ACA20000 */ sw $v0, ($a1) -/* C56F3C 80240FFC 28620010 */ slti $v0, $v1, 0x10 -/* C56F40 80241000 1440FFFA */ bnez $v0, .L80240FEC -/* C56F44 80241004 24A50004 */ addiu $a1, $a1, 4 -/* C56F48 80241008 08090413 */ j .L8024104C -/* C56F4C 8024100C 00000000 */ nop -.L80241010: -/* C56F50 80241010 0000182D */ daddu $v1, $zero, $zero -/* C56F54 80241014 0040282D */ daddu $a1, $v0, $zero -/* C56F58 80241018 0220202D */ daddu $a0, $s1, $zero -.L8024101C: -/* C56F5C 8024101C 8CA20000 */ lw $v0, ($a1) -/* C56F60 80241020 24A50004 */ addiu $a1, $a1, 4 -/* C56F64 80241024 24630001 */ addiu $v1, $v1, 1 -/* C56F68 80241028 AC820084 */ sw $v0, 0x84($a0) -/* C56F6C 8024102C 28620010 */ slti $v0, $v1, 0x10 -/* C56F70 80241030 1440FFFA */ bnez $v0, .L8024101C -/* C56F74 80241034 24840004 */ addiu $a0, $a0, 4 -/* C56F78 80241038 3C108024 */ lui $s0, %hi(D_802436E0_C59620) -/* C56F7C 8024103C 261036E0 */ addiu $s0, $s0, %lo(D_802436E0_C59620) -/* C56F80 80241040 0C00AB4B */ jal heap_free -/* C56F84 80241044 8E040000 */ lw $a0, ($s0) -/* C56F88 80241048 AE000000 */ sw $zero, ($s0) -.L8024104C: -/* C56F8C 8024104C 8FBF0018 */ lw $ra, 0x18($sp) -/* C56F90 80241050 8FB10014 */ lw $s1, 0x14($sp) -/* C56F94 80241054 8FB00010 */ lw $s0, 0x10($sp) -/* C56F98 80241058 24020002 */ addiu $v0, $zero, 2 -/* C56F9C 8024105C 03E00008 */ jr $ra -/* C56FA0 80241060 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s deleted file mode 100644 index daf03a85da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240738_95B938.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_95B938 -/* 95B938 80240738 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 95B93C 8024073C AFB20038 */ sw $s2, 0x38($sp) -/* 95B940 80240740 0080902D */ daddu $s2, $a0, $zero -/* 95B944 80240744 AFBF0044 */ sw $ra, 0x44($sp) -/* 95B948 80240748 AFB40040 */ sw $s4, 0x40($sp) -/* 95B94C 8024074C AFB3003C */ sw $s3, 0x3c($sp) -/* 95B950 80240750 AFB10034 */ sw $s1, 0x34($sp) -/* 95B954 80240754 AFB00030 */ sw $s0, 0x30($sp) -/* 95B958 80240758 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 95B95C 8024075C F7B40048 */ sdc1 $f20, 0x48($sp) -/* 95B960 80240760 8E510148 */ lw $s1, 0x148($s2) -/* 95B964 80240764 00A0982D */ daddu $s3, $a1, $zero -/* 95B968 80240768 86240008 */ lh $a0, 8($s1) -/* 95B96C 8024076C 0C00EABB */ jal get_npc_unsafe -/* 95B970 80240770 00C0A02D */ daddu $s4, $a2, $zero -/* 95B974 80240774 8E630014 */ lw $v1, 0x14($s3) -/* 95B978 80240778 04600030 */ bltz $v1, .L8024083C -/* 95B97C 8024077C 0040802D */ daddu $s0, $v0, $zero -/* 95B980 80240780 8E420074 */ lw $v0, 0x74($s2) -/* 95B984 80240784 1C40002C */ bgtz $v0, .L80240838 -/* 95B988 80240788 2442FFFF */ addiu $v0, $v0, -1 -/* 95B98C 8024078C 0280202D */ daddu $a0, $s4, $zero -/* 95B990 80240790 AE430074 */ sw $v1, 0x74($s2) -/* 95B994 80240794 AFA00010 */ sw $zero, 0x10($sp) -/* 95B998 80240798 8E66000C */ lw $a2, 0xc($s3) -/* 95B99C 8024079C 8E670010 */ lw $a3, 0x10($s3) -/* 95B9A0 802407A0 0C01242D */ jal func_800490B4 -/* 95B9A4 802407A4 0220282D */ daddu $a1, $s1, $zero -/* 95B9A8 802407A8 10400021 */ beqz $v0, .L80240830 -/* 95B9AC 802407AC 0000202D */ daddu $a0, $zero, $zero -/* 95B9B0 802407B0 0200282D */ daddu $a1, $s0, $zero -/* 95B9B4 802407B4 0000302D */ daddu $a2, $zero, $zero -/* 95B9B8 802407B8 860300A8 */ lh $v1, 0xa8($s0) -/* 95B9BC 802407BC 3C013F80 */ lui $at, 0x3f80 -/* 95B9C0 802407C0 44810000 */ mtc1 $at, $f0 -/* 95B9C4 802407C4 3C014000 */ lui $at, 0x4000 -/* 95B9C8 802407C8 44811000 */ mtc1 $at, $f2 -/* 95B9CC 802407CC 3C01C1A0 */ lui $at, 0xc1a0 -/* 95B9D0 802407D0 44812000 */ mtc1 $at, $f4 -/* 95B9D4 802407D4 2402000F */ addiu $v0, $zero, 0xf -/* 95B9D8 802407D8 AFA2001C */ sw $v0, 0x1c($sp) -/* 95B9DC 802407DC 44833000 */ mtc1 $v1, $f6 -/* 95B9E0 802407E0 00000000 */ nop -/* 95B9E4 802407E4 468031A0 */ cvt.s.w $f6, $f6 -/* 95B9E8 802407E8 44073000 */ mfc1 $a3, $f6 -/* 95B9EC 802407EC 27A20028 */ addiu $v0, $sp, 0x28 -/* 95B9F0 802407F0 AFA20020 */ sw $v0, 0x20($sp) -/* 95B9F4 802407F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95B9F8 802407F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95B9FC 802407FC 0C01BFA4 */ jal fx_emote -/* 95BA00 80240800 E7A40018 */ swc1 $f4, 0x18($sp) -/* 95BA04 80240804 0200202D */ daddu $a0, $s0, $zero -/* 95BA08 80240808 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 95BA0C 8024080C 0C012530 */ jal func_800494C0 -/* 95BA10 80240810 3C060020 */ lui $a2, 0x20 -/* 95BA14 80240814 8E220018 */ lw $v0, 0x18($s1) -/* 95BA18 80240818 9442002A */ lhu $v0, 0x2a($v0) -/* 95BA1C 8024081C 30420001 */ andi $v0, $v0, 1 -/* 95BA20 80240820 14400064 */ bnez $v0, .L802409B4 -/* 95BA24 80240824 2402000A */ addiu $v0, $zero, 0xa -/* 95BA28 80240828 0809026D */ j .L802409B4 -/* 95BA2C 8024082C 2402000C */ addiu $v0, $zero, 0xc -.L80240830: -/* 95BA30 80240830 8E420074 */ lw $v0, 0x74($s2) -/* 95BA34 80240834 2442FFFF */ addiu $v0, $v0, -1 -.L80240838: -/* 95BA38 80240838 AE420074 */ sw $v0, 0x74($s2) -.L8024083C: -/* 95BA3C 8024083C 8602008C */ lh $v0, 0x8c($s0) -/* 95BA40 80240840 1440005D */ bnez $v0, .L802409B8 -/* 95BA44 80240844 00000000 */ nop -/* 95BA48 80240848 C6000018 */ lwc1 $f0, 0x18($s0) -/* 95BA4C 8024084C 3C014010 */ lui $at, 0x4010 -/* 95BA50 80240850 44811800 */ mtc1 $at, $f3 -/* 95BA54 80240854 44801000 */ mtc1 $zero, $f2 -/* 95BA58 80240858 46000021 */ cvt.d.s $f0, $f0 -/* 95BA5C 8024085C 4622003C */ c.lt.d $f0, $f2 -/* 95BA60 80240860 00000000 */ nop -/* 95BA64 80240864 45000003 */ bc1f .L80240874 -/* 95BA68 80240868 0200202D */ daddu $a0, $s0, $zero -/* 95BA6C 8024086C 0809021E */ j .L80240878 -/* 95BA70 80240870 0000282D */ daddu $a1, $zero, $zero -.L80240874: -/* 95BA74 80240874 24050001 */ addiu $a1, $zero, 1 -.L80240878: -/* 95BA78 80240878 0C00F598 */ jal func_8003D660 -/* 95BA7C 8024087C 00000000 */ nop -/* 95BA80 80240880 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 95BA84 80240884 8E430078 */ lw $v1, 0x78($s2) -/* 95BA88 80240888 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 95BA8C 8024088C 00031040 */ sll $v0, $v1, 1 -/* 95BA90 80240890 00431021 */ addu $v0, $v0, $v1 -/* 95BA94 80240894 8E2300D0 */ lw $v1, 0xd0($s1) -/* 95BA98 80240898 00021080 */ sll $v0, $v0, 2 -/* 95BA9C 8024089C 00431021 */ addu $v0, $v0, $v1 -/* 95BAA0 802408A0 C4560004 */ lwc1 $f22, 4($v0) -/* 95BAA4 802408A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95BAA8 802408A8 C454000C */ lwc1 $f20, 0xc($v0) -/* 95BAAC 802408AC 4680A520 */ cvt.s.w $f20, $f20 -/* 95BAB0 802408B0 4406B000 */ mfc1 $a2, $f22 -/* 95BAB4 802408B4 4407A000 */ mfc1 $a3, $f20 -/* 95BAB8 802408B8 0C00A720 */ jal atan2 -/* 95BABC 802408BC 00000000 */ nop -/* 95BAC0 802408C0 8E050018 */ lw $a1, 0x18($s0) -/* 95BAC4 802408C4 44060000 */ mfc1 $a2, $f0 -/* 95BAC8 802408C8 0200202D */ daddu $a0, $s0, $zero -/* 95BACC 802408CC 0C00EA95 */ jal npc_move_heading -/* 95BAD0 802408D0 AE06000C */ sw $a2, 0xc($s0) -/* 95BAD4 802408D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 95BAD8 802408D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 95BADC 802408DC 4406B000 */ mfc1 $a2, $f22 -/* 95BAE0 802408E0 4407A000 */ mfc1 $a3, $f20 -/* 95BAE4 802408E4 0C00A7B5 */ jal dist2D -/* 95BAE8 802408E8 00000000 */ nop -/* 95BAEC 802408EC C6020018 */ lwc1 $f2, 0x18($s0) -/* 95BAF0 802408F0 4602003E */ c.le.s $f0, $f2 -/* 95BAF4 802408F4 00000000 */ nop -/* 95BAF8 802408F8 4500002F */ bc1f .L802409B8 -/* 95BAFC 802408FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 95BB00 80240900 24020002 */ addiu $v0, $zero, 2 -/* 95BB04 80240904 0C00A67F */ jal rand_int -/* 95BB08 80240908 AE420070 */ sw $v0, 0x70($s2) -/* 95BB0C 8024090C 3C035555 */ lui $v1, 0x5555 -/* 95BB10 80240910 34635556 */ ori $v1, $v1, 0x5556 -/* 95BB14 80240914 00430018 */ mult $v0, $v1 -/* 95BB18 80240918 000227C3 */ sra $a0, $v0, 0x1f -/* 95BB1C 8024091C 00004010 */ mfhi $t0 -/* 95BB20 80240920 01042023 */ subu $a0, $t0, $a0 -/* 95BB24 80240924 00041840 */ sll $v1, $a0, 1 -/* 95BB28 80240928 00641821 */ addu $v1, $v1, $a0 -/* 95BB2C 8024092C 00431023 */ subu $v0, $v0, $v1 -/* 95BB30 80240930 24430002 */ addiu $v1, $v0, 2 -/* 95BB34 80240934 AE430074 */ sw $v1, 0x74($s2) -/* 95BB38 80240938 8E62002C */ lw $v0, 0x2c($s3) -/* 95BB3C 8024093C 18400009 */ blez $v0, .L80240964 -/* 95BB40 80240940 24020004 */ addiu $v0, $zero, 4 -/* 95BB44 80240944 8E620004 */ lw $v0, 4($s3) -/* 95BB48 80240948 18400006 */ blez $v0, .L80240964 -/* 95BB4C 8024094C 24020004 */ addiu $v0, $zero, 4 -/* 95BB50 80240950 8E620008 */ lw $v0, 8($s3) -/* 95BB54 80240954 18400003 */ blez $v0, .L80240964 -/* 95BB58 80240958 24020004 */ addiu $v0, $zero, 4 -/* 95BB5C 8024095C 14600002 */ bnez $v1, .L80240968 -/* 95BB60 80240960 00000000 */ nop -.L80240964: -/* 95BB64 80240964 AE420070 */ sw $v0, 0x70($s2) -.L80240968: -/* 95BB68 80240968 0C00A67F */ jal rand_int -/* 95BB6C 8024096C 24042710 */ addiu $a0, $zero, 0x2710 -/* 95BB70 80240970 3C0351EB */ lui $v1, 0x51eb -/* 95BB74 80240974 3463851F */ ori $v1, $v1, 0x851f -/* 95BB78 80240978 00430018 */ mult $v0, $v1 -/* 95BB7C 8024097C 00021FC3 */ sra $v1, $v0, 0x1f -/* 95BB80 80240980 00004010 */ mfhi $t0 -/* 95BB84 80240984 00082143 */ sra $a0, $t0, 5 -/* 95BB88 80240988 00832023 */ subu $a0, $a0, $v1 -/* 95BB8C 8024098C 00041840 */ sll $v1, $a0, 1 -/* 95BB90 80240990 00641821 */ addu $v1, $v1, $a0 -/* 95BB94 80240994 000318C0 */ sll $v1, $v1, 3 -/* 95BB98 80240998 00641821 */ addu $v1, $v1, $a0 -/* 95BB9C 8024099C 00031880 */ sll $v1, $v1, 2 -/* 95BBA0 802409A0 8E640004 */ lw $a0, 4($s3) -/* 95BBA4 802409A4 00431023 */ subu $v0, $v0, $v1 -/* 95BBA8 802409A8 0044102A */ slt $v0, $v0, $a0 -/* 95BBAC 802409AC 10400002 */ beqz $v0, .L802409B8 -/* 95BBB0 802409B0 24020004 */ addiu $v0, $zero, 4 -.L802409B4: -/* 95BBB4 802409B4 AE420070 */ sw $v0, 0x70($s2) -.L802409B8: -/* 95BBB8 802409B8 8FBF0044 */ lw $ra, 0x44($sp) -/* 95BBBC 802409BC 8FB40040 */ lw $s4, 0x40($sp) -/* 95BBC0 802409C0 8FB3003C */ lw $s3, 0x3c($sp) -/* 95BBC4 802409C4 8FB20038 */ lw $s2, 0x38($sp) -/* 95BBC8 802409C8 8FB10034 */ lw $s1, 0x34($sp) -/* 95BBCC 802409CC 8FB00030 */ lw $s0, 0x30($sp) -/* 95BBD0 802409D0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 95BBD4 802409D4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 95BBD8 802409D8 03E00008 */ jr $ra -/* 95BBDC 802409DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s deleted file mode 100644 index 1df6780c64..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA0_95BCA0 -/* 95BCA0 80240AA0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95BCA4 80240AA4 AFB40040 */ sw $s4, 0x40($sp) -/* 95BCA8 80240AA8 0080A02D */ daddu $s4, $a0, $zero -/* 95BCAC 80240AAC AFBF0044 */ sw $ra, 0x44($sp) -/* 95BCB0 80240AB0 AFB3003C */ sw $s3, 0x3c($sp) -/* 95BCB4 80240AB4 AFB20038 */ sw $s2, 0x38($sp) -/* 95BCB8 80240AB8 AFB10034 */ sw $s1, 0x34($sp) -/* 95BCBC 80240ABC AFB00030 */ sw $s0, 0x30($sp) -/* 95BCC0 80240AC0 8E910148 */ lw $s1, 0x148($s4) -/* 95BCC4 80240AC4 00A0902D */ daddu $s2, $a1, $zero -/* 95BCC8 80240AC8 86240008 */ lh $a0, 8($s1) -/* 95BCCC 80240ACC 0C00EABB */ jal get_npc_unsafe -/* 95BCD0 80240AD0 00C0982D */ daddu $s3, $a2, $zero -/* 95BCD4 80240AD4 8E430014 */ lw $v1, 0x14($s2) -/* 95BCD8 80240AD8 04600031 */ bltz $v1, .L80240BA0 -/* 95BCDC 80240ADC 0040802D */ daddu $s0, $v0, $zero -/* 95BCE0 80240AE0 0260202D */ daddu $a0, $s3, $zero -/* 95BCE4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) -/* 95BCE8 80240AE8 8E460024 */ lw $a2, 0x24($s2) -/* 95BCEC 80240AEC 8E470028 */ lw $a3, 0x28($s2) -/* 95BCF0 80240AF0 0C01242D */ jal func_800490B4 -/* 95BCF4 80240AF4 0220282D */ daddu $a1, $s1, $zero -/* 95BCF8 80240AF8 10400029 */ beqz $v0, .L80240BA0 -/* 95BCFC 80240AFC 0000202D */ daddu $a0, $zero, $zero -/* 95BD00 80240B00 0200282D */ daddu $a1, $s0, $zero -/* 95BD04 80240B04 0000302D */ daddu $a2, $zero, $zero -/* 95BD08 80240B08 860300A8 */ lh $v1, 0xa8($s0) -/* 95BD0C 80240B0C 3C013F80 */ lui $at, 0x3f80 -/* 95BD10 80240B10 44810000 */ mtc1 $at, $f0 -/* 95BD14 80240B14 3C014000 */ lui $at, 0x4000 -/* 95BD18 80240B18 44811000 */ mtc1 $at, $f2 -/* 95BD1C 80240B1C 3C01C1A0 */ lui $at, 0xc1a0 -/* 95BD20 80240B20 44812000 */ mtc1 $at, $f4 -/* 95BD24 80240B24 2402000F */ addiu $v0, $zero, 0xf -/* 95BD28 80240B28 AFA2001C */ sw $v0, 0x1c($sp) -/* 95BD2C 80240B2C 44833000 */ mtc1 $v1, $f6 -/* 95BD30 80240B30 00000000 */ nop -/* 95BD34 80240B34 468031A0 */ cvt.s.w $f6, $f6 -/* 95BD38 80240B38 44073000 */ mfc1 $a3, $f6 -/* 95BD3C 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 -/* 95BD40 80240B40 AFA20020 */ sw $v0, 0x20($sp) -/* 95BD44 80240B44 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95BD48 80240B48 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95BD4C 80240B4C 0C01BFA4 */ jal fx_emote -/* 95BD50 80240B50 E7A40018 */ swc1 $f4, 0x18($sp) -/* 95BD54 80240B54 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 95BD58 80240B58 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 95BD5C 80240B5C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 95BD60 80240B60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 95BD64 80240B64 8C460028 */ lw $a2, 0x28($v0) -/* 95BD68 80240B68 0C00A720 */ jal atan2 -/* 95BD6C 80240B6C 8C470030 */ lw $a3, 0x30($v0) -/* 95BD70 80240B70 0200202D */ daddu $a0, $s0, $zero -/* 95BD74 80240B74 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 95BD78 80240B78 3C060020 */ lui $a2, 0x20 -/* 95BD7C 80240B7C 0C012530 */ jal func_800494C0 -/* 95BD80 80240B80 E480000C */ swc1 $f0, 0xc($a0) -/* 95BD84 80240B84 8E220018 */ lw $v0, 0x18($s1) -/* 95BD88 80240B88 9442002A */ lhu $v0, 0x2a($v0) -/* 95BD8C 80240B8C 30420001 */ andi $v0, $v0, 1 -/* 95BD90 80240B90 14400029 */ bnez $v0, .L80240C38 -/* 95BD94 80240B94 2402000A */ addiu $v0, $zero, 0xa -/* 95BD98 80240B98 0809030E */ j .L80240C38 -/* 95BD9C 80240B9C 2402000C */ addiu $v0, $zero, 0xc -.L80240BA0: -/* 95BDA0 80240BA0 8602008C */ lh $v0, 0x8c($s0) -/* 95BDA4 80240BA4 14400025 */ bnez $v0, .L80240C3C -/* 95BDA8 80240BA8 00000000 */ nop -/* 95BDAC 80240BAC 9602008E */ lhu $v0, 0x8e($s0) -/* 95BDB0 80240BB0 2442FFFF */ addiu $v0, $v0, -1 -/* 95BDB4 80240BB4 A602008E */ sh $v0, 0x8e($s0) -/* 95BDB8 80240BB8 00021400 */ sll $v0, $v0, 0x10 -/* 95BDBC 80240BBC 1440001F */ bnez $v0, .L80240C3C -/* 95BDC0 80240BC0 00000000 */ nop -/* 95BDC4 80240BC4 8E820074 */ lw $v0, 0x74($s4) -/* 95BDC8 80240BC8 2442FFFF */ addiu $v0, $v0, -1 -/* 95BDCC 80240BCC 10400019 */ beqz $v0, .L80240C34 -/* 95BDD0 80240BD0 AE820074 */ sw $v0, 0x74($s4) -/* 95BDD4 80240BD4 8E220018 */ lw $v0, 0x18($s1) -/* 95BDD8 80240BD8 9442002A */ lhu $v0, 0x2a($v0) -/* 95BDDC 80240BDC 30420010 */ andi $v0, $v0, 0x10 -/* 95BDE0 80240BE0 14400007 */ bnez $v0, .L80240C00 -/* 95BDE4 80240BE4 00000000 */ nop -/* 95BDE8 80240BE8 C600000C */ lwc1 $f0, 0xc($s0) -/* 95BDEC 80240BEC 3C014334 */ lui $at, 0x4334 -/* 95BDF0 80240BF0 44816000 */ mtc1 $at, $f12 -/* 95BDF4 80240BF4 0C00A6C9 */ jal clamp_angle -/* 95BDF8 80240BF8 460C0300 */ add.s $f12, $f0, $f12 -/* 95BDFC 80240BFC E600000C */ swc1 $f0, 0xc($s0) -.L80240C00: -/* 95BE00 80240C00 8E440008 */ lw $a0, 8($s2) -/* 95BE04 80240C04 000417C2 */ srl $v0, $a0, 0x1f -/* 95BE08 80240C08 00822021 */ addu $a0, $a0, $v0 -/* 95BE0C 80240C0C 00042043 */ sra $a0, $a0, 1 -/* 95BE10 80240C10 0C00A67F */ jal rand_int -/* 95BE14 80240C14 24840001 */ addiu $a0, $a0, 1 -/* 95BE18 80240C18 8E430008 */ lw $v1, 8($s2) -/* 95BE1C 80240C1C 000327C2 */ srl $a0, $v1, 0x1f -/* 95BE20 80240C20 00641821 */ addu $v1, $v1, $a0 -/* 95BE24 80240C24 00031843 */ sra $v1, $v1, 1 -/* 95BE28 80240C28 00621821 */ addu $v1, $v1, $v0 -/* 95BE2C 80240C2C 0809030F */ j .L80240C3C -/* 95BE30 80240C30 A603008E */ sh $v1, 0x8e($s0) -.L80240C34: -/* 95BE34 80240C34 24020004 */ addiu $v0, $zero, 4 -.L80240C38: -/* 95BE38 80240C38 AE820070 */ sw $v0, 0x70($s4) -.L80240C3C: -/* 95BE3C 80240C3C 8FBF0044 */ lw $ra, 0x44($sp) -/* 95BE40 80240C40 8FB40040 */ lw $s4, 0x40($sp) -/* 95BE44 80240C44 8FB3003C */ lw $s3, 0x3c($sp) -/* 95BE48 80240C48 8FB20038 */ lw $s2, 0x38($sp) -/* 95BE4C 80240C4C 8FB10034 */ lw $s1, 0x34($sp) -/* 95BE50 80240C50 8FB00030 */ lw $s0, 0x30($sp) -/* 95BE54 80240C54 03E00008 */ jr $ra -/* 95BE58 80240C58 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s deleted file mode 100644 index e0a1f5a9d8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F2C_95C12C -/* 95C12C 80240F2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95C130 80240F30 AFB3003C */ sw $s3, 0x3c($sp) -/* 95C134 80240F34 0080982D */ daddu $s3, $a0, $zero -/* 95C138 80240F38 AFBF0040 */ sw $ra, 0x40($sp) -/* 95C13C 80240F3C AFB20038 */ sw $s2, 0x38($sp) -/* 95C140 80240F40 AFB10034 */ sw $s1, 0x34($sp) -/* 95C144 80240F44 AFB00030 */ sw $s0, 0x30($sp) -/* 95C148 80240F48 8E720148 */ lw $s2, 0x148($s3) -/* 95C14C 80240F4C 00A0882D */ daddu $s1, $a1, $zero -/* 95C150 80240F50 86440008 */ lh $a0, 8($s2) -/* 95C154 80240F54 0C00EABB */ jal get_npc_unsafe -/* 95C158 80240F58 00C0802D */ daddu $s0, $a2, $zero -/* 95C15C 80240F5C 0200202D */ daddu $a0, $s0, $zero -/* 95C160 80240F60 0240282D */ daddu $a1, $s2, $zero -/* 95C164 80240F64 24030001 */ addiu $v1, $zero, 1 -/* 95C168 80240F68 AFA30010 */ sw $v1, 0x10($sp) -/* 95C16C 80240F6C 8E260024 */ lw $a2, 0x24($s1) -/* 95C170 80240F70 8E270028 */ lw $a3, 0x28($s1) -/* 95C174 80240F74 0C01242D */ jal func_800490B4 -/* 95C178 80240F78 0040802D */ daddu $s0, $v0, $zero -/* 95C17C 80240F7C 1440001E */ bnez $v0, .L80240FF8 -/* 95C180 80240F80 0200202D */ daddu $a0, $s0, $zero -/* 95C184 80240F84 24040002 */ addiu $a0, $zero, 2 -/* 95C188 80240F88 0200282D */ daddu $a1, $s0, $zero -/* 95C18C 80240F8C 0000302D */ daddu $a2, $zero, $zero -/* 95C190 80240F90 860300A8 */ lh $v1, 0xa8($s0) -/* 95C194 80240F94 3C013F80 */ lui $at, 0x3f80 -/* 95C198 80240F98 44810000 */ mtc1 $at, $f0 -/* 95C19C 80240F9C 3C014000 */ lui $at, 0x4000 -/* 95C1A0 80240FA0 44811000 */ mtc1 $at, $f2 -/* 95C1A4 80240FA4 3C01C1A0 */ lui $at, 0xc1a0 -/* 95C1A8 80240FA8 44812000 */ mtc1 $at, $f4 -/* 95C1AC 80240FAC 2402000F */ addiu $v0, $zero, 0xf -/* 95C1B0 80240FB0 AFA2001C */ sw $v0, 0x1c($sp) -/* 95C1B4 80240FB4 44833000 */ mtc1 $v1, $f6 -/* 95C1B8 80240FB8 00000000 */ nop -/* 95C1BC 80240FBC 468031A0 */ cvt.s.w $f6, $f6 -/* 95C1C0 80240FC0 44073000 */ mfc1 $a3, $f6 -/* 95C1C4 80240FC4 27A20028 */ addiu $v0, $sp, 0x28 -/* 95C1C8 80240FC8 AFA20020 */ sw $v0, 0x20($sp) -/* 95C1CC 80240FCC E7A00010 */ swc1 $f0, 0x10($sp) -/* 95C1D0 80240FD0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95C1D4 80240FD4 0C01BFA4 */ jal fx_emote -/* 95C1D8 80240FD8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 95C1DC 80240FDC 8E4200CC */ lw $v0, 0xcc($s2) -/* 95C1E0 80240FE0 8C430000 */ lw $v1, ($v0) -/* 95C1E4 80240FE4 24020019 */ addiu $v0, $zero, 0x19 -/* 95C1E8 80240FE8 A602008E */ sh $v0, 0x8e($s0) -/* 95C1EC 80240FEC 2402000E */ addiu $v0, $zero, 0xe -/* 95C1F0 80240FF0 0809040B */ j .L8024102C -/* 95C1F4 80240FF4 AE030028 */ sw $v1, 0x28($s0) -.L80240FF8: -/* 95C1F8 80240FF8 0C00F598 */ jal func_8003D660 -/* 95C1FC 80240FFC 24050001 */ addiu $a1, $zero, 1 -/* 95C200 80241000 8E050018 */ lw $a1, 0x18($s0) -/* 95C204 80241004 8E06000C */ lw $a2, 0xc($s0) -/* 95C208 80241008 0C00EA95 */ jal npc_move_heading -/* 95C20C 8024100C 0200202D */ daddu $a0, $s0, $zero -/* 95C210 80241010 8602008E */ lh $v0, 0x8e($s0) -/* 95C214 80241014 9603008E */ lhu $v1, 0x8e($s0) -/* 95C218 80241018 18400003 */ blez $v0, .L80241028 -/* 95C21C 8024101C 2462FFFF */ addiu $v0, $v1, -1 -/* 95C220 80241020 0809040C */ j .L80241030 -/* 95C224 80241024 A602008E */ sh $v0, 0x8e($s0) -.L80241028: -/* 95C228 80241028 2402000C */ addiu $v0, $zero, 0xc -.L8024102C: -/* 95C22C 8024102C AE620070 */ sw $v0, 0x70($s3) -.L80241030: -/* 95C230 80241030 8FBF0040 */ lw $ra, 0x40($sp) -/* 95C234 80241034 8FB3003C */ lw $s3, 0x3c($sp) -/* 95C238 80241038 8FB20038 */ lw $s2, 0x38($sp) -/* 95C23C 8024103C 8FB10034 */ lw $s1, 0x34($sp) -/* 95C240 80241040 8FB00030 */ lw $s0, 0x30($sp) -/* 95C244 80241044 03E00008 */ jr $ra -/* 95C248 80241048 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s deleted file mode 100644 index f880b8f5f1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B4_95C2B4 -/* 95C2B4 802410B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C2B8 802410B8 AFB10014 */ sw $s1, 0x14($sp) -/* 95C2BC 802410BC 0080882D */ daddu $s1, $a0, $zero -/* 95C2C0 802410C0 AFBF001C */ sw $ra, 0x1c($sp) -/* 95C2C4 802410C4 AFB20018 */ sw $s2, 0x18($sp) -/* 95C2C8 802410C8 AFB00010 */ sw $s0, 0x10($sp) -/* 95C2CC 802410CC 8E300148 */ lw $s0, 0x148($s1) -/* 95C2D0 802410D0 86040008 */ lh $a0, 8($s0) -/* 95C2D4 802410D4 0C00EABB */ jal get_npc_unsafe -/* 95C2D8 802410D8 00A0902D */ daddu $s2, $a1, $zero -/* 95C2DC 802410DC 8E0300D0 */ lw $v1, 0xd0($s0) -/* 95C2E0 802410E0 8E240078 */ lw $a0, 0x78($s1) -/* 95C2E4 802410E4 8C630000 */ lw $v1, ($v1) -/* 95C2E8 802410E8 0083182A */ slt $v1, $a0, $v1 -/* 95C2EC 802410EC 10600013 */ beqz $v1, .L8024113C -/* 95C2F0 802410F0 0040302D */ daddu $a2, $v0, $zero -/* 95C2F4 802410F4 00041040 */ sll $v0, $a0, 1 -/* 95C2F8 802410F8 00441021 */ addu $v0, $v0, $a0 -/* 95C2FC 802410FC 00022880 */ sll $a1, $v0, 2 -.L80241100: -/* 95C300 80241100 8E0300D0 */ lw $v1, 0xd0($s0) -/* 95C304 80241104 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 95C308 80241108 00A31021 */ addu $v0, $a1, $v1 -/* 95C30C 8024110C C4400008 */ lwc1 $f0, 8($v0) -/* 95C310 80241110 46800020 */ cvt.s.w $f0, $f0 -/* 95C314 80241114 4602003E */ c.le.s $f0, $f2 -/* 95C318 80241118 00000000 */ nop -/* 95C31C 8024111C 45020003 */ bc1fl .L8024112C -/* 95C320 80241120 24840001 */ addiu $a0, $a0, 1 -/* 95C324 80241124 0809044F */ j .L8024113C -/* 95C328 80241128 AE240078 */ sw $a0, 0x78($s1) -.L8024112C: -/* 95C32C 8024112C 8C620000 */ lw $v0, ($v1) -/* 95C330 80241130 0082102A */ slt $v0, $a0, $v0 -/* 95C334 80241134 1440FFF2 */ bnez $v0, .L80241100 -/* 95C338 80241138 24A5000C */ addiu $a1, $a1, 0xc -.L8024113C: -/* 95C33C 8024113C C6400000 */ lwc1 $f0, ($s2) -/* 95C340 80241140 E4C00018 */ swc1 $f0, 0x18($a2) -/* 95C344 80241144 8E0200CC */ lw $v0, 0xcc($s0) -/* 95C348 80241148 8C420004 */ lw $v0, 4($v0) -/* 95C34C 8024114C ACC20028 */ sw $v0, 0x28($a2) -/* 95C350 80241150 24020001 */ addiu $v0, $zero, 1 -/* 95C354 80241154 AE200074 */ sw $zero, 0x74($s1) -/* 95C358 80241158 AE220070 */ sw $v0, 0x70($s1) -/* 95C35C 8024115C 8FBF001C */ lw $ra, 0x1c($sp) -/* 95C360 80241160 8FB20018 */ lw $s2, 0x18($sp) -/* 95C364 80241164 8FB10014 */ lw $s1, 0x14($sp) -/* 95C368 80241168 8FB00010 */ lw $s0, 0x10($sp) -/* 95C36C 8024116C 03E00008 */ jr $ra -/* 95C370 80241170 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index ae4fce1569..c63bc65f81 100644 --- a/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/ver/us/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -137,7 +137,7 @@ glabel L80241358_95C558 glabel L80241368_95C568 /* 95C568 80241368 0280202D */ daddu $a0, $s4, $zero /* 95C56C 8024136C 0260282D */ daddu $a1, $s3, $zero -/* 95C570 80241370 0C0901CE */ jal func_80240738_95B938 +/* 95C570 80241370 0C0901CE */ jal dro_01_UnkFunc13 /* 95C574 80241374 02A0302D */ daddu $a2, $s5, $zero /* 95C578 80241378 08090512 */ j L80241448_95C648 /* 95C57C 8024137C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241380_95C580 glabel L80241390_95C590 /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero -/* 95C598 80241398 0C0902A8 */ jal func_80240AA0_95BCA0 +/* 95C598 80241398 0C0902A8 */ jal dro_01_UnkFunc14 /* 95C59C 8024139C 02A0302D */ daddu $a2, $s5, $zero /* 95C5A0 802413A0 08090512 */ j L80241448_95C648 /* 95C5A4 802413A4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L802413E8_95C5E8 glabel L802413F8_95C5F8 /* 95C5F8 802413F8 0280202D */ daddu $a0, $s4, $zero /* 95C5FC 802413FC 0260282D */ daddu $a1, $s3, $zero -/* 95C600 80241400 0C0903CB */ jal func_80240F2C_95C12C +/* 95C600 80241400 0C0903CB */ jal dro_01_UnkFunc15 /* 95C604 80241404 02A0302D */ daddu $a2, $s5, $zero /* 95C608 80241408 08090512 */ j L80241448_95C648 /* 95C60C 8024140C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241410_95C610 glabel L80241428_95C628 /* 95C628 80241428 0280202D */ daddu $a0, $s4, $zero /* 95C62C 8024142C 0260282D */ daddu $a1, $s3, $zero -/* 95C630 80241430 0C09042D */ jal func_802410B4_95C2B4 +/* 95C630 80241430 0C09042D */ jal dro_01_UnkFunc16 /* 95C634 80241434 02A0302D */ daddu $a2, $s5, $zero /* 95C638 80241438 08090512 */ j L80241448_95C648 /* 95C63C 8024143C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s deleted file mode 100644 index b4b4c7ff10..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240198_C9E0B8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240198_C9E0B8 -/* C9E0B8 80240198 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C9E0BC 8024019C AFB20038 */ sw $s2, 0x38($sp) -/* C9E0C0 802401A0 0080902D */ daddu $s2, $a0, $zero -/* C9E0C4 802401A4 AFBF0044 */ sw $ra, 0x44($sp) -/* C9E0C8 802401A8 AFB40040 */ sw $s4, 0x40($sp) -/* C9E0CC 802401AC AFB3003C */ sw $s3, 0x3c($sp) -/* C9E0D0 802401B0 AFB10034 */ sw $s1, 0x34($sp) -/* C9E0D4 802401B4 AFB00030 */ sw $s0, 0x30($sp) -/* C9E0D8 802401B8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C9E0DC 802401BC F7B40048 */ sdc1 $f20, 0x48($sp) -/* C9E0E0 802401C0 8E510148 */ lw $s1, 0x148($s2) -/* C9E0E4 802401C4 00A0982D */ daddu $s3, $a1, $zero -/* C9E0E8 802401C8 86240008 */ lh $a0, 8($s1) -/* C9E0EC 802401CC 0C00EABB */ jal get_npc_unsafe -/* C9E0F0 802401D0 00C0A02D */ daddu $s4, $a2, $zero -/* C9E0F4 802401D4 8E630014 */ lw $v1, 0x14($s3) -/* C9E0F8 802401D8 04600030 */ bltz $v1, .L8024029C -/* C9E0FC 802401DC 0040802D */ daddu $s0, $v0, $zero -/* C9E100 802401E0 8E420074 */ lw $v0, 0x74($s2) -/* C9E104 802401E4 1C40002C */ bgtz $v0, .L80240298 -/* C9E108 802401E8 2442FFFF */ addiu $v0, $v0, -1 -/* C9E10C 802401EC 0280202D */ daddu $a0, $s4, $zero -/* C9E110 802401F0 AE430074 */ sw $v1, 0x74($s2) -/* C9E114 802401F4 AFA00010 */ sw $zero, 0x10($sp) -/* C9E118 802401F8 8E66000C */ lw $a2, 0xc($s3) -/* C9E11C 802401FC 8E670010 */ lw $a3, 0x10($s3) -/* C9E120 80240200 0C01242D */ jal func_800490B4 -/* C9E124 80240204 0220282D */ daddu $a1, $s1, $zero -/* C9E128 80240208 10400021 */ beqz $v0, .L80240290 -/* C9E12C 8024020C 0000202D */ daddu $a0, $zero, $zero -/* C9E130 80240210 0200282D */ daddu $a1, $s0, $zero -/* C9E134 80240214 0000302D */ daddu $a2, $zero, $zero -/* C9E138 80240218 860300A8 */ lh $v1, 0xa8($s0) -/* C9E13C 8024021C 3C013F80 */ lui $at, 0x3f80 -/* C9E140 80240220 44810000 */ mtc1 $at, $f0 -/* C9E144 80240224 3C014000 */ lui $at, 0x4000 -/* C9E148 80240228 44811000 */ mtc1 $at, $f2 -/* C9E14C 8024022C 3C01C1A0 */ lui $at, 0xc1a0 -/* C9E150 80240230 44812000 */ mtc1 $at, $f4 -/* C9E154 80240234 2402000F */ addiu $v0, $zero, 0xf -/* C9E158 80240238 AFA2001C */ sw $v0, 0x1c($sp) -/* C9E15C 8024023C 44833000 */ mtc1 $v1, $f6 -/* C9E160 80240240 00000000 */ nop -/* C9E164 80240244 468031A0 */ cvt.s.w $f6, $f6 -/* C9E168 80240248 44073000 */ mfc1 $a3, $f6 -/* C9E16C 8024024C 27A20028 */ addiu $v0, $sp, 0x28 -/* C9E170 80240250 AFA20020 */ sw $v0, 0x20($sp) -/* C9E174 80240254 E7A00010 */ swc1 $f0, 0x10($sp) -/* C9E178 80240258 E7A20014 */ swc1 $f2, 0x14($sp) -/* C9E17C 8024025C 0C01BFA4 */ jal fx_emote -/* C9E180 80240260 E7A40018 */ swc1 $f4, 0x18($sp) -/* C9E184 80240264 0200202D */ daddu $a0, $s0, $zero -/* C9E188 80240268 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C9E18C 8024026C 0C012530 */ jal func_800494C0 -/* C9E190 80240270 3C060020 */ lui $a2, 0x20 -/* C9E194 80240274 8E220018 */ lw $v0, 0x18($s1) -/* C9E198 80240278 9442002A */ lhu $v0, 0x2a($v0) -/* C9E19C 8024027C 30420001 */ andi $v0, $v0, 1 -/* C9E1A0 80240280 14400064 */ bnez $v0, .L80240414 -/* C9E1A4 80240284 2402000A */ addiu $v0, $zero, 0xa -/* C9E1A8 80240288 08090105 */ j .L80240414 -/* C9E1AC 8024028C 2402000C */ addiu $v0, $zero, 0xc -.L80240290: -/* C9E1B0 80240290 8E420074 */ lw $v0, 0x74($s2) -/* C9E1B4 80240294 2442FFFF */ addiu $v0, $v0, -1 -.L80240298: -/* C9E1B8 80240298 AE420074 */ sw $v0, 0x74($s2) -.L8024029C: -/* C9E1BC 8024029C 8602008C */ lh $v0, 0x8c($s0) -/* C9E1C0 802402A0 1440005D */ bnez $v0, .L80240418 -/* C9E1C4 802402A4 00000000 */ nop -/* C9E1C8 802402A8 C6000018 */ lwc1 $f0, 0x18($s0) -/* C9E1CC 802402AC 3C014010 */ lui $at, 0x4010 -/* C9E1D0 802402B0 44811800 */ mtc1 $at, $f3 -/* C9E1D4 802402B4 44801000 */ mtc1 $zero, $f2 -/* C9E1D8 802402B8 46000021 */ cvt.d.s $f0, $f0 -/* C9E1DC 802402BC 4622003C */ c.lt.d $f0, $f2 -/* C9E1E0 802402C0 00000000 */ nop -/* C9E1E4 802402C4 45000003 */ bc1f .L802402D4 -/* C9E1E8 802402C8 0200202D */ daddu $a0, $s0, $zero -/* C9E1EC 802402CC 080900B6 */ j .L802402D8 -/* C9E1F0 802402D0 0000282D */ daddu $a1, $zero, $zero -.L802402D4: -/* C9E1F4 802402D4 24050001 */ addiu $a1, $zero, 1 -.L802402D8: -/* C9E1F8 802402D8 0C00F598 */ jal func_8003D660 -/* C9E1FC 802402DC 00000000 */ nop -/* C9E200 802402E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C9E204 802402E4 8E430078 */ lw $v1, 0x78($s2) -/* C9E208 802402E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C9E20C 802402EC 00031040 */ sll $v0, $v1, 1 -/* C9E210 802402F0 00431021 */ addu $v0, $v0, $v1 -/* C9E214 802402F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C9E218 802402F8 00021080 */ sll $v0, $v0, 2 -/* C9E21C 802402FC 00431021 */ addu $v0, $v0, $v1 -/* C9E220 80240300 C4560004 */ lwc1 $f22, 4($v0) -/* C9E224 80240304 4680B5A0 */ cvt.s.w $f22, $f22 -/* C9E228 80240308 C454000C */ lwc1 $f20, 0xc($v0) -/* C9E22C 8024030C 4680A520 */ cvt.s.w $f20, $f20 -/* C9E230 80240310 4406B000 */ mfc1 $a2, $f22 -/* C9E234 80240314 4407A000 */ mfc1 $a3, $f20 -/* C9E238 80240318 0C00A720 */ jal atan2 -/* C9E23C 8024031C 00000000 */ nop -/* C9E240 80240320 8E050018 */ lw $a1, 0x18($s0) -/* C9E244 80240324 44060000 */ mfc1 $a2, $f0 -/* C9E248 80240328 0200202D */ daddu $a0, $s0, $zero -/* C9E24C 8024032C 0C00EA95 */ jal npc_move_heading -/* C9E250 80240330 AE06000C */ sw $a2, 0xc($s0) -/* C9E254 80240334 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C9E258 80240338 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C9E25C 8024033C 4406B000 */ mfc1 $a2, $f22 -/* C9E260 80240340 4407A000 */ mfc1 $a3, $f20 -/* C9E264 80240344 0C00A7B5 */ jal dist2D -/* C9E268 80240348 00000000 */ nop -/* C9E26C 8024034C C6020018 */ lwc1 $f2, 0x18($s0) -/* C9E270 80240350 4602003E */ c.le.s $f0, $f2 -/* C9E274 80240354 00000000 */ nop -/* C9E278 80240358 4500002F */ bc1f .L80240418 -/* C9E27C 8024035C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C9E280 80240360 24020002 */ addiu $v0, $zero, 2 -/* C9E284 80240364 0C00A67F */ jal rand_int -/* C9E288 80240368 AE420070 */ sw $v0, 0x70($s2) -/* C9E28C 8024036C 3C035555 */ lui $v1, 0x5555 -/* C9E290 80240370 34635556 */ ori $v1, $v1, 0x5556 -/* C9E294 80240374 00430018 */ mult $v0, $v1 -/* C9E298 80240378 000227C3 */ sra $a0, $v0, 0x1f -/* C9E29C 8024037C 00004010 */ mfhi $t0 -/* C9E2A0 80240380 01042023 */ subu $a0, $t0, $a0 -/* C9E2A4 80240384 00041840 */ sll $v1, $a0, 1 -/* C9E2A8 80240388 00641821 */ addu $v1, $v1, $a0 -/* C9E2AC 8024038C 00431023 */ subu $v0, $v0, $v1 -/* C9E2B0 80240390 24430002 */ addiu $v1, $v0, 2 -/* C9E2B4 80240394 AE430074 */ sw $v1, 0x74($s2) -/* C9E2B8 80240398 8E62002C */ lw $v0, 0x2c($s3) -/* C9E2BC 8024039C 18400009 */ blez $v0, .L802403C4 -/* C9E2C0 802403A0 24020004 */ addiu $v0, $zero, 4 -/* C9E2C4 802403A4 8E620004 */ lw $v0, 4($s3) -/* C9E2C8 802403A8 18400006 */ blez $v0, .L802403C4 -/* C9E2CC 802403AC 24020004 */ addiu $v0, $zero, 4 -/* C9E2D0 802403B0 8E620008 */ lw $v0, 8($s3) -/* C9E2D4 802403B4 18400003 */ blez $v0, .L802403C4 -/* C9E2D8 802403B8 24020004 */ addiu $v0, $zero, 4 -/* C9E2DC 802403BC 14600002 */ bnez $v1, .L802403C8 -/* C9E2E0 802403C0 00000000 */ nop -.L802403C4: -/* C9E2E4 802403C4 AE420070 */ sw $v0, 0x70($s2) -.L802403C8: -/* C9E2E8 802403C8 0C00A67F */ jal rand_int -/* C9E2EC 802403CC 24042710 */ addiu $a0, $zero, 0x2710 -/* C9E2F0 802403D0 3C0351EB */ lui $v1, 0x51eb -/* C9E2F4 802403D4 3463851F */ ori $v1, $v1, 0x851f -/* C9E2F8 802403D8 00430018 */ mult $v0, $v1 -/* C9E2FC 802403DC 00021FC3 */ sra $v1, $v0, 0x1f -/* C9E300 802403E0 00004010 */ mfhi $t0 -/* C9E304 802403E4 00082143 */ sra $a0, $t0, 5 -/* C9E308 802403E8 00832023 */ subu $a0, $a0, $v1 -/* C9E30C 802403EC 00041840 */ sll $v1, $a0, 1 -/* C9E310 802403F0 00641821 */ addu $v1, $v1, $a0 -/* C9E314 802403F4 000318C0 */ sll $v1, $v1, 3 -/* C9E318 802403F8 00641821 */ addu $v1, $v1, $a0 -/* C9E31C 802403FC 00031880 */ sll $v1, $v1, 2 -/* C9E320 80240400 8E640004 */ lw $a0, 4($s3) -/* C9E324 80240404 00431023 */ subu $v0, $v0, $v1 -/* C9E328 80240408 0044102A */ slt $v0, $v0, $a0 -/* C9E32C 8024040C 10400002 */ beqz $v0, .L80240418 -/* C9E330 80240410 24020004 */ addiu $v0, $zero, 4 -.L80240414: -/* C9E334 80240414 AE420070 */ sw $v0, 0x70($s2) -.L80240418: -/* C9E338 80240418 8FBF0044 */ lw $ra, 0x44($sp) -/* C9E33C 8024041C 8FB40040 */ lw $s4, 0x40($sp) -/* C9E340 80240420 8FB3003C */ lw $s3, 0x3c($sp) -/* C9E344 80240424 8FB20038 */ lw $s2, 0x38($sp) -/* C9E348 80240428 8FB10034 */ lw $s1, 0x34($sp) -/* C9E34C 8024042C 8FB00030 */ lw $s0, 0x30($sp) -/* C9E350 80240430 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C9E354 80240434 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C9E358 80240438 03E00008 */ jr $ra -/* C9E35C 8024043C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s deleted file mode 100644 index 17f3ad979c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240500_C9E420.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_C9E420 -/* C9E420 80240500 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9E424 80240504 AFB40040 */ sw $s4, 0x40($sp) -/* C9E428 80240508 0080A02D */ daddu $s4, $a0, $zero -/* C9E42C 8024050C AFBF0044 */ sw $ra, 0x44($sp) -/* C9E430 80240510 AFB3003C */ sw $s3, 0x3c($sp) -/* C9E434 80240514 AFB20038 */ sw $s2, 0x38($sp) -/* C9E438 80240518 AFB10034 */ sw $s1, 0x34($sp) -/* C9E43C 8024051C AFB00030 */ sw $s0, 0x30($sp) -/* C9E440 80240520 8E910148 */ lw $s1, 0x148($s4) -/* C9E444 80240524 00A0902D */ daddu $s2, $a1, $zero -/* C9E448 80240528 86240008 */ lh $a0, 8($s1) -/* C9E44C 8024052C 0C00EABB */ jal get_npc_unsafe -/* C9E450 80240530 00C0982D */ daddu $s3, $a2, $zero -/* C9E454 80240534 8E430014 */ lw $v1, 0x14($s2) -/* C9E458 80240538 04600031 */ bltz $v1, .L80240600 -/* C9E45C 8024053C 0040802D */ daddu $s0, $v0, $zero -/* C9E460 80240540 0260202D */ daddu $a0, $s3, $zero -/* C9E464 80240544 AFA00010 */ sw $zero, 0x10($sp) -/* C9E468 80240548 8E460024 */ lw $a2, 0x24($s2) -/* C9E46C 8024054C 8E470028 */ lw $a3, 0x28($s2) -/* C9E470 80240550 0C01242D */ jal func_800490B4 -/* C9E474 80240554 0220282D */ daddu $a1, $s1, $zero -/* C9E478 80240558 10400029 */ beqz $v0, .L80240600 -/* C9E47C 8024055C 0000202D */ daddu $a0, $zero, $zero -/* C9E480 80240560 0200282D */ daddu $a1, $s0, $zero -/* C9E484 80240564 0000302D */ daddu $a2, $zero, $zero -/* C9E488 80240568 860300A8 */ lh $v1, 0xa8($s0) -/* C9E48C 8024056C 3C013F80 */ lui $at, 0x3f80 -/* C9E490 80240570 44810000 */ mtc1 $at, $f0 -/* C9E494 80240574 3C014000 */ lui $at, 0x4000 -/* C9E498 80240578 44811000 */ mtc1 $at, $f2 -/* C9E49C 8024057C 3C01C1A0 */ lui $at, 0xc1a0 -/* C9E4A0 80240580 44812000 */ mtc1 $at, $f4 -/* C9E4A4 80240584 2402000F */ addiu $v0, $zero, 0xf -/* C9E4A8 80240588 AFA2001C */ sw $v0, 0x1c($sp) -/* C9E4AC 8024058C 44833000 */ mtc1 $v1, $f6 -/* C9E4B0 80240590 00000000 */ nop -/* C9E4B4 80240594 468031A0 */ cvt.s.w $f6, $f6 -/* C9E4B8 80240598 44073000 */ mfc1 $a3, $f6 -/* C9E4BC 8024059C 27A20028 */ addiu $v0, $sp, 0x28 -/* C9E4C0 802405A0 AFA20020 */ sw $v0, 0x20($sp) -/* C9E4C4 802405A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C9E4C8 802405A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C9E4CC 802405AC 0C01BFA4 */ jal fx_emote -/* C9E4D0 802405B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C9E4D4 802405B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C9E4D8 802405B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C9E4DC 802405BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C9E4E0 802405C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C9E4E4 802405C4 8C460028 */ lw $a2, 0x28($v0) -/* C9E4E8 802405C8 0C00A720 */ jal atan2 -/* C9E4EC 802405CC 8C470030 */ lw $a3, 0x30($v0) -/* C9E4F0 802405D0 0200202D */ daddu $a0, $s0, $zero -/* C9E4F4 802405D4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C9E4F8 802405D8 3C060020 */ lui $a2, 0x20 -/* C9E4FC 802405DC 0C012530 */ jal func_800494C0 -/* C9E500 802405E0 E480000C */ swc1 $f0, 0xc($a0) -/* C9E504 802405E4 8E220018 */ lw $v0, 0x18($s1) -/* C9E508 802405E8 9442002A */ lhu $v0, 0x2a($v0) -/* C9E50C 802405EC 30420001 */ andi $v0, $v0, 1 -/* C9E510 802405F0 14400029 */ bnez $v0, .L80240698 -/* C9E514 802405F4 2402000A */ addiu $v0, $zero, 0xa -/* C9E518 802405F8 080901A6 */ j .L80240698 -/* C9E51C 802405FC 2402000C */ addiu $v0, $zero, 0xc -.L80240600: -/* C9E520 80240600 8602008C */ lh $v0, 0x8c($s0) -/* C9E524 80240604 14400025 */ bnez $v0, .L8024069C -/* C9E528 80240608 00000000 */ nop -/* C9E52C 8024060C 9602008E */ lhu $v0, 0x8e($s0) -/* C9E530 80240610 2442FFFF */ addiu $v0, $v0, -1 -/* C9E534 80240614 A602008E */ sh $v0, 0x8e($s0) -/* C9E538 80240618 00021400 */ sll $v0, $v0, 0x10 -/* C9E53C 8024061C 1440001F */ bnez $v0, .L8024069C -/* C9E540 80240620 00000000 */ nop -/* C9E544 80240624 8E820074 */ lw $v0, 0x74($s4) -/* C9E548 80240628 2442FFFF */ addiu $v0, $v0, -1 -/* C9E54C 8024062C 10400019 */ beqz $v0, .L80240694 -/* C9E550 80240630 AE820074 */ sw $v0, 0x74($s4) -/* C9E554 80240634 8E220018 */ lw $v0, 0x18($s1) -/* C9E558 80240638 9442002A */ lhu $v0, 0x2a($v0) -/* C9E55C 8024063C 30420010 */ andi $v0, $v0, 0x10 -/* C9E560 80240640 14400007 */ bnez $v0, .L80240660 -/* C9E564 80240644 00000000 */ nop -/* C9E568 80240648 C600000C */ lwc1 $f0, 0xc($s0) -/* C9E56C 8024064C 3C014334 */ lui $at, 0x4334 -/* C9E570 80240650 44816000 */ mtc1 $at, $f12 -/* C9E574 80240654 0C00A6C9 */ jal clamp_angle -/* C9E578 80240658 460C0300 */ add.s $f12, $f0, $f12 -/* C9E57C 8024065C E600000C */ swc1 $f0, 0xc($s0) -.L80240660: -/* C9E580 80240660 8E440008 */ lw $a0, 8($s2) -/* C9E584 80240664 000417C2 */ srl $v0, $a0, 0x1f -/* C9E588 80240668 00822021 */ addu $a0, $a0, $v0 -/* C9E58C 8024066C 00042043 */ sra $a0, $a0, 1 -/* C9E590 80240670 0C00A67F */ jal rand_int -/* C9E594 80240674 24840001 */ addiu $a0, $a0, 1 -/* C9E598 80240678 8E430008 */ lw $v1, 8($s2) -/* C9E59C 8024067C 000327C2 */ srl $a0, $v1, 0x1f -/* C9E5A0 80240680 00641821 */ addu $v1, $v1, $a0 -/* C9E5A4 80240684 00031843 */ sra $v1, $v1, 1 -/* C9E5A8 80240688 00621821 */ addu $v1, $v1, $v0 -/* C9E5AC 8024068C 080901A7 */ j .L8024069C -/* C9E5B0 80240690 A603008E */ sh $v1, 0x8e($s0) -.L80240694: -/* C9E5B4 80240694 24020004 */ addiu $v0, $zero, 4 -.L80240698: -/* C9E5B8 80240698 AE820070 */ sw $v0, 0x70($s4) -.L8024069C: -/* C9E5BC 8024069C 8FBF0044 */ lw $ra, 0x44($sp) -/* C9E5C0 802406A0 8FB40040 */ lw $s4, 0x40($sp) -/* C9E5C4 802406A4 8FB3003C */ lw $s3, 0x3c($sp) -/* C9E5C8 802406A8 8FB20038 */ lw $s2, 0x38($sp) -/* C9E5CC 802406AC 8FB10034 */ lw $s1, 0x34($sp) -/* C9E5D0 802406B0 8FB00030 */ lw $s0, 0x30($sp) -/* C9E5D4 802406B4 03E00008 */ jr $ra -/* C9E5D8 802406B8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s deleted file mode 100644 index 8e8764ff02..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024098C_C9E8AC -/* C9E8AC 8024098C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9E8B0 80240990 AFB3003C */ sw $s3, 0x3c($sp) -/* C9E8B4 80240994 0080982D */ daddu $s3, $a0, $zero -/* C9E8B8 80240998 AFBF0040 */ sw $ra, 0x40($sp) -/* C9E8BC 8024099C AFB20038 */ sw $s2, 0x38($sp) -/* C9E8C0 802409A0 AFB10034 */ sw $s1, 0x34($sp) -/* C9E8C4 802409A4 AFB00030 */ sw $s0, 0x30($sp) -/* C9E8C8 802409A8 8E720148 */ lw $s2, 0x148($s3) -/* C9E8CC 802409AC 00A0882D */ daddu $s1, $a1, $zero -/* C9E8D0 802409B0 86440008 */ lh $a0, 8($s2) -/* C9E8D4 802409B4 0C00EABB */ jal get_npc_unsafe -/* C9E8D8 802409B8 00C0802D */ daddu $s0, $a2, $zero -/* C9E8DC 802409BC 0200202D */ daddu $a0, $s0, $zero -/* C9E8E0 802409C0 0240282D */ daddu $a1, $s2, $zero -/* C9E8E4 802409C4 24030001 */ addiu $v1, $zero, 1 -/* C9E8E8 802409C8 AFA30010 */ sw $v1, 0x10($sp) -/* C9E8EC 802409CC 8E260024 */ lw $a2, 0x24($s1) -/* C9E8F0 802409D0 8E270028 */ lw $a3, 0x28($s1) -/* C9E8F4 802409D4 0C01242D */ jal func_800490B4 -/* C9E8F8 802409D8 0040802D */ daddu $s0, $v0, $zero -/* C9E8FC 802409DC 1440001E */ bnez $v0, .L80240A58 -/* C9E900 802409E0 0200202D */ daddu $a0, $s0, $zero -/* C9E904 802409E4 24040002 */ addiu $a0, $zero, 2 -/* C9E908 802409E8 0200282D */ daddu $a1, $s0, $zero -/* C9E90C 802409EC 0000302D */ daddu $a2, $zero, $zero -/* C9E910 802409F0 860300A8 */ lh $v1, 0xa8($s0) -/* C9E914 802409F4 3C013F80 */ lui $at, 0x3f80 -/* C9E918 802409F8 44810000 */ mtc1 $at, $f0 -/* C9E91C 802409FC 3C014000 */ lui $at, 0x4000 -/* C9E920 80240A00 44811000 */ mtc1 $at, $f2 -/* C9E924 80240A04 3C01C1A0 */ lui $at, 0xc1a0 -/* C9E928 80240A08 44812000 */ mtc1 $at, $f4 -/* C9E92C 80240A0C 2402000F */ addiu $v0, $zero, 0xf -/* C9E930 80240A10 AFA2001C */ sw $v0, 0x1c($sp) -/* C9E934 80240A14 44833000 */ mtc1 $v1, $f6 -/* C9E938 80240A18 00000000 */ nop -/* C9E93C 80240A1C 468031A0 */ cvt.s.w $f6, $f6 -/* C9E940 80240A20 44073000 */ mfc1 $a3, $f6 -/* C9E944 80240A24 27A20028 */ addiu $v0, $sp, 0x28 -/* C9E948 80240A28 AFA20020 */ sw $v0, 0x20($sp) -/* C9E94C 80240A2C E7A00010 */ swc1 $f0, 0x10($sp) -/* C9E950 80240A30 E7A20014 */ swc1 $f2, 0x14($sp) -/* C9E954 80240A34 0C01BFA4 */ jal fx_emote -/* C9E958 80240A38 E7A40018 */ swc1 $f4, 0x18($sp) -/* C9E95C 80240A3C 8E4200CC */ lw $v0, 0xcc($s2) -/* C9E960 80240A40 8C430000 */ lw $v1, ($v0) -/* C9E964 80240A44 24020019 */ addiu $v0, $zero, 0x19 -/* C9E968 80240A48 A602008E */ sh $v0, 0x8e($s0) -/* C9E96C 80240A4C 2402000E */ addiu $v0, $zero, 0xe -/* C9E970 80240A50 080902A3 */ j .L80240A8C -/* C9E974 80240A54 AE030028 */ sw $v1, 0x28($s0) -.L80240A58: -/* C9E978 80240A58 0C00F598 */ jal func_8003D660 -/* C9E97C 80240A5C 24050001 */ addiu $a1, $zero, 1 -/* C9E980 80240A60 8E050018 */ lw $a1, 0x18($s0) -/* C9E984 80240A64 8E06000C */ lw $a2, 0xc($s0) -/* C9E988 80240A68 0C00EA95 */ jal npc_move_heading -/* C9E98C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* C9E990 80240A70 8602008E */ lh $v0, 0x8e($s0) -/* C9E994 80240A74 9603008E */ lhu $v1, 0x8e($s0) -/* C9E998 80240A78 18400003 */ blez $v0, .L80240A88 -/* C9E99C 80240A7C 2462FFFF */ addiu $v0, $v1, -1 -/* C9E9A0 80240A80 080902A4 */ j .L80240A90 -/* C9E9A4 80240A84 A602008E */ sh $v0, 0x8e($s0) -.L80240A88: -/* C9E9A8 80240A88 2402000C */ addiu $v0, $zero, 0xc -.L80240A8C: -/* C9E9AC 80240A8C AE620070 */ sw $v0, 0x70($s3) -.L80240A90: -/* C9E9B0 80240A90 8FBF0040 */ lw $ra, 0x40($sp) -/* C9E9B4 80240A94 8FB3003C */ lw $s3, 0x3c($sp) -/* C9E9B8 80240A98 8FB20038 */ lw $s2, 0x38($sp) -/* C9E9BC 80240A9C 8FB10034 */ lw $s1, 0x34($sp) -/* C9E9C0 80240AA0 8FB00030 */ lw $s0, 0x30($sp) -/* C9E9C4 80240AA4 03E00008 */ jr $ra -/* C9E9C8 80240AA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s deleted file mode 100644 index 6a323fdfd9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240B14_C9EA34.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B14_C9EA34 -/* C9EA34 80240B14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C9EA38 80240B18 AFB10014 */ sw $s1, 0x14($sp) -/* C9EA3C 80240B1C 0080882D */ daddu $s1, $a0, $zero -/* C9EA40 80240B20 AFBF001C */ sw $ra, 0x1c($sp) -/* C9EA44 80240B24 AFB20018 */ sw $s2, 0x18($sp) -/* C9EA48 80240B28 AFB00010 */ sw $s0, 0x10($sp) -/* C9EA4C 80240B2C 8E300148 */ lw $s0, 0x148($s1) -/* C9EA50 80240B30 86040008 */ lh $a0, 8($s0) -/* C9EA54 80240B34 0C00EABB */ jal get_npc_unsafe -/* C9EA58 80240B38 00A0902D */ daddu $s2, $a1, $zero -/* C9EA5C 80240B3C 8E0300D0 */ lw $v1, 0xd0($s0) -/* C9EA60 80240B40 8E240078 */ lw $a0, 0x78($s1) -/* C9EA64 80240B44 8C630000 */ lw $v1, ($v1) -/* C9EA68 80240B48 0083182A */ slt $v1, $a0, $v1 -/* C9EA6C 80240B4C 10600013 */ beqz $v1, .L80240B9C -/* C9EA70 80240B50 0040302D */ daddu $a2, $v0, $zero -/* C9EA74 80240B54 00041040 */ sll $v0, $a0, 1 -/* C9EA78 80240B58 00441021 */ addu $v0, $v0, $a0 -/* C9EA7C 80240B5C 00022880 */ sll $a1, $v0, 2 -.L80240B60: -/* C9EA80 80240B60 8E0300D0 */ lw $v1, 0xd0($s0) -/* C9EA84 80240B64 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C9EA88 80240B68 00A31021 */ addu $v0, $a1, $v1 -/* C9EA8C 80240B6C C4400008 */ lwc1 $f0, 8($v0) -/* C9EA90 80240B70 46800020 */ cvt.s.w $f0, $f0 -/* C9EA94 80240B74 4602003E */ c.le.s $f0, $f2 -/* C9EA98 80240B78 00000000 */ nop -/* C9EA9C 80240B7C 45020003 */ bc1fl .L80240B8C -/* C9EAA0 80240B80 24840001 */ addiu $a0, $a0, 1 -/* C9EAA4 80240B84 080902E7 */ j .L80240B9C -/* C9EAA8 80240B88 AE240078 */ sw $a0, 0x78($s1) -.L80240B8C: -/* C9EAAC 80240B8C 8C620000 */ lw $v0, ($v1) -/* C9EAB0 80240B90 0082102A */ slt $v0, $a0, $v0 -/* C9EAB4 80240B94 1440FFF2 */ bnez $v0, .L80240B60 -/* C9EAB8 80240B98 24A5000C */ addiu $a1, $a1, 0xc -.L80240B9C: -/* C9EABC 80240B9C C6400000 */ lwc1 $f0, ($s2) -/* C9EAC0 80240BA0 E4C00018 */ swc1 $f0, 0x18($a2) -/* C9EAC4 80240BA4 8E0200CC */ lw $v0, 0xcc($s0) -/* C9EAC8 80240BA8 8C420004 */ lw $v0, 4($v0) -/* C9EACC 80240BAC ACC20028 */ sw $v0, 0x28($a2) -/* C9EAD0 80240BB0 24020001 */ addiu $v0, $zero, 1 -/* C9EAD4 80240BB4 AE200074 */ sw $zero, 0x74($s1) -/* C9EAD8 80240BB8 AE220070 */ sw $v0, 0x70($s1) -/* C9EADC 80240BBC 8FBF001C */ lw $ra, 0x1c($sp) -/* C9EAE0 80240BC0 8FB20018 */ lw $s2, 0x18($sp) -/* C9EAE4 80240BC4 8FB10014 */ lw $s1, 0x14($sp) -/* C9EAE8 80240BC8 8FB00010 */ lw $s0, 0x10($sp) -/* C9EAEC 80240BCC 03E00008 */ jr $ra -/* C9EAF0 80240BD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 766e68e15c..3d30b852b1 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -137,7 +137,7 @@ glabel L80240DB8_C9ECD8 glabel L80240DC8_C9ECE8 /* C9ECE8 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C9ECEC 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C9ECF0 80240DD0 0C090066 */ jal func_80240198_C9E0B8 +/* C9ECF0 80240DD0 0C090066 */ jal flo_00_UnkFunc13 /* C9ECF4 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C9ECF8 80240DD8 080903AA */ j L80240EA8_C9EDC8 /* C9ECFC 80240DDC 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80240DE0_C9ED00 glabel L80240DF0_C9ED10 /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C9ED18 80240DF8 0C090140 */ jal func_80240500_C9E420 +/* C9ED18 80240DF8 0C090140 */ jal flo_00_UnkFunc14 /* C9ED1C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C9ED20 80240E00 080903AA */ j L80240EA8_C9EDC8 /* C9ED24 80240E04 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80240E48_C9ED68 glabel L80240E58_C9ED78 /* C9ED78 80240E58 0280202D */ daddu $a0, $s4, $zero /* C9ED7C 80240E5C 0260282D */ daddu $a1, $s3, $zero -/* C9ED80 80240E60 0C090263 */ jal func_8024098C_C9E8AC +/* C9ED80 80240E60 0C090263 */ jal flo_00_UnkFunc15 /* C9ED84 80240E64 02A0302D */ daddu $a2, $s5, $zero /* C9ED88 80240E68 080903AA */ j L80240EA8_C9EDC8 /* C9ED8C 80240E6C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80240E70_C9ED90 glabel L80240E88_C9EDA8 /* C9EDA8 80240E88 0280202D */ daddu $a0, $s4, $zero /* C9EDAC 80240E8C 0260282D */ daddu $a1, $s3, $zero -/* C9EDB0 80240E90 0C0902C5 */ jal func_80240B14_C9EA34 +/* C9EDB0 80240E90 0C0902C5 */ jal flo_00_UnkFunc16 /* C9EDB4 80240E94 02A0302D */ daddu $a2, $s5, $zero /* C9EDB8 80240E98 080903AA */ j L80240EA8_C9EDC8 /* C9EDBC 80240E9C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024001C_CAED5C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024001C_CAED5C.s deleted file mode 100644 index 40c7f36dd7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_8024001C_CAED5C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_CAED5C -/* CAED5C 8024001C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* CAED60 80240020 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* CAED64 80240024 8C430000 */ lw $v1, ($v0) -/* CAED68 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* CAED6C 8024002C 00641824 */ and $v1, $v1, $a0 -/* CAED70 80240030 AC430000 */ sw $v1, ($v0) -/* CAED74 80240034 03E00008 */ jr $ra -/* CAED78 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240068_CAEDA8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240068_CAEDA8.s deleted file mode 100644 index 8304598e7d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240068_CAEDA8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_CAEDA8 -/* CAEDA8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAEDAC 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* CAEDB0 80240070 0080802D */ daddu $s0, $a0, $zero -/* CAEDB4 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* CAEDB8 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* CAEDBC 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* CAEDC0 80240080 8E250000 */ lw $a1, ($s1) -/* CAEDC4 80240084 0C0B1EAF */ jal get_variable -/* CAEDC8 80240088 26310004 */ addiu $s1, $s1, 4 -/* CAEDCC 8024008C 0200202D */ daddu $a0, $s0, $zero -/* CAEDD0 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* CAEDD4 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* CAEDD8 80240098 000210C0 */ sll $v0, $v0, 3 -/* CAEDDC 8024009C 00431021 */ addu $v0, $v0, $v1 -/* CAEDE0 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* CAEDE4 802400A4 8E250000 */ lw $a1, ($s1) -/* CAEDE8 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* CAEDEC 802400AC A0460015 */ sb $a2, 0x15($v0) -/* CAEDF0 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* CAEDF4 802400B4 0C0B2026 */ jal set_variable -/* CAEDF8 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* CAEDFC 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* CAEE00 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* CAEE04 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* CAEE08 802400C8 24020002 */ addiu $v0, $zero, 2 -/* CAEE0C 802400CC 03E00008 */ jr $ra -/* CAEE10 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s deleted file mode 100644 index 1eba109901..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_CAF188 -/* CAF188 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* CAF18C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* CAF190 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CAF194 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* CAF198 80240458 00021100 */ sll $v0, $v0, 4 -/* CAF19C 8024045C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* CAF1A0 80240460 00822021 */ addu $a0, $a0, $v0 -/* CAF1A4 80240464 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* CAF1A8 80240468 0C0496CF */ jal set_message_string -/* CAF1AC 8024046C 0000282D */ daddu $a1, $zero, $zero -/* CAF1B0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* CAF1B4 80240474 24020002 */ addiu $v0, $zero, 2 -/* CAF1B8 80240478 03E00008 */ jr $ra -/* CAF1BC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240480_CAF1C0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240480_CAF1C0.s deleted file mode 100644 index a0dab30d31..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240480_CAF1C0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_CAF1C0 -/* CAF1C0 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CAF1C4 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* CAF1C8 80240488 0080882D */ daddu $s1, $a0, $zero -/* CAF1CC 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* CAF1D0 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* CAF1D4 80240494 8E30000C */ lw $s0, 0xc($s1) -/* CAF1D8 80240498 8E050000 */ lw $a1, ($s0) -/* CAF1DC 8024049C 0C0B1EAF */ jal get_variable -/* CAF1E0 802404A0 26100004 */ addiu $s0, $s0, 4 -/* CAF1E4 802404A4 0C04417A */ jal get_entity_by_index -/* CAF1E8 802404A8 0040202D */ daddu $a0, $v0, $zero -/* CAF1EC 802404AC 8E100000 */ lw $s0, ($s0) -/* CAF1F0 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* CAF1F4 802404B4 3C014148 */ lui $at, 0x4148 -/* CAF1F8 802404B8 44810000 */ mtc1 $at, $f0 -/* CAF1FC 802404BC 3C013F33 */ lui $at, 0x3f33 -/* CAF200 802404C0 34213333 */ ori $at, $at, 0x3333 -/* CAF204 802404C4 44811000 */ mtc1 $at, $f2 -/* CAF208 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* CAF20C 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* CAF210 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* CAF214 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* CAF218 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* CAF21C 802404DC 44062000 */ mfc1 $a2, $f4 -/* CAF220 802404E0 0C01C5D4 */ jal func_80071750 -/* CAF224 802404E4 0000202D */ daddu $a0, $zero, $zero -/* CAF228 802404E8 0220202D */ daddu $a0, $s1, $zero -/* CAF22C 802404EC 0200282D */ daddu $a1, $s0, $zero -/* CAF230 802404F0 0C0B2026 */ jal set_variable -/* CAF234 802404F4 0040302D */ daddu $a2, $v0, $zero -/* CAF238 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* CAF23C 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* CAF240 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* CAF244 80240504 24020002 */ addiu $v0, $zero, 2 -/* CAF248 80240508 03E00008 */ jr $ra -/* CAF24C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240544_CAF284.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240544_CAF284.s deleted file mode 100644 index 31eb6ae686..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240544_CAF284.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_CAF284 -/* CAF284 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF288 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* CAF28C 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* CAF290 80240550 0C0B1EAF */ jal get_variable -/* CAF294 80240554 8C450000 */ lw $a1, ($v0) -/* CAF298 80240558 0C04417A */ jal get_entity_by_index -/* CAF29C 8024055C 0040202D */ daddu $a0, $v0, $zero -/* CAF2A0 80240560 3C013F80 */ lui $at, 0x3f80 -/* CAF2A4 80240564 44810000 */ mtc1 $at, $f0 -/* CAF2A8 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* CAF2AC 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* CAF2B0 80240570 3C014148 */ lui $at, 0x4148 -/* CAF2B4 80240574 44810000 */ mtc1 $at, $f0 -/* CAF2B8 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* CAF2BC 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* CAF2C0 80240580 46001080 */ add.s $f2, $f2, $f0 -/* CAF2C4 80240584 8C450048 */ lw $a1, 0x48($v0) -/* CAF2C8 80240588 8C470050 */ lw $a3, 0x50($v0) -/* CAF2CC 8024058C 44061000 */ mfc1 $a2, $f2 -/* CAF2D0 80240590 0C01C2EC */ jal func_80070BB0 -/* CAF2D4 80240594 24040004 */ addiu $a0, $zero, 4 -/* CAF2D8 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* CAF2DC 8024059C 24020002 */ addiu $v0, $zero, 2 -/* CAF2E0 802405A0 03E00008 */ jr $ra -/* CAF2E4 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802405A8_CAF2E8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802405A8_CAF2E8.s deleted file mode 100644 index 7bfbdda10b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802405A8_CAF2E8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_CAF2E8 -/* CAF2E8 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF2EC 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* CAF2F0 802405B0 0C00EAD2 */ jal get_npc_safe -/* CAF2F4 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* CAF2F8 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* CAF2FC 802405BC 3C014148 */ lui $at, 0x4148 -/* CAF300 802405C0 44811000 */ mtc1 $at, $f2 -/* CAF304 802405C4 3C013F80 */ lui $at, 0x3f80 -/* CAF308 802405C8 44810000 */ mtc1 $at, $f0 -/* CAF30C 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* CAF310 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* CAF314 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* CAF318 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CAF31C 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* CAF320 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* CAF324 802405E4 44062000 */ mfc1 $a2, $f4 -/* CAF328 802405E8 0C01C2EC */ jal func_80070BB0 -/* CAF32C 802405EC 24040009 */ addiu $a0, $zero, 9 -/* CAF330 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* CAF334 802405F4 24020002 */ addiu $v0, $zero, 2 -/* CAF338 802405F8 03E00008 */ jr $ra -/* CAF33C 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s b/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s deleted file mode 100644 index 7c4051eefd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240B38_CAF878.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_CAF878 -/* CAF878 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CAF87C 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* CAF880 80240B40 0080882D */ daddu $s1, $a0, $zero -/* CAF884 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* CAF888 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* CAF88C 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* CAF890 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* CAF894 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* CAF898 80240B58 0000902D */ daddu $s2, $zero, $zero -/* CAF89C 80240B5C 8E050000 */ lw $a1, ($s0) -/* CAF8A0 80240B60 0C0B1EAF */ jal get_variable -/* CAF8A4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* CAF8A8 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* CAF8AC 80240B6C 8E050000 */ lw $a1, ($s0) -/* CAF8B0 80240B70 0C0B1EAF */ jal get_variable -/* CAF8B4 80240B74 0220202D */ daddu $a0, $s1, $zero -/* CAF8B8 80240B78 0240202D */ daddu $a0, $s2, $zero -/* CAF8BC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* CAF8C0 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* CAF8C4 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* CAF8C8 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* CAF8CC 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* CAF8D0 80240B90 0C04DF84 */ jal set_transition_stencil_color -/* CAF8D4 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* CAF8D8 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* CAF8DC 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* CAF8E0 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* CAF8E4 80240BA4 28620002 */ slti $v0, $v1, 2 -/* CAF8E8 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* CAF8EC 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* CAF8F0 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* CAF8F4 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* CAF8F8 80240BB8 08090312 */ j .L80240C48 -/* CAF8FC 80240BBC 00000000 */ nop -.L80240BC0: -/* CAF900 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* CAF904 80240BC4 00000000 */ nop -/* CAF908 80240BC8 08090312 */ j .L80240C48 -/* CAF90C 80240BCC 00000000 */ nop -.L80240BD0: -/* CAF910 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* CAF914 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* CAF918 80240BD8 00000000 */ nop -/* CAF91C 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* CAF920 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* CAF924 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* CAF928 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* CAF92C 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* CAF930 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* CAF934 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* CAF938 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* CAF93C 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* CAF940 80240C00 08090312 */ j .L80240C48 -/* CAF944 80240C04 00000000 */ nop -.L80240C08: -/* CAF948 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* CAF94C 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* CAF950 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* CAF954 80240C14 28420002 */ slti $v0, $v0, 2 -/* CAF958 80240C18 1440000B */ bnez $v0, .L80240C48 -/* CAF95C 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* CAF960 80240C20 08090312 */ j .L80240C48 -/* CAF964 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* CAF968 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* CAF96C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* CAF970 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* CAF974 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* CAF978 80240C38 00621023 */ subu $v0, $v1, $v0 -/* CAF97C 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* CAF980 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* CAF984 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* CAF988 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* CAF98C 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* CAF990 80240C50 44050000 */ mfc1 $a1, $f0 -/* CAF994 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* CAF998 80240C58 24040001 */ addiu $a0, $zero, 1 -/* CAF99C 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* CAF9A0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* CAF9A4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* CAF9A8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* CAF9AC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* CAF9B0 80240C70 03E00008 */ jr $ra -/* CAF9B4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s deleted file mode 100644 index ed66dac7c2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240BB8_CB5BB8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_CB5BB8 -/* CB5BB8 80240BB8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CB5BBC 80240BBC AFB3004C */ sw $s3, 0x4c($sp) -/* CB5BC0 80240BC0 0080982D */ daddu $s3, $a0, $zero -/* CB5BC4 80240BC4 AFBF0054 */ sw $ra, 0x54($sp) -/* CB5BC8 80240BC8 AFB40050 */ sw $s4, 0x50($sp) -/* CB5BCC 80240BCC AFB20048 */ sw $s2, 0x48($sp) -/* CB5BD0 80240BD0 AFB10044 */ sw $s1, 0x44($sp) -/* CB5BD4 80240BD4 AFB00040 */ sw $s0, 0x40($sp) -/* CB5BD8 80240BD8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CB5BDC 80240BDC F7B80068 */ sdc1 $f24, 0x68($sp) -/* CB5BE0 80240BE0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CB5BE4 80240BE4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CB5BE8 80240BE8 8E710148 */ lw $s1, 0x148($s3) -/* CB5BEC 80240BEC 00A0902D */ daddu $s2, $a1, $zero -/* CB5BF0 80240BF0 86240008 */ lh $a0, 8($s1) -/* CB5BF4 80240BF4 0C00EABB */ jal get_npc_unsafe -/* CB5BF8 80240BF8 00C0A02D */ daddu $s4, $a2, $zero -/* CB5BFC 80240BFC 0040802D */ daddu $s0, $v0, $zero -/* CB5C00 80240C00 C6200078 */ lwc1 $f0, 0x78($s1) -/* CB5C04 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* CB5C08 80240C08 46000021 */ cvt.d.s $f0, $f0 -/* CB5C0C 80240C0C 3C014059 */ lui $at, 0x4059 -/* CB5C10 80240C10 44811800 */ mtc1 $at, $f3 -/* CB5C14 80240C14 44801000 */ mtc1 $zero, $f2 -/* CB5C18 80240C18 8602008E */ lh $v0, 0x8e($s0) -/* CB5C1C 80240C1C 9603008E */ lhu $v1, 0x8e($s0) -/* CB5C20 80240C20 46220003 */ div.d $f0, $f0, $f2 -/* CB5C24 80240C24 46200620 */ cvt.s.d $f24, $f0 -/* CB5C28 80240C28 C6200088 */ lwc1 $f0, 0x88($s1) -/* CB5C2C 80240C2C 46800020 */ cvt.s.w $f0, $f0 -/* CB5C30 80240C30 46000021 */ cvt.d.s $f0, $f0 -/* CB5C34 80240C34 46220003 */ div.d $f0, $f0, $f2 -/* CB5C38 80240C38 46200020 */ cvt.s.d $f0, $f0 -/* CB5C3C 80240C3C 18400003 */ blez $v0, .L80240C4C -/* CB5C40 80240C40 4600C680 */ add.s $f26, $f24, $f0 -/* CB5C44 80240C44 2462FFFF */ addiu $v0, $v1, -1 -/* CB5C48 80240C48 A602008E */ sh $v0, 0x8e($s0) -.L80240C4C: -/* CB5C4C 80240C4C 8E220070 */ lw $v0, 0x70($s1) -/* CB5C50 80240C50 18400034 */ blez $v0, .L80240D24 -/* CB5C54 80240C54 00000000 */ nop -/* CB5C58 80240C58 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CB5C5C 80240C5C 46806320 */ cvt.s.w $f12, $f12 -/* CB5C60 80240C60 44820000 */ mtc1 $v0, $f0 -/* CB5C64 80240C64 00000000 */ nop -/* CB5C68 80240C68 46800020 */ cvt.s.w $f0, $f0 -/* CB5C6C 80240C6C 46000021 */ cvt.d.s $f0, $f0 -/* CB5C70 80240C70 46220003 */ div.d $f0, $f0, $f2 -/* CB5C74 80240C74 0C00A8BB */ jal sin_deg -/* CB5C78 80240C78 462005A0 */ cvt.s.d $f22, $f0 -/* CB5C7C 80240C7C 8E020000 */ lw $v0, ($s0) -/* CB5C80 80240C80 30420008 */ andi $v0, $v0, 8 -/* CB5C84 80240C84 10400003 */ beqz $v0, .L80240C94 -/* CB5C88 80240C88 46000506 */ mov.s $f20, $f0 -/* CB5C8C 80240C8C 08090335 */ j .L80240CD4 -/* CB5C90 80240C90 0000102D */ daddu $v0, $zero, $zero -.L80240C94: -/* CB5C94 80240C94 27A50028 */ addiu $a1, $sp, 0x28 -/* CB5C98 80240C98 27A6002C */ addiu $a2, $sp, 0x2c -/* CB5C9C 80240C9C C6000038 */ lwc1 $f0, 0x38($s0) -/* CB5CA0 80240CA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB5CA4 80240CA4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CB5CA8 80240CA8 3C01447A */ lui $at, 0x447a -/* CB5CAC 80240CAC 44813000 */ mtc1 $at, $f6 -/* CB5CB0 80240CB0 27A20034 */ addiu $v0, $sp, 0x34 -/* CB5CB4 80240CB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CB5CB8 80240CB8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CB5CBC 80240CBC E7A40030 */ swc1 $f4, 0x30($sp) -/* CB5CC0 80240CC0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CB5CC4 80240CC4 AFA20010 */ sw $v0, 0x10($sp) -/* CB5CC8 80240CC8 8E040080 */ lw $a0, 0x80($s0) -/* CB5CCC 80240CCC 0C0372DF */ jal func_800DCB7C -/* CB5CD0 80240CD0 27A70030 */ addiu $a3, $sp, 0x30 -.L80240CD4: -/* CB5CD4 80240CD4 10400007 */ beqz $v0, .L80240CF4 -/* CB5CD8 80240CD8 00000000 */ nop -/* CB5CDC 80240CDC 4616A082 */ mul.s $f2, $f20, $f22 -/* CB5CE0 80240CE0 00000000 */ nop -/* CB5CE4 80240CE4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CB5CE8 80240CE8 46180000 */ add.s $f0, $f0, $f24 -/* CB5CEC 80240CEC 08090340 */ j .L80240D00 -/* CB5CF0 80240CF0 46020000 */ add.s $f0, $f0, $f2 -.L80240CF4: -/* CB5CF4 80240CF4 4616A002 */ mul.s $f0, $f20, $f22 -/* CB5CF8 80240CF8 00000000 */ nop -/* CB5CFC 80240CFC 4600D000 */ add.s $f0, $f26, $f0 -.L80240D00: -/* CB5D00 80240D00 E600003C */ swc1 $f0, 0x3c($s0) -/* CB5D04 80240D04 8E220074 */ lw $v0, 0x74($s1) -/* CB5D08 80240D08 2442000A */ addiu $v0, $v0, 0xa -/* CB5D0C 80240D0C 44826000 */ mtc1 $v0, $f12 -/* CB5D10 80240D10 00000000 */ nop -/* CB5D14 80240D14 0C00A6C9 */ jal clamp_angle -/* CB5D18 80240D18 46806320 */ cvt.s.w $f12, $f12 -/* CB5D1C 80240D1C 4600020D */ trunc.w.s $f8, $f0 -/* CB5D20 80240D20 E6280074 */ swc1 $f8, 0x74($s1) -.L80240D24: -/* CB5D24 80240D24 8E220090 */ lw $v0, 0x90($s1) -/* CB5D28 80240D28 1C400040 */ bgtz $v0, .L80240E2C -/* CB5D2C 80240D2C 2442FFFF */ addiu $v0, $v0, -1 -/* CB5D30 80240D30 860200A8 */ lh $v0, 0xa8($s0) -/* CB5D34 80240D34 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB5D38 80240D38 44821000 */ mtc1 $v0, $f2 -/* CB5D3C 80240D3C 00000000 */ nop -/* CB5D40 80240D40 468010A0 */ cvt.s.w $f2, $f2 -/* CB5D44 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB5D48 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB5D4C 80240D4C 46020000 */ add.s $f0, $f0, $f2 -/* CB5D50 80240D50 3C014024 */ lui $at, 0x4024 -/* CB5D54 80240D54 44812800 */ mtc1 $at, $f5 -/* CB5D58 80240D58 44802000 */ mtc1 $zero, $f4 -/* CB5D5C 80240D5C C442002C */ lwc1 $f2, 0x2c($v0) -/* CB5D60 80240D60 46000021 */ cvt.d.s $f0, $f0 -/* CB5D64 80240D64 46240000 */ add.d $f0, $f0, $f4 -/* CB5D68 80240D68 460010A1 */ cvt.d.s $f2, $f2 -/* CB5D6C 80240D6C 4620103C */ c.lt.d $f2, $f0 -/* CB5D70 80240D70 00000000 */ nop -/* CB5D74 80240D74 4500002E */ bc1f .L80240E30 -/* CB5D78 80240D78 0280202D */ daddu $a0, $s4, $zero -/* CB5D7C 80240D7C 24020001 */ addiu $v0, $zero, 1 -/* CB5D80 80240D80 AFA20010 */ sw $v0, 0x10($sp) -/* CB5D84 80240D84 8E460024 */ lw $a2, 0x24($s2) -/* CB5D88 80240D88 8E470028 */ lw $a3, 0x28($s2) -/* CB5D8C 80240D8C 0C01242D */ jal func_800490B4 -/* CB5D90 80240D90 0220282D */ daddu $a1, $s1, $zero -/* CB5D94 80240D94 10400026 */ beqz $v0, .L80240E30 -/* CB5D98 80240D98 0000202D */ daddu $a0, $zero, $zero -/* CB5D9C 80240D9C 0200282D */ daddu $a1, $s0, $zero -/* CB5DA0 80240DA0 0000302D */ daddu $a2, $zero, $zero -/* CB5DA4 80240DA4 2412000C */ addiu $s2, $zero, 0xc -/* CB5DA8 80240DA8 860300A8 */ lh $v1, 0xa8($s0) -/* CB5DAC 80240DAC 3C013F80 */ lui $at, 0x3f80 -/* CB5DB0 80240DB0 44810000 */ mtc1 $at, $f0 -/* CB5DB4 80240DB4 3C014000 */ lui $at, 0x4000 -/* CB5DB8 80240DB8 44811000 */ mtc1 $at, $f2 -/* CB5DBC 80240DBC 3C01C1A0 */ lui $at, 0xc1a0 -/* CB5DC0 80240DC0 44812000 */ mtc1 $at, $f4 -/* CB5DC4 80240DC4 44834000 */ mtc1 $v1, $f8 -/* CB5DC8 80240DC8 00000000 */ nop -/* CB5DCC 80240DCC 46804220 */ cvt.s.w $f8, $f8 -/* CB5DD0 80240DD0 44074000 */ mfc1 $a3, $f8 -/* CB5DD4 80240DD4 27A20038 */ addiu $v0, $sp, 0x38 -/* CB5DD8 80240DD8 AFB2001C */ sw $s2, 0x1c($sp) -/* CB5DDC 80240DDC AFA20020 */ sw $v0, 0x20($sp) -/* CB5DE0 80240DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CB5DE4 80240DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CB5DE8 80240DE8 0C01BFA4 */ jal fx_emote -/* CB5DEC 80240DEC E7A40018 */ swc1 $f4, 0x18($sp) -/* CB5DF0 80240DF0 0200202D */ daddu $a0, $s0, $zero -/* CB5DF4 80240DF4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CB5DF8 80240DF8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CB5DFC 80240DFC 3C060020 */ lui $a2, 0x20 -/* CB5E00 80240E00 0C012530 */ jal func_800494C0 -/* CB5E04 80240E04 E4800064 */ swc1 $f0, 0x64($a0) -/* CB5E08 80240E08 8E220018 */ lw $v0, 0x18($s1) -/* CB5E0C 80240E0C 9442002A */ lhu $v0, 0x2a($v0) -/* CB5E10 80240E10 30420001 */ andi $v0, $v0, 1 -/* CB5E14 80240E14 10400003 */ beqz $v0, .L80240E24 -/* CB5E18 80240E18 2402000A */ addiu $v0, $zero, 0xa -/* CB5E1C 80240E1C 080903B3 */ j .L80240ECC -/* CB5E20 80240E20 AE620070 */ sw $v0, 0x70($s3) -.L80240E24: -/* CB5E24 80240E24 080903B3 */ j .L80240ECC -/* CB5E28 80240E28 AE720070 */ sw $s2, 0x70($s3) -.L80240E2C: -/* CB5E2C 80240E2C AE220090 */ sw $v0, 0x90($s1) -.L80240E30: -/* CB5E30 80240E30 8602008C */ lh $v0, 0x8c($s0) -/* CB5E34 80240E34 14400025 */ bnez $v0, .L80240ECC -/* CB5E38 80240E38 00000000 */ nop -/* CB5E3C 80240E3C 8602008E */ lh $v0, 0x8e($s0) -/* CB5E40 80240E40 1C400022 */ bgtz $v0, .L80240ECC -/* CB5E44 80240E44 00000000 */ nop -/* CB5E48 80240E48 8E620074 */ lw $v0, 0x74($s3) -/* CB5E4C 80240E4C 2442FFFF */ addiu $v0, $v0, -1 -/* CB5E50 80240E50 1840001D */ blez $v0, .L80240EC8 -/* CB5E54 80240E54 AE620074 */ sw $v0, 0x74($s3) -/* CB5E58 80240E58 8E220018 */ lw $v0, 0x18($s1) -/* CB5E5C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) -/* CB5E60 80240E60 30420010 */ andi $v0, $v0, 0x10 -/* CB5E64 80240E64 14400007 */ bnez $v0, .L80240E84 -/* CB5E68 80240E68 00000000 */ nop -/* CB5E6C 80240E6C C600000C */ lwc1 $f0, 0xc($s0) -/* CB5E70 80240E70 3C014334 */ lui $at, 0x4334 -/* CB5E74 80240E74 44816000 */ mtc1 $at, $f12 -/* CB5E78 80240E78 0C00A6C9 */ jal clamp_angle -/* CB5E7C 80240E7C 460C0300 */ add.s $f12, $f0, $f12 -/* CB5E80 80240E80 E600000C */ swc1 $f0, 0xc($s0) -.L80240E84: -/* CB5E84 80240E84 0C00A67F */ jal rand_int -/* CB5E88 80240E88 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CB5E8C 80240E8C 3C032E8B */ lui $v1, 0x2e8b -/* CB5E90 80240E90 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CB5E94 80240E94 00430018 */ mult $v0, $v1 -/* CB5E98 80240E98 00021FC3 */ sra $v1, $v0, 0x1f -/* CB5E9C 80240E9C 00004010 */ mfhi $t0 -/* CB5EA0 80240EA0 00082043 */ sra $a0, $t0, 1 -/* CB5EA4 80240EA4 00832023 */ subu $a0, $a0, $v1 -/* CB5EA8 80240EA8 00041840 */ sll $v1, $a0, 1 -/* CB5EAC 80240EAC 00641821 */ addu $v1, $v1, $a0 -/* CB5EB0 80240EB0 00031880 */ sll $v1, $v1, 2 -/* CB5EB4 80240EB4 00641823 */ subu $v1, $v1, $a0 -/* CB5EB8 80240EB8 00431023 */ subu $v0, $v0, $v1 -/* CB5EBC 80240EBC 24420005 */ addiu $v0, $v0, 5 -/* CB5EC0 80240EC0 080903B3 */ j .L80240ECC -/* CB5EC4 80240EC4 A602008E */ sh $v0, 0x8e($s0) -.L80240EC8: -/* CB5EC8 80240EC8 AE600070 */ sw $zero, 0x70($s3) -.L80240ECC: -/* CB5ECC 80240ECC 8FBF0054 */ lw $ra, 0x54($sp) -/* CB5ED0 80240ED0 8FB40050 */ lw $s4, 0x50($sp) -/* CB5ED4 80240ED4 8FB3004C */ lw $s3, 0x4c($sp) -/* CB5ED8 80240ED8 8FB20048 */ lw $s2, 0x48($sp) -/* CB5EDC 80240EDC 8FB10044 */ lw $s1, 0x44($sp) -/* CB5EE0 80240EE0 8FB00040 */ lw $s0, 0x40($sp) -/* CB5EE4 80240EE4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CB5EE8 80240EE8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CB5EEC 80240EEC D7B60060 */ ldc1 $f22, 0x60($sp) -/* CB5EF0 80240EF0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CB5EF4 80240EF4 03E00008 */ jr $ra -/* CB5EF8 80240EF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s deleted file mode 100644 index 1e73d6bd80..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241178_CB6178 -/* CB6178 80241178 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB617C 8024117C AFB20030 */ sw $s2, 0x30($sp) -/* CB6180 80241180 0080902D */ daddu $s2, $a0, $zero -/* CB6184 80241184 AFBF0038 */ sw $ra, 0x38($sp) -/* CB6188 80241188 AFB30034 */ sw $s3, 0x34($sp) -/* CB618C 8024118C AFB1002C */ sw $s1, 0x2c($sp) -/* CB6190 80241190 AFB00028 */ sw $s0, 0x28($sp) -/* CB6194 80241194 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CB6198 80241198 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CB619C 8024119C 8E510148 */ lw $s1, 0x148($s2) -/* CB61A0 802411A0 86240008 */ lh $a0, 8($s1) -/* CB61A4 802411A4 0C00EABB */ jal get_npc_unsafe -/* CB61A8 802411A8 00A0982D */ daddu $s3, $a1, $zero -/* CB61AC 802411AC 0040802D */ daddu $s0, $v0, $zero -/* CB61B0 802411B0 0200202D */ daddu $a0, $s0, $zero -/* CB61B4 802411B4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CB61B8 802411B8 468010A0 */ cvt.s.w $f2, $f2 -/* CB61BC 802411BC 460010A1 */ cvt.d.s $f2, $f2 -/* CB61C0 802411C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CB61C4 802411C4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CB61C8 802411C8 8E050018 */ lw $a1, 0x18($s0) -/* CB61CC 802411CC 46002100 */ add.s $f4, $f4, $f0 -/* CB61D0 802411D0 8E06000C */ lw $a2, 0xc($s0) -/* CB61D4 802411D4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CB61D8 802411D8 46800020 */ cvt.s.w $f0, $f0 -/* CB61DC 802411DC E604001C */ swc1 $f4, 0x1c($s0) -/* CB61E0 802411E0 3C014059 */ lui $at, 0x4059 -/* CB61E4 802411E4 44812800 */ mtc1 $at, $f5 -/* CB61E8 802411E8 44802000 */ mtc1 $zero, $f4 -/* CB61EC 802411EC 46000021 */ cvt.d.s $f0, $f0 -/* CB61F0 802411F0 46240003 */ div.d $f0, $f0, $f4 -/* CB61F4 802411F4 46200520 */ cvt.s.d $f20, $f0 -/* CB61F8 802411F8 46241083 */ div.d $f2, $f2, $f4 -/* CB61FC 802411FC 0C00EA95 */ jal npc_move_heading -/* CB6200 80241200 462015A0 */ cvt.s.d $f22, $f2 -/* CB6204 80241204 C604001C */ lwc1 $f4, 0x1c($s0) -/* CB6208 80241208 44801000 */ mtc1 $zero, $f2 -/* CB620C 8024120C 44801800 */ mtc1 $zero, $f3 -/* CB6210 80241210 46002021 */ cvt.d.s $f0, $f4 -/* CB6214 80241214 4620103E */ c.le.d $f2, $f0 -/* CB6218 80241218 00000000 */ nop -/* CB621C 8024121C 45000030 */ bc1f .L802412E0 -/* CB6220 80241220 00000000 */ nop -/* CB6224 80241224 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB6228 80241228 46040000 */ add.s $f0, $f0, $f4 -/* CB622C 8024122C E600003C */ swc1 $f0, 0x3c($s0) -/* CB6230 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* CB6234 80241234 8C420024 */ lw $v0, 0x24($v0) -/* CB6238 80241238 AE020028 */ sw $v0, 0x28($s0) -/* CB623C 8024123C A2200007 */ sb $zero, 7($s1) -/* CB6240 80241240 8E020000 */ lw $v0, ($s0) -/* CB6244 80241244 30420008 */ andi $v0, $v0, 8 -/* CB6248 80241248 14400011 */ bnez $v0, .L80241290 -/* CB624C 8024124C 0000102D */ daddu $v0, $zero, $zero -/* CB6250 80241250 27A50018 */ addiu $a1, $sp, 0x18 -/* CB6254 80241254 27A6001C */ addiu $a2, $sp, 0x1c -/* CB6258 80241258 C6000038 */ lwc1 $f0, 0x38($s0) -/* CB625C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) -/* CB6260 80241260 C6040040 */ lwc1 $f4, 0x40($s0) -/* CB6264 80241264 3C01447A */ lui $at, 0x447a -/* CB6268 80241268 44813000 */ mtc1 $at, $f6 -/* CB626C 8024126C 27A20024 */ addiu $v0, $sp, 0x24 -/* CB6270 80241270 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB6274 80241274 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CB6278 80241278 E7A40020 */ swc1 $f4, 0x20($sp) -/* CB627C 8024127C E7A60024 */ swc1 $f6, 0x24($sp) -/* CB6280 80241280 AFA20010 */ sw $v0, 0x10($sp) -/* CB6284 80241284 8E040080 */ lw $a0, 0x80($s0) -/* CB6288 80241288 0C0372DF */ jal func_800DCB7C -/* CB628C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241290: -/* CB6290 80241290 1040000B */ beqz $v0, .L802412C0 -/* CB6294 80241294 00000000 */ nop -/* CB6298 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CB629C 8024129C 46140080 */ add.s $f2, $f0, $f20 -/* CB62A0 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB62A4 802412A4 4600103E */ c.le.s $f2, $f0 -/* CB62A8 802412A8 00000000 */ nop -/* CB62AC 802412AC 4500008D */ bc1f .L802414E4 -/* CB62B0 802412B0 00000000 */ nop -/* CB62B4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) -/* CB62B8 802412B8 08090539 */ j .L802414E4 -/* CB62BC 802412BC AE400070 */ sw $zero, 0x70($s2) -.L802412C0: -/* CB62C0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB62C4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CB62C8 802412C8 4602003E */ c.le.s $f0, $f2 -/* CB62CC 802412CC 00000000 */ nop -/* CB62D0 802412D0 45030084 */ bc1tl .L802414E4 -/* CB62D4 802412D4 AE400070 */ sw $zero, 0x70($s2) -/* CB62D8 802412D8 08090539 */ j .L802414E4 -/* CB62DC 802412DC 00000000 */ nop -.L802412E0: -/* CB62E0 802412E0 4622003C */ c.lt.d $f0, $f2 -/* CB62E4 802412E4 00000000 */ nop -/* CB62E8 802412E8 4500007E */ bc1f .L802414E4 -/* CB62EC 802412EC 00000000 */ nop -/* CB62F0 802412F0 9602008E */ lhu $v0, 0x8e($s0) -/* CB62F4 802412F4 24420001 */ addiu $v0, $v0, 1 -/* CB62F8 802412F8 A602008E */ sh $v0, 0x8e($s0) -/* CB62FC 802412FC 00021400 */ sll $v0, $v0, 0x10 -/* CB6300 80241300 8E630020 */ lw $v1, 0x20($s3) -/* CB6304 80241304 00021403 */ sra $v0, $v0, 0x10 -/* CB6308 80241308 0043102A */ slt $v0, $v0, $v1 -/* CB630C 8024130C 14400026 */ bnez $v0, .L802413A8 -/* CB6310 80241310 00000000 */ nop -/* CB6314 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB6318 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB631C 8024131C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB6320 80241320 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB6324 80241324 A600008E */ sh $zero, 0x8e($s0) -/* CB6328 80241328 8C460028 */ lw $a2, 0x28($v0) -/* CB632C 8024132C 0C00A720 */ jal atan2 -/* CB6330 80241330 8C470030 */ lw $a3, 0x30($v0) -/* CB6334 80241334 46000506 */ mov.s $f20, $f0 -/* CB6338 80241338 C60C000C */ lwc1 $f12, 0xc($s0) -/* CB633C 8024133C 0C00A70A */ jal get_clamped_angle_diff -/* CB6340 80241340 4600A386 */ mov.s $f14, $f20 -/* CB6344 80241344 46000086 */ mov.s $f2, $f0 -/* CB6348 80241348 8E62001C */ lw $v0, 0x1c($s3) -/* CB634C 8024134C 46001005 */ abs.s $f0, $f2 -/* CB6350 80241350 44822000 */ mtc1 $v0, $f4 -/* CB6354 80241354 00000000 */ nop -/* CB6358 80241358 46802120 */ cvt.s.w $f4, $f4 -/* CB635C 8024135C 4600203C */ c.lt.s $f4, $f0 -/* CB6360 80241360 00000000 */ nop -/* CB6364 80241364 4500000D */ bc1f .L8024139C -/* CB6368 80241368 00000000 */ nop -/* CB636C 8024136C 44800000 */ mtc1 $zero, $f0 -/* CB6370 80241370 C614000C */ lwc1 $f20, 0xc($s0) -/* CB6374 80241374 4600103C */ c.lt.s $f2, $f0 -/* CB6378 80241378 00000000 */ nop -/* CB637C 8024137C 45000006 */ bc1f .L80241398 -/* CB6380 80241380 00021023 */ negu $v0, $v0 -/* CB6384 80241384 44820000 */ mtc1 $v0, $f0 -/* CB6388 80241388 00000000 */ nop -/* CB638C 8024138C 46800020 */ cvt.s.w $f0, $f0 -/* CB6390 80241390 080904E7 */ j .L8024139C -/* CB6394 80241394 4600A500 */ add.s $f20, $f20, $f0 -.L80241398: -/* CB6398 80241398 4604A500 */ add.s $f20, $f20, $f4 -.L8024139C: -/* CB639C 8024139C 0C00A6C9 */ jal clamp_angle -/* CB63A0 802413A0 4600A306 */ mov.s $f12, $f20 -/* CB63A4 802413A4 E600000C */ swc1 $f0, 0xc($s0) -.L802413A8: -/* CB63A8 802413A8 8E020000 */ lw $v0, ($s0) -/* CB63AC 802413AC 30420008 */ andi $v0, $v0, 8 -/* CB63B0 802413B0 1040000A */ beqz $v0, .L802413DC -/* CB63B4 802413B4 27A50018 */ addiu $a1, $sp, 0x18 -/* CB63B8 802413B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB63BC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) -/* CB63C0 802413C0 46001080 */ add.s $f2, $f2, $f0 -/* CB63C4 802413C4 4616103C */ c.lt.s $f2, $f22 -/* CB63C8 802413C8 00000000 */ nop -/* CB63CC 802413CC 45020045 */ bc1fl .L802414E4 -/* CB63D0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) -/* CB63D4 802413D4 08090538 */ j .L802414E0 -/* CB63D8 802413D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802413DC: -/* CB63DC 802413DC C6000038 */ lwc1 $f0, 0x38($s0) -/* CB63E0 802413E0 27A6001C */ addiu $a2, $sp, 0x1c -/* CB63E4 802413E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB63E8 802413E8 860200A8 */ lh $v0, 0xa8($s0) -/* CB63EC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) -/* CB63F0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* CB63F4 802413F4 44821000 */ mtc1 $v0, $f2 -/* CB63F8 802413F8 00000000 */ nop -/* CB63FC 802413FC 468010A0 */ cvt.s.w $f2, $f2 -/* CB6400 80241400 46000005 */ abs.s $f0, $f0 -/* CB6404 80241404 46020000 */ add.s $f0, $f0, $f2 -/* CB6408 80241408 C6060040 */ lwc1 $f6, 0x40($s0) -/* CB640C 8024140C 27A20024 */ addiu $v0, $sp, 0x24 -/* CB6410 80241410 46022100 */ add.s $f4, $f4, $f2 -/* CB6414 80241414 3C014024 */ lui $at, 0x4024 -/* CB6418 80241418 44811800 */ mtc1 $at, $f3 -/* CB641C 8024141C 44801000 */ mtc1 $zero, $f2 -/* CB6420 80241420 46000021 */ cvt.d.s $f0, $f0 -/* CB6424 80241424 46220000 */ add.d $f0, $f0, $f2 -/* CB6428 80241428 E7A60020 */ swc1 $f6, 0x20($sp) -/* CB642C 8024142C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CB6430 80241430 46200020 */ cvt.s.d $f0, $f0 -/* CB6434 80241434 E7A00024 */ swc1 $f0, 0x24($sp) -/* CB6438 80241438 AFA20010 */ sw $v0, 0x10($sp) -/* CB643C 8024143C 8E040080 */ lw $a0, 0x80($s0) -/* CB6440 80241440 0C0372DF */ jal func_800DCB7C -/* CB6444 80241444 27A70020 */ addiu $a3, $sp, 0x20 -/* CB6448 80241448 10400015 */ beqz $v0, .L802414A0 -/* CB644C 8024144C 00000000 */ nop -/* CB6450 80241450 860200A8 */ lh $v0, 0xa8($s0) -/* CB6454 80241454 C604001C */ lwc1 $f4, 0x1c($s0) -/* CB6458 80241458 44820000 */ mtc1 $v0, $f0 -/* CB645C 8024145C 00000000 */ nop -/* CB6460 80241460 46800020 */ cvt.s.w $f0, $f0 -/* CB6464 80241464 46002085 */ abs.s $f2, $f4 -/* CB6468 80241468 46020000 */ add.s $f0, $f0, $f2 -/* CB646C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CB6470 80241470 4600103E */ c.le.s $f2, $f0 -/* CB6474 80241474 00000000 */ nop -/* CB6478 80241478 45000005 */ bc1f .L80241490 -/* CB647C 8024147C 00000000 */ nop -/* CB6480 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CB6484 80241484 AE00001C */ sw $zero, 0x1c($s0) -/* CB6488 80241488 08090539 */ j .L802414E4 -/* CB648C 8024148C E600003C */ swc1 $f0, 0x3c($s0) -.L80241490: -/* CB6490 80241490 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB6494 80241494 46040000 */ add.s $f0, $f0, $f4 -/* CB6498 80241498 08090539 */ j .L802414E4 -/* CB649C 8024149C E600003C */ swc1 $f0, 0x3c($s0) -.L802414A0: -/* CB64A0 802414A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CB64A4 802414A4 860200A8 */ lh $v0, 0xa8($s0) -/* CB64A8 802414A8 46163081 */ sub.s $f2, $f6, $f22 -/* CB64AC 802414AC 44820000 */ mtc1 $v0, $f0 -/* CB64B0 802414B0 00000000 */ nop -/* CB64B4 802414B4 46800020 */ cvt.s.w $f0, $f0 -/* CB64B8 802414B8 46001080 */ add.s $f2, $f2, $f0 -/* CB64BC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) -/* CB64C0 802414C0 46002005 */ abs.s $f0, $f4 -/* CB64C4 802414C4 4602003C */ c.lt.s $f0, $f2 -/* CB64C8 802414C8 00000000 */ nop -/* CB64CC 802414CC 45020005 */ bc1fl .L802414E4 -/* CB64D0 802414D0 AE00001C */ sw $zero, 0x1c($s0) -/* CB64D4 802414D4 46043000 */ add.s $f0, $f6, $f4 -/* CB64D8 802414D8 08090539 */ j .L802414E4 -/* CB64DC 802414DC E600003C */ swc1 $f0, 0x3c($s0) -.L802414E0: -/* CB64E0 802414E0 AE00001C */ sw $zero, 0x1c($s0) -.L802414E4: -/* CB64E4 802414E4 8FBF0038 */ lw $ra, 0x38($sp) -/* CB64E8 802414E8 8FB30034 */ lw $s3, 0x34($sp) -/* CB64EC 802414EC 8FB20030 */ lw $s2, 0x30($sp) -/* CB64F0 802414F0 8FB1002C */ lw $s1, 0x2c($sp) -/* CB64F4 802414F4 8FB00028 */ lw $s0, 0x28($sp) -/* CB64F8 802414F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CB64FC 802414FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* CB6500 80241500 03E00008 */ jr $ra -/* CB6504 80241504 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s deleted file mode 100644 index 3da598c2ce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241508_CB6508 -/* CB6508 80241508 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CB650C 8024150C AFB00028 */ sw $s0, 0x28($sp) -/* CB6510 80241510 00A0802D */ daddu $s0, $a1, $zero -/* CB6514 80241514 AFB1002C */ sw $s1, 0x2c($sp) -/* CB6518 80241518 00C0882D */ daddu $s1, $a2, $zero -/* CB651C 8024151C AFBF0034 */ sw $ra, 0x34($sp) -/* CB6520 80241520 AFB20030 */ sw $s2, 0x30($sp) -/* CB6524 80241524 AE200070 */ sw $zero, 0x70($s1) -/* CB6528 80241528 8C830000 */ lw $v1, ($a0) -/* CB652C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CB6530 80241530 A480008E */ sh $zero, 0x8e($a0) -/* CB6534 80241534 00621824 */ and $v1, $v1, $v0 -/* CB6538 80241538 34650800 */ ori $a1, $v1, 0x800 -/* CB653C 8024153C AC850000 */ sw $a1, ($a0) -/* CB6540 80241540 8E0200D0 */ lw $v0, 0xd0($s0) -/* CB6544 80241544 8C420034 */ lw $v0, 0x34($v0) -/* CB6548 80241548 10400003 */ beqz $v0, .L80241558 -/* CB654C 8024154C 00E0902D */ daddu $s2, $a3, $zero -/* CB6550 80241550 08090558 */ j .L80241560 -/* CB6554 80241554 34620808 */ ori $v0, $v1, 0x808 -.L80241558: -/* CB6558 80241558 2402FFF7 */ addiu $v0, $zero, -9 -/* CB655C 8024155C 00A21024 */ and $v0, $a1, $v0 -.L80241560: -/* CB6560 80241560 AC820000 */ sw $v0, ($a0) -/* CB6564 80241564 27A20024 */ addiu $v0, $sp, 0x24 -/* CB6568 80241568 27A50018 */ addiu $a1, $sp, 0x18 -/* CB656C 8024156C C4800038 */ lwc1 $f0, 0x38($a0) -/* CB6570 80241570 C482003C */ lwc1 $f2, 0x3c($a0) -/* CB6574 80241574 C4840040 */ lwc1 $f4, 0x40($a0) -/* CB6578 80241578 3C01447A */ lui $at, 0x447a -/* CB657C 8024157C 44813000 */ mtc1 $at, $f6 -/* CB6580 80241580 27A6001C */ addiu $a2, $sp, 0x1c -/* CB6584 80241584 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB6588 80241588 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CB658C 8024158C E7A40020 */ swc1 $f4, 0x20($sp) -/* CB6590 80241590 E7A60024 */ swc1 $f6, 0x24($sp) -/* CB6594 80241594 AFA20010 */ sw $v0, 0x10($sp) -/* CB6598 80241598 8C840080 */ lw $a0, 0x80($a0) -/* CB659C 8024159C 0C0372DF */ jal func_800DCB7C -/* CB65A0 802415A0 27A70020 */ addiu $a3, $sp, 0x20 -/* CB65A4 802415A4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CB65A8 802415A8 3C014059 */ lui $at, 0x4059 -/* CB65AC 802415AC 44812800 */ mtc1 $at, $f5 -/* CB65B0 802415B0 44802000 */ mtc1 $zero, $f4 -/* CB65B4 802415B4 460010A1 */ cvt.d.s $f2, $f2 -/* CB65B8 802415B8 46241082 */ mul.d $f2, $f2, $f4 -/* CB65BC 802415BC 00000000 */ nop -/* CB65C0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CB65C4 802415C4 46000021 */ cvt.d.s $f0, $f0 -/* CB65C8 802415C8 46240002 */ mul.d $f0, $f0, $f4 -/* CB65CC 802415CC 00000000 */ nop -/* CB65D0 802415D0 3C013FE0 */ lui $at, 0x3fe0 -/* CB65D4 802415D4 44812800 */ mtc1 $at, $f5 -/* CB65D8 802415D8 44802000 */ mtc1 $zero, $f4 -/* CB65DC 802415DC 00000000 */ nop -/* CB65E0 802415E0 46241080 */ add.d $f2, $f2, $f4 -/* CB65E4 802415E4 AE000074 */ sw $zero, 0x74($s0) -/* CB65E8 802415E8 46240000 */ add.d $f0, $f0, $f4 -/* CB65EC 802415EC AE000090 */ sw $zero, 0x90($s0) -/* CB65F0 802415F0 4620120D */ trunc.w.d $f8, $f2 -/* CB65F4 802415F4 E6080078 */ swc1 $f8, 0x78($s0) -/* CB65F8 802415F8 4620020D */ trunc.w.d $f8, $f0 -/* CB65FC 802415FC E6080088 */ swc1 $f8, 0x88($s0) -/* CB6600 80241600 8E420014 */ lw $v0, 0x14($s2) -/* CB6604 80241604 AE220074 */ sw $v0, 0x74($s1) -/* CB6608 80241608 8E0200B0 */ lw $v0, 0xb0($s0) -/* CB660C 8024160C 34420010 */ ori $v0, $v0, 0x10 -/* CB6610 80241610 AE0200B0 */ sw $v0, 0xb0($s0) -/* CB6614 80241614 8FBF0034 */ lw $ra, 0x34($sp) -/* CB6618 80241618 8FB20030 */ lw $s2, 0x30($sp) -/* CB661C 8024161C 8FB1002C */ lw $s1, 0x2c($sp) -/* CB6620 80241620 8FB00028 */ lw $s0, 0x28($sp) -/* CB6624 80241624 03E00008 */ jr $ra -/* CB6628 80241628 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index d4df7d8ad1..a82406f435 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -46,7 +46,7 @@ glabel func_8024162C_CB662C /* CB66D0 802416D0 02A0202D */ daddu $a0, $s5, $zero /* CB66D4 802416D4 0240282D */ daddu $a1, $s2, $zero /* CB66D8 802416D8 0280302D */ daddu $a2, $s4, $zero -/* CB66DC 802416DC 0C090542 */ jal func_80241508_CB6508 +/* CB66DC 802416DC 0C090542 */ jal flo_09_UnkFunc5 /* CB66E0 802416E0 0200382D */ daddu $a3, $s0, $zero .L802416E4: /* CB66E4 802416E4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241760_CB6760 glabel L80241770_CB6770 /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero -/* CB6778 80241778 0C0902EE */ jal func_80240BB8_CB5BB8 +/* CB6778 80241778 0C0902EE */ jal flo_09_UnkFunc4 /* CB677C 8024177C 0260302D */ daddu $a2, $s3, $zero /* CB6780 80241780 080905FD */ j .L802417F4 /* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802417C8_CB67C8 glabel L802417E0_CB67E0 /* CB67E0 802417E0 0280202D */ daddu $a0, $s4, $zero /* CB67E4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* CB67E8 802417E8 0C09045E */ jal func_80241178_CB6178 +/* CB67E8 802417E8 0C09045E */ jal flo_09_UnkFunc6 /* CB67EC 802417EC 0260302D */ daddu $a2, $s3, $zero glabel L802417F0_CB67F0 /* CB67F0 802417F0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s deleted file mode 100644 index 943ef2e6a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240A5C_CC426C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C_CC426C -/* CC426C 80240A5C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CC4270 80240A60 AFB3004C */ sw $s3, 0x4c($sp) -/* CC4274 80240A64 0080982D */ daddu $s3, $a0, $zero -/* CC4278 80240A68 AFBF0054 */ sw $ra, 0x54($sp) -/* CC427C 80240A6C AFB40050 */ sw $s4, 0x50($sp) -/* CC4280 80240A70 AFB20048 */ sw $s2, 0x48($sp) -/* CC4284 80240A74 AFB10044 */ sw $s1, 0x44($sp) -/* CC4288 80240A78 AFB00040 */ sw $s0, 0x40($sp) -/* CC428C 80240A7C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CC4290 80240A80 F7B80068 */ sdc1 $f24, 0x68($sp) -/* CC4294 80240A84 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CC4298 80240A88 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CC429C 80240A8C 8E710148 */ lw $s1, 0x148($s3) -/* CC42A0 80240A90 00A0902D */ daddu $s2, $a1, $zero -/* CC42A4 80240A94 86240008 */ lh $a0, 8($s1) -/* CC42A8 80240A98 0C00EABB */ jal get_npc_unsafe -/* CC42AC 80240A9C 00C0A02D */ daddu $s4, $a2, $zero -/* CC42B0 80240AA0 0040802D */ daddu $s0, $v0, $zero -/* CC42B4 80240AA4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CC42B8 80240AA8 46800020 */ cvt.s.w $f0, $f0 -/* CC42BC 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* CC42C0 80240AB0 3C014059 */ lui $at, 0x4059 -/* CC42C4 80240AB4 44811800 */ mtc1 $at, $f3 -/* CC42C8 80240AB8 44801000 */ mtc1 $zero, $f2 -/* CC42CC 80240ABC 8602008E */ lh $v0, 0x8e($s0) -/* CC42D0 80240AC0 9603008E */ lhu $v1, 0x8e($s0) -/* CC42D4 80240AC4 46220003 */ div.d $f0, $f0, $f2 -/* CC42D8 80240AC8 46200620 */ cvt.s.d $f24, $f0 -/* CC42DC 80240ACC C6200088 */ lwc1 $f0, 0x88($s1) -/* CC42E0 80240AD0 46800020 */ cvt.s.w $f0, $f0 -/* CC42E4 80240AD4 46000021 */ cvt.d.s $f0, $f0 -/* CC42E8 80240AD8 46220003 */ div.d $f0, $f0, $f2 -/* CC42EC 80240ADC 46200020 */ cvt.s.d $f0, $f0 -/* CC42F0 80240AE0 18400003 */ blez $v0, .L80240AF0 -/* CC42F4 80240AE4 4600C680 */ add.s $f26, $f24, $f0 -/* CC42F8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 -/* CC42FC 80240AEC A602008E */ sh $v0, 0x8e($s0) -.L80240AF0: -/* CC4300 80240AF0 8E220070 */ lw $v0, 0x70($s1) -/* CC4304 80240AF4 18400034 */ blez $v0, .L80240BC8 -/* CC4308 80240AF8 00000000 */ nop -/* CC430C 80240AFC C62C0074 */ lwc1 $f12, 0x74($s1) -/* CC4310 80240B00 46806320 */ cvt.s.w $f12, $f12 -/* CC4314 80240B04 44820000 */ mtc1 $v0, $f0 -/* CC4318 80240B08 00000000 */ nop -/* CC431C 80240B0C 46800020 */ cvt.s.w $f0, $f0 -/* CC4320 80240B10 46000021 */ cvt.d.s $f0, $f0 -/* CC4324 80240B14 46220003 */ div.d $f0, $f0, $f2 -/* CC4328 80240B18 0C00A8BB */ jal sin_deg -/* CC432C 80240B1C 462005A0 */ cvt.s.d $f22, $f0 -/* CC4330 80240B20 8E020000 */ lw $v0, ($s0) -/* CC4334 80240B24 30420008 */ andi $v0, $v0, 8 -/* CC4338 80240B28 10400003 */ beqz $v0, .L80240B38 -/* CC433C 80240B2C 46000506 */ mov.s $f20, $f0 -/* CC4340 80240B30 080902DE */ j .L80240B78 -/* CC4344 80240B34 0000102D */ daddu $v0, $zero, $zero -.L80240B38: -/* CC4348 80240B38 27A50028 */ addiu $a1, $sp, 0x28 -/* CC434C 80240B3C 27A6002C */ addiu $a2, $sp, 0x2c -/* CC4350 80240B40 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4354 80240B44 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4358 80240B48 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC435C 80240B4C 3C01447A */ lui $at, 0x447a -/* CC4360 80240B50 44813000 */ mtc1 $at, $f6 -/* CC4364 80240B54 27A20034 */ addiu $v0, $sp, 0x34 -/* CC4368 80240B58 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC436C 80240B5C E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC4370 80240B60 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC4374 80240B64 E7A60034 */ swc1 $f6, 0x34($sp) -/* CC4378 80240B68 AFA20010 */ sw $v0, 0x10($sp) -/* CC437C 80240B6C 8E040080 */ lw $a0, 0x80($s0) -/* CC4380 80240B70 0C0372DF */ jal func_800DCB7C -/* CC4384 80240B74 27A70030 */ addiu $a3, $sp, 0x30 -.L80240B78: -/* CC4388 80240B78 10400007 */ beqz $v0, .L80240B98 -/* CC438C 80240B7C 00000000 */ nop -/* CC4390 80240B80 4616A082 */ mul.s $f2, $f20, $f22 -/* CC4394 80240B84 00000000 */ nop -/* CC4398 80240B88 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CC439C 80240B8C 46180000 */ add.s $f0, $f0, $f24 -/* CC43A0 80240B90 080902E9 */ j .L80240BA4 -/* CC43A4 80240B94 46020000 */ add.s $f0, $f0, $f2 -.L80240B98: -/* CC43A8 80240B98 4616A002 */ mul.s $f0, $f20, $f22 -/* CC43AC 80240B9C 00000000 */ nop -/* CC43B0 80240BA0 4600D000 */ add.s $f0, $f26, $f0 -.L80240BA4: -/* CC43B4 80240BA4 E600003C */ swc1 $f0, 0x3c($s0) -/* CC43B8 80240BA8 8E220074 */ lw $v0, 0x74($s1) -/* CC43BC 80240BAC 2442000A */ addiu $v0, $v0, 0xa -/* CC43C0 80240BB0 44826000 */ mtc1 $v0, $f12 -/* CC43C4 80240BB4 00000000 */ nop -/* CC43C8 80240BB8 0C00A6C9 */ jal clamp_angle -/* CC43CC 80240BBC 46806320 */ cvt.s.w $f12, $f12 -/* CC43D0 80240BC0 4600020D */ trunc.w.s $f8, $f0 -/* CC43D4 80240BC4 E6280074 */ swc1 $f8, 0x74($s1) -.L80240BC8: -/* CC43D8 80240BC8 8E220090 */ lw $v0, 0x90($s1) -/* CC43DC 80240BCC 1C400040 */ bgtz $v0, .L80240CD0 -/* CC43E0 80240BD0 2442FFFF */ addiu $v0, $v0, -1 -/* CC43E4 80240BD4 860200A8 */ lh $v0, 0xa8($s0) -/* CC43E8 80240BD8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC43EC 80240BDC 44821000 */ mtc1 $v0, $f2 -/* CC43F0 80240BE0 00000000 */ nop -/* CC43F4 80240BE4 468010A0 */ cvt.s.w $f2, $f2 -/* CC43F8 80240BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC43FC 80240BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC4400 80240BF0 46020000 */ add.s $f0, $f0, $f2 -/* CC4404 80240BF4 3C014024 */ lui $at, 0x4024 -/* CC4408 80240BF8 44812800 */ mtc1 $at, $f5 -/* CC440C 80240BFC 44802000 */ mtc1 $zero, $f4 -/* CC4410 80240C00 C442002C */ lwc1 $f2, 0x2c($v0) -/* CC4414 80240C04 46000021 */ cvt.d.s $f0, $f0 -/* CC4418 80240C08 46240000 */ add.d $f0, $f0, $f4 -/* CC441C 80240C0C 460010A1 */ cvt.d.s $f2, $f2 -/* CC4420 80240C10 4620103C */ c.lt.d $f2, $f0 -/* CC4424 80240C14 00000000 */ nop -/* CC4428 80240C18 4500002E */ bc1f .L80240CD4 -/* CC442C 80240C1C 0280202D */ daddu $a0, $s4, $zero -/* CC4430 80240C20 24020001 */ addiu $v0, $zero, 1 -/* CC4434 80240C24 AFA20010 */ sw $v0, 0x10($sp) -/* CC4438 80240C28 8E460024 */ lw $a2, 0x24($s2) -/* CC443C 80240C2C 8E470028 */ lw $a3, 0x28($s2) -/* CC4440 80240C30 0C01242D */ jal func_800490B4 -/* CC4444 80240C34 0220282D */ daddu $a1, $s1, $zero -/* CC4448 80240C38 10400026 */ beqz $v0, .L80240CD4 -/* CC444C 80240C3C 0000202D */ daddu $a0, $zero, $zero -/* CC4450 80240C40 0200282D */ daddu $a1, $s0, $zero -/* CC4454 80240C44 0000302D */ daddu $a2, $zero, $zero -/* CC4458 80240C48 2412000C */ addiu $s2, $zero, 0xc -/* CC445C 80240C4C 860300A8 */ lh $v1, 0xa8($s0) -/* CC4460 80240C50 3C013F80 */ lui $at, 0x3f80 -/* CC4464 80240C54 44810000 */ mtc1 $at, $f0 -/* CC4468 80240C58 3C014000 */ lui $at, 0x4000 -/* CC446C 80240C5C 44811000 */ mtc1 $at, $f2 -/* CC4470 80240C60 3C01C1A0 */ lui $at, 0xc1a0 -/* CC4474 80240C64 44812000 */ mtc1 $at, $f4 -/* CC4478 80240C68 44834000 */ mtc1 $v1, $f8 -/* CC447C 80240C6C 00000000 */ nop -/* CC4480 80240C70 46804220 */ cvt.s.w $f8, $f8 -/* CC4484 80240C74 44074000 */ mfc1 $a3, $f8 -/* CC4488 80240C78 27A20038 */ addiu $v0, $sp, 0x38 -/* CC448C 80240C7C AFB2001C */ sw $s2, 0x1c($sp) -/* CC4490 80240C80 AFA20020 */ sw $v0, 0x20($sp) -/* CC4494 80240C84 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC4498 80240C88 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC449C 80240C8C 0C01BFA4 */ jal fx_emote -/* CC44A0 80240C90 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC44A4 80240C94 0200202D */ daddu $a0, $s0, $zero -/* CC44A8 80240C98 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CC44AC 80240C9C C480003C */ lwc1 $f0, 0x3c($a0) -/* CC44B0 80240CA0 3C060020 */ lui $a2, 0x20 -/* CC44B4 80240CA4 0C012530 */ jal func_800494C0 -/* CC44B8 80240CA8 E4800064 */ swc1 $f0, 0x64($a0) -/* CC44BC 80240CAC 8E220018 */ lw $v0, 0x18($s1) -/* CC44C0 80240CB0 9442002A */ lhu $v0, 0x2a($v0) -/* CC44C4 80240CB4 30420001 */ andi $v0, $v0, 1 -/* CC44C8 80240CB8 10400003 */ beqz $v0, .L80240CC8 -/* CC44CC 80240CBC 2402000A */ addiu $v0, $zero, 0xa -/* CC44D0 80240CC0 0809035C */ j .L80240D70 -/* CC44D4 80240CC4 AE620070 */ sw $v0, 0x70($s3) -.L80240CC8: -/* CC44D8 80240CC8 0809035C */ j .L80240D70 -/* CC44DC 80240CCC AE720070 */ sw $s2, 0x70($s3) -.L80240CD0: -/* CC44E0 80240CD0 AE220090 */ sw $v0, 0x90($s1) -.L80240CD4: -/* CC44E4 80240CD4 8602008C */ lh $v0, 0x8c($s0) -/* CC44E8 80240CD8 14400025 */ bnez $v0, .L80240D70 -/* CC44EC 80240CDC 00000000 */ nop -/* CC44F0 80240CE0 8602008E */ lh $v0, 0x8e($s0) -/* CC44F4 80240CE4 1C400022 */ bgtz $v0, .L80240D70 -/* CC44F8 80240CE8 00000000 */ nop -/* CC44FC 80240CEC 8E620074 */ lw $v0, 0x74($s3) -/* CC4500 80240CF0 2442FFFF */ addiu $v0, $v0, -1 -/* CC4504 80240CF4 1840001D */ blez $v0, .L80240D6C -/* CC4508 80240CF8 AE620074 */ sw $v0, 0x74($s3) -/* CC450C 80240CFC 8E220018 */ lw $v0, 0x18($s1) -/* CC4510 80240D00 9442002A */ lhu $v0, 0x2a($v0) -/* CC4514 80240D04 30420010 */ andi $v0, $v0, 0x10 -/* CC4518 80240D08 14400007 */ bnez $v0, .L80240D28 -/* CC451C 80240D0C 00000000 */ nop -/* CC4520 80240D10 C600000C */ lwc1 $f0, 0xc($s0) -/* CC4524 80240D14 3C014334 */ lui $at, 0x4334 -/* CC4528 80240D18 44816000 */ mtc1 $at, $f12 -/* CC452C 80240D1C 0C00A6C9 */ jal clamp_angle -/* CC4530 80240D20 460C0300 */ add.s $f12, $f0, $f12 -/* CC4534 80240D24 E600000C */ swc1 $f0, 0xc($s0) -.L80240D28: -/* CC4538 80240D28 0C00A67F */ jal rand_int -/* CC453C 80240D2C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CC4540 80240D30 3C032E8B */ lui $v1, 0x2e8b -/* CC4544 80240D34 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CC4548 80240D38 00430018 */ mult $v0, $v1 -/* CC454C 80240D3C 00021FC3 */ sra $v1, $v0, 0x1f -/* CC4550 80240D40 00004010 */ mfhi $t0 -/* CC4554 80240D44 00082043 */ sra $a0, $t0, 1 -/* CC4558 80240D48 00832023 */ subu $a0, $a0, $v1 -/* CC455C 80240D4C 00041840 */ sll $v1, $a0, 1 -/* CC4560 80240D50 00641821 */ addu $v1, $v1, $a0 -/* CC4564 80240D54 00031880 */ sll $v1, $v1, 2 -/* CC4568 80240D58 00641823 */ subu $v1, $v1, $a0 -/* CC456C 80240D5C 00431023 */ subu $v0, $v0, $v1 -/* CC4570 80240D60 24420005 */ addiu $v0, $v0, 5 -/* CC4574 80240D64 0809035C */ j .L80240D70 -/* CC4578 80240D68 A602008E */ sh $v0, 0x8e($s0) -.L80240D6C: -/* CC457C 80240D6C AE600070 */ sw $zero, 0x70($s3) -.L80240D70: -/* CC4580 80240D70 8FBF0054 */ lw $ra, 0x54($sp) -/* CC4584 80240D74 8FB40050 */ lw $s4, 0x50($sp) -/* CC4588 80240D78 8FB3004C */ lw $s3, 0x4c($sp) -/* CC458C 80240D7C 8FB20048 */ lw $s2, 0x48($sp) -/* CC4590 80240D80 8FB10044 */ lw $s1, 0x44($sp) -/* CC4594 80240D84 8FB00040 */ lw $s0, 0x40($sp) -/* CC4598 80240D88 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CC459C 80240D8C D7B80068 */ ldc1 $f24, 0x68($sp) -/* CC45A0 80240D90 D7B60060 */ ldc1 $f22, 0x60($sp) -/* CC45A4 80240D94 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CC45A8 80240D98 03E00008 */ jr $ra -/* CC45AC 80240D9C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s deleted file mode 100644 index 56c3155545..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024101C_CC482C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024101C_CC482C -/* CC482C 8024101C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CC4830 80241020 AFB20030 */ sw $s2, 0x30($sp) -/* CC4834 80241024 0080902D */ daddu $s2, $a0, $zero -/* CC4838 80241028 AFBF0038 */ sw $ra, 0x38($sp) -/* CC483C 8024102C AFB30034 */ sw $s3, 0x34($sp) -/* CC4840 80241030 AFB1002C */ sw $s1, 0x2c($sp) -/* CC4844 80241034 AFB00028 */ sw $s0, 0x28($sp) -/* CC4848 80241038 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CC484C 8024103C F7B40040 */ sdc1 $f20, 0x40($sp) -/* CC4850 80241040 8E510148 */ lw $s1, 0x148($s2) -/* CC4854 80241044 86240008 */ lh $a0, 8($s1) -/* CC4858 80241048 0C00EABB */ jal get_npc_unsafe -/* CC485C 8024104C 00A0982D */ daddu $s3, $a1, $zero -/* CC4860 80241050 0040802D */ daddu $s0, $v0, $zero -/* CC4864 80241054 0200202D */ daddu $a0, $s0, $zero -/* CC4868 80241058 C6220088 */ lwc1 $f2, 0x88($s1) -/* CC486C 8024105C 468010A0 */ cvt.s.w $f2, $f2 -/* CC4870 80241060 460010A1 */ cvt.d.s $f2, $f2 -/* CC4874 80241064 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC4878 80241068 C6000014 */ lwc1 $f0, 0x14($s0) -/* CC487C 8024106C 8E050018 */ lw $a1, 0x18($s0) -/* CC4880 80241070 46002100 */ add.s $f4, $f4, $f0 -/* CC4884 80241074 8E06000C */ lw $a2, 0xc($s0) -/* CC4888 80241078 C6200078 */ lwc1 $f0, 0x78($s1) -/* CC488C 8024107C 46800020 */ cvt.s.w $f0, $f0 -/* CC4890 80241080 E604001C */ swc1 $f4, 0x1c($s0) -/* CC4894 80241084 3C014059 */ lui $at, 0x4059 -/* CC4898 80241088 44812800 */ mtc1 $at, $f5 -/* CC489C 8024108C 44802000 */ mtc1 $zero, $f4 -/* CC48A0 80241090 46000021 */ cvt.d.s $f0, $f0 -/* CC48A4 80241094 46240003 */ div.d $f0, $f0, $f4 -/* CC48A8 80241098 46200520 */ cvt.s.d $f20, $f0 -/* CC48AC 8024109C 46241083 */ div.d $f2, $f2, $f4 -/* CC48B0 802410A0 0C00EA95 */ jal npc_move_heading -/* CC48B4 802410A4 462015A0 */ cvt.s.d $f22, $f2 -/* CC48B8 802410A8 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC48BC 802410AC 44801000 */ mtc1 $zero, $f2 -/* CC48C0 802410B0 44801800 */ mtc1 $zero, $f3 -/* CC48C4 802410B4 46002021 */ cvt.d.s $f0, $f4 -/* CC48C8 802410B8 4620103E */ c.le.d $f2, $f0 -/* CC48CC 802410BC 00000000 */ nop -/* CC48D0 802410C0 45000030 */ bc1f .L80241184 -/* CC48D4 802410C4 00000000 */ nop -/* CC48D8 802410C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC48DC 802410CC 46040000 */ add.s $f0, $f0, $f4 -/* CC48E0 802410D0 E600003C */ swc1 $f0, 0x3c($s0) -/* CC48E4 802410D4 8E2200CC */ lw $v0, 0xcc($s1) -/* CC48E8 802410D8 8C420024 */ lw $v0, 0x24($v0) -/* CC48EC 802410DC AE020028 */ sw $v0, 0x28($s0) -/* CC48F0 802410E0 A2200007 */ sb $zero, 7($s1) -/* CC48F4 802410E4 8E020000 */ lw $v0, ($s0) -/* CC48F8 802410E8 30420008 */ andi $v0, $v0, 8 -/* CC48FC 802410EC 14400011 */ bnez $v0, .L80241134 -/* CC4900 802410F0 0000102D */ daddu $v0, $zero, $zero -/* CC4904 802410F4 27A50018 */ addiu $a1, $sp, 0x18 -/* CC4908 802410F8 27A6001C */ addiu $a2, $sp, 0x1c -/* CC490C 802410FC C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4910 80241100 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4914 80241104 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC4918 80241108 3C01447A */ lui $at, 0x447a -/* CC491C 8024110C 44813000 */ mtc1 $at, $f6 -/* CC4920 80241110 27A20024 */ addiu $v0, $sp, 0x24 -/* CC4924 80241114 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4928 80241118 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CC492C 8024111C E7A40020 */ swc1 $f4, 0x20($sp) -/* CC4930 80241120 E7A60024 */ swc1 $f6, 0x24($sp) -/* CC4934 80241124 AFA20010 */ sw $v0, 0x10($sp) -/* CC4938 80241128 8E040080 */ lw $a0, 0x80($s0) -/* CC493C 8024112C 0C0372DF */ jal func_800DCB7C -/* CC4940 80241130 27A70020 */ addiu $a3, $sp, 0x20 -.L80241134: -/* CC4944 80241134 1040000B */ beqz $v0, .L80241164 -/* CC4948 80241138 00000000 */ nop -/* CC494C 8024113C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CC4950 80241140 46140080 */ add.s $f2, $f0, $f20 -/* CC4954 80241144 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC4958 80241148 4600103E */ c.le.s $f2, $f0 -/* CC495C 8024114C 00000000 */ nop -/* CC4960 80241150 4500008D */ bc1f .L80241388 -/* CC4964 80241154 00000000 */ nop -/* CC4968 80241158 E602003C */ swc1 $f2, 0x3c($s0) -/* CC496C 8024115C 080904E2 */ j .L80241388 -/* CC4970 80241160 AE400070 */ sw $zero, 0x70($s2) -.L80241164: -/* CC4974 80241164 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4978 80241168 C6000064 */ lwc1 $f0, 0x64($s0) -/* CC497C 8024116C 4602003E */ c.le.s $f0, $f2 -/* CC4980 80241170 00000000 */ nop -/* CC4984 80241174 45030084 */ bc1tl .L80241388 -/* CC4988 80241178 AE400070 */ sw $zero, 0x70($s2) -/* CC498C 8024117C 080904E2 */ j .L80241388 -/* CC4990 80241180 00000000 */ nop -.L80241184: -/* CC4994 80241184 4622003C */ c.lt.d $f0, $f2 -/* CC4998 80241188 00000000 */ nop -/* CC499C 8024118C 4500007E */ bc1f .L80241388 -/* CC49A0 80241190 00000000 */ nop -/* CC49A4 80241194 9602008E */ lhu $v0, 0x8e($s0) -/* CC49A8 80241198 24420001 */ addiu $v0, $v0, 1 -/* CC49AC 8024119C A602008E */ sh $v0, 0x8e($s0) -/* CC49B0 802411A0 00021400 */ sll $v0, $v0, 0x10 -/* CC49B4 802411A4 8E630020 */ lw $v1, 0x20($s3) -/* CC49B8 802411A8 00021403 */ sra $v0, $v0, 0x10 -/* CC49BC 802411AC 0043102A */ slt $v0, $v0, $v1 -/* CC49C0 802411B0 14400026 */ bnez $v0, .L8024124C -/* CC49C4 802411B4 00000000 */ nop -/* CC49C8 802411B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC49CC 802411BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC49D0 802411C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC49D4 802411C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC49D8 802411C8 A600008E */ sh $zero, 0x8e($s0) -/* CC49DC 802411CC 8C460028 */ lw $a2, 0x28($v0) -/* CC49E0 802411D0 0C00A720 */ jal atan2 -/* CC49E4 802411D4 8C470030 */ lw $a3, 0x30($v0) -/* CC49E8 802411D8 46000506 */ mov.s $f20, $f0 -/* CC49EC 802411DC C60C000C */ lwc1 $f12, 0xc($s0) -/* CC49F0 802411E0 0C00A70A */ jal get_clamped_angle_diff -/* CC49F4 802411E4 4600A386 */ mov.s $f14, $f20 -/* CC49F8 802411E8 46000086 */ mov.s $f2, $f0 -/* CC49FC 802411EC 8E62001C */ lw $v0, 0x1c($s3) -/* CC4A00 802411F0 46001005 */ abs.s $f0, $f2 -/* CC4A04 802411F4 44822000 */ mtc1 $v0, $f4 -/* CC4A08 802411F8 00000000 */ nop -/* CC4A0C 802411FC 46802120 */ cvt.s.w $f4, $f4 -/* CC4A10 80241200 4600203C */ c.lt.s $f4, $f0 -/* CC4A14 80241204 00000000 */ nop -/* CC4A18 80241208 4500000D */ bc1f .L80241240 -/* CC4A1C 8024120C 00000000 */ nop -/* CC4A20 80241210 44800000 */ mtc1 $zero, $f0 -/* CC4A24 80241214 C614000C */ lwc1 $f20, 0xc($s0) -/* CC4A28 80241218 4600103C */ c.lt.s $f2, $f0 -/* CC4A2C 8024121C 00000000 */ nop -/* CC4A30 80241220 45000006 */ bc1f .L8024123C -/* CC4A34 80241224 00021023 */ negu $v0, $v0 -/* CC4A38 80241228 44820000 */ mtc1 $v0, $f0 -/* CC4A3C 8024122C 00000000 */ nop -/* CC4A40 80241230 46800020 */ cvt.s.w $f0, $f0 -/* CC4A44 80241234 08090490 */ j .L80241240 -/* CC4A48 80241238 4600A500 */ add.s $f20, $f20, $f0 -.L8024123C: -/* CC4A4C 8024123C 4604A500 */ add.s $f20, $f20, $f4 -.L80241240: -/* CC4A50 80241240 0C00A6C9 */ jal clamp_angle -/* CC4A54 80241244 4600A306 */ mov.s $f12, $f20 -/* CC4A58 80241248 E600000C */ swc1 $f0, 0xc($s0) -.L8024124C: -/* CC4A5C 8024124C 8E020000 */ lw $v0, ($s0) -/* CC4A60 80241250 30420008 */ andi $v0, $v0, 8 -/* CC4A64 80241254 1040000A */ beqz $v0, .L80241280 -/* CC4A68 80241258 27A50018 */ addiu $a1, $sp, 0x18 -/* CC4A6C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4A70 80241260 C600001C */ lwc1 $f0, 0x1c($s0) -/* CC4A74 80241264 46001080 */ add.s $f2, $f2, $f0 -/* CC4A78 80241268 4616103C */ c.lt.s $f2, $f22 -/* CC4A7C 8024126C 00000000 */ nop -/* CC4A80 80241270 45020045 */ bc1fl .L80241388 -/* CC4A84 80241274 E602003C */ swc1 $f2, 0x3c($s0) -/* CC4A88 80241278 080904E1 */ j .L80241384 -/* CC4A8C 8024127C E616003C */ swc1 $f22, 0x3c($s0) -.L80241280: -/* CC4A90 80241280 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4A94 80241284 27A6001C */ addiu $a2, $sp, 0x1c -/* CC4A98 80241288 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4A9C 8024128C 860200A8 */ lh $v0, 0xa8($s0) -/* CC4AA0 80241290 C600001C */ lwc1 $f0, 0x1c($s0) -/* CC4AA4 80241294 C604003C */ lwc1 $f4, 0x3c($s0) -/* CC4AA8 80241298 44821000 */ mtc1 $v0, $f2 -/* CC4AAC 8024129C 00000000 */ nop -/* CC4AB0 802412A0 468010A0 */ cvt.s.w $f2, $f2 -/* CC4AB4 802412A4 46000005 */ abs.s $f0, $f0 -/* CC4AB8 802412A8 46020000 */ add.s $f0, $f0, $f2 -/* CC4ABC 802412AC C6060040 */ lwc1 $f6, 0x40($s0) -/* CC4AC0 802412B0 27A20024 */ addiu $v0, $sp, 0x24 -/* CC4AC4 802412B4 46022100 */ add.s $f4, $f4, $f2 -/* CC4AC8 802412B8 3C014024 */ lui $at, 0x4024 -/* CC4ACC 802412BC 44811800 */ mtc1 $at, $f3 -/* CC4AD0 802412C0 44801000 */ mtc1 $zero, $f2 -/* CC4AD4 802412C4 46000021 */ cvt.d.s $f0, $f0 -/* CC4AD8 802412C8 46220000 */ add.d $f0, $f0, $f2 -/* CC4ADC 802412CC E7A60020 */ swc1 $f6, 0x20($sp) -/* CC4AE0 802412D0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* CC4AE4 802412D4 46200020 */ cvt.s.d $f0, $f0 -/* CC4AE8 802412D8 E7A00024 */ swc1 $f0, 0x24($sp) -/* CC4AEC 802412DC AFA20010 */ sw $v0, 0x10($sp) -/* CC4AF0 802412E0 8E040080 */ lw $a0, 0x80($s0) -/* CC4AF4 802412E4 0C0372DF */ jal func_800DCB7C -/* CC4AF8 802412E8 27A70020 */ addiu $a3, $sp, 0x20 -/* CC4AFC 802412EC 10400015 */ beqz $v0, .L80241344 -/* CC4B00 802412F0 00000000 */ nop -/* CC4B04 802412F4 860200A8 */ lh $v0, 0xa8($s0) -/* CC4B08 802412F8 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC4B0C 802412FC 44820000 */ mtc1 $v0, $f0 -/* CC4B10 80241300 00000000 */ nop -/* CC4B14 80241304 46800020 */ cvt.s.w $f0, $f0 -/* CC4B18 80241308 46002085 */ abs.s $f2, $f4 -/* CC4B1C 8024130C 46020000 */ add.s $f0, $f0, $f2 -/* CC4B20 80241310 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CC4B24 80241314 4600103E */ c.le.s $f2, $f0 -/* CC4B28 80241318 00000000 */ nop -/* CC4B2C 8024131C 45000005 */ bc1f .L80241334 -/* CC4B30 80241320 00000000 */ nop -/* CC4B34 80241324 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CC4B38 80241328 AE00001C */ sw $zero, 0x1c($s0) -/* CC4B3C 8024132C 080904E2 */ j .L80241388 -/* CC4B40 80241330 E600003C */ swc1 $f0, 0x3c($s0) -.L80241334: -/* CC4B44 80241334 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC4B48 80241338 46040000 */ add.s $f0, $f0, $f4 -/* CC4B4C 8024133C 080904E2 */ j .L80241388 -/* CC4B50 80241340 E600003C */ swc1 $f0, 0x3c($s0) -.L80241344: -/* CC4B54 80241344 C606003C */ lwc1 $f6, 0x3c($s0) -/* CC4B58 80241348 860200A8 */ lh $v0, 0xa8($s0) -/* CC4B5C 8024134C 46163081 */ sub.s $f2, $f6, $f22 -/* CC4B60 80241350 44820000 */ mtc1 $v0, $f0 -/* CC4B64 80241354 00000000 */ nop -/* CC4B68 80241358 46800020 */ cvt.s.w $f0, $f0 -/* CC4B6C 8024135C 46001080 */ add.s $f2, $f2, $f0 -/* CC4B70 80241360 C604001C */ lwc1 $f4, 0x1c($s0) -/* CC4B74 80241364 46002005 */ abs.s $f0, $f4 -/* CC4B78 80241368 4602003C */ c.lt.s $f0, $f2 -/* CC4B7C 8024136C 00000000 */ nop -/* CC4B80 80241370 45020005 */ bc1fl .L80241388 -/* CC4B84 80241374 AE00001C */ sw $zero, 0x1c($s0) -/* CC4B88 80241378 46043000 */ add.s $f0, $f6, $f4 -/* CC4B8C 8024137C 080904E2 */ j .L80241388 -/* CC4B90 80241380 E600003C */ swc1 $f0, 0x3c($s0) -.L80241384: -/* CC4B94 80241384 AE00001C */ sw $zero, 0x1c($s0) -.L80241388: -/* CC4B98 80241388 8FBF0038 */ lw $ra, 0x38($sp) -/* CC4B9C 8024138C 8FB30034 */ lw $s3, 0x34($sp) -/* CC4BA0 80241390 8FB20030 */ lw $s2, 0x30($sp) -/* CC4BA4 80241394 8FB1002C */ lw $s1, 0x2c($sp) -/* CC4BA8 80241398 8FB00028 */ lw $s0, 0x28($sp) -/* CC4BAC 8024139C D7B60048 */ ldc1 $f22, 0x48($sp) -/* CC4BB0 802413A0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* CC4BB4 802413A4 03E00008 */ jr $ra -/* CC4BB8 802413A8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s deleted file mode 100644 index d73cdd5601..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802413AC_CC4BBC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413AC_CC4BBC -/* CC4BBC 802413AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CC4BC0 802413B0 AFB00028 */ sw $s0, 0x28($sp) -/* CC4BC4 802413B4 00A0802D */ daddu $s0, $a1, $zero -/* CC4BC8 802413B8 AFB1002C */ sw $s1, 0x2c($sp) -/* CC4BCC 802413BC 00C0882D */ daddu $s1, $a2, $zero -/* CC4BD0 802413C0 AFBF0034 */ sw $ra, 0x34($sp) -/* CC4BD4 802413C4 AFB20030 */ sw $s2, 0x30($sp) -/* CC4BD8 802413C8 AE200070 */ sw $zero, 0x70($s1) -/* CC4BDC 802413CC 8C830000 */ lw $v1, ($a0) -/* CC4BE0 802413D0 2402FDFF */ addiu $v0, $zero, -0x201 -/* CC4BE4 802413D4 A480008E */ sh $zero, 0x8e($a0) -/* CC4BE8 802413D8 00621824 */ and $v1, $v1, $v0 -/* CC4BEC 802413DC 34650800 */ ori $a1, $v1, 0x800 -/* CC4BF0 802413E0 AC850000 */ sw $a1, ($a0) -/* CC4BF4 802413E4 8E0200D0 */ lw $v0, 0xd0($s0) -/* CC4BF8 802413E8 8C420034 */ lw $v0, 0x34($v0) -/* CC4BFC 802413EC 10400003 */ beqz $v0, .L802413FC -/* CC4C00 802413F0 00E0902D */ daddu $s2, $a3, $zero -/* CC4C04 802413F4 08090501 */ j .L80241404 -/* CC4C08 802413F8 34620808 */ ori $v0, $v1, 0x808 -.L802413FC: -/* CC4C0C 802413FC 2402FFF7 */ addiu $v0, $zero, -9 -/* CC4C10 80241400 00A21024 */ and $v0, $a1, $v0 -.L80241404: -/* CC4C14 80241404 AC820000 */ sw $v0, ($a0) -/* CC4C18 80241408 27A20024 */ addiu $v0, $sp, 0x24 -/* CC4C1C 8024140C 27A50018 */ addiu $a1, $sp, 0x18 -/* CC4C20 80241410 C4800038 */ lwc1 $f0, 0x38($a0) -/* CC4C24 80241414 C482003C */ lwc1 $f2, 0x3c($a0) -/* CC4C28 80241418 C4840040 */ lwc1 $f4, 0x40($a0) -/* CC4C2C 8024141C 3C01447A */ lui $at, 0x447a -/* CC4C30 80241420 44813000 */ mtc1 $at, $f6 -/* CC4C34 80241424 27A6001C */ addiu $a2, $sp, 0x1c -/* CC4C38 80241428 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4C3C 8024142C E7A2001C */ swc1 $f2, 0x1c($sp) -/* CC4C40 80241430 E7A40020 */ swc1 $f4, 0x20($sp) -/* CC4C44 80241434 E7A60024 */ swc1 $f6, 0x24($sp) -/* CC4C48 80241438 AFA20010 */ sw $v0, 0x10($sp) -/* CC4C4C 8024143C 8C840080 */ lw $a0, 0x80($a0) -/* CC4C50 80241440 0C0372DF */ jal func_800DCB7C -/* CC4C54 80241444 27A70020 */ addiu $a3, $sp, 0x20 -/* CC4C58 80241448 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CC4C5C 8024144C 3C014059 */ lui $at, 0x4059 -/* CC4C60 80241450 44812800 */ mtc1 $at, $f5 -/* CC4C64 80241454 44802000 */ mtc1 $zero, $f4 -/* CC4C68 80241458 460010A1 */ cvt.d.s $f2, $f2 -/* CC4C6C 8024145C 46241082 */ mul.d $f2, $f2, $f4 -/* CC4C70 80241460 00000000 */ nop -/* CC4C74 80241464 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CC4C78 80241468 46000021 */ cvt.d.s $f0, $f0 -/* CC4C7C 8024146C 46240002 */ mul.d $f0, $f0, $f4 -/* CC4C80 80241470 00000000 */ nop -/* CC4C84 80241474 3C013FE0 */ lui $at, 0x3fe0 -/* CC4C88 80241478 44812800 */ mtc1 $at, $f5 -/* CC4C8C 8024147C 44802000 */ mtc1 $zero, $f4 -/* CC4C90 80241480 00000000 */ nop -/* CC4C94 80241484 46241080 */ add.d $f2, $f2, $f4 -/* CC4C98 80241488 AE000074 */ sw $zero, 0x74($s0) -/* CC4C9C 8024148C 46240000 */ add.d $f0, $f0, $f4 -/* CC4CA0 80241490 AE000090 */ sw $zero, 0x90($s0) -/* CC4CA4 80241494 4620120D */ trunc.w.d $f8, $f2 -/* CC4CA8 80241498 E6080078 */ swc1 $f8, 0x78($s0) -/* CC4CAC 8024149C 4620020D */ trunc.w.d $f8, $f0 -/* CC4CB0 802414A0 E6080088 */ swc1 $f8, 0x88($s0) -/* CC4CB4 802414A4 8E420014 */ lw $v0, 0x14($s2) -/* CC4CB8 802414A8 AE220074 */ sw $v0, 0x74($s1) -/* CC4CBC 802414AC 8E0200B0 */ lw $v0, 0xb0($s0) -/* CC4CC0 802414B0 34420010 */ ori $v0, $v0, 0x10 -/* CC4CC4 802414B4 AE0200B0 */ sw $v0, 0xb0($s0) -/* CC4CC8 802414B8 8FBF0034 */ lw $ra, 0x34($sp) -/* CC4CCC 802414BC 8FB20030 */ lw $s2, 0x30($sp) -/* CC4CD0 802414C0 8FB1002C */ lw $s1, 0x2c($sp) -/* CC4CD4 802414C4 8FB00028 */ lw $s0, 0x28($sp) -/* CC4CD8 802414C8 03E00008 */ jr $ra -/* CC4CDC 802414CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 665bccb820..8d5fd460d4 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -46,7 +46,7 @@ glabel func_802414D0_CC4CE0 /* CC4D84 80241574 02A0202D */ daddu $a0, $s5, $zero /* CC4D88 80241578 0240282D */ daddu $a1, $s2, $zero /* CC4D8C 8024157C 0280302D */ daddu $a2, $s4, $zero -/* CC4D90 80241580 0C0904EB */ jal func_802413AC_CC4BBC +/* CC4D90 80241580 0C0904EB */ jal flo_13_UnkFunc5 /* CC4D94 80241584 0200382D */ daddu $a3, $s0, $zero .L80241588: /* CC4D98 80241588 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241604_CC4E14 glabel L80241614_CC4E24 /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero -/* CC4E2C 8024161C 0C090297 */ jal func_80240A5C_CC426C +/* CC4E2C 8024161C 0C090297 */ jal flo_13_UnkFunc4 /* CC4E30 80241620 0260302D */ daddu $a2, $s3, $zero /* CC4E34 80241624 080905A6 */ j .L80241698 /* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L8024166C_CC4E7C glabel L80241684_CC4E94 /* CC4E94 80241684 0280202D */ daddu $a0, $s4, $zero /* CC4E98 80241688 0200282D */ daddu $a1, $s0, $zero -/* CC4E9C 8024168C 0C090407 */ jal func_8024101C_CC482C +/* CC4E9C 8024168C 0C090407 */ jal flo_13_UnkFunc6 /* CC4EA0 80241690 0260302D */ daddu $a2, $s3, $zero glabel L80241694_CC4EA4 /* CC4EA4 80241694 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index e085cca7d2..c5f4cef4f7 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -48,7 +48,7 @@ glabel func_80241DB8_CC55C8 /* CC5674 80241E64 0240202D */ daddu $a0, $s2, $zero /* CC5678 80241E68 0260282D */ daddu $a1, $s3, $zero /* CC567C 80241E6C 0280302D */ daddu $a2, $s4, $zero -/* CC5680 80241E70 0C0904EB */ jal func_802413AC_CC4BBC +/* CC5680 80241E70 0C0904EB */ jal flo_13_UnkFunc5 /* CC5684 80241E74 02C0382D */ daddu $a3, $s6, $zero /* CC5688 80241E78 AE800070 */ sw $zero, 0x70($s4) .L80241E7C: @@ -166,7 +166,7 @@ glabel func_80241DB8_CC55C8 /* CC5818 80242008 00000000 */ nop .L8024200C: /* CC581C 8024200C 02C0282D */ daddu $a1, $s6, $zero -/* CC5820 80242010 0C090407 */ jal func_8024101C_CC482C +/* CC5820 80242010 0C090407 */ jal flo_13_UnkFunc6 /* CC5824 80242014 02A0302D */ daddu $a2, $s5, $zero .L80242018: /* CC5828 80242018 8E830070 */ lw $v1, 0x70($s4) diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s deleted file mode 100644 index 161caa9d87..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A8_CCC6B8 -/* CCC6B8 802413A8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CCC6BC 802413AC AFB3004C */ sw $s3, 0x4c($sp) -/* CCC6C0 802413B0 0080982D */ daddu $s3, $a0, $zero -/* CCC6C4 802413B4 AFBF0054 */ sw $ra, 0x54($sp) -/* CCC6C8 802413B8 AFB40050 */ sw $s4, 0x50($sp) -/* CCC6CC 802413BC AFB20048 */ sw $s2, 0x48($sp) -/* CCC6D0 802413C0 AFB10044 */ sw $s1, 0x44($sp) -/* CCC6D4 802413C4 AFB00040 */ sw $s0, 0x40($sp) -/* CCC6D8 802413C8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CCC6DC 802413CC F7B80068 */ sdc1 $f24, 0x68($sp) -/* CCC6E0 802413D0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CCC6E4 802413D4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CCC6E8 802413D8 8E710148 */ lw $s1, 0x148($s3) -/* CCC6EC 802413DC 00A0902D */ daddu $s2, $a1, $zero -/* CCC6F0 802413E0 86240008 */ lh $a0, 8($s1) -/* CCC6F4 802413E4 0C00EABB */ jal get_npc_unsafe -/* CCC6F8 802413E8 00C0A02D */ daddu $s4, $a2, $zero -/* CCC6FC 802413EC 0040802D */ daddu $s0, $v0, $zero -/* CCC700 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) -/* CCC704 802413F4 46800020 */ cvt.s.w $f0, $f0 -/* CCC708 802413F8 46000021 */ cvt.d.s $f0, $f0 -/* CCC70C 802413FC 3C014059 */ lui $at, 0x4059 -/* CCC710 80241400 44811800 */ mtc1 $at, $f3 -/* CCC714 80241404 44801000 */ mtc1 $zero, $f2 -/* CCC718 80241408 8602008E */ lh $v0, 0x8e($s0) -/* CCC71C 8024140C 9603008E */ lhu $v1, 0x8e($s0) -/* CCC720 80241410 46220003 */ div.d $f0, $f0, $f2 -/* CCC724 80241414 46200620 */ cvt.s.d $f24, $f0 -/* CCC728 80241418 C6200088 */ lwc1 $f0, 0x88($s1) -/* CCC72C 8024141C 46800020 */ cvt.s.w $f0, $f0 -/* CCC730 80241420 46000021 */ cvt.d.s $f0, $f0 -/* CCC734 80241424 46220003 */ div.d $f0, $f0, $f2 -/* CCC738 80241428 46200020 */ cvt.s.d $f0, $f0 -/* CCC73C 8024142C 18400003 */ blez $v0, .L8024143C -/* CCC740 80241430 4600C680 */ add.s $f26, $f24, $f0 -/* CCC744 80241434 2462FFFF */ addiu $v0, $v1, -1 -/* CCC748 80241438 A602008E */ sh $v0, 0x8e($s0) -.L8024143C: -/* CCC74C 8024143C 8E220070 */ lw $v0, 0x70($s1) -/* CCC750 80241440 18400034 */ blez $v0, .L80241514 -/* CCC754 80241444 00000000 */ nop -/* CCC758 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CCC75C 8024144C 46806320 */ cvt.s.w $f12, $f12 -/* CCC760 80241450 44820000 */ mtc1 $v0, $f0 -/* CCC764 80241454 00000000 */ nop -/* CCC768 80241458 46800020 */ cvt.s.w $f0, $f0 -/* CCC76C 8024145C 46000021 */ cvt.d.s $f0, $f0 -/* CCC770 80241460 46220003 */ div.d $f0, $f0, $f2 -/* CCC774 80241464 0C00A8BB */ jal sin_deg -/* CCC778 80241468 462005A0 */ cvt.s.d $f22, $f0 -/* CCC77C 8024146C 8E020000 */ lw $v0, ($s0) -/* CCC780 80241470 30420008 */ andi $v0, $v0, 8 -/* CCC784 80241474 10400003 */ beqz $v0, .L80241484 -/* CCC788 80241478 46000506 */ mov.s $f20, $f0 -/* CCC78C 8024147C 08090531 */ j .L802414C4 -/* CCC790 80241480 0000102D */ daddu $v0, $zero, $zero -.L80241484: -/* CCC794 80241484 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC798 80241488 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC79C 8024148C C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC7A0 80241490 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC7A4 80241494 C6040040 */ lwc1 $f4, 0x40($s0) -/* CCC7A8 80241498 3C01447A */ lui $at, 0x447a -/* CCC7AC 8024149C 44813000 */ mtc1 $at, $f6 -/* CCC7B0 802414A0 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC7B4 802414A4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC7B8 802414A8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CCC7BC 802414AC E7A40030 */ swc1 $f4, 0x30($sp) -/* CCC7C0 802414B0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CCC7C4 802414B4 AFA20010 */ sw $v0, 0x10($sp) -/* CCC7C8 802414B8 8E040080 */ lw $a0, 0x80($s0) -/* CCC7CC 802414BC 0C0372DF */ jal func_800DCB7C -/* CCC7D0 802414C0 27A70030 */ addiu $a3, $sp, 0x30 -.L802414C4: -/* CCC7D4 802414C4 10400007 */ beqz $v0, .L802414E4 -/* CCC7D8 802414C8 00000000 */ nop -/* CCC7DC 802414CC 4616A082 */ mul.s $f2, $f20, $f22 -/* CCC7E0 802414D0 00000000 */ nop -/* CCC7E4 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CCC7E8 802414D8 46180000 */ add.s $f0, $f0, $f24 -/* CCC7EC 802414DC 0809053C */ j .L802414F0 -/* CCC7F0 802414E0 46020000 */ add.s $f0, $f0, $f2 -.L802414E4: -/* CCC7F4 802414E4 4616A002 */ mul.s $f0, $f20, $f22 -/* CCC7F8 802414E8 00000000 */ nop -/* CCC7FC 802414EC 4600D000 */ add.s $f0, $f26, $f0 -.L802414F0: -/* CCC800 802414F0 E600003C */ swc1 $f0, 0x3c($s0) -/* CCC804 802414F4 8E220074 */ lw $v0, 0x74($s1) -/* CCC808 802414F8 2442000A */ addiu $v0, $v0, 0xa -/* CCC80C 802414FC 44826000 */ mtc1 $v0, $f12 -/* CCC810 80241500 00000000 */ nop -/* CCC814 80241504 0C00A6C9 */ jal clamp_angle -/* CCC818 80241508 46806320 */ cvt.s.w $f12, $f12 -/* CCC81C 8024150C 4600020D */ trunc.w.s $f8, $f0 -/* CCC820 80241510 E6280074 */ swc1 $f8, 0x74($s1) -.L80241514: -/* CCC824 80241514 8E220090 */ lw $v0, 0x90($s1) -/* CCC828 80241518 1C400040 */ bgtz $v0, .L8024161C -/* CCC82C 8024151C 2442FFFF */ addiu $v0, $v0, -1 -/* CCC830 80241520 860200A8 */ lh $v0, 0xa8($s0) -/* CCC834 80241524 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC838 80241528 44821000 */ mtc1 $v0, $f2 -/* CCC83C 8024152C 00000000 */ nop -/* CCC840 80241530 468010A0 */ cvt.s.w $f2, $f2 -/* CCC844 80241534 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCC848 80241538 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCC84C 8024153C 46020000 */ add.s $f0, $f0, $f2 -/* CCC850 80241540 3C014024 */ lui $at, 0x4024 -/* CCC854 80241544 44812800 */ mtc1 $at, $f5 -/* CCC858 80241548 44802000 */ mtc1 $zero, $f4 -/* CCC85C 8024154C C442002C */ lwc1 $f2, 0x2c($v0) -/* CCC860 80241550 46000021 */ cvt.d.s $f0, $f0 -/* CCC864 80241554 46240000 */ add.d $f0, $f0, $f4 -/* CCC868 80241558 460010A1 */ cvt.d.s $f2, $f2 -/* CCC86C 8024155C 4620103C */ c.lt.d $f2, $f0 -/* CCC870 80241560 00000000 */ nop -/* CCC874 80241564 4500002E */ bc1f .L80241620 -/* CCC878 80241568 0280202D */ daddu $a0, $s4, $zero -/* CCC87C 8024156C 24020001 */ addiu $v0, $zero, 1 -/* CCC880 80241570 AFA20010 */ sw $v0, 0x10($sp) -/* CCC884 80241574 8E460024 */ lw $a2, 0x24($s2) -/* CCC888 80241578 8E470028 */ lw $a3, 0x28($s2) -/* CCC88C 8024157C 0C01242D */ jal func_800490B4 -/* CCC890 80241580 0220282D */ daddu $a1, $s1, $zero -/* CCC894 80241584 10400026 */ beqz $v0, .L80241620 -/* CCC898 80241588 0000202D */ daddu $a0, $zero, $zero -/* CCC89C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* CCC8A0 80241590 0000302D */ daddu $a2, $zero, $zero -/* CCC8A4 80241594 2412000C */ addiu $s2, $zero, 0xc -/* CCC8A8 80241598 860300A8 */ lh $v1, 0xa8($s0) -/* CCC8AC 8024159C 3C013F80 */ lui $at, 0x3f80 -/* CCC8B0 802415A0 44810000 */ mtc1 $at, $f0 -/* CCC8B4 802415A4 3C014000 */ lui $at, 0x4000 -/* CCC8B8 802415A8 44811000 */ mtc1 $at, $f2 -/* CCC8BC 802415AC 3C01C1A0 */ lui $at, 0xc1a0 -/* CCC8C0 802415B0 44812000 */ mtc1 $at, $f4 -/* CCC8C4 802415B4 44834000 */ mtc1 $v1, $f8 -/* CCC8C8 802415B8 00000000 */ nop -/* CCC8CC 802415BC 46804220 */ cvt.s.w $f8, $f8 -/* CCC8D0 802415C0 44074000 */ mfc1 $a3, $f8 -/* CCC8D4 802415C4 27A20038 */ addiu $v0, $sp, 0x38 -/* CCC8D8 802415C8 AFB2001C */ sw $s2, 0x1c($sp) -/* CCC8DC 802415CC AFA20020 */ sw $v0, 0x20($sp) -/* CCC8E0 802415D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCC8E4 802415D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CCC8E8 802415D8 0C01BFA4 */ jal fx_emote -/* CCC8EC 802415DC E7A40018 */ swc1 $f4, 0x18($sp) -/* CCC8F0 802415E0 0200202D */ daddu $a0, $s0, $zero -/* CCC8F4 802415E4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CCC8F8 802415E8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CCC8FC 802415EC 3C060020 */ lui $a2, 0x20 -/* CCC900 802415F0 0C012530 */ jal func_800494C0 -/* CCC904 802415F4 E4800064 */ swc1 $f0, 0x64($a0) -/* CCC908 802415F8 8E220018 */ lw $v0, 0x18($s1) -/* CCC90C 802415FC 9442002A */ lhu $v0, 0x2a($v0) -/* CCC910 80241600 30420001 */ andi $v0, $v0, 1 -/* CCC914 80241604 10400003 */ beqz $v0, .L80241614 -/* CCC918 80241608 2402000A */ addiu $v0, $zero, 0xa -/* CCC91C 8024160C 080905AF */ j .L802416BC -/* CCC920 80241610 AE620070 */ sw $v0, 0x70($s3) -.L80241614: -/* CCC924 80241614 080905AF */ j .L802416BC -/* CCC928 80241618 AE720070 */ sw $s2, 0x70($s3) -.L8024161C: -/* CCC92C 8024161C AE220090 */ sw $v0, 0x90($s1) -.L80241620: -/* CCC930 80241620 8602008C */ lh $v0, 0x8c($s0) -/* CCC934 80241624 14400025 */ bnez $v0, .L802416BC -/* CCC938 80241628 00000000 */ nop -/* CCC93C 8024162C 8602008E */ lh $v0, 0x8e($s0) -/* CCC940 80241630 1C400022 */ bgtz $v0, .L802416BC -/* CCC944 80241634 00000000 */ nop -/* CCC948 80241638 8E620074 */ lw $v0, 0x74($s3) -/* CCC94C 8024163C 2442FFFF */ addiu $v0, $v0, -1 -/* CCC950 80241640 1840001D */ blez $v0, .L802416B8 -/* CCC954 80241644 AE620074 */ sw $v0, 0x74($s3) -/* CCC958 80241648 8E220018 */ lw $v0, 0x18($s1) -/* CCC95C 8024164C 9442002A */ lhu $v0, 0x2a($v0) -/* CCC960 80241650 30420010 */ andi $v0, $v0, 0x10 -/* CCC964 80241654 14400007 */ bnez $v0, .L80241674 -/* CCC968 80241658 00000000 */ nop -/* CCC96C 8024165C C600000C */ lwc1 $f0, 0xc($s0) -/* CCC970 80241660 3C014334 */ lui $at, 0x4334 -/* CCC974 80241664 44816000 */ mtc1 $at, $f12 -/* CCC978 80241668 0C00A6C9 */ jal clamp_angle -/* CCC97C 8024166C 460C0300 */ add.s $f12, $f0, $f12 -/* CCC980 80241670 E600000C */ swc1 $f0, 0xc($s0) -.L80241674: -/* CCC984 80241674 0C00A67F */ jal rand_int -/* CCC988 80241678 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CCC98C 8024167C 3C032E8B */ lui $v1, 0x2e8b -/* CCC990 80241680 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CCC994 80241684 00430018 */ mult $v0, $v1 -/* CCC998 80241688 00021FC3 */ sra $v1, $v0, 0x1f -/* CCC99C 8024168C 00004010 */ mfhi $t0 -/* CCC9A0 80241690 00082043 */ sra $a0, $t0, 1 -/* CCC9A4 80241694 00832023 */ subu $a0, $a0, $v1 -/* CCC9A8 80241698 00041840 */ sll $v1, $a0, 1 -/* CCC9AC 8024169C 00641821 */ addu $v1, $v1, $a0 -/* CCC9B0 802416A0 00031880 */ sll $v1, $v1, 2 -/* CCC9B4 802416A4 00641823 */ subu $v1, $v1, $a0 -/* CCC9B8 802416A8 00431023 */ subu $v0, $v0, $v1 -/* CCC9BC 802416AC 24420005 */ addiu $v0, $v0, 5 -/* CCC9C0 802416B0 080905AF */ j .L802416BC -/* CCC9C4 802416B4 A602008E */ sh $v0, 0x8e($s0) -.L802416B8: -/* CCC9C8 802416B8 AE600070 */ sw $zero, 0x70($s3) -.L802416BC: -/* CCC9CC 802416BC 8FBF0054 */ lw $ra, 0x54($sp) -/* CCC9D0 802416C0 8FB40050 */ lw $s4, 0x50($sp) -/* CCC9D4 802416C4 8FB3004C */ lw $s3, 0x4c($sp) -/* CCC9D8 802416C8 8FB20048 */ lw $s2, 0x48($sp) -/* CCC9DC 802416CC 8FB10044 */ lw $s1, 0x44($sp) -/* CCC9E0 802416D0 8FB00040 */ lw $s0, 0x40($sp) -/* CCC9E4 802416D4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CCC9E8 802416D8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CCC9EC 802416DC D7B60060 */ ldc1 $f22, 0x60($sp) -/* CCC9F0 802416E0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CCC9F4 802416E4 03E00008 */ jr $ra -/* CCC9F8 802416E8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s deleted file mode 100644 index 54a855e28f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241968_CCCC78 -/* CCCC78 80241968 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CCCC7C 8024196C AFB20030 */ sw $s2, 0x30($sp) -/* CCCC80 80241970 0080902D */ daddu $s2, $a0, $zero -/* CCCC84 80241974 AFBF0038 */ sw $ra, 0x38($sp) -/* CCCC88 80241978 AFB30034 */ sw $s3, 0x34($sp) -/* CCCC8C 8024197C AFB1002C */ sw $s1, 0x2c($sp) -/* CCCC90 80241980 AFB00028 */ sw $s0, 0x28($sp) -/* CCCC94 80241984 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CCCC98 80241988 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CCCC9C 8024198C 8E510148 */ lw $s1, 0x148($s2) -/* CCCCA0 80241990 86240008 */ lh $a0, 8($s1) -/* CCCCA4 80241994 0C00EABB */ jal get_npc_unsafe -/* CCCCA8 80241998 00A0982D */ daddu $s3, $a1, $zero -/* CCCCAC 8024199C 0040802D */ daddu $s0, $v0, $zero -/* CCCCB0 802419A0 0200202D */ daddu $a0, $s0, $zero -/* CCCCB4 802419A4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CCCCB8 802419A8 468010A0 */ cvt.s.w $f2, $f2 -/* CCCCBC 802419AC 460010A1 */ cvt.d.s $f2, $f2 -/* CCCCC0 802419B0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCCC4 802419B4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CCCCC8 802419B8 8E050018 */ lw $a1, 0x18($s0) -/* CCCCCC 802419BC 46002100 */ add.s $f4, $f4, $f0 -/* CCCCD0 802419C0 8E06000C */ lw $a2, 0xc($s0) -/* CCCCD4 802419C4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CCCCD8 802419C8 46800020 */ cvt.s.w $f0, $f0 -/* CCCCDC 802419CC E604001C */ swc1 $f4, 0x1c($s0) -/* CCCCE0 802419D0 3C014059 */ lui $at, 0x4059 -/* CCCCE4 802419D4 44812800 */ mtc1 $at, $f5 -/* CCCCE8 802419D8 44802000 */ mtc1 $zero, $f4 -/* CCCCEC 802419DC 46000021 */ cvt.d.s $f0, $f0 -/* CCCCF0 802419E0 46240003 */ div.d $f0, $f0, $f4 -/* CCCCF4 802419E4 46200520 */ cvt.s.d $f20, $f0 -/* CCCCF8 802419E8 46241083 */ div.d $f2, $f2, $f4 -/* CCCCFC 802419EC 0C00EA95 */ jal npc_move_heading -/* CCCD00 802419F0 462015A0 */ cvt.s.d $f22, $f2 -/* CCCD04 802419F4 C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCD08 802419F8 44801000 */ mtc1 $zero, $f2 -/* CCCD0C 802419FC 44801800 */ mtc1 $zero, $f3 -/* CCCD10 80241A00 46002021 */ cvt.d.s $f0, $f4 -/* CCCD14 80241A04 4620103E */ c.le.d $f2, $f0 -/* CCCD18 80241A08 00000000 */ nop -/* CCCD1C 80241A0C 45000030 */ bc1f .L80241AD0 -/* CCCD20 80241A10 00000000 */ nop -/* CCCD24 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCCD28 80241A18 46040000 */ add.s $f0, $f0, $f4 -/* CCCD2C 80241A1C E600003C */ swc1 $f0, 0x3c($s0) -/* CCCD30 80241A20 8E2200CC */ lw $v0, 0xcc($s1) -/* CCCD34 80241A24 8C420024 */ lw $v0, 0x24($v0) -/* CCCD38 80241A28 AE020028 */ sw $v0, 0x28($s0) -/* CCCD3C 80241A2C A2200007 */ sb $zero, 7($s1) -/* CCCD40 80241A30 8E020000 */ lw $v0, ($s0) -/* CCCD44 80241A34 30420008 */ andi $v0, $v0, 8 -/* CCCD48 80241A38 14400011 */ bnez $v0, .L80241A80 -/* CCCD4C 80241A3C 0000102D */ daddu $v0, $zero, $zero -/* CCCD50 80241A40 27A50018 */ addiu $a1, $sp, 0x18 -/* CCCD54 80241A44 27A6001C */ addiu $a2, $sp, 0x1c -/* CCCD58 80241A48 C6000038 */ lwc1 $f0, 0x38($s0) -/* CCCD5C 80241A4C C602003C */ lwc1 $f2, 0x3c($s0) -/* CCCD60 80241A50 C6040040 */ lwc1 $f4, 0x40($s0) -/* CCCD64 80241A54 3C01447A */ lui $at, 0x447a -/* CCCD68 80241A58 44813000 */ mtc1 $at, $f6 -/* CCCD6C 80241A5C 27A20024 */ addiu $v0, $sp, 0x24 -/* CCCD70 80241A60 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCCD74 80241A64 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CCCD78 80241A68 E7A40020 */ swc1 $f4, 0x20($sp) -/* CCCD7C 80241A6C E7A60024 */ swc1 $f6, 0x24($sp) -/* CCCD80 80241A70 AFA20010 */ sw $v0, 0x10($sp) -/* CCCD84 80241A74 8E040080 */ lw $a0, 0x80($s0) -/* CCCD88 80241A78 0C0372DF */ jal func_800DCB7C -/* CCCD8C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A80: -/* CCCD90 80241A80 1040000B */ beqz $v0, .L80241AB0 -/* CCCD94 80241A84 00000000 */ nop -/* CCCD98 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CCCD9C 80241A8C 46140080 */ add.s $f2, $f0, $f20 -/* CCCDA0 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCCDA4 80241A94 4600103E */ c.le.s $f2, $f0 -/* CCCDA8 80241A98 00000000 */ nop -/* CCCDAC 80241A9C 4500008D */ bc1f .L80241CD4 -/* CCCDB0 80241AA0 00000000 */ nop -/* CCCDB4 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) -/* CCCDB8 80241AA8 08090735 */ j .L80241CD4 -/* CCCDBC 80241AAC AE400070 */ sw $zero, 0x70($s2) -.L80241AB0: -/* CCCDC0 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCCDC4 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CCCDC8 80241AB8 4602003E */ c.le.s $f0, $f2 -/* CCCDCC 80241ABC 00000000 */ nop -/* CCCDD0 80241AC0 45030084 */ bc1tl .L80241CD4 -/* CCCDD4 80241AC4 AE400070 */ sw $zero, 0x70($s2) -/* CCCDD8 80241AC8 08090735 */ j .L80241CD4 -/* CCCDDC 80241ACC 00000000 */ nop -.L80241AD0: -/* CCCDE0 80241AD0 4622003C */ c.lt.d $f0, $f2 -/* CCCDE4 80241AD4 00000000 */ nop -/* CCCDE8 80241AD8 4500007E */ bc1f .L80241CD4 -/* CCCDEC 80241ADC 00000000 */ nop -/* CCCDF0 80241AE0 9602008E */ lhu $v0, 0x8e($s0) -/* CCCDF4 80241AE4 24420001 */ addiu $v0, $v0, 1 -/* CCCDF8 80241AE8 A602008E */ sh $v0, 0x8e($s0) -/* CCCDFC 80241AEC 00021400 */ sll $v0, $v0, 0x10 -/* CCCE00 80241AF0 8E630020 */ lw $v1, 0x20($s3) -/* CCCE04 80241AF4 00021403 */ sra $v0, $v0, 0x10 -/* CCCE08 80241AF8 0043102A */ slt $v0, $v0, $v1 -/* CCCE0C 80241AFC 14400026 */ bnez $v0, .L80241B98 -/* CCCE10 80241B00 00000000 */ nop -/* CCCE14 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCCE18 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCCE1C 80241B0C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCCE20 80241B10 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCCE24 80241B14 A600008E */ sh $zero, 0x8e($s0) -/* CCCE28 80241B18 8C460028 */ lw $a2, 0x28($v0) -/* CCCE2C 80241B1C 0C00A720 */ jal atan2 -/* CCCE30 80241B20 8C470030 */ lw $a3, 0x30($v0) -/* CCCE34 80241B24 46000506 */ mov.s $f20, $f0 -/* CCCE38 80241B28 C60C000C */ lwc1 $f12, 0xc($s0) -/* CCCE3C 80241B2C 0C00A70A */ jal get_clamped_angle_diff -/* CCCE40 80241B30 4600A386 */ mov.s $f14, $f20 -/* CCCE44 80241B34 46000086 */ mov.s $f2, $f0 -/* CCCE48 80241B38 8E62001C */ lw $v0, 0x1c($s3) -/* CCCE4C 80241B3C 46001005 */ abs.s $f0, $f2 -/* CCCE50 80241B40 44822000 */ mtc1 $v0, $f4 -/* CCCE54 80241B44 00000000 */ nop -/* CCCE58 80241B48 46802120 */ cvt.s.w $f4, $f4 -/* CCCE5C 80241B4C 4600203C */ c.lt.s $f4, $f0 -/* CCCE60 80241B50 00000000 */ nop -/* CCCE64 80241B54 4500000D */ bc1f .L80241B8C -/* CCCE68 80241B58 00000000 */ nop -/* CCCE6C 80241B5C 44800000 */ mtc1 $zero, $f0 -/* CCCE70 80241B60 C614000C */ lwc1 $f20, 0xc($s0) -/* CCCE74 80241B64 4600103C */ c.lt.s $f2, $f0 -/* CCCE78 80241B68 00000000 */ nop -/* CCCE7C 80241B6C 45000006 */ bc1f .L80241B88 -/* CCCE80 80241B70 00021023 */ negu $v0, $v0 -/* CCCE84 80241B74 44820000 */ mtc1 $v0, $f0 -/* CCCE88 80241B78 00000000 */ nop -/* CCCE8C 80241B7C 46800020 */ cvt.s.w $f0, $f0 -/* CCCE90 80241B80 080906E3 */ j .L80241B8C -/* CCCE94 80241B84 4600A500 */ add.s $f20, $f20, $f0 -.L80241B88: -/* CCCE98 80241B88 4604A500 */ add.s $f20, $f20, $f4 -.L80241B8C: -/* CCCE9C 80241B8C 0C00A6C9 */ jal clamp_angle -/* CCCEA0 80241B90 4600A306 */ mov.s $f12, $f20 -/* CCCEA4 80241B94 E600000C */ swc1 $f0, 0xc($s0) -.L80241B98: -/* CCCEA8 80241B98 8E020000 */ lw $v0, ($s0) -/* CCCEAC 80241B9C 30420008 */ andi $v0, $v0, 8 -/* CCCEB0 80241BA0 1040000A */ beqz $v0, .L80241BCC -/* CCCEB4 80241BA4 27A50018 */ addiu $a1, $sp, 0x18 -/* CCCEB8 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCCEBC 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) -/* CCCEC0 80241BB0 46001080 */ add.s $f2, $f2, $f0 -/* CCCEC4 80241BB4 4616103C */ c.lt.s $f2, $f22 -/* CCCEC8 80241BB8 00000000 */ nop -/* CCCECC 80241BBC 45020045 */ bc1fl .L80241CD4 -/* CCCED0 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) -/* CCCED4 80241BC4 08090734 */ j .L80241CD0 -/* CCCED8 80241BC8 E616003C */ swc1 $f22, 0x3c($s0) -.L80241BCC: -/* CCCEDC 80241BCC C6000038 */ lwc1 $f0, 0x38($s0) -/* CCCEE0 80241BD0 27A6001C */ addiu $a2, $sp, 0x1c -/* CCCEE4 80241BD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCCEE8 80241BD8 860200A8 */ lh $v0, 0xa8($s0) -/* CCCEEC 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) -/* CCCEF0 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) -/* CCCEF4 80241BE4 44821000 */ mtc1 $v0, $f2 -/* CCCEF8 80241BE8 00000000 */ nop -/* CCCEFC 80241BEC 468010A0 */ cvt.s.w $f2, $f2 -/* CCCF00 80241BF0 46000005 */ abs.s $f0, $f0 -/* CCCF04 80241BF4 46020000 */ add.s $f0, $f0, $f2 -/* CCCF08 80241BF8 C6060040 */ lwc1 $f6, 0x40($s0) -/* CCCF0C 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 -/* CCCF10 80241C00 46022100 */ add.s $f4, $f4, $f2 -/* CCCF14 80241C04 3C014024 */ lui $at, 0x4024 -/* CCCF18 80241C08 44811800 */ mtc1 $at, $f3 -/* CCCF1C 80241C0C 44801000 */ mtc1 $zero, $f2 -/* CCCF20 80241C10 46000021 */ cvt.d.s $f0, $f0 -/* CCCF24 80241C14 46220000 */ add.d $f0, $f0, $f2 -/* CCCF28 80241C18 E7A60020 */ swc1 $f6, 0x20($sp) -/* CCCF2C 80241C1C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CCCF30 80241C20 46200020 */ cvt.s.d $f0, $f0 -/* CCCF34 80241C24 E7A00024 */ swc1 $f0, 0x24($sp) -/* CCCF38 80241C28 AFA20010 */ sw $v0, 0x10($sp) -/* CCCF3C 80241C2C 8E040080 */ lw $a0, 0x80($s0) -/* CCCF40 80241C30 0C0372DF */ jal func_800DCB7C -/* CCCF44 80241C34 27A70020 */ addiu $a3, $sp, 0x20 -/* CCCF48 80241C38 10400015 */ beqz $v0, .L80241C90 -/* CCCF4C 80241C3C 00000000 */ nop -/* CCCF50 80241C40 860200A8 */ lh $v0, 0xa8($s0) -/* CCCF54 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCF58 80241C48 44820000 */ mtc1 $v0, $f0 -/* CCCF5C 80241C4C 00000000 */ nop -/* CCCF60 80241C50 46800020 */ cvt.s.w $f0, $f0 -/* CCCF64 80241C54 46002085 */ abs.s $f2, $f4 -/* CCCF68 80241C58 46020000 */ add.s $f0, $f0, $f2 -/* CCCF6C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CCCF70 80241C60 4600103E */ c.le.s $f2, $f0 -/* CCCF74 80241C64 00000000 */ nop -/* CCCF78 80241C68 45000005 */ bc1f .L80241C80 -/* CCCF7C 80241C6C 00000000 */ nop -/* CCCF80 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CCCF84 80241C74 AE00001C */ sw $zero, 0x1c($s0) -/* CCCF88 80241C78 08090735 */ j .L80241CD4 -/* CCCF8C 80241C7C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C80: -/* CCCF90 80241C80 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCCF94 80241C84 46040000 */ add.s $f0, $f0, $f4 -/* CCCF98 80241C88 08090735 */ j .L80241CD4 -/* CCCF9C 80241C8C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C90: -/* CCCFA0 80241C90 C606003C */ lwc1 $f6, 0x3c($s0) -/* CCCFA4 80241C94 860200A8 */ lh $v0, 0xa8($s0) -/* CCCFA8 80241C98 46163081 */ sub.s $f2, $f6, $f22 -/* CCCFAC 80241C9C 44820000 */ mtc1 $v0, $f0 -/* CCCFB0 80241CA0 00000000 */ nop -/* CCCFB4 80241CA4 46800020 */ cvt.s.w $f0, $f0 -/* CCCFB8 80241CA8 46001080 */ add.s $f2, $f2, $f0 -/* CCCFBC 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCFC0 80241CB0 46002005 */ abs.s $f0, $f4 -/* CCCFC4 80241CB4 4602003C */ c.lt.s $f0, $f2 -/* CCCFC8 80241CB8 00000000 */ nop -/* CCCFCC 80241CBC 45020005 */ bc1fl .L80241CD4 -/* CCCFD0 80241CC0 AE00001C */ sw $zero, 0x1c($s0) -/* CCCFD4 80241CC4 46043000 */ add.s $f0, $f6, $f4 -/* CCCFD8 80241CC8 08090735 */ j .L80241CD4 -/* CCCFDC 80241CCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241CD0: -/* CCCFE0 80241CD0 AE00001C */ sw $zero, 0x1c($s0) -.L80241CD4: -/* CCCFE4 80241CD4 8FBF0038 */ lw $ra, 0x38($sp) -/* CCCFE8 80241CD8 8FB30034 */ lw $s3, 0x34($sp) -/* CCCFEC 80241CDC 8FB20030 */ lw $s2, 0x30($sp) -/* CCCFF0 80241CE0 8FB1002C */ lw $s1, 0x2c($sp) -/* CCCFF4 80241CE4 8FB00028 */ lw $s0, 0x28($sp) -/* CCCFF8 80241CE8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CCCFFC 80241CEC D7B40040 */ ldc1 $f20, 0x40($sp) -/* CCD000 80241CF0 03E00008 */ jr $ra -/* CCD004 80241CF4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s deleted file mode 100644 index 8599343ff9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF8_CCD008 -/* CCD008 80241CF8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CCD00C 80241CFC AFB00028 */ sw $s0, 0x28($sp) -/* CCD010 80241D00 00A0802D */ daddu $s0, $a1, $zero -/* CCD014 80241D04 AFB1002C */ sw $s1, 0x2c($sp) -/* CCD018 80241D08 00C0882D */ daddu $s1, $a2, $zero -/* CCD01C 80241D0C AFBF0034 */ sw $ra, 0x34($sp) -/* CCD020 80241D10 AFB20030 */ sw $s2, 0x30($sp) -/* CCD024 80241D14 AE200070 */ sw $zero, 0x70($s1) -/* CCD028 80241D18 8C830000 */ lw $v1, ($a0) -/* CCD02C 80241D1C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CCD030 80241D20 A480008E */ sh $zero, 0x8e($a0) -/* CCD034 80241D24 00621824 */ and $v1, $v1, $v0 -/* CCD038 80241D28 34650800 */ ori $a1, $v1, 0x800 -/* CCD03C 80241D2C AC850000 */ sw $a1, ($a0) -/* CCD040 80241D30 8E0200D0 */ lw $v0, 0xd0($s0) -/* CCD044 80241D34 8C420034 */ lw $v0, 0x34($v0) -/* CCD048 80241D38 10400003 */ beqz $v0, .L80241D48 -/* CCD04C 80241D3C 00E0902D */ daddu $s2, $a3, $zero -/* CCD050 80241D40 08090754 */ j .L80241D50 -/* CCD054 80241D44 34620808 */ ori $v0, $v1, 0x808 -.L80241D48: -/* CCD058 80241D48 2402FFF7 */ addiu $v0, $zero, -9 -/* CCD05C 80241D4C 00A21024 */ and $v0, $a1, $v0 -.L80241D50: -/* CCD060 80241D50 AC820000 */ sw $v0, ($a0) -/* CCD064 80241D54 27A20024 */ addiu $v0, $sp, 0x24 -/* CCD068 80241D58 27A50018 */ addiu $a1, $sp, 0x18 -/* CCD06C 80241D5C C4800038 */ lwc1 $f0, 0x38($a0) -/* CCD070 80241D60 C482003C */ lwc1 $f2, 0x3c($a0) -/* CCD074 80241D64 C4840040 */ lwc1 $f4, 0x40($a0) -/* CCD078 80241D68 3C01447A */ lui $at, 0x447a -/* CCD07C 80241D6C 44813000 */ mtc1 $at, $f6 -/* CCD080 80241D70 27A6001C */ addiu $a2, $sp, 0x1c -/* CCD084 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCD088 80241D78 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CCD08C 80241D7C E7A40020 */ swc1 $f4, 0x20($sp) -/* CCD090 80241D80 E7A60024 */ swc1 $f6, 0x24($sp) -/* CCD094 80241D84 AFA20010 */ sw $v0, 0x10($sp) -/* CCD098 80241D88 8C840080 */ lw $a0, 0x80($a0) -/* CCD09C 80241D8C 0C0372DF */ jal func_800DCB7C -/* CCD0A0 80241D90 27A70020 */ addiu $a3, $sp, 0x20 -/* CCD0A4 80241D94 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CCD0A8 80241D98 3C014059 */ lui $at, 0x4059 -/* CCD0AC 80241D9C 44812800 */ mtc1 $at, $f5 -/* CCD0B0 80241DA0 44802000 */ mtc1 $zero, $f4 -/* CCD0B4 80241DA4 460010A1 */ cvt.d.s $f2, $f2 -/* CCD0B8 80241DA8 46241082 */ mul.d $f2, $f2, $f4 -/* CCD0BC 80241DAC 00000000 */ nop -/* CCD0C0 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CCD0C4 80241DB4 46000021 */ cvt.d.s $f0, $f0 -/* CCD0C8 80241DB8 46240002 */ mul.d $f0, $f0, $f4 -/* CCD0CC 80241DBC 00000000 */ nop -/* CCD0D0 80241DC0 3C013FE0 */ lui $at, 0x3fe0 -/* CCD0D4 80241DC4 44812800 */ mtc1 $at, $f5 -/* CCD0D8 80241DC8 44802000 */ mtc1 $zero, $f4 -/* CCD0DC 80241DCC 00000000 */ nop -/* CCD0E0 80241DD0 46241080 */ add.d $f2, $f2, $f4 -/* CCD0E4 80241DD4 AE000074 */ sw $zero, 0x74($s0) -/* CCD0E8 80241DD8 46240000 */ add.d $f0, $f0, $f4 -/* CCD0EC 80241DDC AE000090 */ sw $zero, 0x90($s0) -/* CCD0F0 80241DE0 4620120D */ trunc.w.d $f8, $f2 -/* CCD0F4 80241DE4 E6080078 */ swc1 $f8, 0x78($s0) -/* CCD0F8 80241DE8 4620020D */ trunc.w.d $f8, $f0 -/* CCD0FC 80241DEC E6080088 */ swc1 $f8, 0x88($s0) -/* CCD100 80241DF0 8E420014 */ lw $v0, 0x14($s2) -/* CCD104 80241DF4 AE220074 */ sw $v0, 0x74($s1) -/* CCD108 80241DF8 8E0200B0 */ lw $v0, 0xb0($s0) -/* CCD10C 80241DFC 34420010 */ ori $v0, $v0, 0x10 -/* CCD110 80241E00 AE0200B0 */ sw $v0, 0xb0($s0) -/* CCD114 80241E04 8FBF0034 */ lw $ra, 0x34($sp) -/* CCD118 80241E08 8FB20030 */ lw $s2, 0x30($sp) -/* CCD11C 80241E0C 8FB1002C */ lw $s1, 0x2c($sp) -/* CCD120 80241E10 8FB00028 */ lw $s0, 0x28($sp) -/* CCD124 80241E14 03E00008 */ jr $ra -/* CCD128 80241E18 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 5444630c4f..6ac5833328 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -46,7 +46,7 @@ glabel func_80241E1C_CCD12C /* CCD1D0 80241EC0 02A0202D */ daddu $a0, $s5, $zero /* CCD1D4 80241EC4 0240282D */ daddu $a1, $s2, $zero /* CCD1D8 80241EC8 0280302D */ daddu $a2, $s4, $zero -/* CCD1DC 80241ECC 0C09073E */ jal func_80241CF8_CCD008 +/* CCD1DC 80241ECC 0C09073E */ jal flo_14_UnkFunc5 /* CCD1E0 80241ED0 0200382D */ daddu $a3, $s0, $zero .L80241ED4: /* CCD1E4 80241ED4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241F50_CCD260 glabel L80241F60_CCD270 /* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero /* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero -/* CCD278 80241F68 0C0904EA */ jal func_802413A8_CCC6B8 +/* CCD278 80241F68 0C0904EA */ jal flo_14_UnkFunc4 /* CCD27C 80241F6C 0260302D */ daddu $a2, $s3, $zero /* CCD280 80241F70 080907F9 */ j .L80241FE4 /* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241FB8_CCD2C8 glabel L80241FD0_CCD2E0 /* CCD2E0 80241FD0 0280202D */ daddu $a0, $s4, $zero /* CCD2E4 80241FD4 0200282D */ daddu $a1, $s0, $zero -/* CCD2E8 80241FD8 0C09065A */ jal func_80241968_CCCC78 +/* CCD2E8 80241FD8 0C09065A */ jal flo_14_UnkFunc6 /* CCD2EC 80241FDC 0260302D */ daddu $a2, $s3, $zero glabel L80241FE0_CCD2F0 /* CCD2F0 80241FE0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400FC_CD1F2C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400FC_CD1F2C.s deleted file mode 100644 index a34074c7b2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802400FC_CD1F2C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC_CD1F2C -/* CD1F2C 802400FC 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* CD1F30 80240100 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* CD1F34 80240104 8C430000 */ lw $v1, ($v0) -/* CD1F38 80240108 2404FFBF */ addiu $a0, $zero, -0x41 -/* CD1F3C 8024010C 00641824 */ and $v1, $v1, $a0 -/* CD1F40 80240110 AC430000 */ sw $v1, ($v0) -/* CD1F44 80240114 03E00008 */ jr $ra -/* CD1F48 80240118 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240148_CD1F78.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240148_CD1F78.s deleted file mode 100644 index 4cef9bbb35..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240148_CD1F78.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240148_CD1F78 -/* CD1F78 80240148 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD1F7C 8024014C AFB00010 */ sw $s0, 0x10($sp) -/* CD1F80 80240150 0080802D */ daddu $s0, $a0, $zero -/* CD1F84 80240154 AFBF0018 */ sw $ra, 0x18($sp) -/* CD1F88 80240158 AFB10014 */ sw $s1, 0x14($sp) -/* CD1F8C 8024015C 8E11000C */ lw $s1, 0xc($s0) -/* CD1F90 80240160 8E250000 */ lw $a1, ($s1) -/* CD1F94 80240164 0C0B1EAF */ jal get_variable -/* CD1F98 80240168 26310004 */ addiu $s1, $s1, 4 -/* CD1F9C 8024016C 0200202D */ daddu $a0, $s0, $zero -/* CD1FA0 80240170 3C038011 */ lui $v1, %hi(gPlayerData) -/* CD1FA4 80240174 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* CD1FA8 80240178 000210C0 */ sll $v0, $v0, 3 -/* CD1FAC 8024017C 00431021 */ addu $v0, $v0, $v1 -/* CD1FB0 80240180 90460015 */ lbu $a2, 0x15($v0) -/* CD1FB4 80240184 8E250000 */ lw $a1, ($s1) -/* CD1FB8 80240188 24C60001 */ addiu $a2, $a2, 1 -/* CD1FBC 8024018C A0460015 */ sb $a2, 0x15($v0) -/* CD1FC0 80240190 00063600 */ sll $a2, $a2, 0x18 -/* CD1FC4 80240194 0C0B2026 */ jal set_variable -/* CD1FC8 80240198 00063603 */ sra $a2, $a2, 0x18 -/* CD1FCC 8024019C 8FBF0018 */ lw $ra, 0x18($sp) -/* CD1FD0 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* CD1FD4 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* CD1FD8 802401A8 24020002 */ addiu $v0, $zero, 2 -/* CD1FDC 802401AC 03E00008 */ jr $ra -/* CD1FE0 802401B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s deleted file mode 100644 index 35966456fa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240528_CD2358 -/* CD2358 80240528 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* CD235C 8024052C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* CD2360 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD2364 80240534 AFBF0010 */ sw $ra, 0x10($sp) -/* CD2368 80240538 00021100 */ sll $v0, $v0, 4 -/* CD236C 8024053C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* CD2370 80240540 00822021 */ addu $a0, $a0, $v0 -/* CD2374 80240544 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* CD2378 80240548 0C0496CF */ jal set_message_string -/* CD237C 8024054C 0000282D */ daddu $a1, $zero, $zero -/* CD2380 80240550 8FBF0010 */ lw $ra, 0x10($sp) -/* CD2384 80240554 24020002 */ addiu $v0, $zero, 2 -/* CD2388 80240558 03E00008 */ jr $ra -/* CD238C 8024055C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s deleted file mode 100644 index 4a6807b7a9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240560_CD2390 -/* CD2390 80240560 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD2394 80240564 AFB1001C */ sw $s1, 0x1c($sp) -/* CD2398 80240568 0080882D */ daddu $s1, $a0, $zero -/* CD239C 8024056C AFBF0020 */ sw $ra, 0x20($sp) -/* CD23A0 80240570 AFB00018 */ sw $s0, 0x18($sp) -/* CD23A4 80240574 8E30000C */ lw $s0, 0xc($s1) -/* CD23A8 80240578 8E050000 */ lw $a1, ($s0) -/* CD23AC 8024057C 0C0B1EAF */ jal get_variable -/* CD23B0 80240580 26100004 */ addiu $s0, $s0, 4 -/* CD23B4 80240584 0C04417A */ jal get_entity_by_index -/* CD23B8 80240588 0040202D */ daddu $a0, $v0, $zero -/* CD23BC 8024058C 8E100000 */ lw $s0, ($s0) -/* CD23C0 80240590 C444004C */ lwc1 $f4, 0x4c($v0) -/* CD23C4 80240594 3C014148 */ lui $at, 0x4148 -/* CD23C8 80240598 44810000 */ mtc1 $at, $f0 -/* CD23CC 8024059C 3C013F33 */ lui $at, 0x3f33 -/* CD23D0 802405A0 34213333 */ ori $at, $at, 0x3333 -/* CD23D4 802405A4 44811000 */ mtc1 $at, $f2 -/* CD23D8 802405A8 AFA00014 */ sw $zero, 0x14($sp) -/* CD23DC 802405AC 46002100 */ add.s $f4, $f4, $f0 -/* CD23E0 802405B0 E7A20010 */ swc1 $f2, 0x10($sp) -/* CD23E4 802405B4 8C450048 */ lw $a1, 0x48($v0) -/* CD23E8 802405B8 8C470050 */ lw $a3, 0x50($v0) -/* CD23EC 802405BC 44062000 */ mfc1 $a2, $f4 -/* CD23F0 802405C0 0C01C5D4 */ jal func_80071750 -/* CD23F4 802405C4 0000202D */ daddu $a0, $zero, $zero -/* CD23F8 802405C8 0220202D */ daddu $a0, $s1, $zero -/* CD23FC 802405CC 0200282D */ daddu $a1, $s0, $zero -/* CD2400 802405D0 0C0B2026 */ jal set_variable -/* CD2404 802405D4 0040302D */ daddu $a2, $v0, $zero -/* CD2408 802405D8 8FBF0020 */ lw $ra, 0x20($sp) -/* CD240C 802405DC 8FB1001C */ lw $s1, 0x1c($sp) -/* CD2410 802405E0 8FB00018 */ lw $s0, 0x18($sp) -/* CD2414 802405E4 24020002 */ addiu $v0, $zero, 2 -/* CD2418 802405E8 03E00008 */ jr $ra -/* CD241C 802405EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240624_CD2454.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240624_CD2454.s deleted file mode 100644 index 86799ff980..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240624_CD2454.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624_CD2454 -/* CD2454 80240624 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2458 80240628 AFBF0018 */ sw $ra, 0x18($sp) -/* CD245C 8024062C 8C82000C */ lw $v0, 0xc($a0) -/* CD2460 80240630 0C0B1EAF */ jal get_variable -/* CD2464 80240634 8C450000 */ lw $a1, ($v0) -/* CD2468 80240638 0C04417A */ jal get_entity_by_index -/* CD246C 8024063C 0040202D */ daddu $a0, $v0, $zero -/* CD2470 80240640 3C013F80 */ lui $at, 0x3f80 -/* CD2474 80240644 44810000 */ mtc1 $at, $f0 -/* CD2478 80240648 C442004C */ lwc1 $f2, 0x4c($v0) -/* CD247C 8024064C E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2480 80240650 3C014148 */ lui $at, 0x4148 -/* CD2484 80240654 44810000 */ mtc1 $at, $f0 -/* CD2488 80240658 2403004B */ addiu $v1, $zero, 0x4b -/* CD248C 8024065C AFA30014 */ sw $v1, 0x14($sp) -/* CD2490 80240660 46001080 */ add.s $f2, $f2, $f0 -/* CD2494 80240664 8C450048 */ lw $a1, 0x48($v0) -/* CD2498 80240668 8C470050 */ lw $a3, 0x50($v0) -/* CD249C 8024066C 44061000 */ mfc1 $a2, $f2 -/* CD24A0 80240670 0C01C2EC */ jal func_80070BB0 -/* CD24A4 80240674 24040004 */ addiu $a0, $zero, 4 -/* CD24A8 80240678 8FBF0018 */ lw $ra, 0x18($sp) -/* CD24AC 8024067C 24020002 */ addiu $v0, $zero, 2 -/* CD24B0 80240680 03E00008 */ jr $ra -/* CD24B4 80240684 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240688_CD24B8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240688_CD24B8.s deleted file mode 100644 index 8673e9911b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240688_CD24B8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688_CD24B8 -/* CD24B8 80240688 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD24BC 8024068C AFBF0018 */ sw $ra, 0x18($sp) -/* CD24C0 80240690 0C00EAD2 */ jal get_npc_safe -/* CD24C4 80240694 2404FFFC */ addiu $a0, $zero, -4 -/* CD24C8 80240698 C444003C */ lwc1 $f4, 0x3c($v0) -/* CD24CC 8024069C 3C014148 */ lui $at, 0x4148 -/* CD24D0 802406A0 44811000 */ mtc1 $at, $f2 -/* CD24D4 802406A4 3C013F80 */ lui $at, 0x3f80 -/* CD24D8 802406A8 44810000 */ mtc1 $at, $f0 -/* CD24DC 802406AC 2403001E */ addiu $v1, $zero, 0x1e -/* CD24E0 802406B0 AFA30014 */ sw $v1, 0x14($sp) -/* CD24E4 802406B4 46022100 */ add.s $f4, $f4, $f2 -/* CD24E8 802406B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD24EC 802406BC 8C450038 */ lw $a1, 0x38($v0) -/* CD24F0 802406C0 8C470040 */ lw $a3, 0x40($v0) -/* CD24F4 802406C4 44062000 */ mfc1 $a2, $f4 -/* CD24F8 802406C8 0C01C2EC */ jal func_80070BB0 -/* CD24FC 802406CC 24040009 */ addiu $a0, $zero, 9 -/* CD2500 802406D0 8FBF0018 */ lw $ra, 0x18($sp) -/* CD2504 802406D4 24020002 */ addiu $v0, $zero, 2 -/* CD2508 802406D8 03E00008 */ jr $ra -/* CD250C 802406DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s deleted file mode 100644 index 9484d9e6a8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240C18_CD2A48.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C18_CD2A48 -/* CD2A48 80240C18 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2A4C 80240C1C AFB10014 */ sw $s1, 0x14($sp) -/* CD2A50 80240C20 0080882D */ daddu $s1, $a0, $zero -/* CD2A54 80240C24 AFB20018 */ sw $s2, 0x18($sp) -/* CD2A58 80240C28 AFBF001C */ sw $ra, 0x1c($sp) -/* CD2A5C 80240C2C AFB00010 */ sw $s0, 0x10($sp) -/* CD2A60 80240C30 8E30000C */ lw $s0, 0xc($s1) -/* CD2A64 80240C34 10A00010 */ beqz $a1, .L80240C78 -/* CD2A68 80240C38 0000902D */ daddu $s2, $zero, $zero -/* CD2A6C 80240C3C 8E050000 */ lw $a1, ($s0) -/* CD2A70 80240C40 0C0B1EAF */ jal get_variable -/* CD2A74 80240C44 26100004 */ addiu $s0, $s0, 4 -/* CD2A78 80240C48 AE220084 */ sw $v0, 0x84($s1) -/* CD2A7C 80240C4C 8E050000 */ lw $a1, ($s0) -/* CD2A80 80240C50 0C0B1EAF */ jal get_variable -/* CD2A84 80240C54 0220202D */ daddu $a0, $s1, $zero -/* CD2A88 80240C58 0240202D */ daddu $a0, $s2, $zero -/* CD2A8C 80240C5C 240500D0 */ addiu $a1, $zero, 0xd0 -/* CD2A90 80240C60 00A0302D */ daddu $a2, $a1, $zero -/* CD2A94 80240C64 00A0382D */ daddu $a3, $a1, $zero -/* CD2A98 80240C68 AE220088 */ sw $v0, 0x88($s1) -/* CD2A9C 80240C6C AE200070 */ sw $zero, 0x70($s1) -/* CD2AA0 80240C70 0C04DF84 */ jal set_transition_stencil_color -/* CD2AA4 80240C74 AE200074 */ sw $zero, 0x74($s1) -.L80240C78: -/* CD2AA8 80240C78 8E230070 */ lw $v1, 0x70($s1) -/* CD2AAC 80240C7C 24040001 */ addiu $a0, $zero, 1 -/* CD2AB0 80240C80 10640019 */ beq $v1, $a0, .L80240CE8 -/* CD2AB4 80240C84 28620002 */ slti $v0, $v1, 2 -/* CD2AB8 80240C88 10400005 */ beqz $v0, .L80240CA0 -/* CD2ABC 80240C8C 24020002 */ addiu $v0, $zero, 2 -/* CD2AC0 80240C90 10600007 */ beqz $v1, .L80240CB0 -/* CD2AC4 80240C94 240500FF */ addiu $a1, $zero, 0xff -/* CD2AC8 80240C98 0809034A */ j .L80240D28 -/* CD2ACC 80240C9C 00000000 */ nop -.L80240CA0: -/* CD2AD0 80240CA0 10620019 */ beq $v1, $v0, .L80240D08 -/* CD2AD4 80240CA4 00000000 */ nop -/* CD2AD8 80240CA8 0809034A */ j .L80240D28 -/* CD2ADC 80240CAC 00000000 */ nop -.L80240CB0: -/* CD2AE0 80240CB0 8E220074 */ lw $v0, 0x74($s1) -/* CD2AE4 80240CB4 14450004 */ bne $v0, $a1, .L80240CC8 -/* CD2AE8 80240CB8 00000000 */ nop -/* CD2AEC 80240CBC AE240070 */ sw $a0, 0x70($s1) -/* CD2AF0 80240CC0 AE200078 */ sw $zero, 0x78($s1) -/* CD2AF4 80240CC4 8E220074 */ lw $v0, 0x74($s1) -.L80240CC8: -/* CD2AF8 80240CC8 8E230084 */ lw $v1, 0x84($s1) -/* CD2AFC 80240CCC 00431021 */ addu $v0, $v0, $v1 -/* CD2B00 80240CD0 AE220074 */ sw $v0, 0x74($s1) -/* CD2B04 80240CD4 28420100 */ slti $v0, $v0, 0x100 -/* CD2B08 80240CD8 50400013 */ beql $v0, $zero, .L80240D28 -/* CD2B0C 80240CDC AE250074 */ sw $a1, 0x74($s1) -/* CD2B10 80240CE0 0809034A */ j .L80240D28 -/* CD2B14 80240CE4 00000000 */ nop -.L80240CE8: -/* CD2B18 80240CE8 8E220078 */ lw $v0, 0x78($s1) -/* CD2B1C 80240CEC 24420001 */ addiu $v0, $v0, 1 -/* CD2B20 80240CF0 AE220078 */ sw $v0, 0x78($s1) -/* CD2B24 80240CF4 28420002 */ slti $v0, $v0, 2 -/* CD2B28 80240CF8 1440000B */ bnez $v0, .L80240D28 -/* CD2B2C 80240CFC 24020002 */ addiu $v0, $zero, 2 -/* CD2B30 80240D00 0809034A */ j .L80240D28 -/* CD2B34 80240D04 AE220070 */ sw $v0, 0x70($s1) -.L80240D08: -/* CD2B38 80240D08 8E230074 */ lw $v1, 0x74($s1) -/* CD2B3C 80240D0C 50600001 */ beql $v1, $zero, .L80240D14 -/* CD2B40 80240D10 24120001 */ addiu $s2, $zero, 1 -.L80240D14: -/* CD2B44 80240D14 8E220088 */ lw $v0, 0x88($s1) -/* CD2B48 80240D18 00621023 */ subu $v0, $v1, $v0 -/* CD2B4C 80240D1C 04410002 */ bgez $v0, .L80240D28 -/* CD2B50 80240D20 AE220074 */ sw $v0, 0x74($s1) -/* CD2B54 80240D24 AE200074 */ sw $zero, 0x74($s1) -.L80240D28: -/* CD2B58 80240D28 C6200074 */ lwc1 $f0, 0x74($s1) -/* CD2B5C 80240D2C 46800020 */ cvt.s.w $f0, $f0 -/* CD2B60 80240D30 44050000 */ mfc1 $a1, $f0 -/* CD2B64 80240D34 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* CD2B68 80240D38 24040001 */ addiu $a0, $zero, 1 -/* CD2B6C 80240D3C 0240102D */ daddu $v0, $s2, $zero -/* CD2B70 80240D40 8FBF001C */ lw $ra, 0x1c($sp) -/* CD2B74 80240D44 8FB20018 */ lw $s2, 0x18($sp) -/* CD2B78 80240D48 8FB10014 */ lw $s1, 0x14($sp) -/* CD2B7C 80240D4C 8FB00010 */ lw $s0, 0x10($sp) -/* CD2B80 80240D50 03E00008 */ jr $ra -/* CD2B84 80240D54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DE8_CD2C18.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DE8_CD2C18.s deleted file mode 100644 index c836f59423..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240DE8_CD2C18.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8_CD2C18 -/* CD2C18 80240DE8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* CD2C1C 80240DEC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* CD2C20 80240DF0 AC800084 */ sw $zero, 0x84($a0) -/* CD2C24 80240DF4 80620000 */ lb $v0, ($v1) -/* CD2C28 80240DF8 10400005 */ beqz $v0, .L80240E10 -/* CD2C2C 80240DFC 24020003 */ addiu $v0, $zero, 3 -/* CD2C30 80240E00 80630003 */ lb $v1, 3($v1) -/* CD2C34 80240E04 14620002 */ bne $v1, $v0, .L80240E10 -/* CD2C38 80240E08 24020001 */ addiu $v0, $zero, 1 -/* CD2C3C 80240E0C AC820084 */ sw $v0, 0x84($a0) -.L80240E10: -/* CD2C40 80240E10 03E00008 */ jr $ra -/* CD2C44 80240E14 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s deleted file mode 100644 index f8d77ce62f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_802416E8_CD3518.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E8_CD3518 -/* CD3518 802416E8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CD351C 802416EC AFB3004C */ sw $s3, 0x4c($sp) -/* CD3520 802416F0 0080982D */ daddu $s3, $a0, $zero -/* CD3524 802416F4 AFBF0054 */ sw $ra, 0x54($sp) -/* CD3528 802416F8 AFB40050 */ sw $s4, 0x50($sp) -/* CD352C 802416FC AFB20048 */ sw $s2, 0x48($sp) -/* CD3530 80241700 AFB10044 */ sw $s1, 0x44($sp) -/* CD3534 80241704 AFB00040 */ sw $s0, 0x40($sp) -/* CD3538 80241708 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CD353C 8024170C F7B80068 */ sdc1 $f24, 0x68($sp) -/* CD3540 80241710 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CD3544 80241714 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CD3548 80241718 8E710148 */ lw $s1, 0x148($s3) -/* CD354C 8024171C 00A0902D */ daddu $s2, $a1, $zero -/* CD3550 80241720 86240008 */ lh $a0, 8($s1) -/* CD3554 80241724 0C00EABB */ jal get_npc_unsafe -/* CD3558 80241728 00C0A02D */ daddu $s4, $a2, $zero -/* CD355C 8024172C 0040802D */ daddu $s0, $v0, $zero -/* CD3560 80241730 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD3564 80241734 46800020 */ cvt.s.w $f0, $f0 -/* CD3568 80241738 46000021 */ cvt.d.s $f0, $f0 -/* CD356C 8024173C 3C014059 */ lui $at, 0x4059 -/* CD3570 80241740 44811800 */ mtc1 $at, $f3 -/* CD3574 80241744 44801000 */ mtc1 $zero, $f2 -/* CD3578 80241748 8602008E */ lh $v0, 0x8e($s0) -/* CD357C 8024174C 9603008E */ lhu $v1, 0x8e($s0) -/* CD3580 80241750 46220003 */ div.d $f0, $f0, $f2 -/* CD3584 80241754 46200620 */ cvt.s.d $f24, $f0 -/* CD3588 80241758 C6200088 */ lwc1 $f0, 0x88($s1) -/* CD358C 8024175C 46800020 */ cvt.s.w $f0, $f0 -/* CD3590 80241760 46000021 */ cvt.d.s $f0, $f0 -/* CD3594 80241764 46220003 */ div.d $f0, $f0, $f2 -/* CD3598 80241768 46200020 */ cvt.s.d $f0, $f0 -/* CD359C 8024176C 18400003 */ blez $v0, .L8024177C -/* CD35A0 80241770 4600C680 */ add.s $f26, $f24, $f0 -/* CD35A4 80241774 2462FFFF */ addiu $v0, $v1, -1 -/* CD35A8 80241778 A602008E */ sh $v0, 0x8e($s0) -.L8024177C: -/* CD35AC 8024177C 8E220070 */ lw $v0, 0x70($s1) -/* CD35B0 80241780 18400034 */ blez $v0, .L80241854 -/* CD35B4 80241784 00000000 */ nop -/* CD35B8 80241788 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD35BC 8024178C 46806320 */ cvt.s.w $f12, $f12 -/* CD35C0 80241790 44820000 */ mtc1 $v0, $f0 -/* CD35C4 80241794 00000000 */ nop -/* CD35C8 80241798 46800020 */ cvt.s.w $f0, $f0 -/* CD35CC 8024179C 46000021 */ cvt.d.s $f0, $f0 -/* CD35D0 802417A0 46220003 */ div.d $f0, $f0, $f2 -/* CD35D4 802417A4 0C00A8BB */ jal sin_deg -/* CD35D8 802417A8 462005A0 */ cvt.s.d $f22, $f0 -/* CD35DC 802417AC 8E020000 */ lw $v0, ($s0) -/* CD35E0 802417B0 30420008 */ andi $v0, $v0, 8 -/* CD35E4 802417B4 10400003 */ beqz $v0, .L802417C4 -/* CD35E8 802417B8 46000506 */ mov.s $f20, $f0 -/* CD35EC 802417BC 08090601 */ j .L80241804 -/* CD35F0 802417C0 0000102D */ daddu $v0, $zero, $zero -.L802417C4: -/* CD35F4 802417C4 27A50028 */ addiu $a1, $sp, 0x28 -/* CD35F8 802417C8 27A6002C */ addiu $a2, $sp, 0x2c -/* CD35FC 802417CC C6000038 */ lwc1 $f0, 0x38($s0) -/* CD3600 802417D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3604 802417D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD3608 802417D8 3C01447A */ lui $at, 0x447a -/* CD360C 802417DC 44813000 */ mtc1 $at, $f6 -/* CD3610 802417E0 27A20034 */ addiu $v0, $sp, 0x34 -/* CD3614 802417E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD3618 802417E8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD361C 802417EC E7A40030 */ swc1 $f4, 0x30($sp) -/* CD3620 802417F0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD3624 802417F4 AFA20010 */ sw $v0, 0x10($sp) -/* CD3628 802417F8 8E040080 */ lw $a0, 0x80($s0) -/* CD362C 802417FC 0C0372DF */ jal func_800DCB7C -/* CD3630 80241800 27A70030 */ addiu $a3, $sp, 0x30 -.L80241804: -/* CD3634 80241804 10400007 */ beqz $v0, .L80241824 -/* CD3638 80241808 00000000 */ nop -/* CD363C 8024180C 4616A082 */ mul.s $f2, $f20, $f22 -/* CD3640 80241810 00000000 */ nop -/* CD3644 80241814 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD3648 80241818 46180000 */ add.s $f0, $f0, $f24 -/* CD364C 8024181C 0809060C */ j .L80241830 -/* CD3650 80241820 46020000 */ add.s $f0, $f0, $f2 -.L80241824: -/* CD3654 80241824 4616A002 */ mul.s $f0, $f20, $f22 -/* CD3658 80241828 00000000 */ nop -/* CD365C 8024182C 4600D000 */ add.s $f0, $f26, $f0 -.L80241830: -/* CD3660 80241830 E600003C */ swc1 $f0, 0x3c($s0) -/* CD3664 80241834 8E220074 */ lw $v0, 0x74($s1) -/* CD3668 80241838 2442000A */ addiu $v0, $v0, 0xa -/* CD366C 8024183C 44826000 */ mtc1 $v0, $f12 -/* CD3670 80241840 00000000 */ nop -/* CD3674 80241844 0C00A6C9 */ jal clamp_angle -/* CD3678 80241848 46806320 */ cvt.s.w $f12, $f12 -/* CD367C 8024184C 4600020D */ trunc.w.s $f8, $f0 -/* CD3680 80241850 E6280074 */ swc1 $f8, 0x74($s1) -.L80241854: -/* CD3684 80241854 8E220090 */ lw $v0, 0x90($s1) -/* CD3688 80241858 1C400040 */ bgtz $v0, .L8024195C -/* CD368C 8024185C 2442FFFF */ addiu $v0, $v0, -1 -/* CD3690 80241860 860200A8 */ lh $v0, 0xa8($s0) -/* CD3694 80241864 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3698 80241868 44821000 */ mtc1 $v0, $f2 -/* CD369C 8024186C 00000000 */ nop -/* CD36A0 80241870 468010A0 */ cvt.s.w $f2, $f2 -/* CD36A4 80241874 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD36A8 80241878 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD36AC 8024187C 46020000 */ add.s $f0, $f0, $f2 -/* CD36B0 80241880 3C014024 */ lui $at, 0x4024 -/* CD36B4 80241884 44812800 */ mtc1 $at, $f5 -/* CD36B8 80241888 44802000 */ mtc1 $zero, $f4 -/* CD36BC 8024188C C442002C */ lwc1 $f2, 0x2c($v0) -/* CD36C0 80241890 46000021 */ cvt.d.s $f0, $f0 -/* CD36C4 80241894 46240000 */ add.d $f0, $f0, $f4 -/* CD36C8 80241898 460010A1 */ cvt.d.s $f2, $f2 -/* CD36CC 8024189C 4620103C */ c.lt.d $f2, $f0 -/* CD36D0 802418A0 00000000 */ nop -/* CD36D4 802418A4 4500002E */ bc1f .L80241960 -/* CD36D8 802418A8 0280202D */ daddu $a0, $s4, $zero -/* CD36DC 802418AC 24020001 */ addiu $v0, $zero, 1 -/* CD36E0 802418B0 AFA20010 */ sw $v0, 0x10($sp) -/* CD36E4 802418B4 8E460024 */ lw $a2, 0x24($s2) -/* CD36E8 802418B8 8E470028 */ lw $a3, 0x28($s2) -/* CD36EC 802418BC 0C01242D */ jal func_800490B4 -/* CD36F0 802418C0 0220282D */ daddu $a1, $s1, $zero -/* CD36F4 802418C4 10400026 */ beqz $v0, .L80241960 -/* CD36F8 802418C8 0000202D */ daddu $a0, $zero, $zero -/* CD36FC 802418CC 0200282D */ daddu $a1, $s0, $zero -/* CD3700 802418D0 0000302D */ daddu $a2, $zero, $zero -/* CD3704 802418D4 2412000C */ addiu $s2, $zero, 0xc -/* CD3708 802418D8 860300A8 */ lh $v1, 0xa8($s0) -/* CD370C 802418DC 3C013F80 */ lui $at, 0x3f80 -/* CD3710 802418E0 44810000 */ mtc1 $at, $f0 -/* CD3714 802418E4 3C014000 */ lui $at, 0x4000 -/* CD3718 802418E8 44811000 */ mtc1 $at, $f2 -/* CD371C 802418EC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD3720 802418F0 44812000 */ mtc1 $at, $f4 -/* CD3724 802418F4 44834000 */ mtc1 $v1, $f8 -/* CD3728 802418F8 00000000 */ nop -/* CD372C 802418FC 46804220 */ cvt.s.w $f8, $f8 -/* CD3730 80241900 44074000 */ mfc1 $a3, $f8 -/* CD3734 80241904 27A20038 */ addiu $v0, $sp, 0x38 -/* CD3738 80241908 AFB2001C */ sw $s2, 0x1c($sp) -/* CD373C 8024190C AFA20020 */ sw $v0, 0x20($sp) -/* CD3740 80241910 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD3744 80241914 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD3748 80241918 0C01BFA4 */ jal fx_emote -/* CD374C 8024191C E7A40018 */ swc1 $f4, 0x18($sp) -/* CD3750 80241920 0200202D */ daddu $a0, $s0, $zero -/* CD3754 80241924 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD3758 80241928 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD375C 8024192C 3C060020 */ lui $a2, 0x20 -/* CD3760 80241930 0C012530 */ jal func_800494C0 -/* CD3764 80241934 E4800064 */ swc1 $f0, 0x64($a0) -/* CD3768 80241938 8E220018 */ lw $v0, 0x18($s1) -/* CD376C 8024193C 9442002A */ lhu $v0, 0x2a($v0) -/* CD3770 80241940 30420001 */ andi $v0, $v0, 1 -/* CD3774 80241944 10400003 */ beqz $v0, .L80241954 -/* CD3778 80241948 2402000A */ addiu $v0, $zero, 0xa -/* CD377C 8024194C 0809067F */ j .L802419FC -/* CD3780 80241950 AE620070 */ sw $v0, 0x70($s3) -.L80241954: -/* CD3784 80241954 0809067F */ j .L802419FC -/* CD3788 80241958 AE720070 */ sw $s2, 0x70($s3) -.L8024195C: -/* CD378C 8024195C AE220090 */ sw $v0, 0x90($s1) -.L80241960: -/* CD3790 80241960 8602008C */ lh $v0, 0x8c($s0) -/* CD3794 80241964 14400025 */ bnez $v0, .L802419FC -/* CD3798 80241968 00000000 */ nop -/* CD379C 8024196C 8602008E */ lh $v0, 0x8e($s0) -/* CD37A0 80241970 1C400022 */ bgtz $v0, .L802419FC -/* CD37A4 80241974 00000000 */ nop -/* CD37A8 80241978 8E620074 */ lw $v0, 0x74($s3) -/* CD37AC 8024197C 2442FFFF */ addiu $v0, $v0, -1 -/* CD37B0 80241980 1840001D */ blez $v0, .L802419F8 -/* CD37B4 80241984 AE620074 */ sw $v0, 0x74($s3) -/* CD37B8 80241988 8E220018 */ lw $v0, 0x18($s1) -/* CD37BC 8024198C 9442002A */ lhu $v0, 0x2a($v0) -/* CD37C0 80241990 30420010 */ andi $v0, $v0, 0x10 -/* CD37C4 80241994 14400007 */ bnez $v0, .L802419B4 -/* CD37C8 80241998 00000000 */ nop -/* CD37CC 8024199C C600000C */ lwc1 $f0, 0xc($s0) -/* CD37D0 802419A0 3C014334 */ lui $at, 0x4334 -/* CD37D4 802419A4 44816000 */ mtc1 $at, $f12 -/* CD37D8 802419A8 0C00A6C9 */ jal clamp_angle -/* CD37DC 802419AC 460C0300 */ add.s $f12, $f0, $f12 -/* CD37E0 802419B0 E600000C */ swc1 $f0, 0xc($s0) -.L802419B4: -/* CD37E4 802419B4 0C00A67F */ jal rand_int -/* CD37E8 802419B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD37EC 802419BC 3C032E8B */ lui $v1, 0x2e8b -/* CD37F0 802419C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CD37F4 802419C4 00430018 */ mult $v0, $v1 -/* CD37F8 802419C8 00021FC3 */ sra $v1, $v0, 0x1f -/* CD37FC 802419CC 00004010 */ mfhi $t0 -/* CD3800 802419D0 00082043 */ sra $a0, $t0, 1 -/* CD3804 802419D4 00832023 */ subu $a0, $a0, $v1 -/* CD3808 802419D8 00041840 */ sll $v1, $a0, 1 -/* CD380C 802419DC 00641821 */ addu $v1, $v1, $a0 -/* CD3810 802419E0 00031880 */ sll $v1, $v1, 2 -/* CD3814 802419E4 00641823 */ subu $v1, $v1, $a0 -/* CD3818 802419E8 00431023 */ subu $v0, $v0, $v1 -/* CD381C 802419EC 24420005 */ addiu $v0, $v0, 5 -/* CD3820 802419F0 0809067F */ j .L802419FC -/* CD3824 802419F4 A602008E */ sh $v0, 0x8e($s0) -.L802419F8: -/* CD3828 802419F8 AE600070 */ sw $zero, 0x70($s3) -.L802419FC: -/* CD382C 802419FC 8FBF0054 */ lw $ra, 0x54($sp) -/* CD3830 80241A00 8FB40050 */ lw $s4, 0x50($sp) -/* CD3834 80241A04 8FB3004C */ lw $s3, 0x4c($sp) -/* CD3838 80241A08 8FB20048 */ lw $s2, 0x48($sp) -/* CD383C 80241A0C 8FB10044 */ lw $s1, 0x44($sp) -/* CD3840 80241A10 8FB00040 */ lw $s0, 0x40($sp) -/* CD3844 80241A14 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CD3848 80241A18 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CD384C 80241A1C D7B60060 */ ldc1 $f22, 0x60($sp) -/* CD3850 80241A20 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CD3854 80241A24 03E00008 */ jr $ra -/* CD3858 80241A28 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s deleted file mode 100644 index b16f36b725..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241CA8_CD3AD8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA8_CD3AD8 -/* CD3AD8 80241CA8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD3ADC 80241CAC AFB20030 */ sw $s2, 0x30($sp) -/* CD3AE0 80241CB0 0080902D */ daddu $s2, $a0, $zero -/* CD3AE4 80241CB4 AFBF0038 */ sw $ra, 0x38($sp) -/* CD3AE8 80241CB8 AFB30034 */ sw $s3, 0x34($sp) -/* CD3AEC 80241CBC AFB1002C */ sw $s1, 0x2c($sp) -/* CD3AF0 80241CC0 AFB00028 */ sw $s0, 0x28($sp) -/* CD3AF4 80241CC4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CD3AF8 80241CC8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CD3AFC 80241CCC 8E510148 */ lw $s1, 0x148($s2) -/* CD3B00 80241CD0 86240008 */ lh $a0, 8($s1) -/* CD3B04 80241CD4 0C00EABB */ jal get_npc_unsafe -/* CD3B08 80241CD8 00A0982D */ daddu $s3, $a1, $zero -/* CD3B0C 80241CDC 0040802D */ daddu $s0, $v0, $zero -/* CD3B10 80241CE0 0200202D */ daddu $a0, $s0, $zero -/* CD3B14 80241CE4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD3B18 80241CE8 468010A0 */ cvt.s.w $f2, $f2 -/* CD3B1C 80241CEC 460010A1 */ cvt.d.s $f2, $f2 -/* CD3B20 80241CF0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3B24 80241CF4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CD3B28 80241CF8 8E050018 */ lw $a1, 0x18($s0) -/* CD3B2C 80241CFC 46002100 */ add.s $f4, $f4, $f0 -/* CD3B30 80241D00 8E06000C */ lw $a2, 0xc($s0) -/* CD3B34 80241D04 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD3B38 80241D08 46800020 */ cvt.s.w $f0, $f0 -/* CD3B3C 80241D0C E604001C */ swc1 $f4, 0x1c($s0) -/* CD3B40 80241D10 3C014059 */ lui $at, 0x4059 -/* CD3B44 80241D14 44812800 */ mtc1 $at, $f5 -/* CD3B48 80241D18 44802000 */ mtc1 $zero, $f4 -/* CD3B4C 80241D1C 46000021 */ cvt.d.s $f0, $f0 -/* CD3B50 80241D20 46240003 */ div.d $f0, $f0, $f4 -/* CD3B54 80241D24 46200520 */ cvt.s.d $f20, $f0 -/* CD3B58 80241D28 46241083 */ div.d $f2, $f2, $f4 -/* CD3B5C 80241D2C 0C00EA95 */ jal npc_move_heading -/* CD3B60 80241D30 462015A0 */ cvt.s.d $f22, $f2 -/* CD3B64 80241D34 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3B68 80241D38 44801000 */ mtc1 $zero, $f2 -/* CD3B6C 80241D3C 44801800 */ mtc1 $zero, $f3 -/* CD3B70 80241D40 46002021 */ cvt.d.s $f0, $f4 -/* CD3B74 80241D44 4620103E */ c.le.d $f2, $f0 -/* CD3B78 80241D48 00000000 */ nop -/* CD3B7C 80241D4C 45000030 */ bc1f .L80241E10 -/* CD3B80 80241D50 00000000 */ nop -/* CD3B84 80241D54 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3B88 80241D58 46040000 */ add.s $f0, $f0, $f4 -/* CD3B8C 80241D5C E600003C */ swc1 $f0, 0x3c($s0) -/* CD3B90 80241D60 8E2200CC */ lw $v0, 0xcc($s1) -/* CD3B94 80241D64 8C420024 */ lw $v0, 0x24($v0) -/* CD3B98 80241D68 AE020028 */ sw $v0, 0x28($s0) -/* CD3B9C 80241D6C A2200007 */ sb $zero, 7($s1) -/* CD3BA0 80241D70 8E020000 */ lw $v0, ($s0) -/* CD3BA4 80241D74 30420008 */ andi $v0, $v0, 8 -/* CD3BA8 80241D78 14400011 */ bnez $v0, .L80241DC0 -/* CD3BAC 80241D7C 0000102D */ daddu $v0, $zero, $zero -/* CD3BB0 80241D80 27A50018 */ addiu $a1, $sp, 0x18 -/* CD3BB4 80241D84 27A6001C */ addiu $a2, $sp, 0x1c -/* CD3BB8 80241D88 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD3BBC 80241D8C C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3BC0 80241D90 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD3BC4 80241D94 3C01447A */ lui $at, 0x447a -/* CD3BC8 80241D98 44813000 */ mtc1 $at, $f6 -/* CD3BCC 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 -/* CD3BD0 80241DA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD3BD4 80241DA4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD3BD8 80241DA8 E7A40020 */ swc1 $f4, 0x20($sp) -/* CD3BDC 80241DAC E7A60024 */ swc1 $f6, 0x24($sp) -/* CD3BE0 80241DB0 AFA20010 */ sw $v0, 0x10($sp) -/* CD3BE4 80241DB4 8E040080 */ lw $a0, 0x80($s0) -/* CD3BE8 80241DB8 0C0372DF */ jal func_800DCB7C -/* CD3BEC 80241DBC 27A70020 */ addiu $a3, $sp, 0x20 -.L80241DC0: -/* CD3BF0 80241DC0 1040000B */ beqz $v0, .L80241DF0 -/* CD3BF4 80241DC4 00000000 */ nop -/* CD3BF8 80241DC8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD3BFC 80241DCC 46140080 */ add.s $f2, $f0, $f20 -/* CD3C00 80241DD0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3C04 80241DD4 4600103E */ c.le.s $f2, $f0 -/* CD3C08 80241DD8 00000000 */ nop -/* CD3C0C 80241DDC 4500008D */ bc1f .L80242014 -/* CD3C10 80241DE0 00000000 */ nop -/* CD3C14 80241DE4 E602003C */ swc1 $f2, 0x3c($s0) -/* CD3C18 80241DE8 08090805 */ j .L80242014 -/* CD3C1C 80241DEC AE400070 */ sw $zero, 0x70($s2) -.L80241DF0: -/* CD3C20 80241DF0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3C24 80241DF4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CD3C28 80241DF8 4602003E */ c.le.s $f0, $f2 -/* CD3C2C 80241DFC 00000000 */ nop -/* CD3C30 80241E00 45030084 */ bc1tl .L80242014 -/* CD3C34 80241E04 AE400070 */ sw $zero, 0x70($s2) -/* CD3C38 80241E08 08090805 */ j .L80242014 -/* CD3C3C 80241E0C 00000000 */ nop -.L80241E10: -/* CD3C40 80241E10 4622003C */ c.lt.d $f0, $f2 -/* CD3C44 80241E14 00000000 */ nop -/* CD3C48 80241E18 4500007E */ bc1f .L80242014 -/* CD3C4C 80241E1C 00000000 */ nop -/* CD3C50 80241E20 9602008E */ lhu $v0, 0x8e($s0) -/* CD3C54 80241E24 24420001 */ addiu $v0, $v0, 1 -/* CD3C58 80241E28 A602008E */ sh $v0, 0x8e($s0) -/* CD3C5C 80241E2C 00021400 */ sll $v0, $v0, 0x10 -/* CD3C60 80241E30 8E630020 */ lw $v1, 0x20($s3) -/* CD3C64 80241E34 00021403 */ sra $v0, $v0, 0x10 -/* CD3C68 80241E38 0043102A */ slt $v0, $v0, $v1 -/* CD3C6C 80241E3C 14400026 */ bnez $v0, .L80241ED8 -/* CD3C70 80241E40 00000000 */ nop -/* CD3C74 80241E44 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD3C78 80241E48 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD3C7C 80241E4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD3C80 80241E50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD3C84 80241E54 A600008E */ sh $zero, 0x8e($s0) -/* CD3C88 80241E58 8C460028 */ lw $a2, 0x28($v0) -/* CD3C8C 80241E5C 0C00A720 */ jal atan2 -/* CD3C90 80241E60 8C470030 */ lw $a3, 0x30($v0) -/* CD3C94 80241E64 46000506 */ mov.s $f20, $f0 -/* CD3C98 80241E68 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD3C9C 80241E6C 0C00A70A */ jal get_clamped_angle_diff -/* CD3CA0 80241E70 4600A386 */ mov.s $f14, $f20 -/* CD3CA4 80241E74 46000086 */ mov.s $f2, $f0 -/* CD3CA8 80241E78 8E62001C */ lw $v0, 0x1c($s3) -/* CD3CAC 80241E7C 46001005 */ abs.s $f0, $f2 -/* CD3CB0 80241E80 44822000 */ mtc1 $v0, $f4 -/* CD3CB4 80241E84 00000000 */ nop -/* CD3CB8 80241E88 46802120 */ cvt.s.w $f4, $f4 -/* CD3CBC 80241E8C 4600203C */ c.lt.s $f4, $f0 -/* CD3CC0 80241E90 00000000 */ nop -/* CD3CC4 80241E94 4500000D */ bc1f .L80241ECC -/* CD3CC8 80241E98 00000000 */ nop -/* CD3CCC 80241E9C 44800000 */ mtc1 $zero, $f0 -/* CD3CD0 80241EA0 C614000C */ lwc1 $f20, 0xc($s0) -/* CD3CD4 80241EA4 4600103C */ c.lt.s $f2, $f0 -/* CD3CD8 80241EA8 00000000 */ nop -/* CD3CDC 80241EAC 45000006 */ bc1f .L80241EC8 -/* CD3CE0 80241EB0 00021023 */ negu $v0, $v0 -/* CD3CE4 80241EB4 44820000 */ mtc1 $v0, $f0 -/* CD3CE8 80241EB8 00000000 */ nop -/* CD3CEC 80241EBC 46800020 */ cvt.s.w $f0, $f0 -/* CD3CF0 80241EC0 080907B3 */ j .L80241ECC -/* CD3CF4 80241EC4 4600A500 */ add.s $f20, $f20, $f0 -.L80241EC8: -/* CD3CF8 80241EC8 4604A500 */ add.s $f20, $f20, $f4 -.L80241ECC: -/* CD3CFC 80241ECC 0C00A6C9 */ jal clamp_angle -/* CD3D00 80241ED0 4600A306 */ mov.s $f12, $f20 -/* CD3D04 80241ED4 E600000C */ swc1 $f0, 0xc($s0) -.L80241ED8: -/* CD3D08 80241ED8 8E020000 */ lw $v0, ($s0) -/* CD3D0C 80241EDC 30420008 */ andi $v0, $v0, 8 -/* CD3D10 80241EE0 1040000A */ beqz $v0, .L80241F0C -/* CD3D14 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 -/* CD3D18 80241EE8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD3D1C 80241EEC C600001C */ lwc1 $f0, 0x1c($s0) -/* CD3D20 80241EF0 46001080 */ add.s $f2, $f2, $f0 -/* CD3D24 80241EF4 4616103C */ c.lt.s $f2, $f22 -/* CD3D28 80241EF8 00000000 */ nop -/* CD3D2C 80241EFC 45020045 */ bc1fl .L80242014 -/* CD3D30 80241F00 E602003C */ swc1 $f2, 0x3c($s0) -/* CD3D34 80241F04 08090804 */ j .L80242010 -/* CD3D38 80241F08 E616003C */ swc1 $f22, 0x3c($s0) -.L80241F0C: -/* CD3D3C 80241F0C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD3D40 80241F10 27A6001C */ addiu $a2, $sp, 0x1c -/* CD3D44 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD3D48 80241F18 860200A8 */ lh $v0, 0xa8($s0) -/* CD3D4C 80241F1C C600001C */ lwc1 $f0, 0x1c($s0) -/* CD3D50 80241F20 C604003C */ lwc1 $f4, 0x3c($s0) -/* CD3D54 80241F24 44821000 */ mtc1 $v0, $f2 -/* CD3D58 80241F28 00000000 */ nop -/* CD3D5C 80241F2C 468010A0 */ cvt.s.w $f2, $f2 -/* CD3D60 80241F30 46000005 */ abs.s $f0, $f0 -/* CD3D64 80241F34 46020000 */ add.s $f0, $f0, $f2 -/* CD3D68 80241F38 C6060040 */ lwc1 $f6, 0x40($s0) -/* CD3D6C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 -/* CD3D70 80241F40 46022100 */ add.s $f4, $f4, $f2 -/* CD3D74 80241F44 3C014024 */ lui $at, 0x4024 -/* CD3D78 80241F48 44811800 */ mtc1 $at, $f3 -/* CD3D7C 80241F4C 44801000 */ mtc1 $zero, $f2 -/* CD3D80 80241F50 46000021 */ cvt.d.s $f0, $f0 -/* CD3D84 80241F54 46220000 */ add.d $f0, $f0, $f2 -/* CD3D88 80241F58 E7A60020 */ swc1 $f6, 0x20($sp) -/* CD3D8C 80241F5C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CD3D90 80241F60 46200020 */ cvt.s.d $f0, $f0 -/* CD3D94 80241F64 E7A00024 */ swc1 $f0, 0x24($sp) -/* CD3D98 80241F68 AFA20010 */ sw $v0, 0x10($sp) -/* CD3D9C 80241F6C 8E040080 */ lw $a0, 0x80($s0) -/* CD3DA0 80241F70 0C0372DF */ jal func_800DCB7C -/* CD3DA4 80241F74 27A70020 */ addiu $a3, $sp, 0x20 -/* CD3DA8 80241F78 10400015 */ beqz $v0, .L80241FD0 -/* CD3DAC 80241F7C 00000000 */ nop -/* CD3DB0 80241F80 860200A8 */ lh $v0, 0xa8($s0) -/* CD3DB4 80241F84 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3DB8 80241F88 44820000 */ mtc1 $v0, $f0 -/* CD3DBC 80241F8C 00000000 */ nop -/* CD3DC0 80241F90 46800020 */ cvt.s.w $f0, $f0 -/* CD3DC4 80241F94 46002085 */ abs.s $f2, $f4 -/* CD3DC8 80241F98 46020000 */ add.s $f0, $f0, $f2 -/* CD3DCC 80241F9C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD3DD0 80241FA0 4600103E */ c.le.s $f2, $f0 -/* CD3DD4 80241FA4 00000000 */ nop -/* CD3DD8 80241FA8 45000005 */ bc1f .L80241FC0 -/* CD3DDC 80241FAC 00000000 */ nop -/* CD3DE0 80241FB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD3DE4 80241FB4 AE00001C */ sw $zero, 0x1c($s0) -/* CD3DE8 80241FB8 08090805 */ j .L80242014 -/* CD3DEC 80241FBC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FC0: -/* CD3DF0 80241FC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD3DF4 80241FC4 46040000 */ add.s $f0, $f0, $f4 -/* CD3DF8 80241FC8 08090805 */ j .L80242014 -/* CD3DFC 80241FCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FD0: -/* CD3E00 80241FD0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CD3E04 80241FD4 860200A8 */ lh $v0, 0xa8($s0) -/* CD3E08 80241FD8 46163081 */ sub.s $f2, $f6, $f22 -/* CD3E0C 80241FDC 44820000 */ mtc1 $v0, $f0 -/* CD3E10 80241FE0 00000000 */ nop -/* CD3E14 80241FE4 46800020 */ cvt.s.w $f0, $f0 -/* CD3E18 80241FE8 46001080 */ add.s $f2, $f2, $f0 -/* CD3E1C 80241FEC C604001C */ lwc1 $f4, 0x1c($s0) -/* CD3E20 80241FF0 46002005 */ abs.s $f0, $f4 -/* CD3E24 80241FF4 4602003C */ c.lt.s $f0, $f2 -/* CD3E28 80241FF8 00000000 */ nop -/* CD3E2C 80241FFC 45020005 */ bc1fl .L80242014 -/* CD3E30 80242000 AE00001C */ sw $zero, 0x1c($s0) -/* CD3E34 80242004 46043000 */ add.s $f0, $f6, $f4 -/* CD3E38 80242008 08090805 */ j .L80242014 -/* CD3E3C 8024200C E600003C */ swc1 $f0, 0x3c($s0) -.L80242010: -/* CD3E40 80242010 AE00001C */ sw $zero, 0x1c($s0) -.L80242014: -/* CD3E44 80242014 8FBF0038 */ lw $ra, 0x38($sp) -/* CD3E48 80242018 8FB30034 */ lw $s3, 0x34($sp) -/* CD3E4C 8024201C 8FB20030 */ lw $s2, 0x30($sp) -/* CD3E50 80242020 8FB1002C */ lw $s1, 0x2c($sp) -/* CD3E54 80242024 8FB00028 */ lw $s0, 0x28($sp) -/* CD3E58 80242028 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CD3E5C 8024202C D7B40040 */ ldc1 $f20, 0x40($sp) -/* CD3E60 80242030 03E00008 */ jr $ra -/* CD3E64 80242034 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s deleted file mode 100644 index 76d620ef72..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242038_CD3E68 -/* CD3E68 80242038 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CD3E6C 8024203C AFB00028 */ sw $s0, 0x28($sp) -/* CD3E70 80242040 00A0802D */ daddu $s0, $a1, $zero -/* CD3E74 80242044 AFB1002C */ sw $s1, 0x2c($sp) -/* CD3E78 80242048 00C0882D */ daddu $s1, $a2, $zero -/* CD3E7C 8024204C AFBF0034 */ sw $ra, 0x34($sp) -/* CD3E80 80242050 AFB20030 */ sw $s2, 0x30($sp) -/* CD3E84 80242054 AE200070 */ sw $zero, 0x70($s1) -/* CD3E88 80242058 8C830000 */ lw $v1, ($a0) -/* CD3E8C 8024205C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CD3E90 80242060 A480008E */ sh $zero, 0x8e($a0) -/* CD3E94 80242064 00621824 */ and $v1, $v1, $v0 -/* CD3E98 80242068 34650800 */ ori $a1, $v1, 0x800 -/* CD3E9C 8024206C AC850000 */ sw $a1, ($a0) -/* CD3EA0 80242070 8E0200D0 */ lw $v0, 0xd0($s0) -/* CD3EA4 80242074 8C420034 */ lw $v0, 0x34($v0) -/* CD3EA8 80242078 10400003 */ beqz $v0, .L80242088 -/* CD3EAC 8024207C 00E0902D */ daddu $s2, $a3, $zero -/* CD3EB0 80242080 08090824 */ j .L80242090 -/* CD3EB4 80242084 34620808 */ ori $v0, $v1, 0x808 -.L80242088: -/* CD3EB8 80242088 2402FFF7 */ addiu $v0, $zero, -9 -/* CD3EBC 8024208C 00A21024 */ and $v0, $a1, $v0 -.L80242090: -/* CD3EC0 80242090 AC820000 */ sw $v0, ($a0) -/* CD3EC4 80242094 27A20024 */ addiu $v0, $sp, 0x24 -/* CD3EC8 80242098 27A50018 */ addiu $a1, $sp, 0x18 -/* CD3ECC 8024209C C4800038 */ lwc1 $f0, 0x38($a0) -/* CD3ED0 802420A0 C482003C */ lwc1 $f2, 0x3c($a0) -/* CD3ED4 802420A4 C4840040 */ lwc1 $f4, 0x40($a0) -/* CD3ED8 802420A8 3C01447A */ lui $at, 0x447a -/* CD3EDC 802420AC 44813000 */ mtc1 $at, $f6 -/* CD3EE0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c -/* CD3EE4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD3EE8 802420B8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD3EEC 802420BC E7A40020 */ swc1 $f4, 0x20($sp) -/* CD3EF0 802420C0 E7A60024 */ swc1 $f6, 0x24($sp) -/* CD3EF4 802420C4 AFA20010 */ sw $v0, 0x10($sp) -/* CD3EF8 802420C8 8C840080 */ lw $a0, 0x80($a0) -/* CD3EFC 802420CC 0C0372DF */ jal func_800DCB7C -/* CD3F00 802420D0 27A70020 */ addiu $a3, $sp, 0x20 -/* CD3F04 802420D4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD3F08 802420D8 3C014059 */ lui $at, 0x4059 -/* CD3F0C 802420DC 44812800 */ mtc1 $at, $f5 -/* CD3F10 802420E0 44802000 */ mtc1 $zero, $f4 -/* CD3F14 802420E4 460010A1 */ cvt.d.s $f2, $f2 -/* CD3F18 802420E8 46241082 */ mul.d $f2, $f2, $f4 -/* CD3F1C 802420EC 00000000 */ nop -/* CD3F20 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD3F24 802420F4 46000021 */ cvt.d.s $f0, $f0 -/* CD3F28 802420F8 46240002 */ mul.d $f0, $f0, $f4 -/* CD3F2C 802420FC 00000000 */ nop -/* CD3F30 80242100 3C013FE0 */ lui $at, 0x3fe0 -/* CD3F34 80242104 44812800 */ mtc1 $at, $f5 -/* CD3F38 80242108 44802000 */ mtc1 $zero, $f4 -/* CD3F3C 8024210C 00000000 */ nop -/* CD3F40 80242110 46241080 */ add.d $f2, $f2, $f4 -/* CD3F44 80242114 AE000074 */ sw $zero, 0x74($s0) -/* CD3F48 80242118 46240000 */ add.d $f0, $f0, $f4 -/* CD3F4C 8024211C AE000090 */ sw $zero, 0x90($s0) -/* CD3F50 80242120 4620120D */ trunc.w.d $f8, $f2 -/* CD3F54 80242124 E6080078 */ swc1 $f8, 0x78($s0) -/* CD3F58 80242128 4620020D */ trunc.w.d $f8, $f0 -/* CD3F5C 8024212C E6080088 */ swc1 $f8, 0x88($s0) -/* CD3F60 80242130 8E420014 */ lw $v0, 0x14($s2) -/* CD3F64 80242134 AE220074 */ sw $v0, 0x74($s1) -/* CD3F68 80242138 8E0200B0 */ lw $v0, 0xb0($s0) -/* CD3F6C 8024213C 34420010 */ ori $v0, $v0, 0x10 -/* CD3F70 80242140 AE0200B0 */ sw $v0, 0xb0($s0) -/* CD3F74 80242144 8FBF0034 */ lw $ra, 0x34($sp) -/* CD3F78 80242148 8FB20030 */ lw $s2, 0x30($sp) -/* CD3F7C 8024214C 8FB1002C */ lw $s1, 0x2c($sp) -/* CD3F80 80242150 8FB00028 */ lw $s0, 0x28($sp) -/* CD3F84 80242154 03E00008 */ jr $ra -/* CD3F88 80242158 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index ccfca0d5db..55e2474f05 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -46,7 +46,7 @@ glabel func_8024215C_CD3F8C /* CD4030 80242200 02A0202D */ daddu $a0, $s5, $zero /* CD4034 80242204 0240282D */ daddu $a1, $s2, $zero /* CD4038 80242208 0280302D */ daddu $a2, $s4, $zero -/* CD403C 8024220C 0C09080E */ jal func_80242038_CD3E68 +/* CD403C 8024220C 0C09080E */ jal flo_16_UnkFunc5 /* CD4040 80242210 0200382D */ daddu $a3, $s0, $zero .L80242214: /* CD4044 80242214 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80242290_CD40C0 glabel L802422A0_CD40D0 /* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero /* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero -/* CD40D8 802422A8 0C0905BA */ jal func_802416E8_CD3518 +/* CD40D8 802422A8 0C0905BA */ jal flo_16_UnkFunc4 /* CD40DC 802422AC 0260302D */ daddu $a2, $s3, $zero /* CD40E0 802422B0 080908C9 */ j .L80242324 /* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802422F8_CD4128 glabel L80242310_CD4140 /* CD4140 80242310 0280202D */ daddu $a0, $s4, $zero /* CD4144 80242314 0200282D */ daddu $a1, $s0, $zero -/* CD4148 80242318 0C09072A */ jal func_80241CA8_CD3AD8 +/* CD4148 80242318 0C09072A */ jal flo_16_UnkFunc6 /* CD414C 8024231C 0260302D */ daddu $a2, $s3, $zero glabel L80242320_CD4150 /* CD4150 80242320 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index d881934923..bd3d16dd26 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -46,7 +46,7 @@ glabel func_80242754_CD4584 /* CD4628 802427F8 02A0202D */ daddu $a0, $s5, $zero /* CD462C 802427FC 0240282D */ daddu $a1, $s2, $zero /* CD4630 80242800 0280302D */ daddu $a2, $s4, $zero -/* CD4634 80242804 0C09080E */ jal func_80242038_CD3E68 +/* CD4634 80242804 0C09080E */ jal flo_16_UnkFunc5 /* CD4638 80242808 0200382D */ daddu $a3, $s0, $zero /* CD463C 8024280C AE800070 */ sw $zero, 0x70($s4) .L80242810: @@ -92,7 +92,7 @@ glabel L8024288C_CD46BC glabel L8024289C_CD46CC /* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero /* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero -/* CD46D4 802428A4 0C0905BA */ jal func_802416E8_CD3518 +/* CD46D4 802428A4 0C0905BA */ jal flo_16_UnkFunc4 /* CD46D8 802428A8 0260302D */ daddu $a2, $s3, $zero /* CD46DC 802428AC 08090A46 */ j .L80242918 /* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s deleted file mode 100644 index 0898fbfc5f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240908_CD7BE8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908_CD7BE8 -/* CD7BE8 80240908 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CD7BEC 8024090C AFB3004C */ sw $s3, 0x4c($sp) -/* CD7BF0 80240910 0080982D */ daddu $s3, $a0, $zero -/* CD7BF4 80240914 AFBF0054 */ sw $ra, 0x54($sp) -/* CD7BF8 80240918 AFB40050 */ sw $s4, 0x50($sp) -/* CD7BFC 8024091C AFB20048 */ sw $s2, 0x48($sp) -/* CD7C00 80240920 AFB10044 */ sw $s1, 0x44($sp) -/* CD7C04 80240924 AFB00040 */ sw $s0, 0x40($sp) -/* CD7C08 80240928 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CD7C0C 8024092C F7B80068 */ sdc1 $f24, 0x68($sp) -/* CD7C10 80240930 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CD7C14 80240934 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CD7C18 80240938 8E710148 */ lw $s1, 0x148($s3) -/* CD7C1C 8024093C 00A0902D */ daddu $s2, $a1, $zero -/* CD7C20 80240940 86240008 */ lh $a0, 8($s1) -/* CD7C24 80240944 0C00EABB */ jal get_npc_unsafe -/* CD7C28 80240948 00C0A02D */ daddu $s4, $a2, $zero -/* CD7C2C 8024094C 0040802D */ daddu $s0, $v0, $zero -/* CD7C30 80240950 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD7C34 80240954 46800020 */ cvt.s.w $f0, $f0 -/* CD7C38 80240958 46000021 */ cvt.d.s $f0, $f0 -/* CD7C3C 8024095C 3C014059 */ lui $at, 0x4059 -/* CD7C40 80240960 44811800 */ mtc1 $at, $f3 -/* CD7C44 80240964 44801000 */ mtc1 $zero, $f2 -/* CD7C48 80240968 8602008E */ lh $v0, 0x8e($s0) -/* CD7C4C 8024096C 9603008E */ lhu $v1, 0x8e($s0) -/* CD7C50 80240970 46220003 */ div.d $f0, $f0, $f2 -/* CD7C54 80240974 46200620 */ cvt.s.d $f24, $f0 -/* CD7C58 80240978 C6200088 */ lwc1 $f0, 0x88($s1) -/* CD7C5C 8024097C 46800020 */ cvt.s.w $f0, $f0 -/* CD7C60 80240980 46000021 */ cvt.d.s $f0, $f0 -/* CD7C64 80240984 46220003 */ div.d $f0, $f0, $f2 -/* CD7C68 80240988 46200020 */ cvt.s.d $f0, $f0 -/* CD7C6C 8024098C 18400003 */ blez $v0, .L8024099C -/* CD7C70 80240990 4600C680 */ add.s $f26, $f24, $f0 -/* CD7C74 80240994 2462FFFF */ addiu $v0, $v1, -1 -/* CD7C78 80240998 A602008E */ sh $v0, 0x8e($s0) -.L8024099C: -/* CD7C7C 8024099C 8E220070 */ lw $v0, 0x70($s1) -/* CD7C80 802409A0 18400034 */ blez $v0, .L80240A74 -/* CD7C84 802409A4 00000000 */ nop -/* CD7C88 802409A8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD7C8C 802409AC 46806320 */ cvt.s.w $f12, $f12 -/* CD7C90 802409B0 44820000 */ mtc1 $v0, $f0 -/* CD7C94 802409B4 00000000 */ nop -/* CD7C98 802409B8 46800020 */ cvt.s.w $f0, $f0 -/* CD7C9C 802409BC 46000021 */ cvt.d.s $f0, $f0 -/* CD7CA0 802409C0 46220003 */ div.d $f0, $f0, $f2 -/* CD7CA4 802409C4 0C00A8BB */ jal sin_deg -/* CD7CA8 802409C8 462005A0 */ cvt.s.d $f22, $f0 -/* CD7CAC 802409CC 8E020000 */ lw $v0, ($s0) -/* CD7CB0 802409D0 30420008 */ andi $v0, $v0, 8 -/* CD7CB4 802409D4 10400003 */ beqz $v0, .L802409E4 -/* CD7CB8 802409D8 46000506 */ mov.s $f20, $f0 -/* CD7CBC 802409DC 08090289 */ j .L80240A24 -/* CD7CC0 802409E0 0000102D */ daddu $v0, $zero, $zero -.L802409E4: -/* CD7CC4 802409E4 27A50028 */ addiu $a1, $sp, 0x28 -/* CD7CC8 802409E8 27A6002C */ addiu $a2, $sp, 0x2c -/* CD7CCC 802409EC C6000038 */ lwc1 $f0, 0x38($s0) -/* CD7CD0 802409F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD7CD4 802409F4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD7CD8 802409F8 3C01447A */ lui $at, 0x447a -/* CD7CDC 802409FC 44813000 */ mtc1 $at, $f6 -/* CD7CE0 80240A00 27A20034 */ addiu $v0, $sp, 0x34 -/* CD7CE4 80240A04 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD7CE8 80240A08 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD7CEC 80240A0C E7A40030 */ swc1 $f4, 0x30($sp) -/* CD7CF0 80240A10 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD7CF4 80240A14 AFA20010 */ sw $v0, 0x10($sp) -/* CD7CF8 80240A18 8E040080 */ lw $a0, 0x80($s0) -/* CD7CFC 80240A1C 0C0372DF */ jal func_800DCB7C -/* CD7D00 80240A20 27A70030 */ addiu $a3, $sp, 0x30 -.L80240A24: -/* CD7D04 80240A24 10400007 */ beqz $v0, .L80240A44 -/* CD7D08 80240A28 00000000 */ nop -/* CD7D0C 80240A2C 4616A082 */ mul.s $f2, $f20, $f22 -/* CD7D10 80240A30 00000000 */ nop -/* CD7D14 80240A34 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CD7D18 80240A38 46180000 */ add.s $f0, $f0, $f24 -/* CD7D1C 80240A3C 08090294 */ j .L80240A50 -/* CD7D20 80240A40 46020000 */ add.s $f0, $f0, $f2 -.L80240A44: -/* CD7D24 80240A44 4616A002 */ mul.s $f0, $f20, $f22 -/* CD7D28 80240A48 00000000 */ nop -/* CD7D2C 80240A4C 4600D000 */ add.s $f0, $f26, $f0 -.L80240A50: -/* CD7D30 80240A50 E600003C */ swc1 $f0, 0x3c($s0) -/* CD7D34 80240A54 8E220074 */ lw $v0, 0x74($s1) -/* CD7D38 80240A58 2442000A */ addiu $v0, $v0, 0xa -/* CD7D3C 80240A5C 44826000 */ mtc1 $v0, $f12 -/* CD7D40 80240A60 00000000 */ nop -/* CD7D44 80240A64 0C00A6C9 */ jal clamp_angle -/* CD7D48 80240A68 46806320 */ cvt.s.w $f12, $f12 -/* CD7D4C 80240A6C 4600020D */ trunc.w.s $f8, $f0 -/* CD7D50 80240A70 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A74: -/* CD7D54 80240A74 8E220090 */ lw $v0, 0x90($s1) -/* CD7D58 80240A78 1C400040 */ bgtz $v0, .L80240B7C -/* CD7D5C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 -/* CD7D60 80240A80 860200A8 */ lh $v0, 0xa8($s0) -/* CD7D64 80240A84 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD7D68 80240A88 44821000 */ mtc1 $v0, $f2 -/* CD7D6C 80240A8C 00000000 */ nop -/* CD7D70 80240A90 468010A0 */ cvt.s.w $f2, $f2 -/* CD7D74 80240A94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD7D78 80240A98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD7D7C 80240A9C 46020000 */ add.s $f0, $f0, $f2 -/* CD7D80 80240AA0 3C014024 */ lui $at, 0x4024 -/* CD7D84 80240AA4 44812800 */ mtc1 $at, $f5 -/* CD7D88 80240AA8 44802000 */ mtc1 $zero, $f4 -/* CD7D8C 80240AAC C442002C */ lwc1 $f2, 0x2c($v0) -/* CD7D90 80240AB0 46000021 */ cvt.d.s $f0, $f0 -/* CD7D94 80240AB4 46240000 */ add.d $f0, $f0, $f4 -/* CD7D98 80240AB8 460010A1 */ cvt.d.s $f2, $f2 -/* CD7D9C 80240ABC 4620103C */ c.lt.d $f2, $f0 -/* CD7DA0 80240AC0 00000000 */ nop -/* CD7DA4 80240AC4 4500002E */ bc1f .L80240B80 -/* CD7DA8 80240AC8 0280202D */ daddu $a0, $s4, $zero -/* CD7DAC 80240ACC 24020001 */ addiu $v0, $zero, 1 -/* CD7DB0 80240AD0 AFA20010 */ sw $v0, 0x10($sp) -/* CD7DB4 80240AD4 8E460024 */ lw $a2, 0x24($s2) -/* CD7DB8 80240AD8 8E470028 */ lw $a3, 0x28($s2) -/* CD7DBC 80240ADC 0C01242D */ jal func_800490B4 -/* CD7DC0 80240AE0 0220282D */ daddu $a1, $s1, $zero -/* CD7DC4 80240AE4 10400026 */ beqz $v0, .L80240B80 -/* CD7DC8 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* CD7DCC 80240AEC 0200282D */ daddu $a1, $s0, $zero -/* CD7DD0 80240AF0 0000302D */ daddu $a2, $zero, $zero -/* CD7DD4 80240AF4 2412000C */ addiu $s2, $zero, 0xc -/* CD7DD8 80240AF8 860300A8 */ lh $v1, 0xa8($s0) -/* CD7DDC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* CD7DE0 80240B00 44810000 */ mtc1 $at, $f0 -/* CD7DE4 80240B04 3C014000 */ lui $at, 0x4000 -/* CD7DE8 80240B08 44811000 */ mtc1 $at, $f2 -/* CD7DEC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 -/* CD7DF0 80240B10 44812000 */ mtc1 $at, $f4 -/* CD7DF4 80240B14 44834000 */ mtc1 $v1, $f8 -/* CD7DF8 80240B18 00000000 */ nop -/* CD7DFC 80240B1C 46804220 */ cvt.s.w $f8, $f8 -/* CD7E00 80240B20 44074000 */ mfc1 $a3, $f8 -/* CD7E04 80240B24 27A20038 */ addiu $v0, $sp, 0x38 -/* CD7E08 80240B28 AFB2001C */ sw $s2, 0x1c($sp) -/* CD7E0C 80240B2C AFA20020 */ sw $v0, 0x20($sp) -/* CD7E10 80240B30 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD7E14 80240B34 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD7E18 80240B38 0C01BFA4 */ jal fx_emote -/* CD7E1C 80240B3C E7A40018 */ swc1 $f4, 0x18($sp) -/* CD7E20 80240B40 0200202D */ daddu $a0, $s0, $zero -/* CD7E24 80240B44 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD7E28 80240B48 C480003C */ lwc1 $f0, 0x3c($a0) -/* CD7E2C 80240B4C 3C060020 */ lui $a2, 0x20 -/* CD7E30 80240B50 0C012530 */ jal func_800494C0 -/* CD7E34 80240B54 E4800064 */ swc1 $f0, 0x64($a0) -/* CD7E38 80240B58 8E220018 */ lw $v0, 0x18($s1) -/* CD7E3C 80240B5C 9442002A */ lhu $v0, 0x2a($v0) -/* CD7E40 80240B60 30420001 */ andi $v0, $v0, 1 -/* CD7E44 80240B64 10400003 */ beqz $v0, .L80240B74 -/* CD7E48 80240B68 2402000A */ addiu $v0, $zero, 0xa -/* CD7E4C 80240B6C 08090307 */ j .L80240C1C -/* CD7E50 80240B70 AE620070 */ sw $v0, 0x70($s3) -.L80240B74: -/* CD7E54 80240B74 08090307 */ j .L80240C1C -/* CD7E58 80240B78 AE720070 */ sw $s2, 0x70($s3) -.L80240B7C: -/* CD7E5C 80240B7C AE220090 */ sw $v0, 0x90($s1) -.L80240B80: -/* CD7E60 80240B80 8602008C */ lh $v0, 0x8c($s0) -/* CD7E64 80240B84 14400025 */ bnez $v0, .L80240C1C -/* CD7E68 80240B88 00000000 */ nop -/* CD7E6C 80240B8C 8602008E */ lh $v0, 0x8e($s0) -/* CD7E70 80240B90 1C400022 */ bgtz $v0, .L80240C1C -/* CD7E74 80240B94 00000000 */ nop -/* CD7E78 80240B98 8E620074 */ lw $v0, 0x74($s3) -/* CD7E7C 80240B9C 2442FFFF */ addiu $v0, $v0, -1 -/* CD7E80 80240BA0 1840001D */ blez $v0, .L80240C18 -/* CD7E84 80240BA4 AE620074 */ sw $v0, 0x74($s3) -/* CD7E88 80240BA8 8E220018 */ lw $v0, 0x18($s1) -/* CD7E8C 80240BAC 9442002A */ lhu $v0, 0x2a($v0) -/* CD7E90 80240BB0 30420010 */ andi $v0, $v0, 0x10 -/* CD7E94 80240BB4 14400007 */ bnez $v0, .L80240BD4 -/* CD7E98 80240BB8 00000000 */ nop -/* CD7E9C 80240BBC C600000C */ lwc1 $f0, 0xc($s0) -/* CD7EA0 80240BC0 3C014334 */ lui $at, 0x4334 -/* CD7EA4 80240BC4 44816000 */ mtc1 $at, $f12 -/* CD7EA8 80240BC8 0C00A6C9 */ jal clamp_angle -/* CD7EAC 80240BCC 460C0300 */ add.s $f12, $f0, $f12 -/* CD7EB0 80240BD0 E600000C */ swc1 $f0, 0xc($s0) -.L80240BD4: -/* CD7EB4 80240BD4 0C00A67F */ jal rand_int -/* CD7EB8 80240BD8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD7EBC 80240BDC 3C032E8B */ lui $v1, 0x2e8b -/* CD7EC0 80240BE0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CD7EC4 80240BE4 00430018 */ mult $v0, $v1 -/* CD7EC8 80240BE8 00021FC3 */ sra $v1, $v0, 0x1f -/* CD7ECC 80240BEC 00004010 */ mfhi $t0 -/* CD7ED0 80240BF0 00082043 */ sra $a0, $t0, 1 -/* CD7ED4 80240BF4 00832023 */ subu $a0, $a0, $v1 -/* CD7ED8 80240BF8 00041840 */ sll $v1, $a0, 1 -/* CD7EDC 80240BFC 00641821 */ addu $v1, $v1, $a0 -/* CD7EE0 80240C00 00031880 */ sll $v1, $v1, 2 -/* CD7EE4 80240C04 00641823 */ subu $v1, $v1, $a0 -/* CD7EE8 80240C08 00431023 */ subu $v0, $v0, $v1 -/* CD7EEC 80240C0C 24420005 */ addiu $v0, $v0, 5 -/* CD7EF0 80240C10 08090307 */ j .L80240C1C -/* CD7EF4 80240C14 A602008E */ sh $v0, 0x8e($s0) -.L80240C18: -/* CD7EF8 80240C18 AE600070 */ sw $zero, 0x70($s3) -.L80240C1C: -/* CD7EFC 80240C1C 8FBF0054 */ lw $ra, 0x54($sp) -/* CD7F00 80240C20 8FB40050 */ lw $s4, 0x50($sp) -/* CD7F04 80240C24 8FB3004C */ lw $s3, 0x4c($sp) -/* CD7F08 80240C28 8FB20048 */ lw $s2, 0x48($sp) -/* CD7F0C 80240C2C 8FB10044 */ lw $s1, 0x44($sp) -/* CD7F10 80240C30 8FB00040 */ lw $s0, 0x40($sp) -/* CD7F14 80240C34 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CD7F18 80240C38 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CD7F1C 80240C3C D7B60060 */ ldc1 $f22, 0x60($sp) -/* CD7F20 80240C40 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CD7F24 80240C44 03E00008 */ jr $ra -/* CD7F28 80240C48 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s deleted file mode 100644 index fc73f48cdd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240EC8_CD81A8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC8_CD81A8 -/* CD81A8 80240EC8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD81AC 80240ECC AFB20030 */ sw $s2, 0x30($sp) -/* CD81B0 80240ED0 0080902D */ daddu $s2, $a0, $zero -/* CD81B4 80240ED4 AFBF0038 */ sw $ra, 0x38($sp) -/* CD81B8 80240ED8 AFB30034 */ sw $s3, 0x34($sp) -/* CD81BC 80240EDC AFB1002C */ sw $s1, 0x2c($sp) -/* CD81C0 80240EE0 AFB00028 */ sw $s0, 0x28($sp) -/* CD81C4 80240EE4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CD81C8 80240EE8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CD81CC 80240EEC 8E510148 */ lw $s1, 0x148($s2) -/* CD81D0 80240EF0 86240008 */ lh $a0, 8($s1) -/* CD81D4 80240EF4 0C00EABB */ jal get_npc_unsafe -/* CD81D8 80240EF8 00A0982D */ daddu $s3, $a1, $zero -/* CD81DC 80240EFC 0040802D */ daddu $s0, $v0, $zero -/* CD81E0 80240F00 0200202D */ daddu $a0, $s0, $zero -/* CD81E4 80240F04 C6220088 */ lwc1 $f2, 0x88($s1) -/* CD81E8 80240F08 468010A0 */ cvt.s.w $f2, $f2 -/* CD81EC 80240F0C 460010A1 */ cvt.d.s $f2, $f2 -/* CD81F0 80240F10 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD81F4 80240F14 C6000014 */ lwc1 $f0, 0x14($s0) -/* CD81F8 80240F18 8E050018 */ lw $a1, 0x18($s0) -/* CD81FC 80240F1C 46002100 */ add.s $f4, $f4, $f0 -/* CD8200 80240F20 8E06000C */ lw $a2, 0xc($s0) -/* CD8204 80240F24 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD8208 80240F28 46800020 */ cvt.s.w $f0, $f0 -/* CD820C 80240F2C E604001C */ swc1 $f4, 0x1c($s0) -/* CD8210 80240F30 3C014059 */ lui $at, 0x4059 -/* CD8214 80240F34 44812800 */ mtc1 $at, $f5 -/* CD8218 80240F38 44802000 */ mtc1 $zero, $f4 -/* CD821C 80240F3C 46000021 */ cvt.d.s $f0, $f0 -/* CD8220 80240F40 46240003 */ div.d $f0, $f0, $f4 -/* CD8224 80240F44 46200520 */ cvt.s.d $f20, $f0 -/* CD8228 80240F48 46241083 */ div.d $f2, $f2, $f4 -/* CD822C 80240F4C 0C00EA95 */ jal npc_move_heading -/* CD8230 80240F50 462015A0 */ cvt.s.d $f22, $f2 -/* CD8234 80240F54 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD8238 80240F58 44801000 */ mtc1 $zero, $f2 -/* CD823C 80240F5C 44801800 */ mtc1 $zero, $f3 -/* CD8240 80240F60 46002021 */ cvt.d.s $f0, $f4 -/* CD8244 80240F64 4620103E */ c.le.d $f2, $f0 -/* CD8248 80240F68 00000000 */ nop -/* CD824C 80240F6C 45000030 */ bc1f .L80241030 -/* CD8250 80240F70 00000000 */ nop -/* CD8254 80240F74 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD8258 80240F78 46040000 */ add.s $f0, $f0, $f4 -/* CD825C 80240F7C E600003C */ swc1 $f0, 0x3c($s0) -/* CD8260 80240F80 8E2200CC */ lw $v0, 0xcc($s1) -/* CD8264 80240F84 8C420024 */ lw $v0, 0x24($v0) -/* CD8268 80240F88 AE020028 */ sw $v0, 0x28($s0) -/* CD826C 80240F8C A2200007 */ sb $zero, 7($s1) -/* CD8270 80240F90 8E020000 */ lw $v0, ($s0) -/* CD8274 80240F94 30420008 */ andi $v0, $v0, 8 -/* CD8278 80240F98 14400011 */ bnez $v0, .L80240FE0 -/* CD827C 80240F9C 0000102D */ daddu $v0, $zero, $zero -/* CD8280 80240FA0 27A50018 */ addiu $a1, $sp, 0x18 -/* CD8284 80240FA4 27A6001C */ addiu $a2, $sp, 0x1c -/* CD8288 80240FA8 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD828C 80240FAC C602003C */ lwc1 $f2, 0x3c($s0) -/* CD8290 80240FB0 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD8294 80240FB4 3C01447A */ lui $at, 0x447a -/* CD8298 80240FB8 44813000 */ mtc1 $at, $f6 -/* CD829C 80240FBC 27A20024 */ addiu $v0, $sp, 0x24 -/* CD82A0 80240FC0 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD82A4 80240FC4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD82A8 80240FC8 E7A40020 */ swc1 $f4, 0x20($sp) -/* CD82AC 80240FCC E7A60024 */ swc1 $f6, 0x24($sp) -/* CD82B0 80240FD0 AFA20010 */ sw $v0, 0x10($sp) -/* CD82B4 80240FD4 8E040080 */ lw $a0, 0x80($s0) -/* CD82B8 80240FD8 0C0372DF */ jal func_800DCB7C -/* CD82BC 80240FDC 27A70020 */ addiu $a3, $sp, 0x20 -.L80240FE0: -/* CD82C0 80240FE0 1040000B */ beqz $v0, .L80241010 -/* CD82C4 80240FE4 00000000 */ nop -/* CD82C8 80240FE8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD82CC 80240FEC 46140080 */ add.s $f2, $f0, $f20 -/* CD82D0 80240FF0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD82D4 80240FF4 4600103E */ c.le.s $f2, $f0 -/* CD82D8 80240FF8 00000000 */ nop -/* CD82DC 80240FFC 4500008D */ bc1f .L80241234 -/* CD82E0 80241000 00000000 */ nop -/* CD82E4 80241004 E602003C */ swc1 $f2, 0x3c($s0) -/* CD82E8 80241008 0809048D */ j .L80241234 -/* CD82EC 8024100C AE400070 */ sw $zero, 0x70($s2) -.L80241010: -/* CD82F0 80241010 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD82F4 80241014 C6000064 */ lwc1 $f0, 0x64($s0) -/* CD82F8 80241018 4602003E */ c.le.s $f0, $f2 -/* CD82FC 8024101C 00000000 */ nop -/* CD8300 80241020 45030084 */ bc1tl .L80241234 -/* CD8304 80241024 AE400070 */ sw $zero, 0x70($s2) -/* CD8308 80241028 0809048D */ j .L80241234 -/* CD830C 8024102C 00000000 */ nop -.L80241030: -/* CD8310 80241030 4622003C */ c.lt.d $f0, $f2 -/* CD8314 80241034 00000000 */ nop -/* CD8318 80241038 4500007E */ bc1f .L80241234 -/* CD831C 8024103C 00000000 */ nop -/* CD8320 80241040 9602008E */ lhu $v0, 0x8e($s0) -/* CD8324 80241044 24420001 */ addiu $v0, $v0, 1 -/* CD8328 80241048 A602008E */ sh $v0, 0x8e($s0) -/* CD832C 8024104C 00021400 */ sll $v0, $v0, 0x10 -/* CD8330 80241050 8E630020 */ lw $v1, 0x20($s3) -/* CD8334 80241054 00021403 */ sra $v0, $v0, 0x10 -/* CD8338 80241058 0043102A */ slt $v0, $v0, $v1 -/* CD833C 8024105C 14400026 */ bnez $v0, .L802410F8 -/* CD8340 80241060 00000000 */ nop -/* CD8344 80241064 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CD8348 80241068 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CD834C 8024106C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD8350 80241070 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD8354 80241074 A600008E */ sh $zero, 0x8e($s0) -/* CD8358 80241078 8C460028 */ lw $a2, 0x28($v0) -/* CD835C 8024107C 0C00A720 */ jal atan2 -/* CD8360 80241080 8C470030 */ lw $a3, 0x30($v0) -/* CD8364 80241084 46000506 */ mov.s $f20, $f0 -/* CD8368 80241088 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD836C 8024108C 0C00A70A */ jal get_clamped_angle_diff -/* CD8370 80241090 4600A386 */ mov.s $f14, $f20 -/* CD8374 80241094 46000086 */ mov.s $f2, $f0 -/* CD8378 80241098 8E62001C */ lw $v0, 0x1c($s3) -/* CD837C 8024109C 46001005 */ abs.s $f0, $f2 -/* CD8380 802410A0 44822000 */ mtc1 $v0, $f4 -/* CD8384 802410A4 00000000 */ nop -/* CD8388 802410A8 46802120 */ cvt.s.w $f4, $f4 -/* CD838C 802410AC 4600203C */ c.lt.s $f4, $f0 -/* CD8390 802410B0 00000000 */ nop -/* CD8394 802410B4 4500000D */ bc1f .L802410EC -/* CD8398 802410B8 00000000 */ nop -/* CD839C 802410BC 44800000 */ mtc1 $zero, $f0 -/* CD83A0 802410C0 C614000C */ lwc1 $f20, 0xc($s0) -/* CD83A4 802410C4 4600103C */ c.lt.s $f2, $f0 -/* CD83A8 802410C8 00000000 */ nop -/* CD83AC 802410CC 45000006 */ bc1f .L802410E8 -/* CD83B0 802410D0 00021023 */ negu $v0, $v0 -/* CD83B4 802410D4 44820000 */ mtc1 $v0, $f0 -/* CD83B8 802410D8 00000000 */ nop -/* CD83BC 802410DC 46800020 */ cvt.s.w $f0, $f0 -/* CD83C0 802410E0 0809043B */ j .L802410EC -/* CD83C4 802410E4 4600A500 */ add.s $f20, $f20, $f0 -.L802410E8: -/* CD83C8 802410E8 4604A500 */ add.s $f20, $f20, $f4 -.L802410EC: -/* CD83CC 802410EC 0C00A6C9 */ jal clamp_angle -/* CD83D0 802410F0 4600A306 */ mov.s $f12, $f20 -/* CD83D4 802410F4 E600000C */ swc1 $f0, 0xc($s0) -.L802410F8: -/* CD83D8 802410F8 8E020000 */ lw $v0, ($s0) -/* CD83DC 802410FC 30420008 */ andi $v0, $v0, 8 -/* CD83E0 80241100 1040000A */ beqz $v0, .L8024112C -/* CD83E4 80241104 27A50018 */ addiu $a1, $sp, 0x18 -/* CD83E8 80241108 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD83EC 8024110C C600001C */ lwc1 $f0, 0x1c($s0) -/* CD83F0 80241110 46001080 */ add.s $f2, $f2, $f0 -/* CD83F4 80241114 4616103C */ c.lt.s $f2, $f22 -/* CD83F8 80241118 00000000 */ nop -/* CD83FC 8024111C 45020045 */ bc1fl .L80241234 -/* CD8400 80241120 E602003C */ swc1 $f2, 0x3c($s0) -/* CD8404 80241124 0809048C */ j .L80241230 -/* CD8408 80241128 E616003C */ swc1 $f22, 0x3c($s0) -.L8024112C: -/* CD840C 8024112C C6000038 */ lwc1 $f0, 0x38($s0) -/* CD8410 80241130 27A6001C */ addiu $a2, $sp, 0x1c -/* CD8414 80241134 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD8418 80241138 860200A8 */ lh $v0, 0xa8($s0) -/* CD841C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) -/* CD8420 80241140 C604003C */ lwc1 $f4, 0x3c($s0) -/* CD8424 80241144 44821000 */ mtc1 $v0, $f2 -/* CD8428 80241148 00000000 */ nop -/* CD842C 8024114C 468010A0 */ cvt.s.w $f2, $f2 -/* CD8430 80241150 46000005 */ abs.s $f0, $f0 -/* CD8434 80241154 46020000 */ add.s $f0, $f0, $f2 -/* CD8438 80241158 C6060040 */ lwc1 $f6, 0x40($s0) -/* CD843C 8024115C 27A20024 */ addiu $v0, $sp, 0x24 -/* CD8440 80241160 46022100 */ add.s $f4, $f4, $f2 -/* CD8444 80241164 3C014024 */ lui $at, 0x4024 -/* CD8448 80241168 44811800 */ mtc1 $at, $f3 -/* CD844C 8024116C 44801000 */ mtc1 $zero, $f2 -/* CD8450 80241170 46000021 */ cvt.d.s $f0, $f0 -/* CD8454 80241174 46220000 */ add.d $f0, $f0, $f2 -/* CD8458 80241178 E7A60020 */ swc1 $f6, 0x20($sp) -/* CD845C 8024117C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CD8460 80241180 46200020 */ cvt.s.d $f0, $f0 -/* CD8464 80241184 E7A00024 */ swc1 $f0, 0x24($sp) -/* CD8468 80241188 AFA20010 */ sw $v0, 0x10($sp) -/* CD846C 8024118C 8E040080 */ lw $a0, 0x80($s0) -/* CD8470 80241190 0C0372DF */ jal func_800DCB7C -/* CD8474 80241194 27A70020 */ addiu $a3, $sp, 0x20 -/* CD8478 80241198 10400015 */ beqz $v0, .L802411F0 -/* CD847C 8024119C 00000000 */ nop -/* CD8480 802411A0 860200A8 */ lh $v0, 0xa8($s0) -/* CD8484 802411A4 C604001C */ lwc1 $f4, 0x1c($s0) -/* CD8488 802411A8 44820000 */ mtc1 $v0, $f0 -/* CD848C 802411AC 00000000 */ nop -/* CD8490 802411B0 46800020 */ cvt.s.w $f0, $f0 -/* CD8494 802411B4 46002085 */ abs.s $f2, $f4 -/* CD8498 802411B8 46020000 */ add.s $f0, $f0, $f2 -/* CD849C 802411BC C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD84A0 802411C0 4600103E */ c.le.s $f2, $f0 -/* CD84A4 802411C4 00000000 */ nop -/* CD84A8 802411C8 45000005 */ bc1f .L802411E0 -/* CD84AC 802411CC 00000000 */ nop -/* CD84B0 802411D0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD84B4 802411D4 AE00001C */ sw $zero, 0x1c($s0) -/* CD84B8 802411D8 0809048D */ j .L80241234 -/* CD84BC 802411DC E600003C */ swc1 $f0, 0x3c($s0) -.L802411E0: -/* CD84C0 802411E0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD84C4 802411E4 46040000 */ add.s $f0, $f0, $f4 -/* CD84C8 802411E8 0809048D */ j .L80241234 -/* CD84CC 802411EC E600003C */ swc1 $f0, 0x3c($s0) -.L802411F0: -/* CD84D0 802411F0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CD84D4 802411F4 860200A8 */ lh $v0, 0xa8($s0) -/* CD84D8 802411F8 46163081 */ sub.s $f2, $f6, $f22 -/* CD84DC 802411FC 44820000 */ mtc1 $v0, $f0 -/* CD84E0 80241200 00000000 */ nop -/* CD84E4 80241204 46800020 */ cvt.s.w $f0, $f0 -/* CD84E8 80241208 46001080 */ add.s $f2, $f2, $f0 -/* CD84EC 8024120C C604001C */ lwc1 $f4, 0x1c($s0) -/* CD84F0 80241210 46002005 */ abs.s $f0, $f4 -/* CD84F4 80241214 4602003C */ c.lt.s $f0, $f2 -/* CD84F8 80241218 00000000 */ nop -/* CD84FC 8024121C 45020005 */ bc1fl .L80241234 -/* CD8500 80241220 AE00001C */ sw $zero, 0x1c($s0) -/* CD8504 80241224 46043000 */ add.s $f0, $f6, $f4 -/* CD8508 80241228 0809048D */ j .L80241234 -/* CD850C 8024122C E600003C */ swc1 $f0, 0x3c($s0) -.L80241230: -/* CD8510 80241230 AE00001C */ sw $zero, 0x1c($s0) -.L80241234: -/* CD8514 80241234 8FBF0038 */ lw $ra, 0x38($sp) -/* CD8518 80241238 8FB30034 */ lw $s3, 0x34($sp) -/* CD851C 8024123C 8FB20030 */ lw $s2, 0x30($sp) -/* CD8520 80241240 8FB1002C */ lw $s1, 0x2c($sp) -/* CD8524 80241244 8FB00028 */ lw $s0, 0x28($sp) -/* CD8528 80241248 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CD852C 8024124C D7B40040 */ ldc1 $f20, 0x40($sp) -/* CD8530 80241250 03E00008 */ jr $ra -/* CD8534 80241254 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s deleted file mode 100644 index 885d271ad4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241258_CD8538 -/* CD8538 80241258 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CD853C 8024125C AFB00028 */ sw $s0, 0x28($sp) -/* CD8540 80241260 00A0802D */ daddu $s0, $a1, $zero -/* CD8544 80241264 AFB1002C */ sw $s1, 0x2c($sp) -/* CD8548 80241268 00C0882D */ daddu $s1, $a2, $zero -/* CD854C 8024126C AFBF0034 */ sw $ra, 0x34($sp) -/* CD8550 80241270 AFB20030 */ sw $s2, 0x30($sp) -/* CD8554 80241274 AE200070 */ sw $zero, 0x70($s1) -/* CD8558 80241278 8C830000 */ lw $v1, ($a0) -/* CD855C 8024127C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CD8560 80241280 A480008E */ sh $zero, 0x8e($a0) -/* CD8564 80241284 00621824 */ and $v1, $v1, $v0 -/* CD8568 80241288 34650800 */ ori $a1, $v1, 0x800 -/* CD856C 8024128C AC850000 */ sw $a1, ($a0) -/* CD8570 80241290 8E0200D0 */ lw $v0, 0xd0($s0) -/* CD8574 80241294 8C420034 */ lw $v0, 0x34($v0) -/* CD8578 80241298 10400003 */ beqz $v0, .L802412A8 -/* CD857C 8024129C 00E0902D */ daddu $s2, $a3, $zero -/* CD8580 802412A0 080904AC */ j .L802412B0 -/* CD8584 802412A4 34620808 */ ori $v0, $v1, 0x808 -.L802412A8: -/* CD8588 802412A8 2402FFF7 */ addiu $v0, $zero, -9 -/* CD858C 802412AC 00A21024 */ and $v0, $a1, $v0 -.L802412B0: -/* CD8590 802412B0 AC820000 */ sw $v0, ($a0) -/* CD8594 802412B4 27A20024 */ addiu $v0, $sp, 0x24 -/* CD8598 802412B8 27A50018 */ addiu $a1, $sp, 0x18 -/* CD859C 802412BC C4800038 */ lwc1 $f0, 0x38($a0) -/* CD85A0 802412C0 C482003C */ lwc1 $f2, 0x3c($a0) -/* CD85A4 802412C4 C4840040 */ lwc1 $f4, 0x40($a0) -/* CD85A8 802412C8 3C01447A */ lui $at, 0x447a -/* CD85AC 802412CC 44813000 */ mtc1 $at, $f6 -/* CD85B0 802412D0 27A6001C */ addiu $a2, $sp, 0x1c -/* CD85B4 802412D4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD85B8 802412D8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD85BC 802412DC E7A40020 */ swc1 $f4, 0x20($sp) -/* CD85C0 802412E0 E7A60024 */ swc1 $f6, 0x24($sp) -/* CD85C4 802412E4 AFA20010 */ sw $v0, 0x10($sp) -/* CD85C8 802412E8 8C840080 */ lw $a0, 0x80($a0) -/* CD85CC 802412EC 0C0372DF */ jal func_800DCB7C -/* CD85D0 802412F0 27A70020 */ addiu $a3, $sp, 0x20 -/* CD85D4 802412F4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD85D8 802412F8 3C014059 */ lui $at, 0x4059 -/* CD85DC 802412FC 44812800 */ mtc1 $at, $f5 -/* CD85E0 80241300 44802000 */ mtc1 $zero, $f4 -/* CD85E4 80241304 460010A1 */ cvt.d.s $f2, $f2 -/* CD85E8 80241308 46241082 */ mul.d $f2, $f2, $f4 -/* CD85EC 8024130C 00000000 */ nop -/* CD85F0 80241310 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD85F4 80241314 46000021 */ cvt.d.s $f0, $f0 -/* CD85F8 80241318 46240002 */ mul.d $f0, $f0, $f4 -/* CD85FC 8024131C 00000000 */ nop -/* CD8600 80241320 3C013FE0 */ lui $at, 0x3fe0 -/* CD8604 80241324 44812800 */ mtc1 $at, $f5 -/* CD8608 80241328 44802000 */ mtc1 $zero, $f4 -/* CD860C 8024132C 00000000 */ nop -/* CD8610 80241330 46241080 */ add.d $f2, $f2, $f4 -/* CD8614 80241334 AE000074 */ sw $zero, 0x74($s0) -/* CD8618 80241338 46240000 */ add.d $f0, $f0, $f4 -/* CD861C 8024133C AE000090 */ sw $zero, 0x90($s0) -/* CD8620 80241340 4620120D */ trunc.w.d $f8, $f2 -/* CD8624 80241344 E6080078 */ swc1 $f8, 0x78($s0) -/* CD8628 80241348 4620020D */ trunc.w.d $f8, $f0 -/* CD862C 8024134C E6080088 */ swc1 $f8, 0x88($s0) -/* CD8630 80241350 8E420014 */ lw $v0, 0x14($s2) -/* CD8634 80241354 AE220074 */ sw $v0, 0x74($s1) -/* CD8638 80241358 8E0200B0 */ lw $v0, 0xb0($s0) -/* CD863C 8024135C 34420010 */ ori $v0, $v0, 0x10 -/* CD8640 80241360 AE0200B0 */ sw $v0, 0xb0($s0) -/* CD8644 80241364 8FBF0034 */ lw $ra, 0x34($sp) -/* CD8648 80241368 8FB20030 */ lw $s2, 0x30($sp) -/* CD864C 8024136C 8FB1002C */ lw $s1, 0x2c($sp) -/* CD8650 80241370 8FB00028 */ lw $s0, 0x28($sp) -/* CD8654 80241374 03E00008 */ jr $ra -/* CD8658 80241378 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 221d4a2849..71b5af7173 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -46,7 +46,7 @@ glabel func_8024137C_CD865C /* CD8700 80241420 02A0202D */ daddu $a0, $s5, $zero /* CD8704 80241424 0240282D */ daddu $a1, $s2, $zero /* CD8708 80241428 0280302D */ daddu $a2, $s4, $zero -/* CD870C 8024142C 0C090496 */ jal func_80241258_CD8538 +/* CD870C 8024142C 0C090496 */ jal flo_17_UnkFunc5 /* CD8710 80241430 0200382D */ daddu $a3, $s0, $zero .L80241434: /* CD8714 80241434 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L802414B0_CD8790 glabel L802414C0_CD87A0 /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* CD87A8 802414C8 0C090242 */ jal func_80240908_CD7BE8 +/* CD87A8 802414C8 0C090242 */ jal flo_17_UnkFunc4 /* CD87AC 802414CC 0260302D */ daddu $a2, $s3, $zero /* CD87B0 802414D0 08090551 */ j .L80241544 /* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241518_CD87F8 glabel L80241530_CD8810 /* CD8810 80241530 0280202D */ daddu $a0, $s4, $zero /* CD8814 80241534 0200282D */ daddu $a1, $s0, $zero -/* CD8818 80241538 0C0903B2 */ jal func_80240EC8_CD81A8 +/* CD8818 80241538 0C0903B2 */ jal flo_17_UnkFunc6 /* CD881C 8024153C 0260302D */ daddu $a2, $s3, $zero glabel L80241540_CD8820 /* CD8820 80241540 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index b0a8fefd6e..cf75fec29e 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -48,7 +48,7 @@ glabel func_80241C64_CD8F44 /* CD8FF0 80241D10 0240202D */ daddu $a0, $s2, $zero /* CD8FF4 80241D14 0260282D */ daddu $a1, $s3, $zero /* CD8FF8 80241D18 0280302D */ daddu $a2, $s4, $zero -/* CD8FFC 80241D1C 0C090496 */ jal func_80241258_CD8538 +/* CD8FFC 80241D1C 0C090496 */ jal flo_17_UnkFunc5 /* CD9000 80241D20 02C0382D */ daddu $a3, $s6, $zero /* CD9004 80241D24 AE800070 */ sw $zero, 0x70($s4) .L80241D28: @@ -166,7 +166,7 @@ glabel func_80241C64_CD8F44 /* CD9194 80241EB4 00000000 */ nop .L80241EB8: /* CD9198 80241EB8 02C0282D */ daddu $a1, $s6, $zero -/* CD919C 80241EBC 0C0903B2 */ jal func_80240EC8_CD81A8 +/* CD919C 80241EBC 0C0903B2 */ jal flo_17_UnkFunc6 /* CD91A0 80241EC0 02A0302D */ daddu $a2, $s5, $zero .L80241EC4: /* CD91A4 80241EC4 8E830070 */ lw $v1, 0x70($s4) diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s deleted file mode 100644 index a77a86598d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D8_CF34A8 -/* CF34A8 802408D8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CF34AC 802408DC AFB3004C */ sw $s3, 0x4c($sp) -/* CF34B0 802408E0 0080982D */ daddu $s3, $a0, $zero -/* CF34B4 802408E4 AFBF0054 */ sw $ra, 0x54($sp) -/* CF34B8 802408E8 AFB40050 */ sw $s4, 0x50($sp) -/* CF34BC 802408EC AFB20048 */ sw $s2, 0x48($sp) -/* CF34C0 802408F0 AFB10044 */ sw $s1, 0x44($sp) -/* CF34C4 802408F4 AFB00040 */ sw $s0, 0x40($sp) -/* CF34C8 802408F8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CF34CC 802408FC F7B80068 */ sdc1 $f24, 0x68($sp) -/* CF34D0 80240900 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CF34D4 80240904 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CF34D8 80240908 8E710148 */ lw $s1, 0x148($s3) -/* CF34DC 8024090C 00A0902D */ daddu $s2, $a1, $zero -/* CF34E0 80240910 86240008 */ lh $a0, 8($s1) -/* CF34E4 80240914 0C00EABB */ jal get_npc_unsafe -/* CF34E8 80240918 00C0A02D */ daddu $s4, $a2, $zero -/* CF34EC 8024091C 0040802D */ daddu $s0, $v0, $zero -/* CF34F0 80240920 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF34F4 80240924 46800020 */ cvt.s.w $f0, $f0 -/* CF34F8 80240928 46000021 */ cvt.d.s $f0, $f0 -/* CF34FC 8024092C 3C014059 */ lui $at, 0x4059 -/* CF3500 80240930 44811800 */ mtc1 $at, $f3 -/* CF3504 80240934 44801000 */ mtc1 $zero, $f2 -/* CF3508 80240938 8602008E */ lh $v0, 0x8e($s0) -/* CF350C 8024093C 9603008E */ lhu $v1, 0x8e($s0) -/* CF3510 80240940 46220003 */ div.d $f0, $f0, $f2 -/* CF3514 80240944 46200620 */ cvt.s.d $f24, $f0 -/* CF3518 80240948 C6200088 */ lwc1 $f0, 0x88($s1) -/* CF351C 8024094C 46800020 */ cvt.s.w $f0, $f0 -/* CF3520 80240950 46000021 */ cvt.d.s $f0, $f0 -/* CF3524 80240954 46220003 */ div.d $f0, $f0, $f2 -/* CF3528 80240958 46200020 */ cvt.s.d $f0, $f0 -/* CF352C 8024095C 18400003 */ blez $v0, .L8024096C -/* CF3530 80240960 4600C680 */ add.s $f26, $f24, $f0 -/* CF3534 80240964 2462FFFF */ addiu $v0, $v1, -1 -/* CF3538 80240968 A602008E */ sh $v0, 0x8e($s0) -.L8024096C: -/* CF353C 8024096C 8E220070 */ lw $v0, 0x70($s1) -/* CF3540 80240970 18400034 */ blez $v0, .L80240A44 -/* CF3544 80240974 00000000 */ nop -/* CF3548 80240978 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CF354C 8024097C 46806320 */ cvt.s.w $f12, $f12 -/* CF3550 80240980 44820000 */ mtc1 $v0, $f0 -/* CF3554 80240984 00000000 */ nop -/* CF3558 80240988 46800020 */ cvt.s.w $f0, $f0 -/* CF355C 8024098C 46000021 */ cvt.d.s $f0, $f0 -/* CF3560 80240990 46220003 */ div.d $f0, $f0, $f2 -/* CF3564 80240994 0C00A8BB */ jal sin_deg -/* CF3568 80240998 462005A0 */ cvt.s.d $f22, $f0 -/* CF356C 8024099C 8E020000 */ lw $v0, ($s0) -/* CF3570 802409A0 30420008 */ andi $v0, $v0, 8 -/* CF3574 802409A4 10400003 */ beqz $v0, .L802409B4 -/* CF3578 802409A8 46000506 */ mov.s $f20, $f0 -/* CF357C 802409AC 0809027D */ j .L802409F4 -/* CF3580 802409B0 0000102D */ daddu $v0, $zero, $zero -.L802409B4: -/* CF3584 802409B4 27A50028 */ addiu $a1, $sp, 0x28 -/* CF3588 802409B8 27A6002C */ addiu $a2, $sp, 0x2c -/* CF358C 802409BC C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3590 802409C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3594 802409C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CF3598 802409C8 3C01447A */ lui $at, 0x447a -/* CF359C 802409CC 44813000 */ mtc1 $at, $f6 -/* CF35A0 802409D0 27A20034 */ addiu $v0, $sp, 0x34 -/* CF35A4 802409D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF35A8 802409D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CF35AC 802409DC E7A40030 */ swc1 $f4, 0x30($sp) -/* CF35B0 802409E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CF35B4 802409E4 AFA20010 */ sw $v0, 0x10($sp) -/* CF35B8 802409E8 8E040080 */ lw $a0, 0x80($s0) -/* CF35BC 802409EC 0C0372DF */ jal func_800DCB7C -/* CF35C0 802409F0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409F4: -/* CF35C4 802409F4 10400007 */ beqz $v0, .L80240A14 -/* CF35C8 802409F8 00000000 */ nop -/* CF35CC 802409FC 4616A082 */ mul.s $f2, $f20, $f22 -/* CF35D0 80240A00 00000000 */ nop -/* CF35D4 80240A04 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CF35D8 80240A08 46180000 */ add.s $f0, $f0, $f24 -/* CF35DC 80240A0C 08090288 */ j .L80240A20 -/* CF35E0 80240A10 46020000 */ add.s $f0, $f0, $f2 -.L80240A14: -/* CF35E4 80240A14 4616A002 */ mul.s $f0, $f20, $f22 -/* CF35E8 80240A18 00000000 */ nop -/* CF35EC 80240A1C 4600D000 */ add.s $f0, $f26, $f0 -.L80240A20: -/* CF35F0 80240A20 E600003C */ swc1 $f0, 0x3c($s0) -/* CF35F4 80240A24 8E220074 */ lw $v0, 0x74($s1) -/* CF35F8 80240A28 2442000A */ addiu $v0, $v0, 0xa -/* CF35FC 80240A2C 44826000 */ mtc1 $v0, $f12 -/* CF3600 80240A30 00000000 */ nop -/* CF3604 80240A34 0C00A6C9 */ jal clamp_angle -/* CF3608 80240A38 46806320 */ cvt.s.w $f12, $f12 -/* CF360C 80240A3C 4600020D */ trunc.w.s $f8, $f0 -/* CF3610 80240A40 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A44: -/* CF3614 80240A44 8E220090 */ lw $v0, 0x90($s1) -/* CF3618 80240A48 1C400040 */ bgtz $v0, .L80240B4C -/* CF361C 80240A4C 2442FFFF */ addiu $v0, $v0, -1 -/* CF3620 80240A50 860200A8 */ lh $v0, 0xa8($s0) -/* CF3624 80240A54 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3628 80240A58 44821000 */ mtc1 $v0, $f2 -/* CF362C 80240A5C 00000000 */ nop -/* CF3630 80240A60 468010A0 */ cvt.s.w $f2, $f2 -/* CF3634 80240A64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3638 80240A68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF363C 80240A6C 46020000 */ add.s $f0, $f0, $f2 -/* CF3640 80240A70 3C014024 */ lui $at, 0x4024 -/* CF3644 80240A74 44812800 */ mtc1 $at, $f5 -/* CF3648 80240A78 44802000 */ mtc1 $zero, $f4 -/* CF364C 80240A7C C442002C */ lwc1 $f2, 0x2c($v0) -/* CF3650 80240A80 46000021 */ cvt.d.s $f0, $f0 -/* CF3654 80240A84 46240000 */ add.d $f0, $f0, $f4 -/* CF3658 80240A88 460010A1 */ cvt.d.s $f2, $f2 -/* CF365C 80240A8C 4620103C */ c.lt.d $f2, $f0 -/* CF3660 80240A90 00000000 */ nop -/* CF3664 80240A94 4500002E */ bc1f .L80240B50 -/* CF3668 80240A98 0280202D */ daddu $a0, $s4, $zero -/* CF366C 80240A9C 24020001 */ addiu $v0, $zero, 1 -/* CF3670 80240AA0 AFA20010 */ sw $v0, 0x10($sp) -/* CF3674 80240AA4 8E460024 */ lw $a2, 0x24($s2) -/* CF3678 80240AA8 8E470028 */ lw $a3, 0x28($s2) -/* CF367C 80240AAC 0C01242D */ jal func_800490B4 -/* CF3680 80240AB0 0220282D */ daddu $a1, $s1, $zero -/* CF3684 80240AB4 10400026 */ beqz $v0, .L80240B50 -/* CF3688 80240AB8 0000202D */ daddu $a0, $zero, $zero -/* CF368C 80240ABC 0200282D */ daddu $a1, $s0, $zero -/* CF3690 80240AC0 0000302D */ daddu $a2, $zero, $zero -/* CF3694 80240AC4 2412000C */ addiu $s2, $zero, 0xc -/* CF3698 80240AC8 860300A8 */ lh $v1, 0xa8($s0) -/* CF369C 80240ACC 3C013F80 */ lui $at, 0x3f80 -/* CF36A0 80240AD0 44810000 */ mtc1 $at, $f0 -/* CF36A4 80240AD4 3C014000 */ lui $at, 0x4000 -/* CF36A8 80240AD8 44811000 */ mtc1 $at, $f2 -/* CF36AC 80240ADC 3C01C1A0 */ lui $at, 0xc1a0 -/* CF36B0 80240AE0 44812000 */ mtc1 $at, $f4 -/* CF36B4 80240AE4 44834000 */ mtc1 $v1, $f8 -/* CF36B8 80240AE8 00000000 */ nop -/* CF36BC 80240AEC 46804220 */ cvt.s.w $f8, $f8 -/* CF36C0 80240AF0 44074000 */ mfc1 $a3, $f8 -/* CF36C4 80240AF4 27A20038 */ addiu $v0, $sp, 0x38 -/* CF36C8 80240AF8 AFB2001C */ sw $s2, 0x1c($sp) -/* CF36CC 80240AFC AFA20020 */ sw $v0, 0x20($sp) -/* CF36D0 80240B00 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF36D4 80240B04 E7A20014 */ swc1 $f2, 0x14($sp) -/* CF36D8 80240B08 0C01BFA4 */ jal fx_emote -/* CF36DC 80240B0C E7A40018 */ swc1 $f4, 0x18($sp) -/* CF36E0 80240B10 0200202D */ daddu $a0, $s0, $zero -/* CF36E4 80240B14 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CF36E8 80240B18 C480003C */ lwc1 $f0, 0x3c($a0) -/* CF36EC 80240B1C 3C060020 */ lui $a2, 0x20 -/* CF36F0 80240B20 0C012530 */ jal func_800494C0 -/* CF36F4 80240B24 E4800064 */ swc1 $f0, 0x64($a0) -/* CF36F8 80240B28 8E220018 */ lw $v0, 0x18($s1) -/* CF36FC 80240B2C 9442002A */ lhu $v0, 0x2a($v0) -/* CF3700 80240B30 30420001 */ andi $v0, $v0, 1 -/* CF3704 80240B34 10400003 */ beqz $v0, .L80240B44 -/* CF3708 80240B38 2402000A */ addiu $v0, $zero, 0xa -/* CF370C 80240B3C 080902FB */ j .L80240BEC -/* CF3710 80240B40 AE620070 */ sw $v0, 0x70($s3) -.L80240B44: -/* CF3714 80240B44 080902FB */ j .L80240BEC -/* CF3718 80240B48 AE720070 */ sw $s2, 0x70($s3) -.L80240B4C: -/* CF371C 80240B4C AE220090 */ sw $v0, 0x90($s1) -.L80240B50: -/* CF3720 80240B50 8602008C */ lh $v0, 0x8c($s0) -/* CF3724 80240B54 14400025 */ bnez $v0, .L80240BEC -/* CF3728 80240B58 00000000 */ nop -/* CF372C 80240B5C 8602008E */ lh $v0, 0x8e($s0) -/* CF3730 80240B60 1C400022 */ bgtz $v0, .L80240BEC -/* CF3734 80240B64 00000000 */ nop -/* CF3738 80240B68 8E620074 */ lw $v0, 0x74($s3) -/* CF373C 80240B6C 2442FFFF */ addiu $v0, $v0, -1 -/* CF3740 80240B70 1840001D */ blez $v0, .L80240BE8 -/* CF3744 80240B74 AE620074 */ sw $v0, 0x74($s3) -/* CF3748 80240B78 8E220018 */ lw $v0, 0x18($s1) -/* CF374C 80240B7C 9442002A */ lhu $v0, 0x2a($v0) -/* CF3750 80240B80 30420010 */ andi $v0, $v0, 0x10 -/* CF3754 80240B84 14400007 */ bnez $v0, .L80240BA4 -/* CF3758 80240B88 00000000 */ nop -/* CF375C 80240B8C C600000C */ lwc1 $f0, 0xc($s0) -/* CF3760 80240B90 3C014334 */ lui $at, 0x4334 -/* CF3764 80240B94 44816000 */ mtc1 $at, $f12 -/* CF3768 80240B98 0C00A6C9 */ jal clamp_angle -/* CF376C 80240B9C 460C0300 */ add.s $f12, $f0, $f12 -/* CF3770 80240BA0 E600000C */ swc1 $f0, 0xc($s0) -.L80240BA4: -/* CF3774 80240BA4 0C00A67F */ jal rand_int -/* CF3778 80240BA8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CF377C 80240BAC 3C032E8B */ lui $v1, 0x2e8b -/* CF3780 80240BB0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CF3784 80240BB4 00430018 */ mult $v0, $v1 -/* CF3788 80240BB8 00021FC3 */ sra $v1, $v0, 0x1f -/* CF378C 80240BBC 00004010 */ mfhi $t0 -/* CF3790 80240BC0 00082043 */ sra $a0, $t0, 1 -/* CF3794 80240BC4 00832023 */ subu $a0, $a0, $v1 -/* CF3798 80240BC8 00041840 */ sll $v1, $a0, 1 -/* CF379C 80240BCC 00641821 */ addu $v1, $v1, $a0 -/* CF37A0 80240BD0 00031880 */ sll $v1, $v1, 2 -/* CF37A4 80240BD4 00641823 */ subu $v1, $v1, $a0 -/* CF37A8 80240BD8 00431023 */ subu $v0, $v0, $v1 -/* CF37AC 80240BDC 24420005 */ addiu $v0, $v0, 5 -/* CF37B0 80240BE0 080902FB */ j .L80240BEC -/* CF37B4 80240BE4 A602008E */ sh $v0, 0x8e($s0) -.L80240BE8: -/* CF37B8 80240BE8 AE600070 */ sw $zero, 0x70($s3) -.L80240BEC: -/* CF37BC 80240BEC 8FBF0054 */ lw $ra, 0x54($sp) -/* CF37C0 80240BF0 8FB40050 */ lw $s4, 0x50($sp) -/* CF37C4 80240BF4 8FB3004C */ lw $s3, 0x4c($sp) -/* CF37C8 80240BF8 8FB20048 */ lw $s2, 0x48($sp) -/* CF37CC 80240BFC 8FB10044 */ lw $s1, 0x44($sp) -/* CF37D0 80240C00 8FB00040 */ lw $s0, 0x40($sp) -/* CF37D4 80240C04 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CF37D8 80240C08 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CF37DC 80240C0C D7B60060 */ ldc1 $f22, 0x60($sp) -/* CF37E0 80240C10 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CF37E4 80240C14 03E00008 */ jr $ra -/* CF37E8 80240C18 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s deleted file mode 100644 index 58f5da181b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240E98_CF3A68.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E98_CF3A68 -/* CF3A68 80240E98 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CF3A6C 80240E9C AFB20030 */ sw $s2, 0x30($sp) -/* CF3A70 80240EA0 0080902D */ daddu $s2, $a0, $zero -/* CF3A74 80240EA4 AFBF0038 */ sw $ra, 0x38($sp) -/* CF3A78 80240EA8 AFB30034 */ sw $s3, 0x34($sp) -/* CF3A7C 80240EAC AFB1002C */ sw $s1, 0x2c($sp) -/* CF3A80 80240EB0 AFB00028 */ sw $s0, 0x28($sp) -/* CF3A84 80240EB4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CF3A88 80240EB8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CF3A8C 80240EBC 8E510148 */ lw $s1, 0x148($s2) -/* CF3A90 80240EC0 86240008 */ lh $a0, 8($s1) -/* CF3A94 80240EC4 0C00EABB */ jal get_npc_unsafe -/* CF3A98 80240EC8 00A0982D */ daddu $s3, $a1, $zero -/* CF3A9C 80240ECC 0040802D */ daddu $s0, $v0, $zero -/* CF3AA0 80240ED0 0200202D */ daddu $a0, $s0, $zero -/* CF3AA4 80240ED4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CF3AA8 80240ED8 468010A0 */ cvt.s.w $f2, $f2 -/* CF3AAC 80240EDC 460010A1 */ cvt.d.s $f2, $f2 -/* CF3AB0 80240EE0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3AB4 80240EE4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CF3AB8 80240EE8 8E050018 */ lw $a1, 0x18($s0) -/* CF3ABC 80240EEC 46002100 */ add.s $f4, $f4, $f0 -/* CF3AC0 80240EF0 8E06000C */ lw $a2, 0xc($s0) -/* CF3AC4 80240EF4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF3AC8 80240EF8 46800020 */ cvt.s.w $f0, $f0 -/* CF3ACC 80240EFC E604001C */ swc1 $f4, 0x1c($s0) -/* CF3AD0 80240F00 3C014059 */ lui $at, 0x4059 -/* CF3AD4 80240F04 44812800 */ mtc1 $at, $f5 -/* CF3AD8 80240F08 44802000 */ mtc1 $zero, $f4 -/* CF3ADC 80240F0C 46000021 */ cvt.d.s $f0, $f0 -/* CF3AE0 80240F10 46240003 */ div.d $f0, $f0, $f4 -/* CF3AE4 80240F14 46200520 */ cvt.s.d $f20, $f0 -/* CF3AE8 80240F18 46241083 */ div.d $f2, $f2, $f4 -/* CF3AEC 80240F1C 0C00EA95 */ jal npc_move_heading -/* CF3AF0 80240F20 462015A0 */ cvt.s.d $f22, $f2 -/* CF3AF4 80240F24 C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3AF8 80240F28 44801000 */ mtc1 $zero, $f2 -/* CF3AFC 80240F2C 44801800 */ mtc1 $zero, $f3 -/* CF3B00 80240F30 46002021 */ cvt.d.s $f0, $f4 -/* CF3B04 80240F34 4620103E */ c.le.d $f2, $f0 -/* CF3B08 80240F38 00000000 */ nop -/* CF3B0C 80240F3C 45000030 */ bc1f .L80241000 -/* CF3B10 80240F40 00000000 */ nop -/* CF3B14 80240F44 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3B18 80240F48 46040000 */ add.s $f0, $f0, $f4 -/* CF3B1C 80240F4C E600003C */ swc1 $f0, 0x3c($s0) -/* CF3B20 80240F50 8E2200CC */ lw $v0, 0xcc($s1) -/* CF3B24 80240F54 8C420024 */ lw $v0, 0x24($v0) -/* CF3B28 80240F58 AE020028 */ sw $v0, 0x28($s0) -/* CF3B2C 80240F5C A2200007 */ sb $zero, 7($s1) -/* CF3B30 80240F60 8E020000 */ lw $v0, ($s0) -/* CF3B34 80240F64 30420008 */ andi $v0, $v0, 8 -/* CF3B38 80240F68 14400011 */ bnez $v0, .L80240FB0 -/* CF3B3C 80240F6C 0000102D */ daddu $v0, $zero, $zero -/* CF3B40 80240F70 27A50018 */ addiu $a1, $sp, 0x18 -/* CF3B44 80240F74 27A6001C */ addiu $a2, $sp, 0x1c -/* CF3B48 80240F78 C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3B4C 80240F7C C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3B50 80240F80 C6040040 */ lwc1 $f4, 0x40($s0) -/* CF3B54 80240F84 3C01447A */ lui $at, 0x447a -/* CF3B58 80240F88 44813000 */ mtc1 $at, $f6 -/* CF3B5C 80240F8C 27A20024 */ addiu $v0, $sp, 0x24 -/* CF3B60 80240F90 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3B64 80240F94 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CF3B68 80240F98 E7A40020 */ swc1 $f4, 0x20($sp) -/* CF3B6C 80240F9C E7A60024 */ swc1 $f6, 0x24($sp) -/* CF3B70 80240FA0 AFA20010 */ sw $v0, 0x10($sp) -/* CF3B74 80240FA4 8E040080 */ lw $a0, 0x80($s0) -/* CF3B78 80240FA8 0C0372DF */ jal func_800DCB7C -/* CF3B7C 80240FAC 27A70020 */ addiu $a3, $sp, 0x20 -.L80240FB0: -/* CF3B80 80240FB0 1040000B */ beqz $v0, .L80240FE0 -/* CF3B84 80240FB4 00000000 */ nop -/* CF3B88 80240FB8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CF3B8C 80240FBC 46140080 */ add.s $f2, $f0, $f20 -/* CF3B90 80240FC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3B94 80240FC4 4600103E */ c.le.s $f2, $f0 -/* CF3B98 80240FC8 00000000 */ nop -/* CF3B9C 80240FCC 4500008D */ bc1f .L80241204 -/* CF3BA0 80240FD0 00000000 */ nop -/* CF3BA4 80240FD4 E602003C */ swc1 $f2, 0x3c($s0) -/* CF3BA8 80240FD8 08090481 */ j .L80241204 -/* CF3BAC 80240FDC AE400070 */ sw $zero, 0x70($s2) -.L80240FE0: -/* CF3BB0 80240FE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3BB4 80240FE4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CF3BB8 80240FE8 4602003E */ c.le.s $f0, $f2 -/* CF3BBC 80240FEC 00000000 */ nop -/* CF3BC0 80240FF0 45030084 */ bc1tl .L80241204 -/* CF3BC4 80240FF4 AE400070 */ sw $zero, 0x70($s2) -/* CF3BC8 80240FF8 08090481 */ j .L80241204 -/* CF3BCC 80240FFC 00000000 */ nop -.L80241000: -/* CF3BD0 80241000 4622003C */ c.lt.d $f0, $f2 -/* CF3BD4 80241004 00000000 */ nop -/* CF3BD8 80241008 4500007E */ bc1f .L80241204 -/* CF3BDC 8024100C 00000000 */ nop -/* CF3BE0 80241010 9602008E */ lhu $v0, 0x8e($s0) -/* CF3BE4 80241014 24420001 */ addiu $v0, $v0, 1 -/* CF3BE8 80241018 A602008E */ sh $v0, 0x8e($s0) -/* CF3BEC 8024101C 00021400 */ sll $v0, $v0, 0x10 -/* CF3BF0 80241020 8E630020 */ lw $v1, 0x20($s3) -/* CF3BF4 80241024 00021403 */ sra $v0, $v0, 0x10 -/* CF3BF8 80241028 0043102A */ slt $v0, $v0, $v1 -/* CF3BFC 8024102C 14400026 */ bnez $v0, .L802410C8 -/* CF3C00 80241030 00000000 */ nop -/* CF3C04 80241034 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CF3C08 80241038 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CF3C0C 8024103C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3C10 80241040 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF3C14 80241044 A600008E */ sh $zero, 0x8e($s0) -/* CF3C18 80241048 8C460028 */ lw $a2, 0x28($v0) -/* CF3C1C 8024104C 0C00A720 */ jal atan2 -/* CF3C20 80241050 8C470030 */ lw $a3, 0x30($v0) -/* CF3C24 80241054 46000506 */ mov.s $f20, $f0 -/* CF3C28 80241058 C60C000C */ lwc1 $f12, 0xc($s0) -/* CF3C2C 8024105C 0C00A70A */ jal get_clamped_angle_diff -/* CF3C30 80241060 4600A386 */ mov.s $f14, $f20 -/* CF3C34 80241064 46000086 */ mov.s $f2, $f0 -/* CF3C38 80241068 8E62001C */ lw $v0, 0x1c($s3) -/* CF3C3C 8024106C 46001005 */ abs.s $f0, $f2 -/* CF3C40 80241070 44822000 */ mtc1 $v0, $f4 -/* CF3C44 80241074 00000000 */ nop -/* CF3C48 80241078 46802120 */ cvt.s.w $f4, $f4 -/* CF3C4C 8024107C 4600203C */ c.lt.s $f4, $f0 -/* CF3C50 80241080 00000000 */ nop -/* CF3C54 80241084 4500000D */ bc1f .L802410BC -/* CF3C58 80241088 00000000 */ nop -/* CF3C5C 8024108C 44800000 */ mtc1 $zero, $f0 -/* CF3C60 80241090 C614000C */ lwc1 $f20, 0xc($s0) -/* CF3C64 80241094 4600103C */ c.lt.s $f2, $f0 -/* CF3C68 80241098 00000000 */ nop -/* CF3C6C 8024109C 45000006 */ bc1f .L802410B8 -/* CF3C70 802410A0 00021023 */ negu $v0, $v0 -/* CF3C74 802410A4 44820000 */ mtc1 $v0, $f0 -/* CF3C78 802410A8 00000000 */ nop -/* CF3C7C 802410AC 46800020 */ cvt.s.w $f0, $f0 -/* CF3C80 802410B0 0809042F */ j .L802410BC -/* CF3C84 802410B4 4600A500 */ add.s $f20, $f20, $f0 -.L802410B8: -/* CF3C88 802410B8 4604A500 */ add.s $f20, $f20, $f4 -.L802410BC: -/* CF3C8C 802410BC 0C00A6C9 */ jal clamp_angle -/* CF3C90 802410C0 4600A306 */ mov.s $f12, $f20 -/* CF3C94 802410C4 E600000C */ swc1 $f0, 0xc($s0) -.L802410C8: -/* CF3C98 802410C8 8E020000 */ lw $v0, ($s0) -/* CF3C9C 802410CC 30420008 */ andi $v0, $v0, 8 -/* CF3CA0 802410D0 1040000A */ beqz $v0, .L802410FC -/* CF3CA4 802410D4 27A50018 */ addiu $a1, $sp, 0x18 -/* CF3CA8 802410D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3CAC 802410DC C600001C */ lwc1 $f0, 0x1c($s0) -/* CF3CB0 802410E0 46001080 */ add.s $f2, $f2, $f0 -/* CF3CB4 802410E4 4616103C */ c.lt.s $f2, $f22 -/* CF3CB8 802410E8 00000000 */ nop -/* CF3CBC 802410EC 45020045 */ bc1fl .L80241204 -/* CF3CC0 802410F0 E602003C */ swc1 $f2, 0x3c($s0) -/* CF3CC4 802410F4 08090480 */ j .L80241200 -/* CF3CC8 802410F8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410FC: -/* CF3CCC 802410FC C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3CD0 80241100 27A6001C */ addiu $a2, $sp, 0x1c -/* CF3CD4 80241104 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3CD8 80241108 860200A8 */ lh $v0, 0xa8($s0) -/* CF3CDC 8024110C C600001C */ lwc1 $f0, 0x1c($s0) -/* CF3CE0 80241110 C604003C */ lwc1 $f4, 0x3c($s0) -/* CF3CE4 80241114 44821000 */ mtc1 $v0, $f2 -/* CF3CE8 80241118 00000000 */ nop -/* CF3CEC 8024111C 468010A0 */ cvt.s.w $f2, $f2 -/* CF3CF0 80241120 46000005 */ abs.s $f0, $f0 -/* CF3CF4 80241124 46020000 */ add.s $f0, $f0, $f2 -/* CF3CF8 80241128 C6060040 */ lwc1 $f6, 0x40($s0) -/* CF3CFC 8024112C 27A20024 */ addiu $v0, $sp, 0x24 -/* CF3D00 80241130 46022100 */ add.s $f4, $f4, $f2 -/* CF3D04 80241134 3C014024 */ lui $at, 0x4024 -/* CF3D08 80241138 44811800 */ mtc1 $at, $f3 -/* CF3D0C 8024113C 44801000 */ mtc1 $zero, $f2 -/* CF3D10 80241140 46000021 */ cvt.d.s $f0, $f0 -/* CF3D14 80241144 46220000 */ add.d $f0, $f0, $f2 -/* CF3D18 80241148 E7A60020 */ swc1 $f6, 0x20($sp) -/* CF3D1C 8024114C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CF3D20 80241150 46200020 */ cvt.s.d $f0, $f0 -/* CF3D24 80241154 E7A00024 */ swc1 $f0, 0x24($sp) -/* CF3D28 80241158 AFA20010 */ sw $v0, 0x10($sp) -/* CF3D2C 8024115C 8E040080 */ lw $a0, 0x80($s0) -/* CF3D30 80241160 0C0372DF */ jal func_800DCB7C -/* CF3D34 80241164 27A70020 */ addiu $a3, $sp, 0x20 -/* CF3D38 80241168 10400015 */ beqz $v0, .L802411C0 -/* CF3D3C 8024116C 00000000 */ nop -/* CF3D40 80241170 860200A8 */ lh $v0, 0xa8($s0) -/* CF3D44 80241174 C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3D48 80241178 44820000 */ mtc1 $v0, $f0 -/* CF3D4C 8024117C 00000000 */ nop -/* CF3D50 80241180 46800020 */ cvt.s.w $f0, $f0 -/* CF3D54 80241184 46002085 */ abs.s $f2, $f4 -/* CF3D58 80241188 46020000 */ add.s $f0, $f0, $f2 -/* CF3D5C 8024118C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CF3D60 80241190 4600103E */ c.le.s $f2, $f0 -/* CF3D64 80241194 00000000 */ nop -/* CF3D68 80241198 45000005 */ bc1f .L802411B0 -/* CF3D6C 8024119C 00000000 */ nop -/* CF3D70 802411A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CF3D74 802411A4 AE00001C */ sw $zero, 0x1c($s0) -/* CF3D78 802411A8 08090481 */ j .L80241204 -/* CF3D7C 802411AC E600003C */ swc1 $f0, 0x3c($s0) -.L802411B0: -/* CF3D80 802411B0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3D84 802411B4 46040000 */ add.s $f0, $f0, $f4 -/* CF3D88 802411B8 08090481 */ j .L80241204 -/* CF3D8C 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* CF3D90 802411C0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CF3D94 802411C4 860200A8 */ lh $v0, 0xa8($s0) -/* CF3D98 802411C8 46163081 */ sub.s $f2, $f6, $f22 -/* CF3D9C 802411CC 44820000 */ mtc1 $v0, $f0 -/* CF3DA0 802411D0 00000000 */ nop -/* CF3DA4 802411D4 46800020 */ cvt.s.w $f0, $f0 -/* CF3DA8 802411D8 46001080 */ add.s $f2, $f2, $f0 -/* CF3DAC 802411DC C604001C */ lwc1 $f4, 0x1c($s0) -/* CF3DB0 802411E0 46002005 */ abs.s $f0, $f4 -/* CF3DB4 802411E4 4602003C */ c.lt.s $f0, $f2 -/* CF3DB8 802411E8 00000000 */ nop -/* CF3DBC 802411EC 45020005 */ bc1fl .L80241204 -/* CF3DC0 802411F0 AE00001C */ sw $zero, 0x1c($s0) -/* CF3DC4 802411F4 46043000 */ add.s $f0, $f6, $f4 -/* CF3DC8 802411F8 08090481 */ j .L80241204 -/* CF3DCC 802411FC E600003C */ swc1 $f0, 0x3c($s0) -.L80241200: -/* CF3DD0 80241200 AE00001C */ sw $zero, 0x1c($s0) -.L80241204: -/* CF3DD4 80241204 8FBF0038 */ lw $ra, 0x38($sp) -/* CF3DD8 80241208 8FB30034 */ lw $s3, 0x34($sp) -/* CF3DDC 8024120C 8FB20030 */ lw $s2, 0x30($sp) -/* CF3DE0 80241210 8FB1002C */ lw $s1, 0x2c($sp) -/* CF3DE4 80241214 8FB00028 */ lw $s0, 0x28($sp) -/* CF3DE8 80241218 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CF3DEC 8024121C D7B40040 */ ldc1 $f20, 0x40($sp) -/* CF3DF0 80241220 03E00008 */ jr $ra -/* CF3DF4 80241224 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s deleted file mode 100644 index 036933e10d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241228_CF3DF8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241228_CF3DF8 -/* CF3DF8 80241228 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CF3DFC 8024122C AFB00028 */ sw $s0, 0x28($sp) -/* CF3E00 80241230 00A0802D */ daddu $s0, $a1, $zero -/* CF3E04 80241234 AFB1002C */ sw $s1, 0x2c($sp) -/* CF3E08 80241238 00C0882D */ daddu $s1, $a2, $zero -/* CF3E0C 8024123C AFBF0034 */ sw $ra, 0x34($sp) -/* CF3E10 80241240 AFB20030 */ sw $s2, 0x30($sp) -/* CF3E14 80241244 AE200070 */ sw $zero, 0x70($s1) -/* CF3E18 80241248 8C830000 */ lw $v1, ($a0) -/* CF3E1C 8024124C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CF3E20 80241250 A480008E */ sh $zero, 0x8e($a0) -/* CF3E24 80241254 00621824 */ and $v1, $v1, $v0 -/* CF3E28 80241258 34650800 */ ori $a1, $v1, 0x800 -/* CF3E2C 8024125C AC850000 */ sw $a1, ($a0) -/* CF3E30 80241260 8E0200D0 */ lw $v0, 0xd0($s0) -/* CF3E34 80241264 8C420034 */ lw $v0, 0x34($v0) -/* CF3E38 80241268 10400003 */ beqz $v0, .L80241278 -/* CF3E3C 8024126C 00E0902D */ daddu $s2, $a3, $zero -/* CF3E40 80241270 080904A0 */ j .L80241280 -/* CF3E44 80241274 34620808 */ ori $v0, $v1, 0x808 -.L80241278: -/* CF3E48 80241278 2402FFF7 */ addiu $v0, $zero, -9 -/* CF3E4C 8024127C 00A21024 */ and $v0, $a1, $v0 -.L80241280: -/* CF3E50 80241280 AC820000 */ sw $v0, ($a0) -/* CF3E54 80241284 27A20024 */ addiu $v0, $sp, 0x24 -/* CF3E58 80241288 27A50018 */ addiu $a1, $sp, 0x18 -/* CF3E5C 8024128C C4800038 */ lwc1 $f0, 0x38($a0) -/* CF3E60 80241290 C482003C */ lwc1 $f2, 0x3c($a0) -/* CF3E64 80241294 C4840040 */ lwc1 $f4, 0x40($a0) -/* CF3E68 80241298 3C01447A */ lui $at, 0x447a -/* CF3E6C 8024129C 44813000 */ mtc1 $at, $f6 -/* CF3E70 802412A0 27A6001C */ addiu $a2, $sp, 0x1c -/* CF3E74 802412A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CF3E78 802412A8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CF3E7C 802412AC E7A40020 */ swc1 $f4, 0x20($sp) -/* CF3E80 802412B0 E7A60024 */ swc1 $f6, 0x24($sp) -/* CF3E84 802412B4 AFA20010 */ sw $v0, 0x10($sp) -/* CF3E88 802412B8 8C840080 */ lw $a0, 0x80($a0) -/* CF3E8C 802412BC 0C0372DF */ jal func_800DCB7C -/* CF3E90 802412C0 27A70020 */ addiu $a3, $sp, 0x20 -/* CF3E94 802412C4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CF3E98 802412C8 3C014059 */ lui $at, 0x4059 -/* CF3E9C 802412CC 44812800 */ mtc1 $at, $f5 -/* CF3EA0 802412D0 44802000 */ mtc1 $zero, $f4 -/* CF3EA4 802412D4 460010A1 */ cvt.d.s $f2, $f2 -/* CF3EA8 802412D8 46241082 */ mul.d $f2, $f2, $f4 -/* CF3EAC 802412DC 00000000 */ nop -/* CF3EB0 802412E0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CF3EB4 802412E4 46000021 */ cvt.d.s $f0, $f0 -/* CF3EB8 802412E8 46240002 */ mul.d $f0, $f0, $f4 -/* CF3EBC 802412EC 00000000 */ nop -/* CF3EC0 802412F0 3C013FE0 */ lui $at, 0x3fe0 -/* CF3EC4 802412F4 44812800 */ mtc1 $at, $f5 -/* CF3EC8 802412F8 44802000 */ mtc1 $zero, $f4 -/* CF3ECC 802412FC 00000000 */ nop -/* CF3ED0 80241300 46241080 */ add.d $f2, $f2, $f4 -/* CF3ED4 80241304 AE000074 */ sw $zero, 0x74($s0) -/* CF3ED8 80241308 46240000 */ add.d $f0, $f0, $f4 -/* CF3EDC 8024130C AE000090 */ sw $zero, 0x90($s0) -/* CF3EE0 80241310 4620120D */ trunc.w.d $f8, $f2 -/* CF3EE4 80241314 E6080078 */ swc1 $f8, 0x78($s0) -/* CF3EE8 80241318 4620020D */ trunc.w.d $f8, $f0 -/* CF3EEC 8024131C E6080088 */ swc1 $f8, 0x88($s0) -/* CF3EF0 80241320 8E420014 */ lw $v0, 0x14($s2) -/* CF3EF4 80241324 AE220074 */ sw $v0, 0x74($s1) -/* CF3EF8 80241328 8E0200B0 */ lw $v0, 0xb0($s0) -/* CF3EFC 8024132C 34420010 */ ori $v0, $v0, 0x10 -/* CF3F00 80241330 AE0200B0 */ sw $v0, 0xb0($s0) -/* CF3F04 80241334 8FBF0034 */ lw $ra, 0x34($sp) -/* CF3F08 80241338 8FB20030 */ lw $s2, 0x30($sp) -/* CF3F0C 8024133C 8FB1002C */ lw $s1, 0x2c($sp) -/* CF3F10 80241340 8FB00028 */ lw $s0, 0x28($sp) -/* CF3F14 80241344 03E00008 */ jr $ra -/* CF3F18 80241348 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index 3f0f73faa0..889d3667f1 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -46,7 +46,7 @@ glabel func_8024134C_CF3F1C /* CF3FC0 802413F0 02A0202D */ daddu $a0, $s5, $zero /* CF3FC4 802413F4 0240282D */ daddu $a1, $s2, $zero /* CF3FC8 802413F8 0280302D */ daddu $a2, $s4, $zero -/* CF3FCC 802413FC 0C09048A */ jal func_80241228_CF3DF8 +/* CF3FCC 802413FC 0C09048A */ jal flo_25_UnkFunc5 /* CF3FD0 80241400 0200382D */ daddu $a3, $s0, $zero .L80241404: /* CF3FD4 80241404 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241480_CF4050 glabel L80241490_CF4060 /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero -/* CF4068 80241498 0C090236 */ jal func_802408D8_CF34A8 +/* CF4068 80241498 0C090236 */ jal flo_25_UnkFunc4 /* CF406C 8024149C 0260302D */ daddu $a2, $s3, $zero /* CF4070 802414A0 08090545 */ j .L80241514 /* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802414E8_CF40B8 glabel L80241500_CF40D0 /* CF40D0 80241500 0280202D */ daddu $a0, $s4, $zero /* CF40D4 80241504 0200282D */ daddu $a1, $s0, $zero -/* CF40D8 80241508 0C0903A6 */ jal func_80240E98_CF3A68 +/* CF40D8 80241508 0C0903A6 */ jal flo_25_UnkFunc6 /* CF40DC 8024150C 0260302D */ daddu $a2, $s3, $zero glabel L80241510_CF40E0 /* CF40E0 80241510 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index 33a5c9502d..242644857b 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -46,7 +46,7 @@ glabel func_80241944_CF4514 /* CF45B8 802419E8 02A0202D */ daddu $a0, $s5, $zero /* CF45BC 802419EC 0240282D */ daddu $a1, $s2, $zero /* CF45C0 802419F0 0280302D */ daddu $a2, $s4, $zero -/* CF45C4 802419F4 0C09048A */ jal func_80241228_CF3DF8 +/* CF45C4 802419F4 0C09048A */ jal flo_25_UnkFunc5 /* CF45C8 802419F8 0200382D */ daddu $a3, $s0, $zero /* CF45CC 802419FC AE800070 */ sw $zero, 0x70($s4) .L80241A00: @@ -92,7 +92,7 @@ glabel L80241A7C_CF464C glabel L80241A8C_CF465C /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero -/* CF4664 80241A94 0C090236 */ jal func_802408D8_CF34A8 +/* CF4664 80241A94 0C090236 */ jal flo_25_UnkFunc4 /* CF4668 80241A98 0260302D */ daddu $a2, $s3, $zero /* CF466C 80241A9C 080906C2 */ j .L80241B08 /* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s deleted file mode 100644 index 5cce169ef3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241888_A17AA8 -/* A17AA8 80241888 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A17AAC 8024188C AFB3004C */ sw $s3, 0x4c($sp) -/* A17AB0 80241890 0080982D */ daddu $s3, $a0, $zero -/* A17AB4 80241894 AFBF0054 */ sw $ra, 0x54($sp) -/* A17AB8 80241898 AFB40050 */ sw $s4, 0x50($sp) -/* A17ABC 8024189C AFB20048 */ sw $s2, 0x48($sp) -/* A17AC0 802418A0 AFB10044 */ sw $s1, 0x44($sp) -/* A17AC4 802418A4 AFB00040 */ sw $s0, 0x40($sp) -/* A17AC8 802418A8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A17ACC 802418AC F7B80068 */ sdc1 $f24, 0x68($sp) -/* A17AD0 802418B0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A17AD4 802418B4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A17AD8 802418B8 8E710148 */ lw $s1, 0x148($s3) -/* A17ADC 802418BC 00A0902D */ daddu $s2, $a1, $zero -/* A17AE0 802418C0 86240008 */ lh $a0, 8($s1) -/* A17AE4 802418C4 0C00EABB */ jal get_npc_unsafe -/* A17AE8 802418C8 00C0A02D */ daddu $s4, $a2, $zero -/* A17AEC 802418CC 0040802D */ daddu $s0, $v0, $zero -/* A17AF0 802418D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* A17AF4 802418D4 46800020 */ cvt.s.w $f0, $f0 -/* A17AF8 802418D8 46000021 */ cvt.d.s $f0, $f0 -/* A17AFC 802418DC 3C014059 */ lui $at, 0x4059 -/* A17B00 802418E0 44811800 */ mtc1 $at, $f3 -/* A17B04 802418E4 44801000 */ mtc1 $zero, $f2 -/* A17B08 802418E8 8602008E */ lh $v0, 0x8e($s0) -/* A17B0C 802418EC 9603008E */ lhu $v1, 0x8e($s0) -/* A17B10 802418F0 46220003 */ div.d $f0, $f0, $f2 -/* A17B14 802418F4 46200620 */ cvt.s.d $f24, $f0 -/* A17B18 802418F8 C6200088 */ lwc1 $f0, 0x88($s1) -/* A17B1C 802418FC 46800020 */ cvt.s.w $f0, $f0 -/* A17B20 80241900 46000021 */ cvt.d.s $f0, $f0 -/* A17B24 80241904 46220003 */ div.d $f0, $f0, $f2 -/* A17B28 80241908 46200020 */ cvt.s.d $f0, $f0 -/* A17B2C 8024190C 18400003 */ blez $v0, .L8024191C -/* A17B30 80241910 4600C680 */ add.s $f26, $f24, $f0 -/* A17B34 80241914 2462FFFF */ addiu $v0, $v1, -1 -/* A17B38 80241918 A602008E */ sh $v0, 0x8e($s0) -.L8024191C: -/* A17B3C 8024191C 8E220070 */ lw $v0, 0x70($s1) -/* A17B40 80241920 18400034 */ blez $v0, .L802419F4 -/* A17B44 80241924 00000000 */ nop -/* A17B48 80241928 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A17B4C 8024192C 46806320 */ cvt.s.w $f12, $f12 -/* A17B50 80241930 44820000 */ mtc1 $v0, $f0 -/* A17B54 80241934 00000000 */ nop -/* A17B58 80241938 46800020 */ cvt.s.w $f0, $f0 -/* A17B5C 8024193C 46000021 */ cvt.d.s $f0, $f0 -/* A17B60 80241940 46220003 */ div.d $f0, $f0, $f2 -/* A17B64 80241944 0C00A8BB */ jal sin_deg -/* A17B68 80241948 462005A0 */ cvt.s.d $f22, $f0 -/* A17B6C 8024194C 8E020000 */ lw $v0, ($s0) -/* A17B70 80241950 30420008 */ andi $v0, $v0, 8 -/* A17B74 80241954 10400003 */ beqz $v0, .L80241964 -/* A17B78 80241958 46000506 */ mov.s $f20, $f0 -/* A17B7C 8024195C 08090669 */ j .L802419A4 -/* A17B80 80241960 0000102D */ daddu $v0, $zero, $zero -.L80241964: -/* A17B84 80241964 27A50028 */ addiu $a1, $sp, 0x28 -/* A17B88 80241968 27A6002C */ addiu $a2, $sp, 0x2c -/* A17B8C 8024196C C6000038 */ lwc1 $f0, 0x38($s0) -/* A17B90 80241970 C602003C */ lwc1 $f2, 0x3c($s0) -/* A17B94 80241974 C6040040 */ lwc1 $f4, 0x40($s0) -/* A17B98 80241978 3C01447A */ lui $at, 0x447a -/* A17B9C 8024197C 44813000 */ mtc1 $at, $f6 -/* A17BA0 80241980 27A20034 */ addiu $v0, $sp, 0x34 -/* A17BA4 80241984 E7A00028 */ swc1 $f0, 0x28($sp) -/* A17BA8 80241988 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A17BAC 8024198C E7A40030 */ swc1 $f4, 0x30($sp) -/* A17BB0 80241990 E7A60034 */ swc1 $f6, 0x34($sp) -/* A17BB4 80241994 AFA20010 */ sw $v0, 0x10($sp) -/* A17BB8 80241998 8E040080 */ lw $a0, 0x80($s0) -/* A17BBC 8024199C 0C0372DF */ jal func_800DCB7C -/* A17BC0 802419A0 27A70030 */ addiu $a3, $sp, 0x30 -.L802419A4: -/* A17BC4 802419A4 10400007 */ beqz $v0, .L802419C4 -/* A17BC8 802419A8 00000000 */ nop -/* A17BCC 802419AC 4616A082 */ mul.s $f2, $f20, $f22 -/* A17BD0 802419B0 00000000 */ nop -/* A17BD4 802419B4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A17BD8 802419B8 46180000 */ add.s $f0, $f0, $f24 -/* A17BDC 802419BC 08090674 */ j .L802419D0 -/* A17BE0 802419C0 46020000 */ add.s $f0, $f0, $f2 -.L802419C4: -/* A17BE4 802419C4 4616A002 */ mul.s $f0, $f20, $f22 -/* A17BE8 802419C8 00000000 */ nop -/* A17BEC 802419CC 4600D000 */ add.s $f0, $f26, $f0 -.L802419D0: -/* A17BF0 802419D0 E600003C */ swc1 $f0, 0x3c($s0) -/* A17BF4 802419D4 8E220074 */ lw $v0, 0x74($s1) -/* A17BF8 802419D8 2442000A */ addiu $v0, $v0, 0xa -/* A17BFC 802419DC 44826000 */ mtc1 $v0, $f12 -/* A17C00 802419E0 00000000 */ nop -/* A17C04 802419E4 0C00A6C9 */ jal clamp_angle -/* A17C08 802419E8 46806320 */ cvt.s.w $f12, $f12 -/* A17C0C 802419EC 4600020D */ trunc.w.s $f8, $f0 -/* A17C10 802419F0 E6280074 */ swc1 $f8, 0x74($s1) -.L802419F4: -/* A17C14 802419F4 8E220090 */ lw $v0, 0x90($s1) -/* A17C18 802419F8 1C400040 */ bgtz $v0, .L80241AFC -/* A17C1C 802419FC 2442FFFF */ addiu $v0, $v0, -1 -/* A17C20 80241A00 860200A8 */ lh $v0, 0xa8($s0) -/* A17C24 80241A04 C600003C */ lwc1 $f0, 0x3c($s0) -/* A17C28 80241A08 44821000 */ mtc1 $v0, $f2 -/* A17C2C 80241A0C 00000000 */ nop -/* A17C30 80241A10 468010A0 */ cvt.s.w $f2, $f2 -/* A17C34 80241A14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A17C38 80241A18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17C3C 80241A1C 46020000 */ add.s $f0, $f0, $f2 -/* A17C40 80241A20 3C014024 */ lui $at, 0x4024 -/* A17C44 80241A24 44812800 */ mtc1 $at, $f5 -/* A17C48 80241A28 44802000 */ mtc1 $zero, $f4 -/* A17C4C 80241A2C C442002C */ lwc1 $f2, 0x2c($v0) -/* A17C50 80241A30 46000021 */ cvt.d.s $f0, $f0 -/* A17C54 80241A34 46240000 */ add.d $f0, $f0, $f4 -/* A17C58 80241A38 460010A1 */ cvt.d.s $f2, $f2 -/* A17C5C 80241A3C 4620103C */ c.lt.d $f2, $f0 -/* A17C60 80241A40 00000000 */ nop -/* A17C64 80241A44 4500002E */ bc1f .L80241B00 -/* A17C68 80241A48 0280202D */ daddu $a0, $s4, $zero -/* A17C6C 80241A4C 24020001 */ addiu $v0, $zero, 1 -/* A17C70 80241A50 AFA20010 */ sw $v0, 0x10($sp) -/* A17C74 80241A54 8E460024 */ lw $a2, 0x24($s2) -/* A17C78 80241A58 8E470028 */ lw $a3, 0x28($s2) -/* A17C7C 80241A5C 0C01242D */ jal func_800490B4 -/* A17C80 80241A60 0220282D */ daddu $a1, $s1, $zero -/* A17C84 80241A64 10400026 */ beqz $v0, .L80241B00 -/* A17C88 80241A68 0000202D */ daddu $a0, $zero, $zero -/* A17C8C 80241A6C 0200282D */ daddu $a1, $s0, $zero -/* A17C90 80241A70 0000302D */ daddu $a2, $zero, $zero -/* A17C94 80241A74 2412000C */ addiu $s2, $zero, 0xc -/* A17C98 80241A78 860300A8 */ lh $v1, 0xa8($s0) -/* A17C9C 80241A7C 3C013F80 */ lui $at, 0x3f80 -/* A17CA0 80241A80 44810000 */ mtc1 $at, $f0 -/* A17CA4 80241A84 3C014000 */ lui $at, 0x4000 -/* A17CA8 80241A88 44811000 */ mtc1 $at, $f2 -/* A17CAC 80241A8C 3C01C1A0 */ lui $at, 0xc1a0 -/* A17CB0 80241A90 44812000 */ mtc1 $at, $f4 -/* A17CB4 80241A94 44834000 */ mtc1 $v1, $f8 -/* A17CB8 80241A98 00000000 */ nop -/* A17CBC 80241A9C 46804220 */ cvt.s.w $f8, $f8 -/* A17CC0 80241AA0 44074000 */ mfc1 $a3, $f8 -/* A17CC4 80241AA4 27A20038 */ addiu $v0, $sp, 0x38 -/* A17CC8 80241AA8 AFB2001C */ sw $s2, 0x1c($sp) -/* A17CCC 80241AAC AFA20020 */ sw $v0, 0x20($sp) -/* A17CD0 80241AB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A17CD4 80241AB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A17CD8 80241AB8 0C01BFA4 */ jal fx_emote -/* A17CDC 80241ABC E7A40018 */ swc1 $f4, 0x18($sp) -/* A17CE0 80241AC0 0200202D */ daddu $a0, $s0, $zero -/* A17CE4 80241AC4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A17CE8 80241AC8 C480003C */ lwc1 $f0, 0x3c($a0) -/* A17CEC 80241ACC 3C060020 */ lui $a2, 0x20 -/* A17CF0 80241AD0 0C012530 */ jal func_800494C0 -/* A17CF4 80241AD4 E4800064 */ swc1 $f0, 0x64($a0) -/* A17CF8 80241AD8 8E220018 */ lw $v0, 0x18($s1) -/* A17CFC 80241ADC 9442002A */ lhu $v0, 0x2a($v0) -/* A17D00 80241AE0 30420001 */ andi $v0, $v0, 1 -/* A17D04 80241AE4 10400003 */ beqz $v0, .L80241AF4 -/* A17D08 80241AE8 2402000A */ addiu $v0, $zero, 0xa -/* A17D0C 80241AEC 080906E7 */ j .L80241B9C -/* A17D10 80241AF0 AE620070 */ sw $v0, 0x70($s3) -.L80241AF4: -/* A17D14 80241AF4 080906E7 */ j .L80241B9C -/* A17D18 80241AF8 AE720070 */ sw $s2, 0x70($s3) -.L80241AFC: -/* A17D1C 80241AFC AE220090 */ sw $v0, 0x90($s1) -.L80241B00: -/* A17D20 80241B00 8602008C */ lh $v0, 0x8c($s0) -/* A17D24 80241B04 14400025 */ bnez $v0, .L80241B9C -/* A17D28 80241B08 00000000 */ nop -/* A17D2C 80241B0C 8602008E */ lh $v0, 0x8e($s0) -/* A17D30 80241B10 1C400022 */ bgtz $v0, .L80241B9C -/* A17D34 80241B14 00000000 */ nop -/* A17D38 80241B18 8E620074 */ lw $v0, 0x74($s3) -/* A17D3C 80241B1C 2442FFFF */ addiu $v0, $v0, -1 -/* A17D40 80241B20 1840001D */ blez $v0, .L80241B98 -/* A17D44 80241B24 AE620074 */ sw $v0, 0x74($s3) -/* A17D48 80241B28 8E220018 */ lw $v0, 0x18($s1) -/* A17D4C 80241B2C 9442002A */ lhu $v0, 0x2a($v0) -/* A17D50 80241B30 30420010 */ andi $v0, $v0, 0x10 -/* A17D54 80241B34 14400007 */ bnez $v0, .L80241B54 -/* A17D58 80241B38 00000000 */ nop -/* A17D5C 80241B3C C600000C */ lwc1 $f0, 0xc($s0) -/* A17D60 80241B40 3C014334 */ lui $at, 0x4334 -/* A17D64 80241B44 44816000 */ mtc1 $at, $f12 -/* A17D68 80241B48 0C00A6C9 */ jal clamp_angle -/* A17D6C 80241B4C 460C0300 */ add.s $f12, $f0, $f12 -/* A17D70 80241B50 E600000C */ swc1 $f0, 0xc($s0) -.L80241B54: -/* A17D74 80241B54 0C00A67F */ jal rand_int -/* A17D78 80241B58 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A17D7C 80241B5C 3C032E8B */ lui $v1, 0x2e8b -/* A17D80 80241B60 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A17D84 80241B64 00430018 */ mult $v0, $v1 -/* A17D88 80241B68 00021FC3 */ sra $v1, $v0, 0x1f -/* A17D8C 80241B6C 00004010 */ mfhi $t0 -/* A17D90 80241B70 00082043 */ sra $a0, $t0, 1 -/* A17D94 80241B74 00832023 */ subu $a0, $a0, $v1 -/* A17D98 80241B78 00041840 */ sll $v1, $a0, 1 -/* A17D9C 80241B7C 00641821 */ addu $v1, $v1, $a0 -/* A17DA0 80241B80 00031880 */ sll $v1, $v1, 2 -/* A17DA4 80241B84 00641823 */ subu $v1, $v1, $a0 -/* A17DA8 80241B88 00431023 */ subu $v0, $v0, $v1 -/* A17DAC 80241B8C 24420005 */ addiu $v0, $v0, 5 -/* A17DB0 80241B90 080906E7 */ j .L80241B9C -/* A17DB4 80241B94 A602008E */ sh $v0, 0x8e($s0) -.L80241B98: -/* A17DB8 80241B98 AE600070 */ sw $zero, 0x70($s3) -.L80241B9C: -/* A17DBC 80241B9C 8FBF0054 */ lw $ra, 0x54($sp) -/* A17DC0 80241BA0 8FB40050 */ lw $s4, 0x50($sp) -/* A17DC4 80241BA4 8FB3004C */ lw $s3, 0x4c($sp) -/* A17DC8 80241BA8 8FB20048 */ lw $s2, 0x48($sp) -/* A17DCC 80241BAC 8FB10044 */ lw $s1, 0x44($sp) -/* A17DD0 80241BB0 8FB00040 */ lw $s0, 0x40($sp) -/* A17DD4 80241BB4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A17DD8 80241BB8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* A17DDC 80241BBC D7B60060 */ ldc1 $f22, 0x60($sp) -/* A17DE0 80241BC0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A17DE4 80241BC4 03E00008 */ jr $ra -/* A17DE8 80241BC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s deleted file mode 100644 index a60dc0d82e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E48_A18068 -/* A18068 80241E48 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A1806C 80241E4C AFB20030 */ sw $s2, 0x30($sp) -/* A18070 80241E50 0080902D */ daddu $s2, $a0, $zero -/* A18074 80241E54 AFBF0038 */ sw $ra, 0x38($sp) -/* A18078 80241E58 AFB30034 */ sw $s3, 0x34($sp) -/* A1807C 80241E5C AFB1002C */ sw $s1, 0x2c($sp) -/* A18080 80241E60 AFB00028 */ sw $s0, 0x28($sp) -/* A18084 80241E64 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A18088 80241E68 F7B40040 */ sdc1 $f20, 0x40($sp) -/* A1808C 80241E6C 8E510148 */ lw $s1, 0x148($s2) -/* A18090 80241E70 86240008 */ lh $a0, 8($s1) -/* A18094 80241E74 0C00EABB */ jal get_npc_unsafe -/* A18098 80241E78 00A0982D */ daddu $s3, $a1, $zero -/* A1809C 80241E7C 0040802D */ daddu $s0, $v0, $zero -/* A180A0 80241E80 0200202D */ daddu $a0, $s0, $zero -/* A180A4 80241E84 C6220088 */ lwc1 $f2, 0x88($s1) -/* A180A8 80241E88 468010A0 */ cvt.s.w $f2, $f2 -/* A180AC 80241E8C 460010A1 */ cvt.d.s $f2, $f2 -/* A180B0 80241E90 C604001C */ lwc1 $f4, 0x1c($s0) -/* A180B4 80241E94 C6000014 */ lwc1 $f0, 0x14($s0) -/* A180B8 80241E98 8E050018 */ lw $a1, 0x18($s0) -/* A180BC 80241E9C 46002100 */ add.s $f4, $f4, $f0 -/* A180C0 80241EA0 8E06000C */ lw $a2, 0xc($s0) -/* A180C4 80241EA4 C6200078 */ lwc1 $f0, 0x78($s1) -/* A180C8 80241EA8 46800020 */ cvt.s.w $f0, $f0 -/* A180CC 80241EAC E604001C */ swc1 $f4, 0x1c($s0) -/* A180D0 80241EB0 3C014059 */ lui $at, 0x4059 -/* A180D4 80241EB4 44812800 */ mtc1 $at, $f5 -/* A180D8 80241EB8 44802000 */ mtc1 $zero, $f4 -/* A180DC 80241EBC 46000021 */ cvt.d.s $f0, $f0 -/* A180E0 80241EC0 46240003 */ div.d $f0, $f0, $f4 -/* A180E4 80241EC4 46200520 */ cvt.s.d $f20, $f0 -/* A180E8 80241EC8 46241083 */ div.d $f2, $f2, $f4 -/* A180EC 80241ECC 0C00EA95 */ jal npc_move_heading -/* A180F0 80241ED0 462015A0 */ cvt.s.d $f22, $f2 -/* A180F4 80241ED4 C604001C */ lwc1 $f4, 0x1c($s0) -/* A180F8 80241ED8 44801000 */ mtc1 $zero, $f2 -/* A180FC 80241EDC 44801800 */ mtc1 $zero, $f3 -/* A18100 80241EE0 46002021 */ cvt.d.s $f0, $f4 -/* A18104 80241EE4 4620103E */ c.le.d $f2, $f0 -/* A18108 80241EE8 00000000 */ nop -/* A1810C 80241EEC 45000030 */ bc1f .L80241FB0 -/* A18110 80241EF0 00000000 */ nop -/* A18114 80241EF4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A18118 80241EF8 46040000 */ add.s $f0, $f0, $f4 -/* A1811C 80241EFC E600003C */ swc1 $f0, 0x3c($s0) -/* A18120 80241F00 8E2200CC */ lw $v0, 0xcc($s1) -/* A18124 80241F04 8C420024 */ lw $v0, 0x24($v0) -/* A18128 80241F08 AE020028 */ sw $v0, 0x28($s0) -/* A1812C 80241F0C A2200007 */ sb $zero, 7($s1) -/* A18130 80241F10 8E020000 */ lw $v0, ($s0) -/* A18134 80241F14 30420008 */ andi $v0, $v0, 8 -/* A18138 80241F18 14400011 */ bnez $v0, .L80241F60 -/* A1813C 80241F1C 0000102D */ daddu $v0, $zero, $zero -/* A18140 80241F20 27A50018 */ addiu $a1, $sp, 0x18 -/* A18144 80241F24 27A6001C */ addiu $a2, $sp, 0x1c -/* A18148 80241F28 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1814C 80241F2C C602003C */ lwc1 $f2, 0x3c($s0) -/* A18150 80241F30 C6040040 */ lwc1 $f4, 0x40($s0) -/* A18154 80241F34 3C01447A */ lui $at, 0x447a -/* A18158 80241F38 44813000 */ mtc1 $at, $f6 -/* A1815C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 -/* A18160 80241F40 E7A00018 */ swc1 $f0, 0x18($sp) -/* A18164 80241F44 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A18168 80241F48 E7A40020 */ swc1 $f4, 0x20($sp) -/* A1816C 80241F4C E7A60024 */ swc1 $f6, 0x24($sp) -/* A18170 80241F50 AFA20010 */ sw $v0, 0x10($sp) -/* A18174 80241F54 8E040080 */ lw $a0, 0x80($s0) -/* A18178 80241F58 0C0372DF */ jal func_800DCB7C -/* A1817C 80241F5C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241F60: -/* A18180 80241F60 1040000B */ beqz $v0, .L80241F90 -/* A18184 80241F64 00000000 */ nop -/* A18188 80241F68 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1818C 80241F6C 46140080 */ add.s $f2, $f0, $f20 -/* A18190 80241F70 C600003C */ lwc1 $f0, 0x3c($s0) -/* A18194 80241F74 4600103E */ c.le.s $f2, $f0 -/* A18198 80241F78 00000000 */ nop -/* A1819C 80241F7C 4500008D */ bc1f .L802421B4 -/* A181A0 80241F80 00000000 */ nop -/* A181A4 80241F84 E602003C */ swc1 $f2, 0x3c($s0) -/* A181A8 80241F88 0809086D */ j .L802421B4 -/* A181AC 80241F8C AE400070 */ sw $zero, 0x70($s2) -.L80241F90: -/* A181B0 80241F90 C602003C */ lwc1 $f2, 0x3c($s0) -/* A181B4 80241F94 C6000064 */ lwc1 $f0, 0x64($s0) -/* A181B8 80241F98 4602003E */ c.le.s $f0, $f2 -/* A181BC 80241F9C 00000000 */ nop -/* A181C0 80241FA0 45030084 */ bc1tl .L802421B4 -/* A181C4 80241FA4 AE400070 */ sw $zero, 0x70($s2) -/* A181C8 80241FA8 0809086D */ j .L802421B4 -/* A181CC 80241FAC 00000000 */ nop -.L80241FB0: -/* A181D0 80241FB0 4622003C */ c.lt.d $f0, $f2 -/* A181D4 80241FB4 00000000 */ nop -/* A181D8 80241FB8 4500007E */ bc1f .L802421B4 -/* A181DC 80241FBC 00000000 */ nop -/* A181E0 80241FC0 9602008E */ lhu $v0, 0x8e($s0) -/* A181E4 80241FC4 24420001 */ addiu $v0, $v0, 1 -/* A181E8 80241FC8 A602008E */ sh $v0, 0x8e($s0) -/* A181EC 80241FCC 00021400 */ sll $v0, $v0, 0x10 -/* A181F0 80241FD0 8E630020 */ lw $v1, 0x20($s3) -/* A181F4 80241FD4 00021403 */ sra $v0, $v0, 0x10 -/* A181F8 80241FD8 0043102A */ slt $v0, $v0, $v1 -/* A181FC 80241FDC 14400026 */ bnez $v0, .L80242078 -/* A18200 80241FE0 00000000 */ nop -/* A18204 80241FE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A18208 80241FE8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1820C 80241FEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A18210 80241FF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A18214 80241FF4 A600008E */ sh $zero, 0x8e($s0) -/* A18218 80241FF8 8C460028 */ lw $a2, 0x28($v0) -/* A1821C 80241FFC 0C00A720 */ jal atan2 -/* A18220 80242000 8C470030 */ lw $a3, 0x30($v0) -/* A18224 80242004 46000506 */ mov.s $f20, $f0 -/* A18228 80242008 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1822C 8024200C 0C00A70A */ jal get_clamped_angle_diff -/* A18230 80242010 4600A386 */ mov.s $f14, $f20 -/* A18234 80242014 46000086 */ mov.s $f2, $f0 -/* A18238 80242018 8E62001C */ lw $v0, 0x1c($s3) -/* A1823C 8024201C 46001005 */ abs.s $f0, $f2 -/* A18240 80242020 44822000 */ mtc1 $v0, $f4 -/* A18244 80242024 00000000 */ nop -/* A18248 80242028 46802120 */ cvt.s.w $f4, $f4 -/* A1824C 8024202C 4600203C */ c.lt.s $f4, $f0 -/* A18250 80242030 00000000 */ nop -/* A18254 80242034 4500000D */ bc1f .L8024206C -/* A18258 80242038 00000000 */ nop -/* A1825C 8024203C 44800000 */ mtc1 $zero, $f0 -/* A18260 80242040 C614000C */ lwc1 $f20, 0xc($s0) -/* A18264 80242044 4600103C */ c.lt.s $f2, $f0 -/* A18268 80242048 00000000 */ nop -/* A1826C 8024204C 45000006 */ bc1f .L80242068 -/* A18270 80242050 00021023 */ negu $v0, $v0 -/* A18274 80242054 44820000 */ mtc1 $v0, $f0 -/* A18278 80242058 00000000 */ nop -/* A1827C 8024205C 46800020 */ cvt.s.w $f0, $f0 -/* A18280 80242060 0809081B */ j .L8024206C -/* A18284 80242064 4600A500 */ add.s $f20, $f20, $f0 -.L80242068: -/* A18288 80242068 4604A500 */ add.s $f20, $f20, $f4 -.L8024206C: -/* A1828C 8024206C 0C00A6C9 */ jal clamp_angle -/* A18290 80242070 4600A306 */ mov.s $f12, $f20 -/* A18294 80242074 E600000C */ swc1 $f0, 0xc($s0) -.L80242078: -/* A18298 80242078 8E020000 */ lw $v0, ($s0) -/* A1829C 8024207C 30420008 */ andi $v0, $v0, 8 -/* A182A0 80242080 1040000A */ beqz $v0, .L802420AC -/* A182A4 80242084 27A50018 */ addiu $a1, $sp, 0x18 -/* A182A8 80242088 C602003C */ lwc1 $f2, 0x3c($s0) -/* A182AC 8024208C C600001C */ lwc1 $f0, 0x1c($s0) -/* A182B0 80242090 46001080 */ add.s $f2, $f2, $f0 -/* A182B4 80242094 4616103C */ c.lt.s $f2, $f22 -/* A182B8 80242098 00000000 */ nop -/* A182BC 8024209C 45020045 */ bc1fl .L802421B4 -/* A182C0 802420A0 E602003C */ swc1 $f2, 0x3c($s0) -/* A182C4 802420A4 0809086C */ j .L802421B0 -/* A182C8 802420A8 E616003C */ swc1 $f22, 0x3c($s0) -.L802420AC: -/* A182CC 802420AC C6000038 */ lwc1 $f0, 0x38($s0) -/* A182D0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c -/* A182D4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A182D8 802420B8 860200A8 */ lh $v0, 0xa8($s0) -/* A182DC 802420BC C600001C */ lwc1 $f0, 0x1c($s0) -/* A182E0 802420C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A182E4 802420C4 44821000 */ mtc1 $v0, $f2 -/* A182E8 802420C8 00000000 */ nop -/* A182EC 802420CC 468010A0 */ cvt.s.w $f2, $f2 -/* A182F0 802420D0 46000005 */ abs.s $f0, $f0 -/* A182F4 802420D4 46020000 */ add.s $f0, $f0, $f2 -/* A182F8 802420D8 C6060040 */ lwc1 $f6, 0x40($s0) -/* A182FC 802420DC 27A20024 */ addiu $v0, $sp, 0x24 -/* A18300 802420E0 46022100 */ add.s $f4, $f4, $f2 -/* A18304 802420E4 3C014024 */ lui $at, 0x4024 -/* A18308 802420E8 44811800 */ mtc1 $at, $f3 -/* A1830C 802420EC 44801000 */ mtc1 $zero, $f2 -/* A18310 802420F0 46000021 */ cvt.d.s $f0, $f0 -/* A18314 802420F4 46220000 */ add.d $f0, $f0, $f2 -/* A18318 802420F8 E7A60020 */ swc1 $f6, 0x20($sp) -/* A1831C 802420FC E7A4001C */ swc1 $f4, 0x1c($sp) -/* A18320 80242100 46200020 */ cvt.s.d $f0, $f0 -/* A18324 80242104 E7A00024 */ swc1 $f0, 0x24($sp) -/* A18328 80242108 AFA20010 */ sw $v0, 0x10($sp) -/* A1832C 8024210C 8E040080 */ lw $a0, 0x80($s0) -/* A18330 80242110 0C0372DF */ jal func_800DCB7C -/* A18334 80242114 27A70020 */ addiu $a3, $sp, 0x20 -/* A18338 80242118 10400015 */ beqz $v0, .L80242170 -/* A1833C 8024211C 00000000 */ nop -/* A18340 80242120 860200A8 */ lh $v0, 0xa8($s0) -/* A18344 80242124 C604001C */ lwc1 $f4, 0x1c($s0) -/* A18348 80242128 44820000 */ mtc1 $v0, $f0 -/* A1834C 8024212C 00000000 */ nop -/* A18350 80242130 46800020 */ cvt.s.w $f0, $f0 -/* A18354 80242134 46002085 */ abs.s $f2, $f4 -/* A18358 80242138 46020000 */ add.s $f0, $f0, $f2 -/* A1835C 8024213C C7A20024 */ lwc1 $f2, 0x24($sp) -/* A18360 80242140 4600103E */ c.le.s $f2, $f0 -/* A18364 80242144 00000000 */ nop -/* A18368 80242148 45000005 */ bc1f .L80242160 -/* A1836C 8024214C 00000000 */ nop -/* A18370 80242150 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A18374 80242154 AE00001C */ sw $zero, 0x1c($s0) -/* A18378 80242158 0809086D */ j .L802421B4 -/* A1837C 8024215C E600003C */ swc1 $f0, 0x3c($s0) -.L80242160: -/* A18380 80242160 C600003C */ lwc1 $f0, 0x3c($s0) -/* A18384 80242164 46040000 */ add.s $f0, $f0, $f4 -/* A18388 80242168 0809086D */ j .L802421B4 -/* A1838C 8024216C E600003C */ swc1 $f0, 0x3c($s0) -.L80242170: -/* A18390 80242170 C606003C */ lwc1 $f6, 0x3c($s0) -/* A18394 80242174 860200A8 */ lh $v0, 0xa8($s0) -/* A18398 80242178 46163081 */ sub.s $f2, $f6, $f22 -/* A1839C 8024217C 44820000 */ mtc1 $v0, $f0 -/* A183A0 80242180 00000000 */ nop -/* A183A4 80242184 46800020 */ cvt.s.w $f0, $f0 -/* A183A8 80242188 46001080 */ add.s $f2, $f2, $f0 -/* A183AC 8024218C C604001C */ lwc1 $f4, 0x1c($s0) -/* A183B0 80242190 46002005 */ abs.s $f0, $f4 -/* A183B4 80242194 4602003C */ c.lt.s $f0, $f2 -/* A183B8 80242198 00000000 */ nop -/* A183BC 8024219C 45020005 */ bc1fl .L802421B4 -/* A183C0 802421A0 AE00001C */ sw $zero, 0x1c($s0) -/* A183C4 802421A4 46043000 */ add.s $f0, $f6, $f4 -/* A183C8 802421A8 0809086D */ j .L802421B4 -/* A183CC 802421AC E600003C */ swc1 $f0, 0x3c($s0) -.L802421B0: -/* A183D0 802421B0 AE00001C */ sw $zero, 0x1c($s0) -.L802421B4: -/* A183D4 802421B4 8FBF0038 */ lw $ra, 0x38($sp) -/* A183D8 802421B8 8FB30034 */ lw $s3, 0x34($sp) -/* A183DC 802421BC 8FB20030 */ lw $s2, 0x30($sp) -/* A183E0 802421C0 8FB1002C */ lw $s1, 0x2c($sp) -/* A183E4 802421C4 8FB00028 */ lw $s0, 0x28($sp) -/* A183E8 802421C8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A183EC 802421CC D7B40040 */ ldc1 $f20, 0x40($sp) -/* A183F0 802421D0 03E00008 */ jr $ra -/* A183F4 802421D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s deleted file mode 100644 index 5967e899e1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421D8_A183F8 -/* A183F8 802421D8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A183FC 802421DC AFB00028 */ sw $s0, 0x28($sp) -/* A18400 802421E0 00A0802D */ daddu $s0, $a1, $zero -/* A18404 802421E4 AFB1002C */ sw $s1, 0x2c($sp) -/* A18408 802421E8 00C0882D */ daddu $s1, $a2, $zero -/* A1840C 802421EC AFBF0034 */ sw $ra, 0x34($sp) -/* A18410 802421F0 AFB20030 */ sw $s2, 0x30($sp) -/* A18414 802421F4 AE200070 */ sw $zero, 0x70($s1) -/* A18418 802421F8 8C830000 */ lw $v1, ($a0) -/* A1841C 802421FC 2402FDFF */ addiu $v0, $zero, -0x201 -/* A18420 80242200 A480008E */ sh $zero, 0x8e($a0) -/* A18424 80242204 00621824 */ and $v1, $v1, $v0 -/* A18428 80242208 34650800 */ ori $a1, $v1, 0x800 -/* A1842C 8024220C AC850000 */ sw $a1, ($a0) -/* A18430 80242210 8E0200D0 */ lw $v0, 0xd0($s0) -/* A18434 80242214 8C420034 */ lw $v0, 0x34($v0) -/* A18438 80242218 10400003 */ beqz $v0, .L80242228 -/* A1843C 8024221C 00E0902D */ daddu $s2, $a3, $zero -/* A18440 80242220 0809088C */ j .L80242230 -/* A18444 80242224 34620808 */ ori $v0, $v1, 0x808 -.L80242228: -/* A18448 80242228 2402FFF7 */ addiu $v0, $zero, -9 -/* A1844C 8024222C 00A21024 */ and $v0, $a1, $v0 -.L80242230: -/* A18450 80242230 AC820000 */ sw $v0, ($a0) -/* A18454 80242234 27A20024 */ addiu $v0, $sp, 0x24 -/* A18458 80242238 27A50018 */ addiu $a1, $sp, 0x18 -/* A1845C 8024223C C4800038 */ lwc1 $f0, 0x38($a0) -/* A18460 80242240 C482003C */ lwc1 $f2, 0x3c($a0) -/* A18464 80242244 C4840040 */ lwc1 $f4, 0x40($a0) -/* A18468 80242248 3C01447A */ lui $at, 0x447a -/* A1846C 8024224C 44813000 */ mtc1 $at, $f6 -/* A18470 80242250 27A6001C */ addiu $a2, $sp, 0x1c -/* A18474 80242254 E7A00018 */ swc1 $f0, 0x18($sp) -/* A18478 80242258 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A1847C 8024225C E7A40020 */ swc1 $f4, 0x20($sp) -/* A18480 80242260 E7A60024 */ swc1 $f6, 0x24($sp) -/* A18484 80242264 AFA20010 */ sw $v0, 0x10($sp) -/* A18488 80242268 8C840080 */ lw $a0, 0x80($a0) -/* A1848C 8024226C 0C0372DF */ jal func_800DCB7C -/* A18490 80242270 27A70020 */ addiu $a3, $sp, 0x20 -/* A18494 80242274 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A18498 80242278 3C014059 */ lui $at, 0x4059 -/* A1849C 8024227C 44812800 */ mtc1 $at, $f5 -/* A184A0 80242280 44802000 */ mtc1 $zero, $f4 -/* A184A4 80242284 460010A1 */ cvt.d.s $f2, $f2 -/* A184A8 80242288 46241082 */ mul.d $f2, $f2, $f4 -/* A184AC 8024228C 00000000 */ nop -/* A184B0 80242290 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A184B4 80242294 46000021 */ cvt.d.s $f0, $f0 -/* A184B8 80242298 46240002 */ mul.d $f0, $f0, $f4 -/* A184BC 8024229C 00000000 */ nop -/* A184C0 802422A0 3C013FE0 */ lui $at, 0x3fe0 -/* A184C4 802422A4 44812800 */ mtc1 $at, $f5 -/* A184C8 802422A8 44802000 */ mtc1 $zero, $f4 -/* A184CC 802422AC 00000000 */ nop -/* A184D0 802422B0 46241080 */ add.d $f2, $f2, $f4 -/* A184D4 802422B4 AE000074 */ sw $zero, 0x74($s0) -/* A184D8 802422B8 46240000 */ add.d $f0, $f0, $f4 -/* A184DC 802422BC AE000090 */ sw $zero, 0x90($s0) -/* A184E0 802422C0 4620120D */ trunc.w.d $f8, $f2 -/* A184E4 802422C4 E6080078 */ swc1 $f8, 0x78($s0) -/* A184E8 802422C8 4620020D */ trunc.w.d $f8, $f0 -/* A184EC 802422CC E6080088 */ swc1 $f8, 0x88($s0) -/* A184F0 802422D0 8E420014 */ lw $v0, 0x14($s2) -/* A184F4 802422D4 AE220074 */ sw $v0, 0x74($s1) -/* A184F8 802422D8 8E0200B0 */ lw $v0, 0xb0($s0) -/* A184FC 802422DC 34420010 */ ori $v0, $v0, 0x10 -/* A18500 802422E0 AE0200B0 */ sw $v0, 0xb0($s0) -/* A18504 802422E4 8FBF0034 */ lw $ra, 0x34($sp) -/* A18508 802422E8 8FB20030 */ lw $s2, 0x30($sp) -/* A1850C 802422EC 8FB1002C */ lw $s1, 0x2c($sp) -/* A18510 802422F0 8FB00028 */ lw $s0, 0x28($sp) -/* A18514 802422F4 03E00008 */ jr $ra -/* A18518 802422F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index c35b52cf3e..1d1c7c78e5 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -46,7 +46,7 @@ glabel func_802422FC_A1851C /* A185C0 802423A0 02A0202D */ daddu $a0, $s5, $zero /* A185C4 802423A4 0240282D */ daddu $a1, $s2, $zero /* A185C8 802423A8 0280302D */ daddu $a2, $s4, $zero -/* A185CC 802423AC 0C090876 */ jal func_802421D8_A183F8 +/* A185CC 802423AC 0C090876 */ jal hos_02_UnkFunc5 /* A185D0 802423B0 0200382D */ daddu $a3, $s0, $zero .L802423B4: /* A185D4 802423B4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80242430_A18650 glabel L80242440_A18660 /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $zero -/* A18668 80242448 0C090622 */ jal func_80241888_A17AA8 +/* A18668 80242448 0C090622 */ jal hos_02_UnkFunc4 /* A1866C 8024244C 0260302D */ daddu $a2, $s3, $zero /* A18670 80242450 08090931 */ j .L802424C4 /* A18674 80242454 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80242498_A186B8 glabel L802424B0_A186D0 /* A186D0 802424B0 0280202D */ daddu $a0, $s4, $zero /* A186D4 802424B4 0200282D */ daddu $a1, $s0, $zero -/* A186D8 802424B8 0C090792 */ jal func_80241E48_A18068 +/* A186D8 802424B8 0C090792 */ jal hos_02_UnkFunc6 /* A186DC 802424BC 0260302D */ daddu $a2, $s3, $zero glabel L802424C0_A186E0 /* A186E0 802424C0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index f8081c163d..f63efc9dd1 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -46,7 +46,7 @@ glabel func_802428F4_A18B14 /* A18BB8 80242998 02A0202D */ daddu $a0, $s5, $zero /* A18BBC 8024299C 0240282D */ daddu $a1, $s2, $zero /* A18BC0 802429A0 0280302D */ daddu $a2, $s4, $zero -/* A18BC4 802429A4 0C090876 */ jal func_802421D8_A183F8 +/* A18BC4 802429A4 0C090876 */ jal hos_02_UnkFunc5 /* A18BC8 802429A8 0200382D */ daddu $a3, $s0, $zero /* A18BCC 802429AC AE800070 */ sw $zero, 0x70($s4) .L802429B0: @@ -92,7 +92,7 @@ glabel L80242A2C_A18C4C glabel L80242A3C_A18C5C /* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero /* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero -/* A18C64 80242A44 0C090622 */ jal func_80241888_A17AA8 +/* A18C64 80242A44 0C090622 */ jal hos_02_UnkFunc4 /* A18C68 80242A48 0260302D */ daddu $a2, $s3, $zero /* A18C6C 80242A4C 08090AAE */ j .L80242AB8 /* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s deleted file mode 100644 index 69c13bea53..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241548_A1C648 -/* A1C648 80241548 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A1C64C 8024154C AFB3004C */ sw $s3, 0x4c($sp) -/* A1C650 80241550 0080982D */ daddu $s3, $a0, $zero -/* A1C654 80241554 AFBF0054 */ sw $ra, 0x54($sp) -/* A1C658 80241558 AFB40050 */ sw $s4, 0x50($sp) -/* A1C65C 8024155C AFB20048 */ sw $s2, 0x48($sp) -/* A1C660 80241560 AFB10044 */ sw $s1, 0x44($sp) -/* A1C664 80241564 AFB00040 */ sw $s0, 0x40($sp) -/* A1C668 80241568 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A1C66C 8024156C F7B80068 */ sdc1 $f24, 0x68($sp) -/* A1C670 80241570 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A1C674 80241574 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A1C678 80241578 8E710148 */ lw $s1, 0x148($s3) -/* A1C67C 8024157C 00A0902D */ daddu $s2, $a1, $zero -/* A1C680 80241580 86240008 */ lh $a0, 8($s1) -/* A1C684 80241584 0C00EABB */ jal get_npc_unsafe -/* A1C688 80241588 00C0A02D */ daddu $s4, $a2, $zero -/* A1C68C 8024158C 0040802D */ daddu $s0, $v0, $zero -/* A1C690 80241590 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1C694 80241594 46800020 */ cvt.s.w $f0, $f0 -/* A1C698 80241598 46000021 */ cvt.d.s $f0, $f0 -/* A1C69C 8024159C 3C014059 */ lui $at, 0x4059 -/* A1C6A0 802415A0 44811800 */ mtc1 $at, $f3 -/* A1C6A4 802415A4 44801000 */ mtc1 $zero, $f2 -/* A1C6A8 802415A8 8602008E */ lh $v0, 0x8e($s0) -/* A1C6AC 802415AC 9603008E */ lhu $v1, 0x8e($s0) -/* A1C6B0 802415B0 46220003 */ div.d $f0, $f0, $f2 -/* A1C6B4 802415B4 46200620 */ cvt.s.d $f24, $f0 -/* A1C6B8 802415B8 C6200088 */ lwc1 $f0, 0x88($s1) -/* A1C6BC 802415BC 46800020 */ cvt.s.w $f0, $f0 -/* A1C6C0 802415C0 46000021 */ cvt.d.s $f0, $f0 -/* A1C6C4 802415C4 46220003 */ div.d $f0, $f0, $f2 -/* A1C6C8 802415C8 46200020 */ cvt.s.d $f0, $f0 -/* A1C6CC 802415CC 18400003 */ blez $v0, .L802415DC -/* A1C6D0 802415D0 4600C680 */ add.s $f26, $f24, $f0 -/* A1C6D4 802415D4 2462FFFF */ addiu $v0, $v1, -1 -/* A1C6D8 802415D8 A602008E */ sh $v0, 0x8e($s0) -.L802415DC: -/* A1C6DC 802415DC 8E220070 */ lw $v0, 0x70($s1) -/* A1C6E0 802415E0 18400034 */ blez $v0, .L802416B4 -/* A1C6E4 802415E4 00000000 */ nop -/* A1C6E8 802415E8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A1C6EC 802415EC 46806320 */ cvt.s.w $f12, $f12 -/* A1C6F0 802415F0 44820000 */ mtc1 $v0, $f0 -/* A1C6F4 802415F4 00000000 */ nop -/* A1C6F8 802415F8 46800020 */ cvt.s.w $f0, $f0 -/* A1C6FC 802415FC 46000021 */ cvt.d.s $f0, $f0 -/* A1C700 80241600 46220003 */ div.d $f0, $f0, $f2 -/* A1C704 80241604 0C00A8BB */ jal sin_deg -/* A1C708 80241608 462005A0 */ cvt.s.d $f22, $f0 -/* A1C70C 8024160C 8E020000 */ lw $v0, ($s0) -/* A1C710 80241610 30420008 */ andi $v0, $v0, 8 -/* A1C714 80241614 10400003 */ beqz $v0, .L80241624 -/* A1C718 80241618 46000506 */ mov.s $f20, $f0 -/* A1C71C 8024161C 08090599 */ j .L80241664 -/* A1C720 80241620 0000102D */ daddu $v0, $zero, $zero -.L80241624: -/* A1C724 80241624 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C728 80241628 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C72C 8024162C C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C730 80241630 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C734 80241634 C6040040 */ lwc1 $f4, 0x40($s0) -/* A1C738 80241638 3C01447A */ lui $at, 0x447a -/* A1C73C 8024163C 44813000 */ mtc1 $at, $f6 -/* A1C740 80241640 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C744 80241644 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C748 80241648 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A1C74C 8024164C E7A40030 */ swc1 $f4, 0x30($sp) -/* A1C750 80241650 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1C754 80241654 AFA20010 */ sw $v0, 0x10($sp) -/* A1C758 80241658 8E040080 */ lw $a0, 0x80($s0) -/* A1C75C 8024165C 0C0372DF */ jal func_800DCB7C -/* A1C760 80241660 27A70030 */ addiu $a3, $sp, 0x30 -.L80241664: -/* A1C764 80241664 10400007 */ beqz $v0, .L80241684 -/* A1C768 80241668 00000000 */ nop -/* A1C76C 8024166C 4616A082 */ mul.s $f2, $f20, $f22 -/* A1C770 80241670 00000000 */ nop -/* A1C774 80241674 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A1C778 80241678 46180000 */ add.s $f0, $f0, $f24 -/* A1C77C 8024167C 080905A4 */ j .L80241690 -/* A1C780 80241680 46020000 */ add.s $f0, $f0, $f2 -.L80241684: -/* A1C784 80241684 4616A002 */ mul.s $f0, $f20, $f22 -/* A1C788 80241688 00000000 */ nop -/* A1C78C 8024168C 4600D000 */ add.s $f0, $f26, $f0 -.L80241690: -/* A1C790 80241690 E600003C */ swc1 $f0, 0x3c($s0) -/* A1C794 80241694 8E220074 */ lw $v0, 0x74($s1) -/* A1C798 80241698 2442000A */ addiu $v0, $v0, 0xa -/* A1C79C 8024169C 44826000 */ mtc1 $v0, $f12 -/* A1C7A0 802416A0 00000000 */ nop -/* A1C7A4 802416A4 0C00A6C9 */ jal clamp_angle -/* A1C7A8 802416A8 46806320 */ cvt.s.w $f12, $f12 -/* A1C7AC 802416AC 4600020D */ trunc.w.s $f8, $f0 -/* A1C7B0 802416B0 E6280074 */ swc1 $f8, 0x74($s1) -.L802416B4: -/* A1C7B4 802416B4 8E220090 */ lw $v0, 0x90($s1) -/* A1C7B8 802416B8 1C400040 */ bgtz $v0, .L802417BC -/* A1C7BC 802416BC 2442FFFF */ addiu $v0, $v0, -1 -/* A1C7C0 802416C0 860200A8 */ lh $v0, 0xa8($s0) -/* A1C7C4 802416C4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C7C8 802416C8 44821000 */ mtc1 $v0, $f2 -/* A1C7CC 802416CC 00000000 */ nop -/* A1C7D0 802416D0 468010A0 */ cvt.s.w $f2, $f2 -/* A1C7D4 802416D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1C7D8 802416D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1C7DC 802416DC 46020000 */ add.s $f0, $f0, $f2 -/* A1C7E0 802416E0 3C014024 */ lui $at, 0x4024 -/* A1C7E4 802416E4 44812800 */ mtc1 $at, $f5 -/* A1C7E8 802416E8 44802000 */ mtc1 $zero, $f4 -/* A1C7EC 802416EC C442002C */ lwc1 $f2, 0x2c($v0) -/* A1C7F0 802416F0 46000021 */ cvt.d.s $f0, $f0 -/* A1C7F4 802416F4 46240000 */ add.d $f0, $f0, $f4 -/* A1C7F8 802416F8 460010A1 */ cvt.d.s $f2, $f2 -/* A1C7FC 802416FC 4620103C */ c.lt.d $f2, $f0 -/* A1C800 80241700 00000000 */ nop -/* A1C804 80241704 4500002E */ bc1f .L802417C0 -/* A1C808 80241708 0280202D */ daddu $a0, $s4, $zero -/* A1C80C 8024170C 24020001 */ addiu $v0, $zero, 1 -/* A1C810 80241710 AFA20010 */ sw $v0, 0x10($sp) -/* A1C814 80241714 8E460024 */ lw $a2, 0x24($s2) -/* A1C818 80241718 8E470028 */ lw $a3, 0x28($s2) -/* A1C81C 8024171C 0C01242D */ jal func_800490B4 -/* A1C820 80241720 0220282D */ daddu $a1, $s1, $zero -/* A1C824 80241724 10400026 */ beqz $v0, .L802417C0 -/* A1C828 80241728 0000202D */ daddu $a0, $zero, $zero -/* A1C82C 8024172C 0200282D */ daddu $a1, $s0, $zero -/* A1C830 80241730 0000302D */ daddu $a2, $zero, $zero -/* A1C834 80241734 2412000C */ addiu $s2, $zero, 0xc -/* A1C838 80241738 860300A8 */ lh $v1, 0xa8($s0) -/* A1C83C 8024173C 3C013F80 */ lui $at, 0x3f80 -/* A1C840 80241740 44810000 */ mtc1 $at, $f0 -/* A1C844 80241744 3C014000 */ lui $at, 0x4000 -/* A1C848 80241748 44811000 */ mtc1 $at, $f2 -/* A1C84C 8024174C 3C01C1A0 */ lui $at, 0xc1a0 -/* A1C850 80241750 44812000 */ mtc1 $at, $f4 -/* A1C854 80241754 44834000 */ mtc1 $v1, $f8 -/* A1C858 80241758 00000000 */ nop -/* A1C85C 8024175C 46804220 */ cvt.s.w $f8, $f8 -/* A1C860 80241760 44074000 */ mfc1 $a3, $f8 -/* A1C864 80241764 27A20038 */ addiu $v0, $sp, 0x38 -/* A1C868 80241768 AFB2001C */ sw $s2, 0x1c($sp) -/* A1C86C 8024176C AFA20020 */ sw $v0, 0x20($sp) -/* A1C870 80241770 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1C874 80241774 E7A20014 */ swc1 $f2, 0x14($sp) -/* A1C878 80241778 0C01BFA4 */ jal fx_emote -/* A1C87C 8024177C E7A40018 */ swc1 $f4, 0x18($sp) -/* A1C880 80241780 0200202D */ daddu $a0, $s0, $zero -/* A1C884 80241784 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A1C888 80241788 C480003C */ lwc1 $f0, 0x3c($a0) -/* A1C88C 8024178C 3C060020 */ lui $a2, 0x20 -/* A1C890 80241790 0C012530 */ jal func_800494C0 -/* A1C894 80241794 E4800064 */ swc1 $f0, 0x64($a0) -/* A1C898 80241798 8E220018 */ lw $v0, 0x18($s1) -/* A1C89C 8024179C 9442002A */ lhu $v0, 0x2a($v0) -/* A1C8A0 802417A0 30420001 */ andi $v0, $v0, 1 -/* A1C8A4 802417A4 10400003 */ beqz $v0, .L802417B4 -/* A1C8A8 802417A8 2402000A */ addiu $v0, $zero, 0xa -/* A1C8AC 802417AC 08090617 */ j .L8024185C -/* A1C8B0 802417B0 AE620070 */ sw $v0, 0x70($s3) -.L802417B4: -/* A1C8B4 802417B4 08090617 */ j .L8024185C -/* A1C8B8 802417B8 AE720070 */ sw $s2, 0x70($s3) -.L802417BC: -/* A1C8BC 802417BC AE220090 */ sw $v0, 0x90($s1) -.L802417C0: -/* A1C8C0 802417C0 8602008C */ lh $v0, 0x8c($s0) -/* A1C8C4 802417C4 14400025 */ bnez $v0, .L8024185C -/* A1C8C8 802417C8 00000000 */ nop -/* A1C8CC 802417CC 8602008E */ lh $v0, 0x8e($s0) -/* A1C8D0 802417D0 1C400022 */ bgtz $v0, .L8024185C -/* A1C8D4 802417D4 00000000 */ nop -/* A1C8D8 802417D8 8E620074 */ lw $v0, 0x74($s3) -/* A1C8DC 802417DC 2442FFFF */ addiu $v0, $v0, -1 -/* A1C8E0 802417E0 1840001D */ blez $v0, .L80241858 -/* A1C8E4 802417E4 AE620074 */ sw $v0, 0x74($s3) -/* A1C8E8 802417E8 8E220018 */ lw $v0, 0x18($s1) -/* A1C8EC 802417EC 9442002A */ lhu $v0, 0x2a($v0) -/* A1C8F0 802417F0 30420010 */ andi $v0, $v0, 0x10 -/* A1C8F4 802417F4 14400007 */ bnez $v0, .L80241814 -/* A1C8F8 802417F8 00000000 */ nop -/* A1C8FC 802417FC C600000C */ lwc1 $f0, 0xc($s0) -/* A1C900 80241800 3C014334 */ lui $at, 0x4334 -/* A1C904 80241804 44816000 */ mtc1 $at, $f12 -/* A1C908 80241808 0C00A6C9 */ jal clamp_angle -/* A1C90C 8024180C 460C0300 */ add.s $f12, $f0, $f12 -/* A1C910 80241810 E600000C */ swc1 $f0, 0xc($s0) -.L80241814: -/* A1C914 80241814 0C00A67F */ jal rand_int -/* A1C918 80241818 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A1C91C 8024181C 3C032E8B */ lui $v1, 0x2e8b -/* A1C920 80241820 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A1C924 80241824 00430018 */ mult $v0, $v1 -/* A1C928 80241828 00021FC3 */ sra $v1, $v0, 0x1f -/* A1C92C 8024182C 00004010 */ mfhi $t0 -/* A1C930 80241830 00082043 */ sra $a0, $t0, 1 -/* A1C934 80241834 00832023 */ subu $a0, $a0, $v1 -/* A1C938 80241838 00041840 */ sll $v1, $a0, 1 -/* A1C93C 8024183C 00641821 */ addu $v1, $v1, $a0 -/* A1C940 80241840 00031880 */ sll $v1, $v1, 2 -/* A1C944 80241844 00641823 */ subu $v1, $v1, $a0 -/* A1C948 80241848 00431023 */ subu $v0, $v0, $v1 -/* A1C94C 8024184C 24420005 */ addiu $v0, $v0, 5 -/* A1C950 80241850 08090617 */ j .L8024185C -/* A1C954 80241854 A602008E */ sh $v0, 0x8e($s0) -.L80241858: -/* A1C958 80241858 AE600070 */ sw $zero, 0x70($s3) -.L8024185C: -/* A1C95C 8024185C 8FBF0054 */ lw $ra, 0x54($sp) -/* A1C960 80241860 8FB40050 */ lw $s4, 0x50($sp) -/* A1C964 80241864 8FB3004C */ lw $s3, 0x4c($sp) -/* A1C968 80241868 8FB20048 */ lw $s2, 0x48($sp) -/* A1C96C 8024186C 8FB10044 */ lw $s1, 0x44($sp) -/* A1C970 80241870 8FB00040 */ lw $s0, 0x40($sp) -/* A1C974 80241874 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A1C978 80241878 D7B80068 */ ldc1 $f24, 0x68($sp) -/* A1C97C 8024187C D7B60060 */ ldc1 $f22, 0x60($sp) -/* A1C980 80241880 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A1C984 80241884 03E00008 */ jr $ra -/* A1C988 80241888 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s deleted file mode 100644 index 25110468cc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B08_A1CC08 -/* A1CC08 80241B08 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A1CC0C 80241B0C AFB20030 */ sw $s2, 0x30($sp) -/* A1CC10 80241B10 0080902D */ daddu $s2, $a0, $zero -/* A1CC14 80241B14 AFBF0038 */ sw $ra, 0x38($sp) -/* A1CC18 80241B18 AFB30034 */ sw $s3, 0x34($sp) -/* A1CC1C 80241B1C AFB1002C */ sw $s1, 0x2c($sp) -/* A1CC20 80241B20 AFB00028 */ sw $s0, 0x28($sp) -/* A1CC24 80241B24 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A1CC28 80241B28 F7B40040 */ sdc1 $f20, 0x40($sp) -/* A1CC2C 80241B2C 8E510148 */ lw $s1, 0x148($s2) -/* A1CC30 80241B30 86240008 */ lh $a0, 8($s1) -/* A1CC34 80241B34 0C00EABB */ jal get_npc_unsafe -/* A1CC38 80241B38 00A0982D */ daddu $s3, $a1, $zero -/* A1CC3C 80241B3C 0040802D */ daddu $s0, $v0, $zero -/* A1CC40 80241B40 0200202D */ daddu $a0, $s0, $zero -/* A1CC44 80241B44 C6220088 */ lwc1 $f2, 0x88($s1) -/* A1CC48 80241B48 468010A0 */ cvt.s.w $f2, $f2 -/* A1CC4C 80241B4C 460010A1 */ cvt.d.s $f2, $f2 -/* A1CC50 80241B50 C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CC54 80241B54 C6000014 */ lwc1 $f0, 0x14($s0) -/* A1CC58 80241B58 8E050018 */ lw $a1, 0x18($s0) -/* A1CC5C 80241B5C 46002100 */ add.s $f4, $f4, $f0 -/* A1CC60 80241B60 8E06000C */ lw $a2, 0xc($s0) -/* A1CC64 80241B64 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1CC68 80241B68 46800020 */ cvt.s.w $f0, $f0 -/* A1CC6C 80241B6C E604001C */ swc1 $f4, 0x1c($s0) -/* A1CC70 80241B70 3C014059 */ lui $at, 0x4059 -/* A1CC74 80241B74 44812800 */ mtc1 $at, $f5 -/* A1CC78 80241B78 44802000 */ mtc1 $zero, $f4 -/* A1CC7C 80241B7C 46000021 */ cvt.d.s $f0, $f0 -/* A1CC80 80241B80 46240003 */ div.d $f0, $f0, $f4 -/* A1CC84 80241B84 46200520 */ cvt.s.d $f20, $f0 -/* A1CC88 80241B88 46241083 */ div.d $f2, $f2, $f4 -/* A1CC8C 80241B8C 0C00EA95 */ jal npc_move_heading -/* A1CC90 80241B90 462015A0 */ cvt.s.d $f22, $f2 -/* A1CC94 80241B94 C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CC98 80241B98 44801000 */ mtc1 $zero, $f2 -/* A1CC9C 80241B9C 44801800 */ mtc1 $zero, $f3 -/* A1CCA0 80241BA0 46002021 */ cvt.d.s $f0, $f4 -/* A1CCA4 80241BA4 4620103E */ c.le.d $f2, $f0 -/* A1CCA8 80241BA8 00000000 */ nop -/* A1CCAC 80241BAC 45000030 */ bc1f .L80241C70 -/* A1CCB0 80241BB0 00000000 */ nop -/* A1CCB4 80241BB4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1CCB8 80241BB8 46040000 */ add.s $f0, $f0, $f4 -/* A1CCBC 80241BBC E600003C */ swc1 $f0, 0x3c($s0) -/* A1CCC0 80241BC0 8E2200CC */ lw $v0, 0xcc($s1) -/* A1CCC4 80241BC4 8C420024 */ lw $v0, 0x24($v0) -/* A1CCC8 80241BC8 AE020028 */ sw $v0, 0x28($s0) -/* A1CCCC 80241BCC A2200007 */ sb $zero, 7($s1) -/* A1CCD0 80241BD0 8E020000 */ lw $v0, ($s0) -/* A1CCD4 80241BD4 30420008 */ andi $v0, $v0, 8 -/* A1CCD8 80241BD8 14400011 */ bnez $v0, .L80241C20 -/* A1CCDC 80241BDC 0000102D */ daddu $v0, $zero, $zero -/* A1CCE0 80241BE0 27A50018 */ addiu $a1, $sp, 0x18 -/* A1CCE4 80241BE4 27A6001C */ addiu $a2, $sp, 0x1c -/* A1CCE8 80241BE8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1CCEC 80241BEC C602003C */ lwc1 $f2, 0x3c($s0) -/* A1CCF0 80241BF0 C6040040 */ lwc1 $f4, 0x40($s0) -/* A1CCF4 80241BF4 3C01447A */ lui $at, 0x447a -/* A1CCF8 80241BF8 44813000 */ mtc1 $at, $f6 -/* A1CCFC 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 -/* A1CD00 80241C00 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1CD04 80241C04 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A1CD08 80241C08 E7A40020 */ swc1 $f4, 0x20($sp) -/* A1CD0C 80241C0C E7A60024 */ swc1 $f6, 0x24($sp) -/* A1CD10 80241C10 AFA20010 */ sw $v0, 0x10($sp) -/* A1CD14 80241C14 8E040080 */ lw $a0, 0x80($s0) -/* A1CD18 80241C18 0C0372DF */ jal func_800DCB7C -/* A1CD1C 80241C1C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241C20: -/* A1CD20 80241C20 1040000B */ beqz $v0, .L80241C50 -/* A1CD24 80241C24 00000000 */ nop -/* A1CD28 80241C28 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1CD2C 80241C2C 46140080 */ add.s $f2, $f0, $f20 -/* A1CD30 80241C30 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1CD34 80241C34 4600103E */ c.le.s $f2, $f0 -/* A1CD38 80241C38 00000000 */ nop -/* A1CD3C 80241C3C 4500008D */ bc1f .L80241E74 -/* A1CD40 80241C40 00000000 */ nop -/* A1CD44 80241C44 E602003C */ swc1 $f2, 0x3c($s0) -/* A1CD48 80241C48 0809079D */ j .L80241E74 -/* A1CD4C 80241C4C AE400070 */ sw $zero, 0x70($s2) -.L80241C50: -/* A1CD50 80241C50 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1CD54 80241C54 C6000064 */ lwc1 $f0, 0x64($s0) -/* A1CD58 80241C58 4602003E */ c.le.s $f0, $f2 -/* A1CD5C 80241C5C 00000000 */ nop -/* A1CD60 80241C60 45030084 */ bc1tl .L80241E74 -/* A1CD64 80241C64 AE400070 */ sw $zero, 0x70($s2) -/* A1CD68 80241C68 0809079D */ j .L80241E74 -/* A1CD6C 80241C6C 00000000 */ nop -.L80241C70: -/* A1CD70 80241C70 4622003C */ c.lt.d $f0, $f2 -/* A1CD74 80241C74 00000000 */ nop -/* A1CD78 80241C78 4500007E */ bc1f .L80241E74 -/* A1CD7C 80241C7C 00000000 */ nop -/* A1CD80 80241C80 9602008E */ lhu $v0, 0x8e($s0) -/* A1CD84 80241C84 24420001 */ addiu $v0, $v0, 1 -/* A1CD88 80241C88 A602008E */ sh $v0, 0x8e($s0) -/* A1CD8C 80241C8C 00021400 */ sll $v0, $v0, 0x10 -/* A1CD90 80241C90 8E630020 */ lw $v1, 0x20($s3) -/* A1CD94 80241C94 00021403 */ sra $v0, $v0, 0x10 -/* A1CD98 80241C98 0043102A */ slt $v0, $v0, $v1 -/* A1CD9C 80241C9C 14400026 */ bnez $v0, .L80241D38 -/* A1CDA0 80241CA0 00000000 */ nop -/* A1CDA4 80241CA4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1CDA8 80241CA8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1CDAC 80241CAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1CDB0 80241CB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1CDB4 80241CB4 A600008E */ sh $zero, 0x8e($s0) -/* A1CDB8 80241CB8 8C460028 */ lw $a2, 0x28($v0) -/* A1CDBC 80241CBC 0C00A720 */ jal atan2 -/* A1CDC0 80241CC0 8C470030 */ lw $a3, 0x30($v0) -/* A1CDC4 80241CC4 46000506 */ mov.s $f20, $f0 -/* A1CDC8 80241CC8 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1CDCC 80241CCC 0C00A70A */ jal get_clamped_angle_diff -/* A1CDD0 80241CD0 4600A386 */ mov.s $f14, $f20 -/* A1CDD4 80241CD4 46000086 */ mov.s $f2, $f0 -/* A1CDD8 80241CD8 8E62001C */ lw $v0, 0x1c($s3) -/* A1CDDC 80241CDC 46001005 */ abs.s $f0, $f2 -/* A1CDE0 80241CE0 44822000 */ mtc1 $v0, $f4 -/* A1CDE4 80241CE4 00000000 */ nop -/* A1CDE8 80241CE8 46802120 */ cvt.s.w $f4, $f4 -/* A1CDEC 80241CEC 4600203C */ c.lt.s $f4, $f0 -/* A1CDF0 80241CF0 00000000 */ nop -/* A1CDF4 80241CF4 4500000D */ bc1f .L80241D2C -/* A1CDF8 80241CF8 00000000 */ nop -/* A1CDFC 80241CFC 44800000 */ mtc1 $zero, $f0 -/* A1CE00 80241D00 C614000C */ lwc1 $f20, 0xc($s0) -/* A1CE04 80241D04 4600103C */ c.lt.s $f2, $f0 -/* A1CE08 80241D08 00000000 */ nop -/* A1CE0C 80241D0C 45000006 */ bc1f .L80241D28 -/* A1CE10 80241D10 00021023 */ negu $v0, $v0 -/* A1CE14 80241D14 44820000 */ mtc1 $v0, $f0 -/* A1CE18 80241D18 00000000 */ nop -/* A1CE1C 80241D1C 46800020 */ cvt.s.w $f0, $f0 -/* A1CE20 80241D20 0809074B */ j .L80241D2C -/* A1CE24 80241D24 4600A500 */ add.s $f20, $f20, $f0 -.L80241D28: -/* A1CE28 80241D28 4604A500 */ add.s $f20, $f20, $f4 -.L80241D2C: -/* A1CE2C 80241D2C 0C00A6C9 */ jal clamp_angle -/* A1CE30 80241D30 4600A306 */ mov.s $f12, $f20 -/* A1CE34 80241D34 E600000C */ swc1 $f0, 0xc($s0) -.L80241D38: -/* A1CE38 80241D38 8E020000 */ lw $v0, ($s0) -/* A1CE3C 80241D3C 30420008 */ andi $v0, $v0, 8 -/* A1CE40 80241D40 1040000A */ beqz $v0, .L80241D6C -/* A1CE44 80241D44 27A50018 */ addiu $a1, $sp, 0x18 -/* A1CE48 80241D48 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1CE4C 80241D4C C600001C */ lwc1 $f0, 0x1c($s0) -/* A1CE50 80241D50 46001080 */ add.s $f2, $f2, $f0 -/* A1CE54 80241D54 4616103C */ c.lt.s $f2, $f22 -/* A1CE58 80241D58 00000000 */ nop -/* A1CE5C 80241D5C 45020045 */ bc1fl .L80241E74 -/* A1CE60 80241D60 E602003C */ swc1 $f2, 0x3c($s0) -/* A1CE64 80241D64 0809079C */ j .L80241E70 -/* A1CE68 80241D68 E616003C */ swc1 $f22, 0x3c($s0) -.L80241D6C: -/* A1CE6C 80241D6C C6000038 */ lwc1 $f0, 0x38($s0) -/* A1CE70 80241D70 27A6001C */ addiu $a2, $sp, 0x1c -/* A1CE74 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1CE78 80241D78 860200A8 */ lh $v0, 0xa8($s0) -/* A1CE7C 80241D7C C600001C */ lwc1 $f0, 0x1c($s0) -/* A1CE80 80241D80 C604003C */ lwc1 $f4, 0x3c($s0) -/* A1CE84 80241D84 44821000 */ mtc1 $v0, $f2 -/* A1CE88 80241D88 00000000 */ nop -/* A1CE8C 80241D8C 468010A0 */ cvt.s.w $f2, $f2 -/* A1CE90 80241D90 46000005 */ abs.s $f0, $f0 -/* A1CE94 80241D94 46020000 */ add.s $f0, $f0, $f2 -/* A1CE98 80241D98 C6060040 */ lwc1 $f6, 0x40($s0) -/* A1CE9C 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 -/* A1CEA0 80241DA0 46022100 */ add.s $f4, $f4, $f2 -/* A1CEA4 80241DA4 3C014024 */ lui $at, 0x4024 -/* A1CEA8 80241DA8 44811800 */ mtc1 $at, $f3 -/* A1CEAC 80241DAC 44801000 */ mtc1 $zero, $f2 -/* A1CEB0 80241DB0 46000021 */ cvt.d.s $f0, $f0 -/* A1CEB4 80241DB4 46220000 */ add.d $f0, $f0, $f2 -/* A1CEB8 80241DB8 E7A60020 */ swc1 $f6, 0x20($sp) -/* A1CEBC 80241DBC E7A4001C */ swc1 $f4, 0x1c($sp) -/* A1CEC0 80241DC0 46200020 */ cvt.s.d $f0, $f0 -/* A1CEC4 80241DC4 E7A00024 */ swc1 $f0, 0x24($sp) -/* A1CEC8 80241DC8 AFA20010 */ sw $v0, 0x10($sp) -/* A1CECC 80241DCC 8E040080 */ lw $a0, 0x80($s0) -/* A1CED0 80241DD0 0C0372DF */ jal func_800DCB7C -/* A1CED4 80241DD4 27A70020 */ addiu $a3, $sp, 0x20 -/* A1CED8 80241DD8 10400015 */ beqz $v0, .L80241E30 -/* A1CEDC 80241DDC 00000000 */ nop -/* A1CEE0 80241DE0 860200A8 */ lh $v0, 0xa8($s0) -/* A1CEE4 80241DE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CEE8 80241DE8 44820000 */ mtc1 $v0, $f0 -/* A1CEEC 80241DEC 00000000 */ nop -/* A1CEF0 80241DF0 46800020 */ cvt.s.w $f0, $f0 -/* A1CEF4 80241DF4 46002085 */ abs.s $f2, $f4 -/* A1CEF8 80241DF8 46020000 */ add.s $f0, $f0, $f2 -/* A1CEFC 80241DFC C7A20024 */ lwc1 $f2, 0x24($sp) -/* A1CF00 80241E00 4600103E */ c.le.s $f2, $f0 -/* A1CF04 80241E04 00000000 */ nop -/* A1CF08 80241E08 45000005 */ bc1f .L80241E20 -/* A1CF0C 80241E0C 00000000 */ nop -/* A1CF10 80241E10 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1CF14 80241E14 AE00001C */ sw $zero, 0x1c($s0) -/* A1CF18 80241E18 0809079D */ j .L80241E74 -/* A1CF1C 80241E1C E600003C */ swc1 $f0, 0x3c($s0) -.L80241E20: -/* A1CF20 80241E20 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1CF24 80241E24 46040000 */ add.s $f0, $f0, $f4 -/* A1CF28 80241E28 0809079D */ j .L80241E74 -/* A1CF2C 80241E2C E600003C */ swc1 $f0, 0x3c($s0) -.L80241E30: -/* A1CF30 80241E30 C606003C */ lwc1 $f6, 0x3c($s0) -/* A1CF34 80241E34 860200A8 */ lh $v0, 0xa8($s0) -/* A1CF38 80241E38 46163081 */ sub.s $f2, $f6, $f22 -/* A1CF3C 80241E3C 44820000 */ mtc1 $v0, $f0 -/* A1CF40 80241E40 00000000 */ nop -/* A1CF44 80241E44 46800020 */ cvt.s.w $f0, $f0 -/* A1CF48 80241E48 46001080 */ add.s $f2, $f2, $f0 -/* A1CF4C 80241E4C C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CF50 80241E50 46002005 */ abs.s $f0, $f4 -/* A1CF54 80241E54 4602003C */ c.lt.s $f0, $f2 -/* A1CF58 80241E58 00000000 */ nop -/* A1CF5C 80241E5C 45020005 */ bc1fl .L80241E74 -/* A1CF60 80241E60 AE00001C */ sw $zero, 0x1c($s0) -/* A1CF64 80241E64 46043000 */ add.s $f0, $f6, $f4 -/* A1CF68 80241E68 0809079D */ j .L80241E74 -/* A1CF6C 80241E6C E600003C */ swc1 $f0, 0x3c($s0) -.L80241E70: -/* A1CF70 80241E70 AE00001C */ sw $zero, 0x1c($s0) -.L80241E74: -/* A1CF74 80241E74 8FBF0038 */ lw $ra, 0x38($sp) -/* A1CF78 80241E78 8FB30034 */ lw $s3, 0x34($sp) -/* A1CF7C 80241E7C 8FB20030 */ lw $s2, 0x30($sp) -/* A1CF80 80241E80 8FB1002C */ lw $s1, 0x2c($sp) -/* A1CF84 80241E84 8FB00028 */ lw $s0, 0x28($sp) -/* A1CF88 80241E88 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A1CF8C 80241E8C D7B40040 */ ldc1 $f20, 0x40($sp) -/* A1CF90 80241E90 03E00008 */ jr $ra -/* A1CF94 80241E94 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s deleted file mode 100644 index e14d7e5e8e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E98_A1CF98 -/* A1CF98 80241E98 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A1CF9C 80241E9C AFB00028 */ sw $s0, 0x28($sp) -/* A1CFA0 80241EA0 00A0802D */ daddu $s0, $a1, $zero -/* A1CFA4 80241EA4 AFB1002C */ sw $s1, 0x2c($sp) -/* A1CFA8 80241EA8 00C0882D */ daddu $s1, $a2, $zero -/* A1CFAC 80241EAC AFBF0034 */ sw $ra, 0x34($sp) -/* A1CFB0 80241EB0 AFB20030 */ sw $s2, 0x30($sp) -/* A1CFB4 80241EB4 AE200070 */ sw $zero, 0x70($s1) -/* A1CFB8 80241EB8 8C830000 */ lw $v1, ($a0) -/* A1CFBC 80241EBC 2402FDFF */ addiu $v0, $zero, -0x201 -/* A1CFC0 80241EC0 A480008E */ sh $zero, 0x8e($a0) -/* A1CFC4 80241EC4 00621824 */ and $v1, $v1, $v0 -/* A1CFC8 80241EC8 34650800 */ ori $a1, $v1, 0x800 -/* A1CFCC 80241ECC AC850000 */ sw $a1, ($a0) -/* A1CFD0 80241ED0 8E0200D0 */ lw $v0, 0xd0($s0) -/* A1CFD4 80241ED4 8C420034 */ lw $v0, 0x34($v0) -/* A1CFD8 80241ED8 10400003 */ beqz $v0, .L80241EE8 -/* A1CFDC 80241EDC 00E0902D */ daddu $s2, $a3, $zero -/* A1CFE0 80241EE0 080907BC */ j .L80241EF0 -/* A1CFE4 80241EE4 34620808 */ ori $v0, $v1, 0x808 -.L80241EE8: -/* A1CFE8 80241EE8 2402FFF7 */ addiu $v0, $zero, -9 -/* A1CFEC 80241EEC 00A21024 */ and $v0, $a1, $v0 -.L80241EF0: -/* A1CFF0 80241EF0 AC820000 */ sw $v0, ($a0) -/* A1CFF4 80241EF4 27A20024 */ addiu $v0, $sp, 0x24 -/* A1CFF8 80241EF8 27A50018 */ addiu $a1, $sp, 0x18 -/* A1CFFC 80241EFC C4800038 */ lwc1 $f0, 0x38($a0) -/* A1D000 80241F00 C482003C */ lwc1 $f2, 0x3c($a0) -/* A1D004 80241F04 C4840040 */ lwc1 $f4, 0x40($a0) -/* A1D008 80241F08 3C01447A */ lui $at, 0x447a -/* A1D00C 80241F0C 44813000 */ mtc1 $at, $f6 -/* A1D010 80241F10 27A6001C */ addiu $a2, $sp, 0x1c -/* A1D014 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1D018 80241F18 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A1D01C 80241F1C E7A40020 */ swc1 $f4, 0x20($sp) -/* A1D020 80241F20 E7A60024 */ swc1 $f6, 0x24($sp) -/* A1D024 80241F24 AFA20010 */ sw $v0, 0x10($sp) -/* A1D028 80241F28 8C840080 */ lw $a0, 0x80($a0) -/* A1D02C 80241F2C 0C0372DF */ jal func_800DCB7C -/* A1D030 80241F30 27A70020 */ addiu $a3, $sp, 0x20 -/* A1D034 80241F34 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A1D038 80241F38 3C014059 */ lui $at, 0x4059 -/* A1D03C 80241F3C 44812800 */ mtc1 $at, $f5 -/* A1D040 80241F40 44802000 */ mtc1 $zero, $f4 -/* A1D044 80241F44 460010A1 */ cvt.d.s $f2, $f2 -/* A1D048 80241F48 46241082 */ mul.d $f2, $f2, $f4 -/* A1D04C 80241F4C 00000000 */ nop -/* A1D050 80241F50 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1D054 80241F54 46000021 */ cvt.d.s $f0, $f0 -/* A1D058 80241F58 46240002 */ mul.d $f0, $f0, $f4 -/* A1D05C 80241F5C 00000000 */ nop -/* A1D060 80241F60 3C013FE0 */ lui $at, 0x3fe0 -/* A1D064 80241F64 44812800 */ mtc1 $at, $f5 -/* A1D068 80241F68 44802000 */ mtc1 $zero, $f4 -/* A1D06C 80241F6C 00000000 */ nop -/* A1D070 80241F70 46241080 */ add.d $f2, $f2, $f4 -/* A1D074 80241F74 AE000074 */ sw $zero, 0x74($s0) -/* A1D078 80241F78 46240000 */ add.d $f0, $f0, $f4 -/* A1D07C 80241F7C AE000090 */ sw $zero, 0x90($s0) -/* A1D080 80241F80 4620120D */ trunc.w.d $f8, $f2 -/* A1D084 80241F84 E6080078 */ swc1 $f8, 0x78($s0) -/* A1D088 80241F88 4620020D */ trunc.w.d $f8, $f0 -/* A1D08C 80241F8C E6080088 */ swc1 $f8, 0x88($s0) -/* A1D090 80241F90 8E420014 */ lw $v0, 0x14($s2) -/* A1D094 80241F94 AE220074 */ sw $v0, 0x74($s1) -/* A1D098 80241F98 8E0200B0 */ lw $v0, 0xb0($s0) -/* A1D09C 80241F9C 34420010 */ ori $v0, $v0, 0x10 -/* A1D0A0 80241FA0 AE0200B0 */ sw $v0, 0xb0($s0) -/* A1D0A4 80241FA4 8FBF0034 */ lw $ra, 0x34($sp) -/* A1D0A8 80241FA8 8FB20030 */ lw $s2, 0x30($sp) -/* A1D0AC 80241FAC 8FB1002C */ lw $s1, 0x2c($sp) -/* A1D0B0 80241FB0 8FB00028 */ lw $s0, 0x28($sp) -/* A1D0B4 80241FB4 03E00008 */ jr $ra -/* A1D0B8 80241FB8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index b84145f89b..9709d908f0 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -46,7 +46,7 @@ glabel func_80241FBC_A1D0BC /* A1D160 80242060 02A0202D */ daddu $a0, $s5, $zero /* A1D164 80242064 0240282D */ daddu $a1, $s2, $zero /* A1D168 80242068 0280302D */ daddu $a2, $s4, $zero -/* A1D16C 8024206C 0C0907A6 */ jal func_80241E98_A1CF98 +/* A1D16C 8024206C 0C0907A6 */ jal hos_03_UnkFunc5 /* A1D170 80242070 0200382D */ daddu $a3, $s0, $zero .L80242074: /* A1D174 80242074 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L802420F0_A1D1F0 glabel L80242100_A1D200 /* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero /* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero -/* A1D208 80242108 0C090552 */ jal func_80241548_A1C648 +/* A1D208 80242108 0C090552 */ jal hos_03_UnkFunc4 /* A1D20C 8024210C 0260302D */ daddu $a2, $s3, $zero /* A1D210 80242110 08090861 */ j .L80242184 /* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80242158_A1D258 glabel L80242170_A1D270 /* A1D270 80242170 0280202D */ daddu $a0, $s4, $zero /* A1D274 80242174 0200282D */ daddu $a1, $s0, $zero -/* A1D278 80242178 0C0906C2 */ jal func_80241B08_A1CC08 +/* A1D278 80242178 0C0906C2 */ jal hos_03_UnkFunc6 /* A1D27C 8024217C 0260302D */ daddu $a2, $s3, $zero glabel L80242180_A1D280 /* A1D280 80242180 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s deleted file mode 100644 index 55c7951b8e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_988B7C -/* 988B7C 8024001C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 988B80 80240020 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 988B84 80240024 8C430000 */ lw $v1, ($v0) -/* 988B88 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* 988B8C 8024002C 00641824 */ and $v1, $v1, $a0 -/* 988B90 80240030 AC430000 */ sw $v1, ($v0) -/* 988B94 80240034 03E00008 */ jr $ra -/* 988B98 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s deleted file mode 100644 index 4aebfee073..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_988BC8 -/* 988BC8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 988BCC 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* 988BD0 80240070 0080802D */ daddu $s0, $a0, $zero -/* 988BD4 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* 988BD8 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* 988BDC 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* 988BE0 80240080 8E250000 */ lw $a1, ($s1) -/* 988BE4 80240084 0C0B1EAF */ jal get_variable -/* 988BE8 80240088 26310004 */ addiu $s1, $s1, 4 -/* 988BEC 8024008C 0200202D */ daddu $a0, $s0, $zero -/* 988BF0 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* 988BF4 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 988BF8 80240098 000210C0 */ sll $v0, $v0, 3 -/* 988BFC 8024009C 00431021 */ addu $v0, $v0, $v1 -/* 988C00 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* 988C04 802400A4 8E250000 */ lw $a1, ($s1) -/* 988C08 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* 988C0C 802400AC A0460015 */ sb $a2, 0x15($v0) -/* 988C10 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* 988C14 802400B4 0C0B2026 */ jal set_variable -/* 988C18 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* 988C1C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 988C20 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* 988C24 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* 988C28 802400C8 24020002 */ addiu $v0, $zero, 2 -/* 988C2C 802400CC 03E00008 */ jr $ra -/* 988C30 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s deleted file mode 100644 index 4cd4f4f1c2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_988FA8 -/* 988FA8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 988FAC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 988FB0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 988FB4 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* 988FB8 80240458 00021100 */ sll $v0, $v0, 4 -/* 988FBC 8024045C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 988FC0 80240460 00822021 */ addu $a0, $a0, $v0 -/* 988FC4 80240464 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 988FC8 80240468 0C0496CF */ jal set_message_string -/* 988FCC 8024046C 0000282D */ daddu $a1, $zero, $zero -/* 988FD0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* 988FD4 80240474 24020002 */ addiu $v0, $zero, 2 -/* 988FD8 80240478 03E00008 */ jr $ra -/* 988FDC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240480_988FE0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240480_988FE0.s deleted file mode 100644 index d5a4f55050..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240480_988FE0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_988FE0 -/* 988FE0 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 988FE4 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* 988FE8 80240488 0080882D */ daddu $s1, $a0, $zero -/* 988FEC 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* 988FF0 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* 988FF4 80240494 8E30000C */ lw $s0, 0xc($s1) -/* 988FF8 80240498 8E050000 */ lw $a1, ($s0) -/* 988FFC 8024049C 0C0B1EAF */ jal get_variable -/* 989000 802404A0 26100004 */ addiu $s0, $s0, 4 -/* 989004 802404A4 0C04417A */ jal get_entity_by_index -/* 989008 802404A8 0040202D */ daddu $a0, $v0, $zero -/* 98900C 802404AC 8E100000 */ lw $s0, ($s0) -/* 989010 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 989014 802404B4 3C014148 */ lui $at, 0x4148 -/* 989018 802404B8 44810000 */ mtc1 $at, $f0 -/* 98901C 802404BC 3C013F33 */ lui $at, 0x3f33 -/* 989020 802404C0 34213333 */ ori $at, $at, 0x3333 -/* 989024 802404C4 44811000 */ mtc1 $at, $f2 -/* 989028 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* 98902C 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* 989030 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 989034 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* 989038 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* 98903C 802404DC 44062000 */ mfc1 $a2, $f4 -/* 989040 802404E0 0C01C5D4 */ jal func_80071750 -/* 989044 802404E4 0000202D */ daddu $a0, $zero, $zero -/* 989048 802404E8 0220202D */ daddu $a0, $s1, $zero -/* 98904C 802404EC 0200282D */ daddu $a1, $s0, $zero -/* 989050 802404F0 0C0B2026 */ jal set_variable -/* 989054 802404F4 0040302D */ daddu $a2, $v0, $zero -/* 989058 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* 98905C 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 989060 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* 989064 80240504 24020002 */ addiu $v0, $zero, 2 -/* 989068 80240508 03E00008 */ jr $ra -/* 98906C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240544_9890A4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240544_9890A4.s deleted file mode 100644 index f02632554c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240544_9890A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_9890A4 -/* 9890A4 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9890A8 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* 9890AC 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* 9890B0 80240550 0C0B1EAF */ jal get_variable -/* 9890B4 80240554 8C450000 */ lw $a1, ($v0) -/* 9890B8 80240558 0C04417A */ jal get_entity_by_index -/* 9890BC 8024055C 0040202D */ daddu $a0, $v0, $zero -/* 9890C0 80240560 3C013F80 */ lui $at, 0x3f80 -/* 9890C4 80240564 44810000 */ mtc1 $at, $f0 -/* 9890C8 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* 9890CC 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9890D0 80240570 3C014148 */ lui $at, 0x4148 -/* 9890D4 80240574 44810000 */ mtc1 $at, $f0 -/* 9890D8 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* 9890DC 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* 9890E0 80240580 46001080 */ add.s $f2, $f2, $f0 -/* 9890E4 80240584 8C450048 */ lw $a1, 0x48($v0) -/* 9890E8 80240588 8C470050 */ lw $a3, 0x50($v0) -/* 9890EC 8024058C 44061000 */ mfc1 $a2, $f2 -/* 9890F0 80240590 0C01C2EC */ jal func_80070BB0 -/* 9890F4 80240594 24040004 */ addiu $a0, $zero, 4 -/* 9890F8 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* 9890FC 8024059C 24020002 */ addiu $v0, $zero, 2 -/* 989100 802405A0 03E00008 */ jr $ra -/* 989104 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802405A8_989108.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802405A8_989108.s deleted file mode 100644 index a389ebe9a9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802405A8_989108.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_989108 -/* 989108 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98910C 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* 989110 802405B0 0C00EAD2 */ jal get_npc_safe -/* 989114 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* 989118 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 98911C 802405BC 3C014148 */ lui $at, 0x4148 -/* 989120 802405C0 44811000 */ mtc1 $at, $f2 -/* 989124 802405C4 3C013F80 */ lui $at, 0x3f80 -/* 989128 802405C8 44810000 */ mtc1 $at, $f0 -/* 98912C 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* 989130 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* 989134 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* 989138 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 98913C 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* 989140 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* 989144 802405E4 44062000 */ mfc1 $a2, $f4 -/* 989148 802405E8 0C01C2EC */ jal func_80070BB0 -/* 98914C 802405EC 24040009 */ addiu $a0, $zero, 9 -/* 989150 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* 989154 802405F4 24020002 */ addiu $v0, $zero, 2 -/* 989158 802405F8 03E00008 */ jr $ra -/* 98915C 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s deleted file mode 100644 index e0f6ee1b6d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_989698 -/* 989698 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98969C 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* 9896A0 80240B40 0080882D */ daddu $s1, $a0, $zero -/* 9896A4 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* 9896A8 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* 9896AC 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* 9896B0 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* 9896B4 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* 9896B8 80240B58 0000902D */ daddu $s2, $zero, $zero -/* 9896BC 80240B5C 8E050000 */ lw $a1, ($s0) -/* 9896C0 80240B60 0C0B1EAF */ jal get_variable -/* 9896C4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* 9896C8 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* 9896CC 80240B6C 8E050000 */ lw $a1, ($s0) -/* 9896D0 80240B70 0C0B1EAF */ jal get_variable -/* 9896D4 80240B74 0220202D */ daddu $a0, $s1, $zero -/* 9896D8 80240B78 0240202D */ daddu $a0, $s2, $zero -/* 9896DC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 9896E0 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* 9896E4 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* 9896E8 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* 9896EC 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* 9896F0 80240B90 0C04DF84 */ jal set_transition_stencil_color -/* 9896F4 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* 9896F8 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* 9896FC 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* 989700 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* 989704 80240BA4 28620002 */ slti $v0, $v1, 2 -/* 989708 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* 98970C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* 989710 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* 989714 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* 989718 80240BB8 08090312 */ j .L80240C48 -/* 98971C 80240BBC 00000000 */ nop -.L80240BC0: -/* 989720 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* 989724 80240BC4 00000000 */ nop -/* 989728 80240BC8 08090312 */ j .L80240C48 -/* 98972C 80240BCC 00000000 */ nop -.L80240BD0: -/* 989730 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* 989734 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* 989738 80240BD8 00000000 */ nop -/* 98973C 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* 989740 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* 989744 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* 989748 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* 98974C 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* 989750 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* 989754 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* 989758 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* 98975C 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* 989760 80240C00 08090312 */ j .L80240C48 -/* 989764 80240C04 00000000 */ nop -.L80240C08: -/* 989768 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* 98976C 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* 989770 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* 989774 80240C14 28420002 */ slti $v0, $v0, 2 -/* 989778 80240C18 1440000B */ bnez $v0, .L80240C48 -/* 98977C 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* 989780 80240C20 08090312 */ j .L80240C48 -/* 989784 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* 989788 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* 98978C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* 989790 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* 989794 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* 989798 80240C38 00621023 */ subu $v0, $v1, $v0 -/* 98979C 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* 9897A0 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* 9897A4 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* 9897A8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* 9897AC 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* 9897B0 80240C50 44050000 */ mfc1 $a1, $f0 -/* 9897B4 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 9897B8 80240C58 24040001 */ addiu $a0, $zero, 1 -/* 9897BC 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* 9897C0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* 9897C4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* 9897C8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* 9897CC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 9897D0 80240C70 03E00008 */ jr $ra -/* 9897D4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s deleted file mode 100644 index 00767e028f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08_989868 -/* 989868 80240D08 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 98986C 80240D0C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 989870 80240D10 AC800084 */ sw $zero, 0x84($a0) -/* 989874 80240D14 80620000 */ lb $v0, ($v1) -/* 989878 80240D18 10400005 */ beqz $v0, .L80240D30 -/* 98987C 80240D1C 24020003 */ addiu $v0, $zero, 3 -/* 989880 80240D20 80630003 */ lb $v1, 3($v1) -/* 989884 80240D24 14620002 */ bne $v1, $v0, .L80240D30 -/* 989888 80240D28 24020001 */ addiu $v0, $zero, 1 -/* 98988C 80240D2C AC820084 */ sw $v0, 0x84($a0) -.L80240D30: -/* 989890 80240D30 03E00008 */ jr $ra -/* 989894 80240D34 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s deleted file mode 100644 index c64a2f5d2c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242794_911E44 -/* 911E44 80242794 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 911E48 80242798 AFB3003C */ sw $s3, 0x3c($sp) -/* 911E4C 8024279C 0080982D */ daddu $s3, $a0, $zero -/* 911E50 802427A0 AFBF0040 */ sw $ra, 0x40($sp) -/* 911E54 802427A4 AFB20038 */ sw $s2, 0x38($sp) -/* 911E58 802427A8 AFB10034 */ sw $s1, 0x34($sp) -/* 911E5C 802427AC AFB00030 */ sw $s0, 0x30($sp) -/* 911E60 802427B0 8E700148 */ lw $s0, 0x148($s3) -/* 911E64 802427B4 00A0902D */ daddu $s2, $a1, $zero -/* 911E68 802427B8 86040008 */ lh $a0, 8($s0) -/* 911E6C 802427BC 0C00EABB */ jal get_npc_unsafe -/* 911E70 802427C0 00C0882D */ daddu $s1, $a2, $zero -/* 911E74 802427C4 0220202D */ daddu $a0, $s1, $zero -/* 911E78 802427C8 0200282D */ daddu $a1, $s0, $zero -/* 911E7C 802427CC AFA00010 */ sw $zero, 0x10($sp) -/* 911E80 802427D0 8E460024 */ lw $a2, 0x24($s2) -/* 911E84 802427D4 8E470028 */ lw $a3, 0x28($s2) -/* 911E88 802427D8 0C01242D */ jal func_800490B4 -/* 911E8C 802427DC 0040802D */ daddu $s0, $v0, $zero -/* 911E90 802427E0 1040000B */ beqz $v0, .L80242810 -/* 911E94 802427E4 00000000 */ nop -/* 911E98 802427E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911E9C 802427EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 911EA0 802427F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 911EA4 802427F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 911EA8 802427F8 8C460028 */ lw $a2, 0x28($v0) -/* 911EAC 802427FC 0C00A720 */ jal atan2 -/* 911EB0 80242800 8C470030 */ lw $a3, 0x30($v0) -/* 911EB4 80242804 2402000C */ addiu $v0, $zero, 0xc -/* 911EB8 80242808 08090A3A */ j .L802428E8 -/* 911EBC 8024280C E600000C */ swc1 $f0, 0xc($s0) -.L80242810: -/* 911EC0 80242810 9602008E */ lhu $v0, 0x8e($s0) -/* 911EC4 80242814 2442FFFF */ addiu $v0, $v0, -1 -/* 911EC8 80242818 A602008E */ sh $v0, 0x8e($s0) -/* 911ECC 8024281C 00021400 */ sll $v0, $v0, 0x10 -/* 911ED0 80242820 1C400032 */ bgtz $v0, .L802428EC -/* 911ED4 80242824 00000000 */ nop -/* 911ED8 80242828 8E620074 */ lw $v0, 0x74($s3) -/* 911EDC 8024282C 2442FFFF */ addiu $v0, $v0, -1 -/* 911EE0 80242830 18400014 */ blez $v0, .L80242884 -/* 911EE4 80242834 AE620074 */ sw $v0, 0x74($s3) -/* 911EE8 80242838 C600000C */ lwc1 $f0, 0xc($s0) -/* 911EEC 8024283C 3C014334 */ lui $at, 0x4334 -/* 911EF0 80242840 44816000 */ mtc1 $at, $f12 -/* 911EF4 80242844 0C00A6C9 */ jal clamp_angle -/* 911EF8 80242848 460C0300 */ add.s $f12, $f0, $f12 -/* 911EFC 8024284C E600000C */ swc1 $f0, 0xc($s0) -/* 911F00 80242850 8E440008 */ lw $a0, 8($s2) -/* 911F04 80242854 000417C2 */ srl $v0, $a0, 0x1f -/* 911F08 80242858 00822021 */ addu $a0, $a0, $v0 -/* 911F0C 8024285C 00042043 */ sra $a0, $a0, 1 -/* 911F10 80242860 0C00A67F */ jal rand_int -/* 911F14 80242864 24840001 */ addiu $a0, $a0, 1 -/* 911F18 80242868 8E430008 */ lw $v1, 8($s2) -/* 911F1C 8024286C 000327C2 */ srl $a0, $v1, 0x1f -/* 911F20 80242870 00641821 */ addu $v1, $v1, $a0 -/* 911F24 80242874 00031843 */ sra $v1, $v1, 1 -/* 911F28 80242878 00621821 */ addu $v1, $v1, $v0 -/* 911F2C 8024287C 08090A3B */ j .L802428EC -/* 911F30 80242880 A603008E */ sh $v1, 0x8e($s0) -.L80242884: -/* 911F34 80242884 24040002 */ addiu $a0, $zero, 2 -/* 911F38 80242888 0200282D */ daddu $a1, $s0, $zero -/* 911F3C 8024288C 0000302D */ daddu $a2, $zero, $zero -/* 911F40 80242890 860300A8 */ lh $v1, 0xa8($s0) -/* 911F44 80242894 3C013F80 */ lui $at, 0x3f80 -/* 911F48 80242898 44810000 */ mtc1 $at, $f0 -/* 911F4C 8024289C 3C014000 */ lui $at, 0x4000 -/* 911F50 802428A0 44811000 */ mtc1 $at, $f2 -/* 911F54 802428A4 3C01C1A0 */ lui $at, 0xc1a0 -/* 911F58 802428A8 44812000 */ mtc1 $at, $f4 -/* 911F5C 802428AC 2402000C */ addiu $v0, $zero, 0xc -/* 911F60 802428B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 911F64 802428B4 44833000 */ mtc1 $v1, $f6 -/* 911F68 802428B8 00000000 */ nop -/* 911F6C 802428BC 468031A0 */ cvt.s.w $f6, $f6 -/* 911F70 802428C0 44073000 */ mfc1 $a3, $f6 -/* 911F74 802428C4 27A20028 */ addiu $v0, $sp, 0x28 -/* 911F78 802428C8 AFA20020 */ sw $v0, 0x20($sp) -/* 911F7C 802428CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 911F80 802428D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 911F84 802428D4 0C01BFA4 */ jal fx_emote -/* 911F88 802428D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 911F8C 802428DC 2402000F */ addiu $v0, $zero, 0xf -/* 911F90 802428E0 A602008E */ sh $v0, 0x8e($s0) -/* 911F94 802428E4 24020028 */ addiu $v0, $zero, 0x28 -.L802428E8: -/* 911F98 802428E8 AE620070 */ sw $v0, 0x70($s3) -.L802428EC: -/* 911F9C 802428EC 8FBF0040 */ lw $ra, 0x40($sp) -/* 911FA0 802428F0 8FB3003C */ lw $s3, 0x3c($sp) -/* 911FA4 802428F4 8FB20038 */ lw $s2, 0x38($sp) -/* 911FA8 802428F8 8FB10034 */ lw $s1, 0x34($sp) -/* 911FAC 802428FC 8FB00030 */ lw $s0, 0x30($sp) -/* 911FB0 80242900 03E00008 */ jr $ra -/* 911FB4 80242904 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s deleted file mode 100644 index bb8ab9b738..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF8_9121A8 -/* 9121A8 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9121AC 80242AFC AFB3003C */ sw $s3, 0x3c($sp) -/* 9121B0 80242B00 0080982D */ daddu $s3, $a0, $zero -/* 9121B4 80242B04 AFBF0040 */ sw $ra, 0x40($sp) -/* 9121B8 80242B08 AFB20038 */ sw $s2, 0x38($sp) -/* 9121BC 80242B0C AFB10034 */ sw $s1, 0x34($sp) -/* 9121C0 80242B10 AFB00030 */ sw $s0, 0x30($sp) -/* 9121C4 80242B14 8E720148 */ lw $s2, 0x148($s3) -/* 9121C8 80242B18 0C00EABB */ jal get_npc_unsafe -/* 9121CC 80242B1C 86440008 */ lh $a0, 8($s2) -/* 9121D0 80242B20 0040802D */ daddu $s0, $v0, $zero -/* 9121D4 80242B24 0200202D */ daddu $a0, $s0, $zero -/* 9121D8 80242B28 0C00F598 */ jal func_8003D660 -/* 9121DC 80242B2C 24050001 */ addiu $a1, $zero, 1 -/* 9121E0 80242B30 8E050018 */ lw $a1, 0x18($s0) -/* 9121E4 80242B34 8E06000C */ lw $a2, 0xc($s0) -/* 9121E8 80242B38 0C00EA95 */ jal npc_move_heading -/* 9121EC 80242B3C 0200202D */ daddu $a0, $s0, $zero -/* 9121F0 80242B40 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9121F4 80242B44 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9121F8 80242B48 C462001C */ lwc1 $f2, 0x1c($v1) -/* 9121FC 80242B4C 468010A0 */ cvt.s.w $f2, $f2 -/* 912200 80242B50 C4640024 */ lwc1 $f4, 0x24($v1) -/* 912204 80242B54 46802120 */ cvt.s.w $f4, $f4 -/* 912208 80242B58 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91220C 80242B5C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912210 80242B60 44051000 */ mfc1 $a1, $f2 -/* 912214 80242B64 C4400028 */ lwc1 $f0, 0x28($v0) -/* 912218 80242B68 46800020 */ cvt.s.w $f0, $f0 -/* 91221C 80242B6C E7A00014 */ swc1 $f0, 0x14($sp) -/* 912220 80242B70 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912224 80242B74 44062000 */ mfc1 $a2, $f4 -/* 912228 80242B78 C440002C */ lwc1 $f0, 0x2c($v0) -/* 91222C 80242B7C 46800020 */ cvt.s.w $f0, $f0 -/* 912230 80242B80 E7A00018 */ swc1 $f0, 0x18($sp) -/* 912234 80242B84 8C640030 */ lw $a0, 0x30($v1) -/* 912238 80242B88 0C0123F5 */ jal is_point_within_region -/* 91223C 80242B8C 8E070038 */ lw $a3, 0x38($s0) -/* 912240 80242B90 C6000038 */ lwc1 $f0, 0x38($s0) -/* 912244 80242B94 C602003C */ lwc1 $f2, 0x3c($s0) -/* 912248 80242B98 C6040040 */ lwc1 $f4, 0x40($s0) -/* 91224C 80242B9C 3C013F80 */ lui $at, 0x3f80 -/* 912250 80242BA0 44813000 */ mtc1 $at, $f6 -/* 912254 80242BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 912258 80242BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 91225C 80242BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 912260 80242BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 912264 80242BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 912268 80242BB8 0002882B */ sltu $s1, $zero, $v0 -/* 91226C 80242BBC E7A00014 */ swc1 $f0, 0x14($sp) -/* 912270 80242BC0 860200A8 */ lh $v0, 0xa8($s0) -/* 912274 80242BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* 912278 80242BC8 44820000 */ mtc1 $v0, $f0 -/* 91227C 80242BCC 00000000 */ nop -/* 912280 80242BD0 46800020 */ cvt.s.w $f0, $f0 -/* 912284 80242BD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 912288 80242BD8 860200A6 */ lh $v0, 0xa6($s0) -/* 91228C 80242BDC 27A60024 */ addiu $a2, $sp, 0x24 -/* 912290 80242BE0 44820000 */ mtc1 $v0, $f0 -/* 912294 80242BE4 00000000 */ nop -/* 912298 80242BE8 46800020 */ cvt.s.w $f0, $f0 -/* 91229C 80242BEC E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9122A0 80242BF0 8E040080 */ lw $a0, 0x80($s0) -/* 9122A4 80242BF4 0C037711 */ jal func_800DDC44 -/* 9122A8 80242BF8 27A70028 */ addiu $a3, $sp, 0x28 -/* 9122AC 80242BFC 54400001 */ bnel $v0, $zero, .L80242C04 -/* 9122B0 80242C00 24110001 */ addiu $s1, $zero, 1 -.L80242C04: -/* 9122B4 80242C04 9602008E */ lhu $v0, 0x8e($s0) -/* 9122B8 80242C08 2442FFFF */ addiu $v0, $v0, -1 -/* 9122BC 80242C0C A602008E */ sh $v0, 0x8e($s0) -/* 9122C0 80242C10 00021400 */ sll $v0, $v0, 0x10 -/* 9122C4 80242C14 58400001 */ blezl $v0, .L80242C1C -/* 9122C8 80242C18 24110001 */ addiu $s1, $zero, 1 -.L80242C1C: -/* 9122CC 80242C1C 12200003 */ beqz $s1, .L80242C2C -/* 9122D0 80242C20 24020004 */ addiu $v0, $zero, 4 -/* 9122D4 80242C24 AE620070 */ sw $v0, 0x70($s3) -/* 9122D8 80242C28 A2400007 */ sb $zero, 7($s2) -.L80242C2C: -/* 9122DC 80242C2C 8FBF0040 */ lw $ra, 0x40($sp) -/* 9122E0 80242C30 8FB3003C */ lw $s3, 0x3c($sp) -/* 9122E4 80242C34 8FB20038 */ lw $s2, 0x38($sp) -/* 9122E8 80242C38 8FB10034 */ lw $s1, 0x34($sp) -/* 9122EC 80242C3C 8FB00030 */ lw $s0, 0x30($sp) -/* 9122F0 80242C40 03E00008 */ jr $ra -/* 9122F4 80242C44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s deleted file mode 100644 index 97ba90320d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CF4_9123A4 -/* 9123A4 80242CF4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9123A8 80242CF8 AFB30024 */ sw $s3, 0x24($sp) -/* 9123AC 80242CFC 0080982D */ daddu $s3, $a0, $zero -/* 9123B0 80242D00 AFBF0028 */ sw $ra, 0x28($sp) -/* 9123B4 80242D04 AFB20020 */ sw $s2, 0x20($sp) -/* 9123B8 80242D08 AFB1001C */ sw $s1, 0x1c($sp) -/* 9123BC 80242D0C AFB00018 */ sw $s0, 0x18($sp) -/* 9123C0 80242D10 8E720148 */ lw $s2, 0x148($s3) -/* 9123C4 80242D14 00A0882D */ daddu $s1, $a1, $zero -/* 9123C8 80242D18 86440008 */ lh $a0, 8($s2) -/* 9123CC 80242D1C 0C00EABB */ jal get_npc_unsafe -/* 9123D0 80242D20 00C0802D */ daddu $s0, $a2, $zero -/* 9123D4 80242D24 0200202D */ daddu $a0, $s0, $zero -/* 9123D8 80242D28 0240282D */ daddu $a1, $s2, $zero -/* 9123DC 80242D2C AFA00010 */ sw $zero, 0x10($sp) -/* 9123E0 80242D30 8E260024 */ lw $a2, 0x24($s1) -/* 9123E4 80242D34 8E270028 */ lw $a3, 0x28($s1) -/* 9123E8 80242D38 0C01242D */ jal func_800490B4 -/* 9123EC 80242D3C 0040802D */ daddu $s0, $v0, $zero -/* 9123F0 80242D40 1040000C */ beqz $v0, .L80242D74 -/* 9123F4 80242D44 00000000 */ nop -/* 9123F8 80242D48 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9123FC 80242D4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 912400 80242D50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 912404 80242D54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 912408 80242D58 8C460028 */ lw $a2, 0x28($v0) -/* 91240C 80242D5C 0C00A720 */ jal atan2 -/* 912410 80242D60 8C470030 */ lw $a3, 0x30($v0) -/* 912414 80242D64 2402000C */ addiu $v0, $zero, 0xc -/* 912418 80242D68 E600000C */ swc1 $f0, 0xc($s0) -/* 91241C 80242D6C 08090B84 */ j .L80242E10 -/* 912420 80242D70 AE620070 */ sw $v0, 0x70($s3) -.L80242D74: -/* 912424 80242D74 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912428 80242D78 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91242C 80242D7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 912430 80242D80 C4440000 */ lwc1 $f4, ($v0) -/* 912434 80242D84 46802120 */ cvt.s.w $f4, $f4 -/* 912438 80242D88 44062000 */ mfc1 $a2, $f4 -/* 91243C 80242D8C C4440008 */ lwc1 $f4, 8($v0) -/* 912440 80242D90 46802120 */ cvt.s.w $f4, $f4 -/* 912444 80242D94 44072000 */ mfc1 $a3, $f4 -/* 912448 80242D98 0C00A7B5 */ jal dist2D -/* 91244C 80242D9C 00000000 */ nop -/* 912450 80242DA0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 912454 80242DA4 4602003E */ c.le.s $f0, $f2 -/* 912458 80242DA8 00000000 */ nop -/* 91245C 80242DAC 45000005 */ bc1f .L80242DC4 -/* 912460 80242DB0 2402000A */ addiu $v0, $zero, 0xa -/* 912464 80242DB4 A602008E */ sh $v0, 0x8e($s0) -/* 912468 80242DB8 24020032 */ addiu $v0, $zero, 0x32 -/* 91246C 80242DBC 08090B84 */ j .L80242E10 -/* 912470 80242DC0 AE620070 */ sw $v0, 0x70($s3) -.L80242DC4: -/* 912474 80242DC4 8602008C */ lh $v0, 0x8c($s0) -/* 912478 80242DC8 14400011 */ bnez $v0, .L80242E10 -/* 91247C 80242DCC 00000000 */ nop -/* 912480 80242DD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912484 80242DD4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912488 80242DD8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91248C 80242DDC C4440000 */ lwc1 $f4, ($v0) -/* 912490 80242DE0 46802120 */ cvt.s.w $f4, $f4 -/* 912494 80242DE4 44062000 */ mfc1 $a2, $f4 -/* 912498 80242DE8 C4440008 */ lwc1 $f4, 8($v0) -/* 91249C 80242DEC 46802120 */ cvt.s.w $f4, $f4 -/* 9124A0 80242DF0 44072000 */ mfc1 $a3, $f4 -/* 9124A4 80242DF4 0C00A720 */ jal atan2 -/* 9124A8 80242DF8 00000000 */ nop -/* 9124AC 80242DFC 8E050018 */ lw $a1, 0x18($s0) -/* 9124B0 80242E00 44060000 */ mfc1 $a2, $f0 -/* 9124B4 80242E04 0200202D */ daddu $a0, $s0, $zero -/* 9124B8 80242E08 0C00EA95 */ jal npc_move_heading -/* 9124BC 80242E0C AC86000C */ sw $a2, 0xc($a0) -.L80242E10: -/* 9124C0 80242E10 8FBF0028 */ lw $ra, 0x28($sp) -/* 9124C4 80242E14 8FB30024 */ lw $s3, 0x24($sp) -/* 9124C8 80242E18 8FB20020 */ lw $s2, 0x20($sp) -/* 9124CC 80242E1C 8FB1001C */ lw $s1, 0x1c($sp) -/* 9124D0 80242E20 8FB00018 */ lw $s0, 0x18($sp) -/* 9124D4 80242E24 03E00008 */ jr $ra -/* 9124D8 80242E28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s index d5a1a9ac19..74b3051a6d 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s @@ -140,7 +140,7 @@ glabel L80243138_9127E8 glabel L80243148_9127F8 /* 9127F8 80243148 0260202D */ daddu $a0, $s3, $zero /* 9127FC 8024314C 0280282D */ daddu $a1, $s4, $zero -/* 912800 80243150 0C0909E5 */ jal func_80242794_911E44 +/* 912800 80243150 0C0909E5 */ jal iwa_01_UnkFunc8 /* 912804 80243154 0200302D */ daddu $a2, $s0, $zero /* 912808 80243158 08090CA0 */ j .L80243280 /* 91280C 8024315C 0000102D */ daddu $v0, $zero, $zero @@ -187,7 +187,7 @@ glabel L802431D4_912884 glabel L802431EC_91289C /* 91289C 802431EC 0260202D */ daddu $a0, $s3, $zero /* 9128A0 802431F0 0280282D */ daddu $a1, $s4, $zero -/* 9128A4 802431F4 0C090ABE */ jal func_80242AF8_9121A8 +/* 9128A4 802431F4 0C090ABE */ jal iwa_01_UnkFunc10 /* 9128A8 802431F8 0200302D */ daddu $a2, $s0, $zero /* 9128AC 802431FC 08090CA0 */ j .L80243280 /* 9128B0 80243200 0000102D */ daddu $v0, $zero, $zero @@ -203,7 +203,7 @@ glabel L80243204_9128B4 glabel L80243224_9128D4 /* 9128D4 80243224 0260202D */ daddu $a0, $s3, $zero /* 9128D8 80243228 0280282D */ daddu $a1, $s4, $zero -/* 9128DC 8024322C 0C090B3D */ jal func_80242CF4_9123A4 +/* 9128DC 8024322C 0C090B3D */ jal iwa_01_UnkFunc9 /* 9128E0 80243230 0200302D */ daddu $a2, $s0, $zero /* 9128E4 80243234 08090CA0 */ j .L80243280 /* 9128E8 80243238 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s deleted file mode 100644 index 9db64e6d4e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0_916240 -/* 916240 802404D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 916244 802404D4 AFB3003C */ sw $s3, 0x3c($sp) -/* 916248 802404D8 0080982D */ daddu $s3, $a0, $zero -/* 91624C 802404DC AFBF0040 */ sw $ra, 0x40($sp) -/* 916250 802404E0 AFB20038 */ sw $s2, 0x38($sp) -/* 916254 802404E4 AFB10034 */ sw $s1, 0x34($sp) -/* 916258 802404E8 AFB00030 */ sw $s0, 0x30($sp) -/* 91625C 802404EC 8E700148 */ lw $s0, 0x148($s3) -/* 916260 802404F0 00A0902D */ daddu $s2, $a1, $zero -/* 916264 802404F4 86040008 */ lh $a0, 8($s0) -/* 916268 802404F8 0C00EABB */ jal get_npc_unsafe -/* 91626C 802404FC 00C0882D */ daddu $s1, $a2, $zero -/* 916270 80240500 0220202D */ daddu $a0, $s1, $zero -/* 916274 80240504 0200282D */ daddu $a1, $s0, $zero -/* 916278 80240508 AFA00010 */ sw $zero, 0x10($sp) -/* 91627C 8024050C 8E460024 */ lw $a2, 0x24($s2) -/* 916280 80240510 8E470028 */ lw $a3, 0x28($s2) -/* 916284 80240514 0C01242D */ jal func_800490B4 -/* 916288 80240518 0040802D */ daddu $s0, $v0, $zero -/* 91628C 8024051C 1040000B */ beqz $v0, .L8024054C -/* 916290 80240520 00000000 */ nop -/* 916294 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 916298 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91629C 8024052C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9162A0 80240530 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9162A4 80240534 8C460028 */ lw $a2, 0x28($v0) -/* 9162A8 80240538 0C00A720 */ jal atan2 -/* 9162AC 8024053C 8C470030 */ lw $a3, 0x30($v0) -/* 9162B0 80240540 2402000C */ addiu $v0, $zero, 0xc -/* 9162B4 80240544 08090189 */ j .L80240624 -/* 9162B8 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* 9162BC 8024054C 9602008E */ lhu $v0, 0x8e($s0) -/* 9162C0 80240550 2442FFFF */ addiu $v0, $v0, -1 -/* 9162C4 80240554 A602008E */ sh $v0, 0x8e($s0) -/* 9162C8 80240558 00021400 */ sll $v0, $v0, 0x10 -/* 9162CC 8024055C 1C400032 */ bgtz $v0, .L80240628 -/* 9162D0 80240560 00000000 */ nop -/* 9162D4 80240564 8E620074 */ lw $v0, 0x74($s3) -/* 9162D8 80240568 2442FFFF */ addiu $v0, $v0, -1 -/* 9162DC 8024056C 18400014 */ blez $v0, .L802405C0 -/* 9162E0 80240570 AE620074 */ sw $v0, 0x74($s3) -/* 9162E4 80240574 C600000C */ lwc1 $f0, 0xc($s0) -/* 9162E8 80240578 3C014334 */ lui $at, 0x4334 -/* 9162EC 8024057C 44816000 */ mtc1 $at, $f12 -/* 9162F0 80240580 0C00A6C9 */ jal clamp_angle -/* 9162F4 80240584 460C0300 */ add.s $f12, $f0, $f12 -/* 9162F8 80240588 E600000C */ swc1 $f0, 0xc($s0) -/* 9162FC 8024058C 8E440008 */ lw $a0, 8($s2) -/* 916300 80240590 000417C2 */ srl $v0, $a0, 0x1f -/* 916304 80240594 00822021 */ addu $a0, $a0, $v0 -/* 916308 80240598 00042043 */ sra $a0, $a0, 1 -/* 91630C 8024059C 0C00A67F */ jal rand_int -/* 916310 802405A0 24840001 */ addiu $a0, $a0, 1 -/* 916314 802405A4 8E430008 */ lw $v1, 8($s2) -/* 916318 802405A8 000327C2 */ srl $a0, $v1, 0x1f -/* 91631C 802405AC 00641821 */ addu $v1, $v1, $a0 -/* 916320 802405B0 00031843 */ sra $v1, $v1, 1 -/* 916324 802405B4 00621821 */ addu $v1, $v1, $v0 -/* 916328 802405B8 0809018A */ j .L80240628 -/* 91632C 802405BC A603008E */ sh $v1, 0x8e($s0) -.L802405C0: -/* 916330 802405C0 24040002 */ addiu $a0, $zero, 2 -/* 916334 802405C4 0200282D */ daddu $a1, $s0, $zero -/* 916338 802405C8 0000302D */ daddu $a2, $zero, $zero -/* 91633C 802405CC 860300A8 */ lh $v1, 0xa8($s0) -/* 916340 802405D0 3C013F80 */ lui $at, 0x3f80 -/* 916344 802405D4 44810000 */ mtc1 $at, $f0 -/* 916348 802405D8 3C014000 */ lui $at, 0x4000 -/* 91634C 802405DC 44811000 */ mtc1 $at, $f2 -/* 916350 802405E0 3C01C1A0 */ lui $at, 0xc1a0 -/* 916354 802405E4 44812000 */ mtc1 $at, $f4 -/* 916358 802405E8 2402000C */ addiu $v0, $zero, 0xc -/* 91635C 802405EC AFA2001C */ sw $v0, 0x1c($sp) -/* 916360 802405F0 44833000 */ mtc1 $v1, $f6 -/* 916364 802405F4 00000000 */ nop -/* 916368 802405F8 468031A0 */ cvt.s.w $f6, $f6 -/* 91636C 802405FC 44073000 */ mfc1 $a3, $f6 -/* 916370 80240600 27A20028 */ addiu $v0, $sp, 0x28 -/* 916374 80240604 AFA20020 */ sw $v0, 0x20($sp) -/* 916378 80240608 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91637C 8024060C E7A20014 */ swc1 $f2, 0x14($sp) -/* 916380 80240610 0C01BFA4 */ jal fx_emote -/* 916384 80240614 E7A40018 */ swc1 $f4, 0x18($sp) -/* 916388 80240618 2402000F */ addiu $v0, $zero, 0xf -/* 91638C 8024061C A602008E */ sh $v0, 0x8e($s0) -/* 916390 80240620 24020028 */ addiu $v0, $zero, 0x28 -.L80240624: -/* 916394 80240624 AE620070 */ sw $v0, 0x70($s3) -.L80240628: -/* 916398 80240628 8FBF0040 */ lw $ra, 0x40($sp) -/* 91639C 8024062C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9163A0 80240630 8FB20038 */ lw $s2, 0x38($sp) -/* 9163A4 80240634 8FB10034 */ lw $s1, 0x34($sp) -/* 9163A8 80240638 8FB00030 */ lw $s0, 0x30($sp) -/* 9163AC 8024063C 03E00008 */ jr $ra -/* 9163B0 80240640 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s deleted file mode 100644 index 7bc20ae35a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240834_9165A4 -/* 9165A4 80240834 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9165A8 80240838 AFB3003C */ sw $s3, 0x3c($sp) -/* 9165AC 8024083C 0080982D */ daddu $s3, $a0, $zero -/* 9165B0 80240840 AFBF0040 */ sw $ra, 0x40($sp) -/* 9165B4 80240844 AFB20038 */ sw $s2, 0x38($sp) -/* 9165B8 80240848 AFB10034 */ sw $s1, 0x34($sp) -/* 9165BC 8024084C AFB00030 */ sw $s0, 0x30($sp) -/* 9165C0 80240850 8E720148 */ lw $s2, 0x148($s3) -/* 9165C4 80240854 0C00EABB */ jal get_npc_unsafe -/* 9165C8 80240858 86440008 */ lh $a0, 8($s2) -/* 9165CC 8024085C 0040802D */ daddu $s0, $v0, $zero -/* 9165D0 80240860 0200202D */ daddu $a0, $s0, $zero -/* 9165D4 80240864 0C00F598 */ jal func_8003D660 -/* 9165D8 80240868 24050001 */ addiu $a1, $zero, 1 -/* 9165DC 8024086C 8E050018 */ lw $a1, 0x18($s0) -/* 9165E0 80240870 8E06000C */ lw $a2, 0xc($s0) -/* 9165E4 80240874 0C00EA95 */ jal npc_move_heading -/* 9165E8 80240878 0200202D */ daddu $a0, $s0, $zero -/* 9165EC 8024087C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9165F0 80240880 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9165F4 80240884 C462001C */ lwc1 $f2, 0x1c($v1) -/* 9165F8 80240888 468010A0 */ cvt.s.w $f2, $f2 -/* 9165FC 8024088C C4640024 */ lwc1 $f4, 0x24($v1) -/* 916600 80240890 46802120 */ cvt.s.w $f4, $f4 -/* 916604 80240894 E7A00010 */ swc1 $f0, 0x10($sp) -/* 916608 80240898 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91660C 8024089C 44051000 */ mfc1 $a1, $f2 -/* 916610 802408A0 C4400028 */ lwc1 $f0, 0x28($v0) -/* 916614 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* 916618 802408A8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91661C 802408AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916620 802408B0 44062000 */ mfc1 $a2, $f4 -/* 916624 802408B4 C440002C */ lwc1 $f0, 0x2c($v0) -/* 916628 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* 91662C 802408BC E7A00018 */ swc1 $f0, 0x18($sp) -/* 916630 802408C0 8C640030 */ lw $a0, 0x30($v1) -/* 916634 802408C4 0C0123F5 */ jal is_point_within_region -/* 916638 802408C8 8E070038 */ lw $a3, 0x38($s0) -/* 91663C 802408CC C6000038 */ lwc1 $f0, 0x38($s0) -/* 916640 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 916644 802408D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 916648 802408D8 3C013F80 */ lui $at, 0x3f80 -/* 91664C 802408DC 44813000 */ mtc1 $at, $f6 -/* 916650 802408E0 E7A00020 */ swc1 $f0, 0x20($sp) -/* 916654 802408E4 E7A20024 */ swc1 $f2, 0x24($sp) -/* 916658 802408E8 E7A40028 */ swc1 $f4, 0x28($sp) -/* 91665C 802408EC E7A60010 */ swc1 $f6, 0x10($sp) -/* 916660 802408F0 C600000C */ lwc1 $f0, 0xc($s0) -/* 916664 802408F4 0002882B */ sltu $s1, $zero, $v0 -/* 916668 802408F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91666C 802408FC 860200A8 */ lh $v0, 0xa8($s0) -/* 916670 80240900 27A50020 */ addiu $a1, $sp, 0x20 -/* 916674 80240904 44820000 */ mtc1 $v0, $f0 -/* 916678 80240908 00000000 */ nop -/* 91667C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 916680 80240910 E7A00018 */ swc1 $f0, 0x18($sp) -/* 916684 80240914 860200A6 */ lh $v0, 0xa6($s0) -/* 916688 80240918 27A60024 */ addiu $a2, $sp, 0x24 -/* 91668C 8024091C 44820000 */ mtc1 $v0, $f0 -/* 916690 80240920 00000000 */ nop -/* 916694 80240924 46800020 */ cvt.s.w $f0, $f0 -/* 916698 80240928 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 91669C 8024092C 8E040080 */ lw $a0, 0x80($s0) -/* 9166A0 80240930 0C037711 */ jal func_800DDC44 -/* 9166A4 80240934 27A70028 */ addiu $a3, $sp, 0x28 -/* 9166A8 80240938 54400001 */ bnel $v0, $zero, .L80240940 -/* 9166AC 8024093C 24110001 */ addiu $s1, $zero, 1 -.L80240940: -/* 9166B0 80240940 9602008E */ lhu $v0, 0x8e($s0) -/* 9166B4 80240944 2442FFFF */ addiu $v0, $v0, -1 -/* 9166B8 80240948 A602008E */ sh $v0, 0x8e($s0) -/* 9166BC 8024094C 00021400 */ sll $v0, $v0, 0x10 -/* 9166C0 80240950 58400001 */ blezl $v0, .L80240958 -/* 9166C4 80240954 24110001 */ addiu $s1, $zero, 1 -.L80240958: -/* 9166C8 80240958 12200003 */ beqz $s1, .L80240968 -/* 9166CC 8024095C 24020004 */ addiu $v0, $zero, 4 -/* 9166D0 80240960 AE620070 */ sw $v0, 0x70($s3) -/* 9166D4 80240964 A2400007 */ sb $zero, 7($s2) -.L80240968: -/* 9166D8 80240968 8FBF0040 */ lw $ra, 0x40($sp) -/* 9166DC 8024096C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9166E0 80240970 8FB20038 */ lw $s2, 0x38($sp) -/* 9166E4 80240974 8FB10034 */ lw $s1, 0x34($sp) -/* 9166E8 80240978 8FB00030 */ lw $s0, 0x30($sp) -/* 9166EC 8024097C 03E00008 */ jr $ra -/* 9166F0 80240980 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s deleted file mode 100644 index c922dfe796..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240A30_9167A0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A30_9167A0 -/* 9167A0 80240A30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9167A4 80240A34 AFB30024 */ sw $s3, 0x24($sp) -/* 9167A8 80240A38 0080982D */ daddu $s3, $a0, $zero -/* 9167AC 80240A3C AFBF0028 */ sw $ra, 0x28($sp) -/* 9167B0 80240A40 AFB20020 */ sw $s2, 0x20($sp) -/* 9167B4 80240A44 AFB1001C */ sw $s1, 0x1c($sp) -/* 9167B8 80240A48 AFB00018 */ sw $s0, 0x18($sp) -/* 9167BC 80240A4C 8E720148 */ lw $s2, 0x148($s3) -/* 9167C0 80240A50 00A0882D */ daddu $s1, $a1, $zero -/* 9167C4 80240A54 86440008 */ lh $a0, 8($s2) -/* 9167C8 80240A58 0C00EABB */ jal get_npc_unsafe -/* 9167CC 80240A5C 00C0802D */ daddu $s0, $a2, $zero -/* 9167D0 80240A60 0200202D */ daddu $a0, $s0, $zero -/* 9167D4 80240A64 0240282D */ daddu $a1, $s2, $zero -/* 9167D8 80240A68 AFA00010 */ sw $zero, 0x10($sp) -/* 9167DC 80240A6C 8E260024 */ lw $a2, 0x24($s1) -/* 9167E0 80240A70 8E270028 */ lw $a3, 0x28($s1) -/* 9167E4 80240A74 0C01242D */ jal func_800490B4 -/* 9167E8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* 9167EC 80240A7C 1040000C */ beqz $v0, .L80240AB0 -/* 9167F0 80240A80 00000000 */ nop -/* 9167F4 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9167F8 80240A88 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9167FC 80240A8C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 916800 80240A90 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 916804 80240A94 8C460028 */ lw $a2, 0x28($v0) -/* 916808 80240A98 0C00A720 */ jal atan2 -/* 91680C 80240A9C 8C470030 */ lw $a3, 0x30($v0) -/* 916810 80240AA0 2402000C */ addiu $v0, $zero, 0xc -/* 916814 80240AA4 E600000C */ swc1 $f0, 0xc($s0) -/* 916818 80240AA8 080902D3 */ j .L80240B4C -/* 91681C 80240AAC AE620070 */ sw $v0, 0x70($s3) -.L80240AB0: -/* 916820 80240AB0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916824 80240AB4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916828 80240AB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91682C 80240ABC C4440000 */ lwc1 $f4, ($v0) -/* 916830 80240AC0 46802120 */ cvt.s.w $f4, $f4 -/* 916834 80240AC4 44062000 */ mfc1 $a2, $f4 -/* 916838 80240AC8 C4440008 */ lwc1 $f4, 8($v0) -/* 91683C 80240ACC 46802120 */ cvt.s.w $f4, $f4 -/* 916840 80240AD0 44072000 */ mfc1 $a3, $f4 -/* 916844 80240AD4 0C00A7B5 */ jal dist2D -/* 916848 80240AD8 00000000 */ nop -/* 91684C 80240ADC C6020018 */ lwc1 $f2, 0x18($s0) -/* 916850 80240AE0 4602003E */ c.le.s $f0, $f2 -/* 916854 80240AE4 00000000 */ nop -/* 916858 80240AE8 45000005 */ bc1f .L80240B00 -/* 91685C 80240AEC 2402000A */ addiu $v0, $zero, 0xa -/* 916860 80240AF0 A602008E */ sh $v0, 0x8e($s0) -/* 916864 80240AF4 24020032 */ addiu $v0, $zero, 0x32 -/* 916868 80240AF8 080902D3 */ j .L80240B4C -/* 91686C 80240AFC AE620070 */ sw $v0, 0x70($s3) -.L80240B00: -/* 916870 80240B00 8602008C */ lh $v0, 0x8c($s0) -/* 916874 80240B04 14400011 */ bnez $v0, .L80240B4C -/* 916878 80240B08 00000000 */ nop -/* 91687C 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916880 80240B10 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916884 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 916888 80240B18 C4440000 */ lwc1 $f4, ($v0) -/* 91688C 80240B1C 46802120 */ cvt.s.w $f4, $f4 -/* 916890 80240B20 44062000 */ mfc1 $a2, $f4 -/* 916894 80240B24 C4440008 */ lwc1 $f4, 8($v0) -/* 916898 80240B28 46802120 */ cvt.s.w $f4, $f4 -/* 91689C 80240B2C 44072000 */ mfc1 $a3, $f4 -/* 9168A0 80240B30 0C00A720 */ jal atan2 -/* 9168A4 80240B34 00000000 */ nop -/* 9168A8 80240B38 8E050018 */ lw $a1, 0x18($s0) -/* 9168AC 80240B3C 44060000 */ mfc1 $a2, $f0 -/* 9168B0 80240B40 0200202D */ daddu $a0, $s0, $zero -/* 9168B4 80240B44 0C00EA95 */ jal npc_move_heading -/* 9168B8 80240B48 AC86000C */ sw $a2, 0xc($a0) -.L80240B4C: -/* 9168BC 80240B4C 8FBF0028 */ lw $ra, 0x28($sp) -/* 9168C0 80240B50 8FB30024 */ lw $s3, 0x24($sp) -/* 9168C4 80240B54 8FB20020 */ lw $s2, 0x20($sp) -/* 9168C8 80240B58 8FB1001C */ lw $s1, 0x1c($sp) -/* 9168CC 80240B5C 8FB00018 */ lw $s0, 0x18($sp) -/* 9168D0 80240B60 03E00008 */ jr $ra -/* 9168D4 80240B64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index 87dd05c62f..c959614c8c 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -140,7 +140,7 @@ glabel L80240E74_916BE4 glabel L80240E84_916BF4 /* 916BF4 80240E84 0260202D */ daddu $a0, $s3, $zero /* 916BF8 80240E88 0280282D */ daddu $a1, $s4, $zero -/* 916BFC 80240E8C 0C090134 */ jal func_802404D0_916240 +/* 916BFC 80240E8C 0C090134 */ jal iwa_02_UnkFunc8 /* 916C00 80240E90 0200302D */ daddu $a2, $s0, $zero /* 916C04 80240E94 080903EF */ j .L80240FBC /* 916C08 80240E98 0000102D */ daddu $v0, $zero, $zero @@ -187,7 +187,7 @@ glabel L80240F10_916C80 glabel L80240F28_916C98 /* 916C98 80240F28 0260202D */ daddu $a0, $s3, $zero /* 916C9C 80240F2C 0280282D */ daddu $a1, $s4, $zero -/* 916CA0 80240F30 0C09020D */ jal func_80240834_9165A4 +/* 916CA0 80240F30 0C09020D */ jal iwa_02_UnkFunc10 /* 916CA4 80240F34 0200302D */ daddu $a2, $s0, $zero /* 916CA8 80240F38 080903EF */ j .L80240FBC /* 916CAC 80240F3C 0000102D */ daddu $v0, $zero, $zero @@ -203,7 +203,7 @@ glabel L80240F40_916CB0 glabel L80240F60_916CD0 /* 916CD0 80240F60 0260202D */ daddu $a0, $s3, $zero /* 916CD4 80240F64 0280282D */ daddu $a1, $s4, $zero -/* 916CD8 80240F68 0C09028C */ jal func_80240A30_9167A0 +/* 916CD8 80240F68 0C09028C */ jal iwa_02_UnkFunc9 /* 916CDC 80240F6C 0200302D */ daddu $a2, $s0, $zero /* 916CE0 80240F70 080903EF */ j .L80240FBC /* 916CE4 80240F74 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s deleted file mode 100644 index e0a1417a1a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240810_9193C0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810_9193C0 -/* 9193C0 80240810 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9193C4 80240814 AFB3003C */ sw $s3, 0x3c($sp) -/* 9193C8 80240818 0080982D */ daddu $s3, $a0, $zero -/* 9193CC 8024081C AFBF0040 */ sw $ra, 0x40($sp) -/* 9193D0 80240820 AFB20038 */ sw $s2, 0x38($sp) -/* 9193D4 80240824 AFB10034 */ sw $s1, 0x34($sp) -/* 9193D8 80240828 AFB00030 */ sw $s0, 0x30($sp) -/* 9193DC 8024082C 8E700148 */ lw $s0, 0x148($s3) -/* 9193E0 80240830 00A0902D */ daddu $s2, $a1, $zero -/* 9193E4 80240834 86040008 */ lh $a0, 8($s0) -/* 9193E8 80240838 0C00EABB */ jal get_npc_unsafe -/* 9193EC 8024083C 00C0882D */ daddu $s1, $a2, $zero -/* 9193F0 80240840 0220202D */ daddu $a0, $s1, $zero -/* 9193F4 80240844 0200282D */ daddu $a1, $s0, $zero -/* 9193F8 80240848 AFA00010 */ sw $zero, 0x10($sp) -/* 9193FC 8024084C 8E460024 */ lw $a2, 0x24($s2) -/* 919400 80240850 8E470028 */ lw $a3, 0x28($s2) -/* 919404 80240854 0C01242D */ jal func_800490B4 -/* 919408 80240858 0040802D */ daddu $s0, $v0, $zero -/* 91940C 8024085C 1040000B */ beqz $v0, .L8024088C -/* 919410 80240860 00000000 */ nop -/* 919414 80240864 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 919418 80240868 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91941C 8024086C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919420 80240870 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919424 80240874 8C460028 */ lw $a2, 0x28($v0) -/* 919428 80240878 0C00A720 */ jal atan2 -/* 91942C 8024087C 8C470030 */ lw $a3, 0x30($v0) -/* 919430 80240880 2402000C */ addiu $v0, $zero, 0xc -/* 919434 80240884 08090259 */ j .L80240964 -/* 919438 80240888 E600000C */ swc1 $f0, 0xc($s0) -.L8024088C: -/* 91943C 8024088C 9602008E */ lhu $v0, 0x8e($s0) -/* 919440 80240890 2442FFFF */ addiu $v0, $v0, -1 -/* 919444 80240894 A602008E */ sh $v0, 0x8e($s0) -/* 919448 80240898 00021400 */ sll $v0, $v0, 0x10 -/* 91944C 8024089C 1C400032 */ bgtz $v0, .L80240968 -/* 919450 802408A0 00000000 */ nop -/* 919454 802408A4 8E620074 */ lw $v0, 0x74($s3) -/* 919458 802408A8 2442FFFF */ addiu $v0, $v0, -1 -/* 91945C 802408AC 18400014 */ blez $v0, .L80240900 -/* 919460 802408B0 AE620074 */ sw $v0, 0x74($s3) -/* 919464 802408B4 C600000C */ lwc1 $f0, 0xc($s0) -/* 919468 802408B8 3C014334 */ lui $at, 0x4334 -/* 91946C 802408BC 44816000 */ mtc1 $at, $f12 -/* 919470 802408C0 0C00A6C9 */ jal clamp_angle -/* 919474 802408C4 460C0300 */ add.s $f12, $f0, $f12 -/* 919478 802408C8 E600000C */ swc1 $f0, 0xc($s0) -/* 91947C 802408CC 8E440008 */ lw $a0, 8($s2) -/* 919480 802408D0 000417C2 */ srl $v0, $a0, 0x1f -/* 919484 802408D4 00822021 */ addu $a0, $a0, $v0 -/* 919488 802408D8 00042043 */ sra $a0, $a0, 1 -/* 91948C 802408DC 0C00A67F */ jal rand_int -/* 919490 802408E0 24840001 */ addiu $a0, $a0, 1 -/* 919494 802408E4 8E430008 */ lw $v1, 8($s2) -/* 919498 802408E8 000327C2 */ srl $a0, $v1, 0x1f -/* 91949C 802408EC 00641821 */ addu $v1, $v1, $a0 -/* 9194A0 802408F0 00031843 */ sra $v1, $v1, 1 -/* 9194A4 802408F4 00621821 */ addu $v1, $v1, $v0 -/* 9194A8 802408F8 0809025A */ j .L80240968 -/* 9194AC 802408FC A603008E */ sh $v1, 0x8e($s0) -.L80240900: -/* 9194B0 80240900 24040002 */ addiu $a0, $zero, 2 -/* 9194B4 80240904 0200282D */ daddu $a1, $s0, $zero -/* 9194B8 80240908 0000302D */ daddu $a2, $zero, $zero -/* 9194BC 8024090C 860300A8 */ lh $v1, 0xa8($s0) -/* 9194C0 80240910 3C013F80 */ lui $at, 0x3f80 -/* 9194C4 80240914 44810000 */ mtc1 $at, $f0 -/* 9194C8 80240918 3C014000 */ lui $at, 0x4000 -/* 9194CC 8024091C 44811000 */ mtc1 $at, $f2 -/* 9194D0 80240920 3C01C1A0 */ lui $at, 0xc1a0 -/* 9194D4 80240924 44812000 */ mtc1 $at, $f4 -/* 9194D8 80240928 2402000C */ addiu $v0, $zero, 0xc -/* 9194DC 8024092C AFA2001C */ sw $v0, 0x1c($sp) -/* 9194E0 80240930 44833000 */ mtc1 $v1, $f6 -/* 9194E4 80240934 00000000 */ nop -/* 9194E8 80240938 468031A0 */ cvt.s.w $f6, $f6 -/* 9194EC 8024093C 44073000 */ mfc1 $a3, $f6 -/* 9194F0 80240940 27A20028 */ addiu $v0, $sp, 0x28 -/* 9194F4 80240944 AFA20020 */ sw $v0, 0x20($sp) -/* 9194F8 80240948 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9194FC 8024094C E7A20014 */ swc1 $f2, 0x14($sp) -/* 919500 80240950 0C01BFA4 */ jal fx_emote -/* 919504 80240954 E7A40018 */ swc1 $f4, 0x18($sp) -/* 919508 80240958 2402000F */ addiu $v0, $zero, 0xf -/* 91950C 8024095C A602008E */ sh $v0, 0x8e($s0) -/* 919510 80240960 24020028 */ addiu $v0, $zero, 0x28 -.L80240964: -/* 919514 80240964 AE620070 */ sw $v0, 0x70($s3) -.L80240968: -/* 919518 80240968 8FBF0040 */ lw $ra, 0x40($sp) -/* 91951C 8024096C 8FB3003C */ lw $s3, 0x3c($sp) -/* 919520 80240970 8FB20038 */ lw $s2, 0x38($sp) -/* 919524 80240974 8FB10034 */ lw $s1, 0x34($sp) -/* 919528 80240978 8FB00030 */ lw $s0, 0x30($sp) -/* 91952C 8024097C 03E00008 */ jr $ra -/* 919530 80240980 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s deleted file mode 100644 index c4a216a8eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B74_919724 -/* 919724 80240B74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 919728 80240B78 AFB3003C */ sw $s3, 0x3c($sp) -/* 91972C 80240B7C 0080982D */ daddu $s3, $a0, $zero -/* 919730 80240B80 AFBF0040 */ sw $ra, 0x40($sp) -/* 919734 80240B84 AFB20038 */ sw $s2, 0x38($sp) -/* 919738 80240B88 AFB10034 */ sw $s1, 0x34($sp) -/* 91973C 80240B8C AFB00030 */ sw $s0, 0x30($sp) -/* 919740 80240B90 8E720148 */ lw $s2, 0x148($s3) -/* 919744 80240B94 0C00EABB */ jal get_npc_unsafe -/* 919748 80240B98 86440008 */ lh $a0, 8($s2) -/* 91974C 80240B9C 0040802D */ daddu $s0, $v0, $zero -/* 919750 80240BA0 0200202D */ daddu $a0, $s0, $zero -/* 919754 80240BA4 0C00F598 */ jal func_8003D660 -/* 919758 80240BA8 24050001 */ addiu $a1, $zero, 1 -/* 91975C 80240BAC 8E050018 */ lw $a1, 0x18($s0) -/* 919760 80240BB0 8E06000C */ lw $a2, 0xc($s0) -/* 919764 80240BB4 0C00EA95 */ jal npc_move_heading -/* 919768 80240BB8 0200202D */ daddu $a0, $s0, $zero -/* 91976C 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 919770 80240BC0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 919774 80240BC4 C462001C */ lwc1 $f2, 0x1c($v1) -/* 919778 80240BC8 468010A0 */ cvt.s.w $f2, $f2 -/* 91977C 80240BCC C4640024 */ lwc1 $f4, 0x24($v1) -/* 919780 80240BD0 46802120 */ cvt.s.w $f4, $f4 -/* 919784 80240BD4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 919788 80240BD8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91978C 80240BDC 44051000 */ mfc1 $a1, $f2 -/* 919790 80240BE0 C4400028 */ lwc1 $f0, 0x28($v0) -/* 919794 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 919798 80240BE8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91979C 80240BEC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9197A0 80240BF0 44062000 */ mfc1 $a2, $f4 -/* 9197A4 80240BF4 C440002C */ lwc1 $f0, 0x2c($v0) -/* 9197A8 80240BF8 46800020 */ cvt.s.w $f0, $f0 -/* 9197AC 80240BFC E7A00018 */ swc1 $f0, 0x18($sp) -/* 9197B0 80240C00 8C640030 */ lw $a0, 0x30($v1) -/* 9197B4 80240C04 0C0123F5 */ jal is_point_within_region -/* 9197B8 80240C08 8E070038 */ lw $a3, 0x38($s0) -/* 9197BC 80240C0C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9197C0 80240C10 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9197C4 80240C14 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9197C8 80240C18 3C013F80 */ lui $at, 0x3f80 -/* 9197CC 80240C1C 44813000 */ mtc1 $at, $f6 -/* 9197D0 80240C20 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9197D4 80240C24 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9197D8 80240C28 E7A40028 */ swc1 $f4, 0x28($sp) -/* 9197DC 80240C2C E7A60010 */ swc1 $f6, 0x10($sp) -/* 9197E0 80240C30 C600000C */ lwc1 $f0, 0xc($s0) -/* 9197E4 80240C34 0002882B */ sltu $s1, $zero, $v0 -/* 9197E8 80240C38 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9197EC 80240C3C 860200A8 */ lh $v0, 0xa8($s0) -/* 9197F0 80240C40 27A50020 */ addiu $a1, $sp, 0x20 -/* 9197F4 80240C44 44820000 */ mtc1 $v0, $f0 -/* 9197F8 80240C48 00000000 */ nop -/* 9197FC 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* 919800 80240C50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 919804 80240C54 860200A6 */ lh $v0, 0xa6($s0) -/* 919808 80240C58 27A60024 */ addiu $a2, $sp, 0x24 -/* 91980C 80240C5C 44820000 */ mtc1 $v0, $f0 -/* 919810 80240C60 00000000 */ nop -/* 919814 80240C64 46800020 */ cvt.s.w $f0, $f0 -/* 919818 80240C68 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 91981C 80240C6C 8E040080 */ lw $a0, 0x80($s0) -/* 919820 80240C70 0C037711 */ jal func_800DDC44 -/* 919824 80240C74 27A70028 */ addiu $a3, $sp, 0x28 -/* 919828 80240C78 54400001 */ bnel $v0, $zero, .L80240C80 -/* 91982C 80240C7C 24110001 */ addiu $s1, $zero, 1 -.L80240C80: -/* 919830 80240C80 9602008E */ lhu $v0, 0x8e($s0) -/* 919834 80240C84 2442FFFF */ addiu $v0, $v0, -1 -/* 919838 80240C88 A602008E */ sh $v0, 0x8e($s0) -/* 91983C 80240C8C 00021400 */ sll $v0, $v0, 0x10 -/* 919840 80240C90 58400001 */ blezl $v0, .L80240C98 -/* 919844 80240C94 24110001 */ addiu $s1, $zero, 1 -.L80240C98: -/* 919848 80240C98 12200003 */ beqz $s1, .L80240CA8 -/* 91984C 80240C9C 24020004 */ addiu $v0, $zero, 4 -/* 919850 80240CA0 AE620070 */ sw $v0, 0x70($s3) -/* 919854 80240CA4 A2400007 */ sb $zero, 7($s2) -.L80240CA8: -/* 919858 80240CA8 8FBF0040 */ lw $ra, 0x40($sp) -/* 91985C 80240CAC 8FB3003C */ lw $s3, 0x3c($sp) -/* 919860 80240CB0 8FB20038 */ lw $s2, 0x38($sp) -/* 919864 80240CB4 8FB10034 */ lw $s1, 0x34($sp) -/* 919868 80240CB8 8FB00030 */ lw $s0, 0x30($sp) -/* 91986C 80240CBC 03E00008 */ jr $ra -/* 919870 80240CC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s deleted file mode 100644 index c5a57d6a72..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240D70_919920.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D70_919920 -/* 919920 80240D70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 919924 80240D74 AFB30024 */ sw $s3, 0x24($sp) -/* 919928 80240D78 0080982D */ daddu $s3, $a0, $zero -/* 91992C 80240D7C AFBF0028 */ sw $ra, 0x28($sp) -/* 919930 80240D80 AFB20020 */ sw $s2, 0x20($sp) -/* 919934 80240D84 AFB1001C */ sw $s1, 0x1c($sp) -/* 919938 80240D88 AFB00018 */ sw $s0, 0x18($sp) -/* 91993C 80240D8C 8E720148 */ lw $s2, 0x148($s3) -/* 919940 80240D90 00A0882D */ daddu $s1, $a1, $zero -/* 919944 80240D94 86440008 */ lh $a0, 8($s2) -/* 919948 80240D98 0C00EABB */ jal get_npc_unsafe -/* 91994C 80240D9C 00C0802D */ daddu $s0, $a2, $zero -/* 919950 80240DA0 0200202D */ daddu $a0, $s0, $zero -/* 919954 80240DA4 0240282D */ daddu $a1, $s2, $zero -/* 919958 80240DA8 AFA00010 */ sw $zero, 0x10($sp) -/* 91995C 80240DAC 8E260024 */ lw $a2, 0x24($s1) -/* 919960 80240DB0 8E270028 */ lw $a3, 0x28($s1) -/* 919964 80240DB4 0C01242D */ jal func_800490B4 -/* 919968 80240DB8 0040802D */ daddu $s0, $v0, $zero -/* 91996C 80240DBC 1040000C */ beqz $v0, .L80240DF0 -/* 919970 80240DC0 00000000 */ nop -/* 919974 80240DC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919978 80240DC8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91997C 80240DCC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 919980 80240DD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919984 80240DD4 8C460028 */ lw $a2, 0x28($v0) -/* 919988 80240DD8 0C00A720 */ jal atan2 -/* 91998C 80240DDC 8C470030 */ lw $a3, 0x30($v0) -/* 919990 80240DE0 2402000C */ addiu $v0, $zero, 0xc -/* 919994 80240DE4 E600000C */ swc1 $f0, 0xc($s0) -/* 919998 80240DE8 080903A3 */ j .L80240E8C -/* 91999C 80240DEC AE620070 */ sw $v0, 0x70($s3) -.L80240DF0: -/* 9199A0 80240DF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9199A4 80240DF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9199A8 80240DF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9199AC 80240DFC C4440000 */ lwc1 $f4, ($v0) -/* 9199B0 80240E00 46802120 */ cvt.s.w $f4, $f4 -/* 9199B4 80240E04 44062000 */ mfc1 $a2, $f4 -/* 9199B8 80240E08 C4440008 */ lwc1 $f4, 8($v0) -/* 9199BC 80240E0C 46802120 */ cvt.s.w $f4, $f4 -/* 9199C0 80240E10 44072000 */ mfc1 $a3, $f4 -/* 9199C4 80240E14 0C00A7B5 */ jal dist2D -/* 9199C8 80240E18 00000000 */ nop -/* 9199CC 80240E1C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9199D0 80240E20 4602003E */ c.le.s $f0, $f2 -/* 9199D4 80240E24 00000000 */ nop -/* 9199D8 80240E28 45000005 */ bc1f .L80240E40 -/* 9199DC 80240E2C 2402000A */ addiu $v0, $zero, 0xa -/* 9199E0 80240E30 A602008E */ sh $v0, 0x8e($s0) -/* 9199E4 80240E34 24020032 */ addiu $v0, $zero, 0x32 -/* 9199E8 80240E38 080903A3 */ j .L80240E8C -/* 9199EC 80240E3C AE620070 */ sw $v0, 0x70($s3) -.L80240E40: -/* 9199F0 80240E40 8602008C */ lh $v0, 0x8c($s0) -/* 9199F4 80240E44 14400011 */ bnez $v0, .L80240E8C -/* 9199F8 80240E48 00000000 */ nop -/* 9199FC 80240E4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 919A00 80240E50 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919A04 80240E54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 919A08 80240E58 C4440000 */ lwc1 $f4, ($v0) -/* 919A0C 80240E5C 46802120 */ cvt.s.w $f4, $f4 -/* 919A10 80240E60 44062000 */ mfc1 $a2, $f4 -/* 919A14 80240E64 C4440008 */ lwc1 $f4, 8($v0) -/* 919A18 80240E68 46802120 */ cvt.s.w $f4, $f4 -/* 919A1C 80240E6C 44072000 */ mfc1 $a3, $f4 -/* 919A20 80240E70 0C00A720 */ jal atan2 -/* 919A24 80240E74 00000000 */ nop -/* 919A28 80240E78 8E050018 */ lw $a1, 0x18($s0) -/* 919A2C 80240E7C 44060000 */ mfc1 $a2, $f0 -/* 919A30 80240E80 0200202D */ daddu $a0, $s0, $zero -/* 919A34 80240E84 0C00EA95 */ jal npc_move_heading -/* 919A38 80240E88 AC86000C */ sw $a2, 0xc($a0) -.L80240E8C: -/* 919A3C 80240E8C 8FBF0028 */ lw $ra, 0x28($sp) -/* 919A40 80240E90 8FB30024 */ lw $s3, 0x24($sp) -/* 919A44 80240E94 8FB20020 */ lw $s2, 0x20($sp) -/* 919A48 80240E98 8FB1001C */ lw $s1, 0x1c($sp) -/* 919A4C 80240E9C 8FB00018 */ lw $s0, 0x18($sp) -/* 919A50 80240EA0 03E00008 */ jr $ra -/* 919A54 80240EA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index 10a35212d4..51d124c73c 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -140,7 +140,7 @@ glabel L802411B4_919D64 glabel L802411C4_919D74 /* 919D74 802411C4 0260202D */ daddu $a0, $s3, $zero /* 919D78 802411C8 0280282D */ daddu $a1, $s4, $zero -/* 919D7C 802411CC 0C090204 */ jal func_80240810_9193C0 +/* 919D7C 802411CC 0C090204 */ jal iwa_03_UnkFunc8 /* 919D80 802411D0 0200302D */ daddu $a2, $s0, $zero /* 919D84 802411D4 080904BF */ j .L802412FC /* 919D88 802411D8 0000102D */ daddu $v0, $zero, $zero @@ -187,7 +187,7 @@ glabel L80241250_919E00 glabel L80241268_919E18 /* 919E18 80241268 0260202D */ daddu $a0, $s3, $zero /* 919E1C 8024126C 0280282D */ daddu $a1, $s4, $zero -/* 919E20 80241270 0C0902DD */ jal func_80240B74_919724 +/* 919E20 80241270 0C0902DD */ jal iwa_03_UnkFunc10 /* 919E24 80241274 0200302D */ daddu $a2, $s0, $zero /* 919E28 80241278 080904BF */ j .L802412FC /* 919E2C 8024127C 0000102D */ daddu $v0, $zero, $zero @@ -203,7 +203,7 @@ glabel L80241280_919E30 glabel L802412A0_919E50 /* 919E50 802412A0 0260202D */ daddu $a0, $s3, $zero /* 919E54 802412A4 0280282D */ daddu $a1, $s4, $zero -/* 919E58 802412A8 0C09035C */ jal func_80240D70_919920 +/* 919E58 802412A8 0C09035C */ jal iwa_03_UnkFunc9 /* 919E5C 802412AC 0200302D */ daddu $a2, $s0, $zero /* 919E60 802412B0 080904BF */ j .L802412FC /* 919E64 802412B4 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s deleted file mode 100644 index 0edabc85b7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550_91BE30 -/* 91BE30 80240550 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91BE34 80240554 AFB3003C */ sw $s3, 0x3c($sp) -/* 91BE38 80240558 0080982D */ daddu $s3, $a0, $zero -/* 91BE3C 8024055C AFBF0040 */ sw $ra, 0x40($sp) -/* 91BE40 80240560 AFB20038 */ sw $s2, 0x38($sp) -/* 91BE44 80240564 AFB10034 */ sw $s1, 0x34($sp) -/* 91BE48 80240568 AFB00030 */ sw $s0, 0x30($sp) -/* 91BE4C 8024056C 8E700148 */ lw $s0, 0x148($s3) -/* 91BE50 80240570 00A0902D */ daddu $s2, $a1, $zero -/* 91BE54 80240574 86040008 */ lh $a0, 8($s0) -/* 91BE58 80240578 0C00EABB */ jal get_npc_unsafe -/* 91BE5C 8024057C 00C0882D */ daddu $s1, $a2, $zero -/* 91BE60 80240580 0220202D */ daddu $a0, $s1, $zero -/* 91BE64 80240584 0200282D */ daddu $a1, $s0, $zero -/* 91BE68 80240588 AFA00010 */ sw $zero, 0x10($sp) -/* 91BE6C 8024058C 8E460024 */ lw $a2, 0x24($s2) -/* 91BE70 80240590 8E470028 */ lw $a3, 0x28($s2) -/* 91BE74 80240594 0C01242D */ jal func_800490B4 -/* 91BE78 80240598 0040802D */ daddu $s0, $v0, $zero -/* 91BE7C 8024059C 1040000B */ beqz $v0, .L802405CC -/* 91BE80 802405A0 00000000 */ nop -/* 91BE84 802405A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91BE88 802405A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91BE8C 802405AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91BE90 802405B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91BE94 802405B4 8C460028 */ lw $a2, 0x28($v0) -/* 91BE98 802405B8 0C00A720 */ jal atan2 -/* 91BE9C 802405BC 8C470030 */ lw $a3, 0x30($v0) -/* 91BEA0 802405C0 2402000C */ addiu $v0, $zero, 0xc -/* 91BEA4 802405C4 080901A9 */ j .L802406A4 -/* 91BEA8 802405C8 E600000C */ swc1 $f0, 0xc($s0) -.L802405CC: -/* 91BEAC 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* 91BEB0 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* 91BEB4 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* 91BEB8 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* 91BEBC 802405DC 1C400032 */ bgtz $v0, .L802406A8 -/* 91BEC0 802405E0 00000000 */ nop -/* 91BEC4 802405E4 8E620074 */ lw $v0, 0x74($s3) -/* 91BEC8 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* 91BECC 802405EC 18400014 */ blez $v0, .L80240640 -/* 91BED0 802405F0 AE620074 */ sw $v0, 0x74($s3) -/* 91BED4 802405F4 C600000C */ lwc1 $f0, 0xc($s0) -/* 91BED8 802405F8 3C014334 */ lui $at, 0x4334 -/* 91BEDC 802405FC 44816000 */ mtc1 $at, $f12 -/* 91BEE0 80240600 0C00A6C9 */ jal clamp_angle -/* 91BEE4 80240604 460C0300 */ add.s $f12, $f0, $f12 -/* 91BEE8 80240608 E600000C */ swc1 $f0, 0xc($s0) -/* 91BEEC 8024060C 8E440008 */ lw $a0, 8($s2) -/* 91BEF0 80240610 000417C2 */ srl $v0, $a0, 0x1f -/* 91BEF4 80240614 00822021 */ addu $a0, $a0, $v0 -/* 91BEF8 80240618 00042043 */ sra $a0, $a0, 1 -/* 91BEFC 8024061C 0C00A67F */ jal rand_int -/* 91BF00 80240620 24840001 */ addiu $a0, $a0, 1 -/* 91BF04 80240624 8E430008 */ lw $v1, 8($s2) -/* 91BF08 80240628 000327C2 */ srl $a0, $v1, 0x1f -/* 91BF0C 8024062C 00641821 */ addu $v1, $v1, $a0 -/* 91BF10 80240630 00031843 */ sra $v1, $v1, 1 -/* 91BF14 80240634 00621821 */ addu $v1, $v1, $v0 -/* 91BF18 80240638 080901AA */ j .L802406A8 -/* 91BF1C 8024063C A603008E */ sh $v1, 0x8e($s0) -.L80240640: -/* 91BF20 80240640 24040002 */ addiu $a0, $zero, 2 -/* 91BF24 80240644 0200282D */ daddu $a1, $s0, $zero -/* 91BF28 80240648 0000302D */ daddu $a2, $zero, $zero -/* 91BF2C 8024064C 860300A8 */ lh $v1, 0xa8($s0) -/* 91BF30 80240650 3C013F80 */ lui $at, 0x3f80 -/* 91BF34 80240654 44810000 */ mtc1 $at, $f0 -/* 91BF38 80240658 3C014000 */ lui $at, 0x4000 -/* 91BF3C 8024065C 44811000 */ mtc1 $at, $f2 -/* 91BF40 80240660 3C01C1A0 */ lui $at, 0xc1a0 -/* 91BF44 80240664 44812000 */ mtc1 $at, $f4 -/* 91BF48 80240668 2402000C */ addiu $v0, $zero, 0xc -/* 91BF4C 8024066C AFA2001C */ sw $v0, 0x1c($sp) -/* 91BF50 80240670 44833000 */ mtc1 $v1, $f6 -/* 91BF54 80240674 00000000 */ nop -/* 91BF58 80240678 468031A0 */ cvt.s.w $f6, $f6 -/* 91BF5C 8024067C 44073000 */ mfc1 $a3, $f6 -/* 91BF60 80240680 27A20028 */ addiu $v0, $sp, 0x28 -/* 91BF64 80240684 AFA20020 */ sw $v0, 0x20($sp) -/* 91BF68 80240688 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91BF6C 8024068C E7A20014 */ swc1 $f2, 0x14($sp) -/* 91BF70 80240690 0C01BFA4 */ jal fx_emote -/* 91BF74 80240694 E7A40018 */ swc1 $f4, 0x18($sp) -/* 91BF78 80240698 2402000F */ addiu $v0, $zero, 0xf -/* 91BF7C 8024069C A602008E */ sh $v0, 0x8e($s0) -/* 91BF80 802406A0 24020028 */ addiu $v0, $zero, 0x28 -.L802406A4: -/* 91BF84 802406A4 AE620070 */ sw $v0, 0x70($s3) -.L802406A8: -/* 91BF88 802406A8 8FBF0040 */ lw $ra, 0x40($sp) -/* 91BF8C 802406AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 91BF90 802406B0 8FB20038 */ lw $s2, 0x38($sp) -/* 91BF94 802406B4 8FB10034 */ lw $s1, 0x34($sp) -/* 91BF98 802406B8 8FB00030 */ lw $s0, 0x30($sp) -/* 91BF9C 802406BC 03E00008 */ jr $ra -/* 91BFA0 802406C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s deleted file mode 100644 index 3b9ab0b5e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B4_91C194 -/* 91C194 802408B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91C198 802408B8 AFB3003C */ sw $s3, 0x3c($sp) -/* 91C19C 802408BC 0080982D */ daddu $s3, $a0, $zero -/* 91C1A0 802408C0 AFBF0040 */ sw $ra, 0x40($sp) -/* 91C1A4 802408C4 AFB20038 */ sw $s2, 0x38($sp) -/* 91C1A8 802408C8 AFB10034 */ sw $s1, 0x34($sp) -/* 91C1AC 802408CC AFB00030 */ sw $s0, 0x30($sp) -/* 91C1B0 802408D0 8E720148 */ lw $s2, 0x148($s3) -/* 91C1B4 802408D4 0C00EABB */ jal get_npc_unsafe -/* 91C1B8 802408D8 86440008 */ lh $a0, 8($s2) -/* 91C1BC 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 91C1C0 802408E0 0200202D */ daddu $a0, $s0, $zero -/* 91C1C4 802408E4 0C00F598 */ jal func_8003D660 -/* 91C1C8 802408E8 24050001 */ addiu $a1, $zero, 1 -/* 91C1CC 802408EC 8E050018 */ lw $a1, 0x18($s0) -/* 91C1D0 802408F0 8E06000C */ lw $a2, 0xc($s0) -/* 91C1D4 802408F4 0C00EA95 */ jal npc_move_heading -/* 91C1D8 802408F8 0200202D */ daddu $a0, $s0, $zero -/* 91C1DC 802408FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 91C1E0 80240900 C6000040 */ lwc1 $f0, 0x40($s0) -/* 91C1E4 80240904 C462001C */ lwc1 $f2, 0x1c($v1) -/* 91C1E8 80240908 468010A0 */ cvt.s.w $f2, $f2 -/* 91C1EC 8024090C C4640024 */ lwc1 $f4, 0x24($v1) -/* 91C1F0 80240910 46802120 */ cvt.s.w $f4, $f4 -/* 91C1F4 80240914 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91C1F8 80240918 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C1FC 8024091C 44051000 */ mfc1 $a1, $f2 -/* 91C200 80240920 C4400028 */ lwc1 $f0, 0x28($v0) -/* 91C204 80240924 46800020 */ cvt.s.w $f0, $f0 -/* 91C208 80240928 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91C20C 8024092C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C210 80240930 44062000 */ mfc1 $a2, $f4 -/* 91C214 80240934 C440002C */ lwc1 $f0, 0x2c($v0) -/* 91C218 80240938 46800020 */ cvt.s.w $f0, $f0 -/* 91C21C 8024093C E7A00018 */ swc1 $f0, 0x18($sp) -/* 91C220 80240940 8C640030 */ lw $a0, 0x30($v1) -/* 91C224 80240944 0C0123F5 */ jal is_point_within_region -/* 91C228 80240948 8E070038 */ lw $a3, 0x38($s0) -/* 91C22C 8024094C C6000038 */ lwc1 $f0, 0x38($s0) -/* 91C230 80240950 C602003C */ lwc1 $f2, 0x3c($s0) -/* 91C234 80240954 C6040040 */ lwc1 $f4, 0x40($s0) -/* 91C238 80240958 3C013F80 */ lui $at, 0x3f80 -/* 91C23C 8024095C 44813000 */ mtc1 $at, $f6 -/* 91C240 80240960 E7A00020 */ swc1 $f0, 0x20($sp) -/* 91C244 80240964 E7A20024 */ swc1 $f2, 0x24($sp) -/* 91C248 80240968 E7A40028 */ swc1 $f4, 0x28($sp) -/* 91C24C 8024096C E7A60010 */ swc1 $f6, 0x10($sp) -/* 91C250 80240970 C600000C */ lwc1 $f0, 0xc($s0) -/* 91C254 80240974 0002882B */ sltu $s1, $zero, $v0 -/* 91C258 80240978 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91C25C 8024097C 860200A8 */ lh $v0, 0xa8($s0) -/* 91C260 80240980 27A50020 */ addiu $a1, $sp, 0x20 -/* 91C264 80240984 44820000 */ mtc1 $v0, $f0 -/* 91C268 80240988 00000000 */ nop -/* 91C26C 8024098C 46800020 */ cvt.s.w $f0, $f0 -/* 91C270 80240990 E7A00018 */ swc1 $f0, 0x18($sp) -/* 91C274 80240994 860200A6 */ lh $v0, 0xa6($s0) -/* 91C278 80240998 27A60024 */ addiu $a2, $sp, 0x24 -/* 91C27C 8024099C 44820000 */ mtc1 $v0, $f0 -/* 91C280 802409A0 00000000 */ nop -/* 91C284 802409A4 46800020 */ cvt.s.w $f0, $f0 -/* 91C288 802409A8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 91C28C 802409AC 8E040080 */ lw $a0, 0x80($s0) -/* 91C290 802409B0 0C037711 */ jal func_800DDC44 -/* 91C294 802409B4 27A70028 */ addiu $a3, $sp, 0x28 -/* 91C298 802409B8 54400001 */ bnel $v0, $zero, .L802409C0 -/* 91C29C 802409BC 24110001 */ addiu $s1, $zero, 1 -.L802409C0: -/* 91C2A0 802409C0 9602008E */ lhu $v0, 0x8e($s0) -/* 91C2A4 802409C4 2442FFFF */ addiu $v0, $v0, -1 -/* 91C2A8 802409C8 A602008E */ sh $v0, 0x8e($s0) -/* 91C2AC 802409CC 00021400 */ sll $v0, $v0, 0x10 -/* 91C2B0 802409D0 58400001 */ blezl $v0, .L802409D8 -/* 91C2B4 802409D4 24110001 */ addiu $s1, $zero, 1 -.L802409D8: -/* 91C2B8 802409D8 12200003 */ beqz $s1, .L802409E8 -/* 91C2BC 802409DC 24020004 */ addiu $v0, $zero, 4 -/* 91C2C0 802409E0 AE620070 */ sw $v0, 0x70($s3) -/* 91C2C4 802409E4 A2400007 */ sb $zero, 7($s2) -.L802409E8: -/* 91C2C8 802409E8 8FBF0040 */ lw $ra, 0x40($sp) -/* 91C2CC 802409EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 91C2D0 802409F0 8FB20038 */ lw $s2, 0x38($sp) -/* 91C2D4 802409F4 8FB10034 */ lw $s1, 0x34($sp) -/* 91C2D8 802409F8 8FB00030 */ lw $s0, 0x30($sp) -/* 91C2DC 802409FC 03E00008 */ jr $ra -/* 91C2E0 80240A00 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s deleted file mode 100644 index 56a598456f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB0_91C390 -/* 91C390 80240AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91C394 80240AB4 AFB30024 */ sw $s3, 0x24($sp) -/* 91C398 80240AB8 0080982D */ daddu $s3, $a0, $zero -/* 91C39C 80240ABC AFBF0028 */ sw $ra, 0x28($sp) -/* 91C3A0 80240AC0 AFB20020 */ sw $s2, 0x20($sp) -/* 91C3A4 80240AC4 AFB1001C */ sw $s1, 0x1c($sp) -/* 91C3A8 80240AC8 AFB00018 */ sw $s0, 0x18($sp) -/* 91C3AC 80240ACC 8E720148 */ lw $s2, 0x148($s3) -/* 91C3B0 80240AD0 00A0882D */ daddu $s1, $a1, $zero -/* 91C3B4 80240AD4 86440008 */ lh $a0, 8($s2) -/* 91C3B8 80240AD8 0C00EABB */ jal get_npc_unsafe -/* 91C3BC 80240ADC 00C0802D */ daddu $s0, $a2, $zero -/* 91C3C0 80240AE0 0200202D */ daddu $a0, $s0, $zero -/* 91C3C4 80240AE4 0240282D */ daddu $a1, $s2, $zero -/* 91C3C8 80240AE8 AFA00010 */ sw $zero, 0x10($sp) -/* 91C3CC 80240AEC 8E260024 */ lw $a2, 0x24($s1) -/* 91C3D0 80240AF0 8E270028 */ lw $a3, 0x28($s1) -/* 91C3D4 80240AF4 0C01242D */ jal func_800490B4 -/* 91C3D8 80240AF8 0040802D */ daddu $s0, $v0, $zero -/* 91C3DC 80240AFC 1040000C */ beqz $v0, .L80240B30 -/* 91C3E0 80240B00 00000000 */ nop -/* 91C3E4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C3E8 80240B08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91C3EC 80240B0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91C3F0 80240B10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C3F4 80240B14 8C460028 */ lw $a2, 0x28($v0) -/* 91C3F8 80240B18 0C00A720 */ jal atan2 -/* 91C3FC 80240B1C 8C470030 */ lw $a3, 0x30($v0) -/* 91C400 80240B20 2402000C */ addiu $v0, $zero, 0xc -/* 91C404 80240B24 E600000C */ swc1 $f0, 0xc($s0) -/* 91C408 80240B28 080902F3 */ j .L80240BCC -/* 91C40C 80240B2C AE620070 */ sw $v0, 0x70($s3) -.L80240B30: -/* 91C410 80240B30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C414 80240B34 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C418 80240B38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C41C 80240B3C C4440000 */ lwc1 $f4, ($v0) -/* 91C420 80240B40 46802120 */ cvt.s.w $f4, $f4 -/* 91C424 80240B44 44062000 */ mfc1 $a2, $f4 -/* 91C428 80240B48 C4440008 */ lwc1 $f4, 8($v0) -/* 91C42C 80240B4C 46802120 */ cvt.s.w $f4, $f4 -/* 91C430 80240B50 44072000 */ mfc1 $a3, $f4 -/* 91C434 80240B54 0C00A7B5 */ jal dist2D -/* 91C438 80240B58 00000000 */ nop -/* 91C43C 80240B5C C6020018 */ lwc1 $f2, 0x18($s0) -/* 91C440 80240B60 4602003E */ c.le.s $f0, $f2 -/* 91C444 80240B64 00000000 */ nop -/* 91C448 80240B68 45000005 */ bc1f .L80240B80 -/* 91C44C 80240B6C 2402000A */ addiu $v0, $zero, 0xa -/* 91C450 80240B70 A602008E */ sh $v0, 0x8e($s0) -/* 91C454 80240B74 24020032 */ addiu $v0, $zero, 0x32 -/* 91C458 80240B78 080902F3 */ j .L80240BCC -/* 91C45C 80240B7C AE620070 */ sw $v0, 0x70($s3) -.L80240B80: -/* 91C460 80240B80 8602008C */ lh $v0, 0x8c($s0) -/* 91C464 80240B84 14400011 */ bnez $v0, .L80240BCC -/* 91C468 80240B88 00000000 */ nop -/* 91C46C 80240B8C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C470 80240B90 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C474 80240B94 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C478 80240B98 C4440000 */ lwc1 $f4, ($v0) -/* 91C47C 80240B9C 46802120 */ cvt.s.w $f4, $f4 -/* 91C480 80240BA0 44062000 */ mfc1 $a2, $f4 -/* 91C484 80240BA4 C4440008 */ lwc1 $f4, 8($v0) -/* 91C488 80240BA8 46802120 */ cvt.s.w $f4, $f4 -/* 91C48C 80240BAC 44072000 */ mfc1 $a3, $f4 -/* 91C490 80240BB0 0C00A720 */ jal atan2 -/* 91C494 80240BB4 00000000 */ nop -/* 91C498 80240BB8 8E050018 */ lw $a1, 0x18($s0) -/* 91C49C 80240BBC 44060000 */ mfc1 $a2, $f0 -/* 91C4A0 80240BC0 0200202D */ daddu $a0, $s0, $zero -/* 91C4A4 80240BC4 0C00EA95 */ jal npc_move_heading -/* 91C4A8 80240BC8 AC86000C */ sw $a2, 0xc($a0) -.L80240BCC: -/* 91C4AC 80240BCC 8FBF0028 */ lw $ra, 0x28($sp) -/* 91C4B0 80240BD0 8FB30024 */ lw $s3, 0x24($sp) -/* 91C4B4 80240BD4 8FB20020 */ lw $s2, 0x20($sp) -/* 91C4B8 80240BD8 8FB1001C */ lw $s1, 0x1c($sp) -/* 91C4BC 80240BDC 8FB00018 */ lw $s0, 0x18($sp) -/* 91C4C0 80240BE0 03E00008 */ jr $ra -/* 91C4C4 80240BE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index 97f3783236..99c363770d 100644 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -140,7 +140,7 @@ glabel L80240EF4_91C7D4 glabel L80240F04_91C7E4 /* 91C7E4 80240F04 0260202D */ daddu $a0, $s3, $zero /* 91C7E8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* 91C7EC 80240F0C 0C090154 */ jal func_80240550_91BE30 +/* 91C7EC 80240F0C 0C090154 */ jal iwa_04_UnkFunc8 /* 91C7F0 80240F10 0200302D */ daddu $a2, $s0, $zero /* 91C7F4 80240F14 0809040F */ j .L8024103C /* 91C7F8 80240F18 0000102D */ daddu $v0, $zero, $zero @@ -187,7 +187,7 @@ glabel L80240F90_91C870 glabel L80240FA8_91C888 /* 91C888 80240FA8 0260202D */ daddu $a0, $s3, $zero /* 91C88C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 91C890 80240FB0 0C09022D */ jal func_802408B4_91C194 +/* 91C890 80240FB0 0C09022D */ jal iwa_04_UnkFunc10 /* 91C894 80240FB4 0200302D */ daddu $a2, $s0, $zero /* 91C898 80240FB8 0809040F */ j .L8024103C /* 91C89C 80240FBC 0000102D */ daddu $v0, $zero, $zero @@ -203,7 +203,7 @@ glabel L80240FC0_91C8A0 glabel L80240FE0_91C8C0 /* 91C8C0 80240FE0 0260202D */ daddu $a0, $s3, $zero /* 91C8C4 80240FE4 0280282D */ daddu $a1, $s4, $zero -/* 91C8C8 80240FE8 0C0902AC */ jal func_80240AB0_91C390 +/* 91C8C8 80240FE8 0C0902AC */ jal iwa_04_UnkFunc9 /* 91C8CC 80240FEC 0200302D */ daddu $a2, $s0, $zero /* 91C8D0 80240FF0 0809040F */ j .L8024103C /* 91C8D4 80240FF4 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024030C_91E87C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024030C_91E87C.s deleted file mode 100644 index 0a6b32760d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024030C_91E87C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_91E87C -/* 91E87C 8024030C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 91E880 80240310 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 91E884 80240314 8C430000 */ lw $v1, ($v0) -/* 91E888 80240318 2404FFBF */ addiu $a0, $zero, -0x41 -/* 91E88C 8024031C 00641824 */ and $v1, $v1, $a0 -/* 91E890 80240320 AC430000 */ sw $v1, ($v0) -/* 91E894 80240324 03E00008 */ jr $ra -/* 91E898 80240328 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240358_91E8C8.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240358_91E8C8.s deleted file mode 100644 index 8b65c7fff9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240358_91E8C8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_91E8C8 -/* 91E8C8 80240358 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91E8CC 8024035C AFB00010 */ sw $s0, 0x10($sp) -/* 91E8D0 80240360 0080802D */ daddu $s0, $a0, $zero -/* 91E8D4 80240364 AFBF0018 */ sw $ra, 0x18($sp) -/* 91E8D8 80240368 AFB10014 */ sw $s1, 0x14($sp) -/* 91E8DC 8024036C 8E11000C */ lw $s1, 0xc($s0) -/* 91E8E0 80240370 8E250000 */ lw $a1, ($s1) -/* 91E8E4 80240374 0C0B1EAF */ jal get_variable -/* 91E8E8 80240378 26310004 */ addiu $s1, $s1, 4 -/* 91E8EC 8024037C 0200202D */ daddu $a0, $s0, $zero -/* 91E8F0 80240380 3C038011 */ lui $v1, %hi(gPlayerData) -/* 91E8F4 80240384 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 91E8F8 80240388 000210C0 */ sll $v0, $v0, 3 -/* 91E8FC 8024038C 00431021 */ addu $v0, $v0, $v1 -/* 91E900 80240390 90460015 */ lbu $a2, 0x15($v0) -/* 91E904 80240394 8E250000 */ lw $a1, ($s1) -/* 91E908 80240398 24C60001 */ addiu $a2, $a2, 1 -/* 91E90C 8024039C A0460015 */ sb $a2, 0x15($v0) -/* 91E910 802403A0 00063600 */ sll $a2, $a2, 0x18 -/* 91E914 802403A4 0C0B2026 */ jal set_variable -/* 91E918 802403A8 00063603 */ sra $a2, $a2, 0x18 -/* 91E91C 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 91E920 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* 91E924 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* 91E928 802403B8 24020002 */ addiu $v0, $zero, 2 -/* 91E92C 802403BC 03E00008 */ jr $ra -/* 91E930 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s deleted file mode 100644 index adf3fdd27e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_91ECA8 -/* 91ECA8 80240738 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 91ECAC 8024073C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 91ECB0 80240740 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91ECB4 80240744 AFBF0010 */ sw $ra, 0x10($sp) -/* 91ECB8 80240748 00021100 */ sll $v0, $v0, 4 -/* 91ECBC 8024074C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 91ECC0 80240750 00822021 */ addu $a0, $a0, $v0 -/* 91ECC4 80240754 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 91ECC8 80240758 0C0496CF */ jal set_message_string -/* 91ECCC 8024075C 0000282D */ daddu $a1, $zero, $zero -/* 91ECD0 80240760 8FBF0010 */ lw $ra, 0x10($sp) -/* 91ECD4 80240764 24020002 */ addiu $v0, $zero, 2 -/* 91ECD8 80240768 03E00008 */ jr $ra -/* 91ECDC 8024076C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240770_91ECE0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240770_91ECE0.s deleted file mode 100644 index 5f6f2c5d96..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240770_91ECE0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770_91ECE0 -/* 91ECE0 80240770 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91ECE4 80240774 AFB1001C */ sw $s1, 0x1c($sp) -/* 91ECE8 80240778 0080882D */ daddu $s1, $a0, $zero -/* 91ECEC 8024077C AFBF0020 */ sw $ra, 0x20($sp) -/* 91ECF0 80240780 AFB00018 */ sw $s0, 0x18($sp) -/* 91ECF4 80240784 8E30000C */ lw $s0, 0xc($s1) -/* 91ECF8 80240788 8E050000 */ lw $a1, ($s0) -/* 91ECFC 8024078C 0C0B1EAF */ jal get_variable -/* 91ED00 80240790 26100004 */ addiu $s0, $s0, 4 -/* 91ED04 80240794 0C04417A */ jal get_entity_by_index -/* 91ED08 80240798 0040202D */ daddu $a0, $v0, $zero -/* 91ED0C 8024079C 8E100000 */ lw $s0, ($s0) -/* 91ED10 802407A0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 91ED14 802407A4 3C014148 */ lui $at, 0x4148 -/* 91ED18 802407A8 44810000 */ mtc1 $at, $f0 -/* 91ED1C 802407AC 3C013F33 */ lui $at, 0x3f33 -/* 91ED20 802407B0 34213333 */ ori $at, $at, 0x3333 -/* 91ED24 802407B4 44811000 */ mtc1 $at, $f2 -/* 91ED28 802407B8 AFA00014 */ sw $zero, 0x14($sp) -/* 91ED2C 802407BC 46002100 */ add.s $f4, $f4, $f0 -/* 91ED30 802407C0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 91ED34 802407C4 8C450048 */ lw $a1, 0x48($v0) -/* 91ED38 802407C8 8C470050 */ lw $a3, 0x50($v0) -/* 91ED3C 802407CC 44062000 */ mfc1 $a2, $f4 -/* 91ED40 802407D0 0C01C5D4 */ jal func_80071750 -/* 91ED44 802407D4 0000202D */ daddu $a0, $zero, $zero -/* 91ED48 802407D8 0220202D */ daddu $a0, $s1, $zero -/* 91ED4C 802407DC 0200282D */ daddu $a1, $s0, $zero -/* 91ED50 802407E0 0C0B2026 */ jal set_variable -/* 91ED54 802407E4 0040302D */ daddu $a2, $v0, $zero -/* 91ED58 802407E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 91ED5C 802407EC 8FB1001C */ lw $s1, 0x1c($sp) -/* 91ED60 802407F0 8FB00018 */ lw $s0, 0x18($sp) -/* 91ED64 802407F4 24020002 */ addiu $v0, $zero, 2 -/* 91ED68 802407F8 03E00008 */ jr $ra -/* 91ED6C 802407FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240834_91EDA4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240834_91EDA4.s deleted file mode 100644 index c5cc64da0f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240834_91EDA4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240834_91EDA4 -/* 91EDA4 80240834 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91EDA8 80240838 AFBF0018 */ sw $ra, 0x18($sp) -/* 91EDAC 8024083C 8C82000C */ lw $v0, 0xc($a0) -/* 91EDB0 80240840 0C0B1EAF */ jal get_variable -/* 91EDB4 80240844 8C450000 */ lw $a1, ($v0) -/* 91EDB8 80240848 0C04417A */ jal get_entity_by_index -/* 91EDBC 8024084C 0040202D */ daddu $a0, $v0, $zero -/* 91EDC0 80240850 3C013F80 */ lui $at, 0x3f80 -/* 91EDC4 80240854 44810000 */ mtc1 $at, $f0 -/* 91EDC8 80240858 C442004C */ lwc1 $f2, 0x4c($v0) -/* 91EDCC 8024085C E7A00010 */ swc1 $f0, 0x10($sp) -/* 91EDD0 80240860 3C014148 */ lui $at, 0x4148 -/* 91EDD4 80240864 44810000 */ mtc1 $at, $f0 -/* 91EDD8 80240868 2403004B */ addiu $v1, $zero, 0x4b -/* 91EDDC 8024086C AFA30014 */ sw $v1, 0x14($sp) -/* 91EDE0 80240870 46001080 */ add.s $f2, $f2, $f0 -/* 91EDE4 80240874 8C450048 */ lw $a1, 0x48($v0) -/* 91EDE8 80240878 8C470050 */ lw $a3, 0x50($v0) -/* 91EDEC 8024087C 44061000 */ mfc1 $a2, $f2 -/* 91EDF0 80240880 0C01C2EC */ jal func_80070BB0 -/* 91EDF4 80240884 24040004 */ addiu $a0, $zero, 4 -/* 91EDF8 80240888 8FBF0018 */ lw $ra, 0x18($sp) -/* 91EDFC 8024088C 24020002 */ addiu $v0, $zero, 2 -/* 91EE00 80240890 03E00008 */ jr $ra -/* 91EE04 80240894 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240898_91EE08.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240898_91EE08.s deleted file mode 100644 index ae1de31da9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240898_91EE08.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_91EE08 -/* 91EE08 80240898 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91EE0C 8024089C AFBF0018 */ sw $ra, 0x18($sp) -/* 91EE10 802408A0 0C00EAD2 */ jal get_npc_safe -/* 91EE14 802408A4 2404FFFC */ addiu $a0, $zero, -4 -/* 91EE18 802408A8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 91EE1C 802408AC 3C014148 */ lui $at, 0x4148 -/* 91EE20 802408B0 44811000 */ mtc1 $at, $f2 -/* 91EE24 802408B4 3C013F80 */ lui $at, 0x3f80 -/* 91EE28 802408B8 44810000 */ mtc1 $at, $f0 -/* 91EE2C 802408BC 2403001E */ addiu $v1, $zero, 0x1e -/* 91EE30 802408C0 AFA30014 */ sw $v1, 0x14($sp) -/* 91EE34 802408C4 46022100 */ add.s $f4, $f4, $f2 -/* 91EE38 802408C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91EE3C 802408CC 8C450038 */ lw $a1, 0x38($v0) -/* 91EE40 802408D0 8C470040 */ lw $a3, 0x40($v0) -/* 91EE44 802408D4 44062000 */ mfc1 $a2, $f4 -/* 91EE48 802408D8 0C01C2EC */ jal func_80070BB0 -/* 91EE4C 802408DC 24040009 */ addiu $a0, $zero, 9 -/* 91EE50 802408E0 8FBF0018 */ lw $ra, 0x18($sp) -/* 91EE54 802408E4 24020002 */ addiu $v0, $zero, 2 -/* 91EE58 802408E8 03E00008 */ jr $ra -/* 91EE5C 802408EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s deleted file mode 100644 index 63aee7cd7d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E28_91F398 -/* 91F398 80240E28 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F39C 80240E2C AFB10014 */ sw $s1, 0x14($sp) -/* 91F3A0 80240E30 0080882D */ daddu $s1, $a0, $zero -/* 91F3A4 80240E34 AFB20018 */ sw $s2, 0x18($sp) -/* 91F3A8 80240E38 AFBF001C */ sw $ra, 0x1c($sp) -/* 91F3AC 80240E3C AFB00010 */ sw $s0, 0x10($sp) -/* 91F3B0 80240E40 8E30000C */ lw $s0, 0xc($s1) -/* 91F3B4 80240E44 10A00010 */ beqz $a1, .L80240E88 -/* 91F3B8 80240E48 0000902D */ daddu $s2, $zero, $zero -/* 91F3BC 80240E4C 8E050000 */ lw $a1, ($s0) -/* 91F3C0 80240E50 0C0B1EAF */ jal get_variable -/* 91F3C4 80240E54 26100004 */ addiu $s0, $s0, 4 -/* 91F3C8 80240E58 AE220084 */ sw $v0, 0x84($s1) -/* 91F3CC 80240E5C 8E050000 */ lw $a1, ($s0) -/* 91F3D0 80240E60 0C0B1EAF */ jal get_variable -/* 91F3D4 80240E64 0220202D */ daddu $a0, $s1, $zero -/* 91F3D8 80240E68 0240202D */ daddu $a0, $s2, $zero -/* 91F3DC 80240E6C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 91F3E0 80240E70 00A0302D */ daddu $a2, $a1, $zero -/* 91F3E4 80240E74 00A0382D */ daddu $a3, $a1, $zero -/* 91F3E8 80240E78 AE220088 */ sw $v0, 0x88($s1) -/* 91F3EC 80240E7C AE200070 */ sw $zero, 0x70($s1) -/* 91F3F0 80240E80 0C04DF84 */ jal set_transition_stencil_color -/* 91F3F4 80240E84 AE200074 */ sw $zero, 0x74($s1) -.L80240E88: -/* 91F3F8 80240E88 8E230070 */ lw $v1, 0x70($s1) -/* 91F3FC 80240E8C 24040001 */ addiu $a0, $zero, 1 -/* 91F400 80240E90 10640019 */ beq $v1, $a0, .L80240EF8 -/* 91F404 80240E94 28620002 */ slti $v0, $v1, 2 -/* 91F408 80240E98 10400005 */ beqz $v0, .L80240EB0 -/* 91F40C 80240E9C 24020002 */ addiu $v0, $zero, 2 -/* 91F410 80240EA0 10600007 */ beqz $v1, .L80240EC0 -/* 91F414 80240EA4 240500FF */ addiu $a1, $zero, 0xff -/* 91F418 80240EA8 080903CE */ j .L80240F38 -/* 91F41C 80240EAC 00000000 */ nop -.L80240EB0: -/* 91F420 80240EB0 10620019 */ beq $v1, $v0, .L80240F18 -/* 91F424 80240EB4 00000000 */ nop -/* 91F428 80240EB8 080903CE */ j .L80240F38 -/* 91F42C 80240EBC 00000000 */ nop -.L80240EC0: -/* 91F430 80240EC0 8E220074 */ lw $v0, 0x74($s1) -/* 91F434 80240EC4 14450004 */ bne $v0, $a1, .L80240ED8 -/* 91F438 80240EC8 00000000 */ nop -/* 91F43C 80240ECC AE240070 */ sw $a0, 0x70($s1) -/* 91F440 80240ED0 AE200078 */ sw $zero, 0x78($s1) -/* 91F444 80240ED4 8E220074 */ lw $v0, 0x74($s1) -.L80240ED8: -/* 91F448 80240ED8 8E230084 */ lw $v1, 0x84($s1) -/* 91F44C 80240EDC 00431021 */ addu $v0, $v0, $v1 -/* 91F450 80240EE0 AE220074 */ sw $v0, 0x74($s1) -/* 91F454 80240EE4 28420100 */ slti $v0, $v0, 0x100 -/* 91F458 80240EE8 50400013 */ beql $v0, $zero, .L80240F38 -/* 91F45C 80240EEC AE250074 */ sw $a1, 0x74($s1) -/* 91F460 80240EF0 080903CE */ j .L80240F38 -/* 91F464 80240EF4 00000000 */ nop -.L80240EF8: -/* 91F468 80240EF8 8E220078 */ lw $v0, 0x78($s1) -/* 91F46C 80240EFC 24420001 */ addiu $v0, $v0, 1 -/* 91F470 80240F00 AE220078 */ sw $v0, 0x78($s1) -/* 91F474 80240F04 28420002 */ slti $v0, $v0, 2 -/* 91F478 80240F08 1440000B */ bnez $v0, .L80240F38 -/* 91F47C 80240F0C 24020002 */ addiu $v0, $zero, 2 -/* 91F480 80240F10 080903CE */ j .L80240F38 -/* 91F484 80240F14 AE220070 */ sw $v0, 0x70($s1) -.L80240F18: -/* 91F488 80240F18 8E230074 */ lw $v1, 0x74($s1) -/* 91F48C 80240F1C 50600001 */ beql $v1, $zero, .L80240F24 -/* 91F490 80240F20 24120001 */ addiu $s2, $zero, 1 -.L80240F24: -/* 91F494 80240F24 8E220088 */ lw $v0, 0x88($s1) -/* 91F498 80240F28 00621023 */ subu $v0, $v1, $v0 -/* 91F49C 80240F2C 04410002 */ bgez $v0, .L80240F38 -/* 91F4A0 80240F30 AE220074 */ sw $v0, 0x74($s1) -/* 91F4A4 80240F34 AE200074 */ sw $zero, 0x74($s1) -.L80240F38: -/* 91F4A8 80240F38 C6200074 */ lwc1 $f0, 0x74($s1) -/* 91F4AC 80240F3C 46800020 */ cvt.s.w $f0, $f0 -/* 91F4B0 80240F40 44050000 */ mfc1 $a1, $f0 -/* 91F4B4 80240F44 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 91F4B8 80240F48 24040001 */ addiu $a0, $zero, 1 -/* 91F4BC 80240F4C 0240102D */ daddu $v0, $s2, $zero -/* 91F4C0 80240F50 8FBF001C */ lw $ra, 0x1c($sp) -/* 91F4C4 80240F54 8FB20018 */ lw $s2, 0x18($sp) -/* 91F4C8 80240F58 8FB10014 */ lw $s1, 0x14($sp) -/* 91F4CC 80240F5C 8FB00010 */ lw $s0, 0x10($sp) -/* 91F4D0 80240F60 03E00008 */ jr $ra -/* 91F4D4 80240F64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s deleted file mode 100644 index 6ae18a926e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240588_B2C9F8 -/* B2C9F8 80240588 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B2C9FC 8024058C AFB20038 */ sw $s2, 0x38($sp) -/* B2CA00 80240590 0080902D */ daddu $s2, $a0, $zero -/* B2CA04 80240594 AFBF0044 */ sw $ra, 0x44($sp) -/* B2CA08 80240598 AFB40040 */ sw $s4, 0x40($sp) -/* B2CA0C 8024059C AFB3003C */ sw $s3, 0x3c($sp) -/* B2CA10 802405A0 AFB10034 */ sw $s1, 0x34($sp) -/* B2CA14 802405A4 AFB00030 */ sw $s0, 0x30($sp) -/* B2CA18 802405A8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B2CA1C 802405AC F7B40048 */ sdc1 $f20, 0x48($sp) -/* B2CA20 802405B0 8E510148 */ lw $s1, 0x148($s2) -/* B2CA24 802405B4 00A0982D */ daddu $s3, $a1, $zero -/* B2CA28 802405B8 86240008 */ lh $a0, 8($s1) -/* B2CA2C 802405BC 0C00EABB */ jal get_npc_unsafe -/* B2CA30 802405C0 00C0A02D */ daddu $s4, $a2, $zero -/* B2CA34 802405C4 8E630014 */ lw $v1, 0x14($s3) -/* B2CA38 802405C8 04600030 */ bltz $v1, .L8024068C -/* B2CA3C 802405CC 0040802D */ daddu $s0, $v0, $zero -/* B2CA40 802405D0 8E420074 */ lw $v0, 0x74($s2) -/* B2CA44 802405D4 1C40002C */ bgtz $v0, .L80240688 -/* B2CA48 802405D8 2442FFFF */ addiu $v0, $v0, -1 -/* B2CA4C 802405DC 0280202D */ daddu $a0, $s4, $zero -/* B2CA50 802405E0 AE430074 */ sw $v1, 0x74($s2) -/* B2CA54 802405E4 AFA00010 */ sw $zero, 0x10($sp) -/* B2CA58 802405E8 8E66000C */ lw $a2, 0xc($s3) -/* B2CA5C 802405EC 8E670010 */ lw $a3, 0x10($s3) -/* B2CA60 802405F0 0C01242D */ jal func_800490B4 -/* B2CA64 802405F4 0220282D */ daddu $a1, $s1, $zero -/* B2CA68 802405F8 10400021 */ beqz $v0, .L80240680 -/* B2CA6C 802405FC 0000202D */ daddu $a0, $zero, $zero -/* B2CA70 80240600 0200282D */ daddu $a1, $s0, $zero -/* B2CA74 80240604 0000302D */ daddu $a2, $zero, $zero -/* B2CA78 80240608 860300A8 */ lh $v1, 0xa8($s0) -/* B2CA7C 8024060C 3C013F80 */ lui $at, 0x3f80 -/* B2CA80 80240610 44810000 */ mtc1 $at, $f0 -/* B2CA84 80240614 3C014000 */ lui $at, 0x4000 -/* B2CA88 80240618 44811000 */ mtc1 $at, $f2 -/* B2CA8C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 -/* B2CA90 80240620 44812000 */ mtc1 $at, $f4 -/* B2CA94 80240624 2402000F */ addiu $v0, $zero, 0xf -/* B2CA98 80240628 AFA2001C */ sw $v0, 0x1c($sp) -/* B2CA9C 8024062C 44833000 */ mtc1 $v1, $f6 -/* B2CAA0 80240630 00000000 */ nop -/* B2CAA4 80240634 468031A0 */ cvt.s.w $f6, $f6 -/* B2CAA8 80240638 44073000 */ mfc1 $a3, $f6 -/* B2CAAC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 -/* B2CAB0 80240640 AFA20020 */ sw $v0, 0x20($sp) -/* B2CAB4 80240644 E7A00010 */ swc1 $f0, 0x10($sp) -/* B2CAB8 80240648 E7A20014 */ swc1 $f2, 0x14($sp) -/* B2CABC 8024064C 0C01BFA4 */ jal fx_emote -/* B2CAC0 80240650 E7A40018 */ swc1 $f4, 0x18($sp) -/* B2CAC4 80240654 0200202D */ daddu $a0, $s0, $zero -/* B2CAC8 80240658 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B2CACC 8024065C 0C012530 */ jal func_800494C0 -/* B2CAD0 80240660 3C060020 */ lui $a2, 0x20 -/* B2CAD4 80240664 8E220018 */ lw $v0, 0x18($s1) -/* B2CAD8 80240668 9442002A */ lhu $v0, 0x2a($v0) -/* B2CADC 8024066C 30420001 */ andi $v0, $v0, 1 -/* B2CAE0 80240670 14400064 */ bnez $v0, .L80240804 -/* B2CAE4 80240674 2402000A */ addiu $v0, $zero, 0xa -/* B2CAE8 80240678 08090201 */ j .L80240804 -/* B2CAEC 8024067C 2402000C */ addiu $v0, $zero, 0xc -.L80240680: -/* B2CAF0 80240680 8E420074 */ lw $v0, 0x74($s2) -/* B2CAF4 80240684 2442FFFF */ addiu $v0, $v0, -1 -.L80240688: -/* B2CAF8 80240688 AE420074 */ sw $v0, 0x74($s2) -.L8024068C: -/* B2CAFC 8024068C 8602008C */ lh $v0, 0x8c($s0) -/* B2CB00 80240690 1440005D */ bnez $v0, .L80240808 -/* B2CB04 80240694 00000000 */ nop -/* B2CB08 80240698 C6000018 */ lwc1 $f0, 0x18($s0) -/* B2CB0C 8024069C 3C014010 */ lui $at, 0x4010 -/* B2CB10 802406A0 44811800 */ mtc1 $at, $f3 -/* B2CB14 802406A4 44801000 */ mtc1 $zero, $f2 -/* B2CB18 802406A8 46000021 */ cvt.d.s $f0, $f0 -/* B2CB1C 802406AC 4622003C */ c.lt.d $f0, $f2 -/* B2CB20 802406B0 00000000 */ nop -/* B2CB24 802406B4 45000003 */ bc1f .L802406C4 -/* B2CB28 802406B8 0200202D */ daddu $a0, $s0, $zero -/* B2CB2C 802406BC 080901B2 */ j .L802406C8 -/* B2CB30 802406C0 0000282D */ daddu $a1, $zero, $zero -.L802406C4: -/* B2CB34 802406C4 24050001 */ addiu $a1, $zero, 1 -.L802406C8: -/* B2CB38 802406C8 0C00F598 */ jal func_8003D660 -/* B2CB3C 802406CC 00000000 */ nop -/* B2CB40 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B2CB44 802406D4 8E430078 */ lw $v1, 0x78($s2) -/* B2CB48 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B2CB4C 802406DC 00031040 */ sll $v0, $v1, 1 -/* B2CB50 802406E0 00431021 */ addu $v0, $v0, $v1 -/* B2CB54 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2CB58 802406E8 00021080 */ sll $v0, $v0, 2 -/* B2CB5C 802406EC 00431021 */ addu $v0, $v0, $v1 -/* B2CB60 802406F0 C4560004 */ lwc1 $f22, 4($v0) -/* B2CB64 802406F4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2CB68 802406F8 C454000C */ lwc1 $f20, 0xc($v0) -/* B2CB6C 802406FC 4680A520 */ cvt.s.w $f20, $f20 -/* B2CB70 80240700 4406B000 */ mfc1 $a2, $f22 -/* B2CB74 80240704 4407A000 */ mfc1 $a3, $f20 -/* B2CB78 80240708 0C00A720 */ jal atan2 -/* B2CB7C 8024070C 00000000 */ nop -/* B2CB80 80240710 8E050018 */ lw $a1, 0x18($s0) -/* B2CB84 80240714 44060000 */ mfc1 $a2, $f0 -/* B2CB88 80240718 0200202D */ daddu $a0, $s0, $zero -/* B2CB8C 8024071C 0C00EA95 */ jal npc_move_heading -/* B2CB90 80240720 AE06000C */ sw $a2, 0xc($s0) -/* B2CB94 80240724 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B2CB98 80240728 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B2CB9C 8024072C 4406B000 */ mfc1 $a2, $f22 -/* B2CBA0 80240730 4407A000 */ mfc1 $a3, $f20 -/* B2CBA4 80240734 0C00A7B5 */ jal dist2D -/* B2CBA8 80240738 00000000 */ nop -/* B2CBAC 8024073C C6020018 */ lwc1 $f2, 0x18($s0) -/* B2CBB0 80240740 4602003E */ c.le.s $f0, $f2 -/* B2CBB4 80240744 00000000 */ nop -/* B2CBB8 80240748 4500002F */ bc1f .L80240808 -/* B2CBBC 8024074C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B2CBC0 80240750 24020002 */ addiu $v0, $zero, 2 -/* B2CBC4 80240754 0C00A67F */ jal rand_int -/* B2CBC8 80240758 AE420070 */ sw $v0, 0x70($s2) -/* B2CBCC 8024075C 3C035555 */ lui $v1, 0x5555 -/* B2CBD0 80240760 34635556 */ ori $v1, $v1, 0x5556 -/* B2CBD4 80240764 00430018 */ mult $v0, $v1 -/* B2CBD8 80240768 000227C3 */ sra $a0, $v0, 0x1f -/* B2CBDC 8024076C 00004010 */ mfhi $t0 -/* B2CBE0 80240770 01042023 */ subu $a0, $t0, $a0 -/* B2CBE4 80240774 00041840 */ sll $v1, $a0, 1 -/* B2CBE8 80240778 00641821 */ addu $v1, $v1, $a0 -/* B2CBEC 8024077C 00431023 */ subu $v0, $v0, $v1 -/* B2CBF0 80240780 24430002 */ addiu $v1, $v0, 2 -/* B2CBF4 80240784 AE430074 */ sw $v1, 0x74($s2) -/* B2CBF8 80240788 8E62002C */ lw $v0, 0x2c($s3) -/* B2CBFC 8024078C 18400009 */ blez $v0, .L802407B4 -/* B2CC00 80240790 24020004 */ addiu $v0, $zero, 4 -/* B2CC04 80240794 8E620004 */ lw $v0, 4($s3) -/* B2CC08 80240798 18400006 */ blez $v0, .L802407B4 -/* B2CC0C 8024079C 24020004 */ addiu $v0, $zero, 4 -/* B2CC10 802407A0 8E620008 */ lw $v0, 8($s3) -/* B2CC14 802407A4 18400003 */ blez $v0, .L802407B4 -/* B2CC18 802407A8 24020004 */ addiu $v0, $zero, 4 -/* B2CC1C 802407AC 14600002 */ bnez $v1, .L802407B8 -/* B2CC20 802407B0 00000000 */ nop -.L802407B4: -/* B2CC24 802407B4 AE420070 */ sw $v0, 0x70($s2) -.L802407B8: -/* B2CC28 802407B8 0C00A67F */ jal rand_int -/* B2CC2C 802407BC 24042710 */ addiu $a0, $zero, 0x2710 -/* B2CC30 802407C0 3C0351EB */ lui $v1, 0x51eb -/* B2CC34 802407C4 3463851F */ ori $v1, $v1, 0x851f -/* B2CC38 802407C8 00430018 */ mult $v0, $v1 -/* B2CC3C 802407CC 00021FC3 */ sra $v1, $v0, 0x1f -/* B2CC40 802407D0 00004010 */ mfhi $t0 -/* B2CC44 802407D4 00082143 */ sra $a0, $t0, 5 -/* B2CC48 802407D8 00832023 */ subu $a0, $a0, $v1 -/* B2CC4C 802407DC 00041840 */ sll $v1, $a0, 1 -/* B2CC50 802407E0 00641821 */ addu $v1, $v1, $a0 -/* B2CC54 802407E4 000318C0 */ sll $v1, $v1, 3 -/* B2CC58 802407E8 00641821 */ addu $v1, $v1, $a0 -/* B2CC5C 802407EC 00031880 */ sll $v1, $v1, 2 -/* B2CC60 802407F0 8E640004 */ lw $a0, 4($s3) -/* B2CC64 802407F4 00431023 */ subu $v0, $v0, $v1 -/* B2CC68 802407F8 0044102A */ slt $v0, $v0, $a0 -/* B2CC6C 802407FC 10400002 */ beqz $v0, .L80240808 -/* B2CC70 80240800 24020004 */ addiu $v0, $zero, 4 -.L80240804: -/* B2CC74 80240804 AE420070 */ sw $v0, 0x70($s2) -.L80240808: -/* B2CC78 80240808 8FBF0044 */ lw $ra, 0x44($sp) -/* B2CC7C 8024080C 8FB40040 */ lw $s4, 0x40($sp) -/* B2CC80 80240810 8FB3003C */ lw $s3, 0x3c($sp) -/* B2CC84 80240814 8FB20038 */ lw $s2, 0x38($sp) -/* B2CC88 80240818 8FB10034 */ lw $s1, 0x34($sp) -/* B2CC8C 8024081C 8FB00030 */ lw $s0, 0x30($sp) -/* B2CC90 80240820 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B2CC94 80240824 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B2CC98 80240828 03E00008 */ jr $ra -/* B2CC9C 8024082C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s deleted file mode 100644 index 504e8b8c16..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802408F0_B2CD60.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_B2CD60 -/* B2CD60 802408F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2CD64 802408F4 AFB40040 */ sw $s4, 0x40($sp) -/* B2CD68 802408F8 0080A02D */ daddu $s4, $a0, $zero -/* B2CD6C 802408FC AFBF0044 */ sw $ra, 0x44($sp) -/* B2CD70 80240900 AFB3003C */ sw $s3, 0x3c($sp) -/* B2CD74 80240904 AFB20038 */ sw $s2, 0x38($sp) -/* B2CD78 80240908 AFB10034 */ sw $s1, 0x34($sp) -/* B2CD7C 8024090C AFB00030 */ sw $s0, 0x30($sp) -/* B2CD80 80240910 8E910148 */ lw $s1, 0x148($s4) -/* B2CD84 80240914 00A0902D */ daddu $s2, $a1, $zero -/* B2CD88 80240918 86240008 */ lh $a0, 8($s1) -/* B2CD8C 8024091C 0C00EABB */ jal get_npc_unsafe -/* B2CD90 80240920 00C0982D */ daddu $s3, $a2, $zero -/* B2CD94 80240924 8E430014 */ lw $v1, 0x14($s2) -/* B2CD98 80240928 04600031 */ bltz $v1, .L802409F0 -/* B2CD9C 8024092C 0040802D */ daddu $s0, $v0, $zero -/* B2CDA0 80240930 0260202D */ daddu $a0, $s3, $zero -/* B2CDA4 80240934 AFA00010 */ sw $zero, 0x10($sp) -/* B2CDA8 80240938 8E460024 */ lw $a2, 0x24($s2) -/* B2CDAC 8024093C 8E470028 */ lw $a3, 0x28($s2) -/* B2CDB0 80240940 0C01242D */ jal func_800490B4 -/* B2CDB4 80240944 0220282D */ daddu $a1, $s1, $zero -/* B2CDB8 80240948 10400029 */ beqz $v0, .L802409F0 -/* B2CDBC 8024094C 0000202D */ daddu $a0, $zero, $zero -/* B2CDC0 80240950 0200282D */ daddu $a1, $s0, $zero -/* B2CDC4 80240954 0000302D */ daddu $a2, $zero, $zero -/* B2CDC8 80240958 860300A8 */ lh $v1, 0xa8($s0) -/* B2CDCC 8024095C 3C013F80 */ lui $at, 0x3f80 -/* B2CDD0 80240960 44810000 */ mtc1 $at, $f0 -/* B2CDD4 80240964 3C014000 */ lui $at, 0x4000 -/* B2CDD8 80240968 44811000 */ mtc1 $at, $f2 -/* B2CDDC 8024096C 3C01C1A0 */ lui $at, 0xc1a0 -/* B2CDE0 80240970 44812000 */ mtc1 $at, $f4 -/* B2CDE4 80240974 2402000F */ addiu $v0, $zero, 0xf -/* B2CDE8 80240978 AFA2001C */ sw $v0, 0x1c($sp) -/* B2CDEC 8024097C 44833000 */ mtc1 $v1, $f6 -/* B2CDF0 80240980 00000000 */ nop -/* B2CDF4 80240984 468031A0 */ cvt.s.w $f6, $f6 -/* B2CDF8 80240988 44073000 */ mfc1 $a3, $f6 -/* B2CDFC 8024098C 27A20028 */ addiu $v0, $sp, 0x28 -/* B2CE00 80240990 AFA20020 */ sw $v0, 0x20($sp) -/* B2CE04 80240994 E7A00010 */ swc1 $f0, 0x10($sp) -/* B2CE08 80240998 E7A20014 */ swc1 $f2, 0x14($sp) -/* B2CE0C 8024099C 0C01BFA4 */ jal fx_emote -/* B2CE10 802409A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B2CE14 802409A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B2CE18 802409A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B2CE1C 802409AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B2CE20 802409B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B2CE24 802409B4 8C460028 */ lw $a2, 0x28($v0) -/* B2CE28 802409B8 0C00A720 */ jal atan2 -/* B2CE2C 802409BC 8C470030 */ lw $a3, 0x30($v0) -/* B2CE30 802409C0 0200202D */ daddu $a0, $s0, $zero -/* B2CE34 802409C4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B2CE38 802409C8 3C060020 */ lui $a2, 0x20 -/* B2CE3C 802409CC 0C012530 */ jal func_800494C0 -/* B2CE40 802409D0 E480000C */ swc1 $f0, 0xc($a0) -/* B2CE44 802409D4 8E220018 */ lw $v0, 0x18($s1) -/* B2CE48 802409D8 9442002A */ lhu $v0, 0x2a($v0) -/* B2CE4C 802409DC 30420001 */ andi $v0, $v0, 1 -/* B2CE50 802409E0 14400029 */ bnez $v0, .L80240A88 -/* B2CE54 802409E4 2402000A */ addiu $v0, $zero, 0xa -/* B2CE58 802409E8 080902A2 */ j .L80240A88 -/* B2CE5C 802409EC 2402000C */ addiu $v0, $zero, 0xc -.L802409F0: -/* B2CE60 802409F0 8602008C */ lh $v0, 0x8c($s0) -/* B2CE64 802409F4 14400025 */ bnez $v0, .L80240A8C -/* B2CE68 802409F8 00000000 */ nop -/* B2CE6C 802409FC 9602008E */ lhu $v0, 0x8e($s0) -/* B2CE70 80240A00 2442FFFF */ addiu $v0, $v0, -1 -/* B2CE74 80240A04 A602008E */ sh $v0, 0x8e($s0) -/* B2CE78 80240A08 00021400 */ sll $v0, $v0, 0x10 -/* B2CE7C 80240A0C 1440001F */ bnez $v0, .L80240A8C -/* B2CE80 80240A10 00000000 */ nop -/* B2CE84 80240A14 8E820074 */ lw $v0, 0x74($s4) -/* B2CE88 80240A18 2442FFFF */ addiu $v0, $v0, -1 -/* B2CE8C 80240A1C 10400019 */ beqz $v0, .L80240A84 -/* B2CE90 80240A20 AE820074 */ sw $v0, 0x74($s4) -/* B2CE94 80240A24 8E220018 */ lw $v0, 0x18($s1) -/* B2CE98 80240A28 9442002A */ lhu $v0, 0x2a($v0) -/* B2CE9C 80240A2C 30420010 */ andi $v0, $v0, 0x10 -/* B2CEA0 80240A30 14400007 */ bnez $v0, .L80240A50 -/* B2CEA4 80240A34 00000000 */ nop -/* B2CEA8 80240A38 C600000C */ lwc1 $f0, 0xc($s0) -/* B2CEAC 80240A3C 3C014334 */ lui $at, 0x4334 -/* B2CEB0 80240A40 44816000 */ mtc1 $at, $f12 -/* B2CEB4 80240A44 0C00A6C9 */ jal clamp_angle -/* B2CEB8 80240A48 460C0300 */ add.s $f12, $f0, $f12 -/* B2CEBC 80240A4C E600000C */ swc1 $f0, 0xc($s0) -.L80240A50: -/* B2CEC0 80240A50 8E440008 */ lw $a0, 8($s2) -/* B2CEC4 80240A54 000417C2 */ srl $v0, $a0, 0x1f -/* B2CEC8 80240A58 00822021 */ addu $a0, $a0, $v0 -/* B2CECC 80240A5C 00042043 */ sra $a0, $a0, 1 -/* B2CED0 80240A60 0C00A67F */ jal rand_int -/* B2CED4 80240A64 24840001 */ addiu $a0, $a0, 1 -/* B2CED8 80240A68 8E430008 */ lw $v1, 8($s2) -/* B2CEDC 80240A6C 000327C2 */ srl $a0, $v1, 0x1f -/* B2CEE0 80240A70 00641821 */ addu $v1, $v1, $a0 -/* B2CEE4 80240A74 00031843 */ sra $v1, $v1, 1 -/* B2CEE8 80240A78 00621821 */ addu $v1, $v1, $v0 -/* B2CEEC 80240A7C 080902A3 */ j .L80240A8C -/* B2CEF0 80240A80 A603008E */ sh $v1, 0x8e($s0) -.L80240A84: -/* B2CEF4 80240A84 24020004 */ addiu $v0, $zero, 4 -.L80240A88: -/* B2CEF8 80240A88 AE820070 */ sw $v0, 0x70($s4) -.L80240A8C: -/* B2CEFC 80240A8C 8FBF0044 */ lw $ra, 0x44($sp) -/* B2CF00 80240A90 8FB40040 */ lw $s4, 0x40($sp) -/* B2CF04 80240A94 8FB3003C */ lw $s3, 0x3c($sp) -/* B2CF08 80240A98 8FB20038 */ lw $s2, 0x38($sp) -/* B2CF0C 80240A9C 8FB10034 */ lw $s1, 0x34($sp) -/* B2CF10 80240AA0 8FB00030 */ lw $s0, 0x30($sp) -/* B2CF14 80240AA4 03E00008 */ jr $ra -/* B2CF18 80240AA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s deleted file mode 100644 index bf362c27b6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D7C_B2D1EC -/* B2D1EC 80240D7C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2D1F0 80240D80 AFB3003C */ sw $s3, 0x3c($sp) -/* B2D1F4 80240D84 0080982D */ daddu $s3, $a0, $zero -/* B2D1F8 80240D88 AFBF0040 */ sw $ra, 0x40($sp) -/* B2D1FC 80240D8C AFB20038 */ sw $s2, 0x38($sp) -/* B2D200 80240D90 AFB10034 */ sw $s1, 0x34($sp) -/* B2D204 80240D94 AFB00030 */ sw $s0, 0x30($sp) -/* B2D208 80240D98 8E720148 */ lw $s2, 0x148($s3) -/* B2D20C 80240D9C 00A0882D */ daddu $s1, $a1, $zero -/* B2D210 80240DA0 86440008 */ lh $a0, 8($s2) -/* B2D214 80240DA4 0C00EABB */ jal get_npc_unsafe -/* B2D218 80240DA8 00C0802D */ daddu $s0, $a2, $zero -/* B2D21C 80240DAC 0200202D */ daddu $a0, $s0, $zero -/* B2D220 80240DB0 0240282D */ daddu $a1, $s2, $zero -/* B2D224 80240DB4 24030001 */ addiu $v1, $zero, 1 -/* B2D228 80240DB8 AFA30010 */ sw $v1, 0x10($sp) -/* B2D22C 80240DBC 8E260024 */ lw $a2, 0x24($s1) -/* B2D230 80240DC0 8E270028 */ lw $a3, 0x28($s1) -/* B2D234 80240DC4 0C01242D */ jal func_800490B4 -/* B2D238 80240DC8 0040802D */ daddu $s0, $v0, $zero -/* B2D23C 80240DCC 1440001E */ bnez $v0, .L80240E48 -/* B2D240 80240DD0 0200202D */ daddu $a0, $s0, $zero -/* B2D244 80240DD4 24040002 */ addiu $a0, $zero, 2 -/* B2D248 80240DD8 0200282D */ daddu $a1, $s0, $zero -/* B2D24C 80240DDC 0000302D */ daddu $a2, $zero, $zero -/* B2D250 80240DE0 860300A8 */ lh $v1, 0xa8($s0) -/* B2D254 80240DE4 3C013F80 */ lui $at, 0x3f80 -/* B2D258 80240DE8 44810000 */ mtc1 $at, $f0 -/* B2D25C 80240DEC 3C014000 */ lui $at, 0x4000 -/* B2D260 80240DF0 44811000 */ mtc1 $at, $f2 -/* B2D264 80240DF4 3C01C1A0 */ lui $at, 0xc1a0 -/* B2D268 80240DF8 44812000 */ mtc1 $at, $f4 -/* B2D26C 80240DFC 2402000F */ addiu $v0, $zero, 0xf -/* B2D270 80240E00 AFA2001C */ sw $v0, 0x1c($sp) -/* B2D274 80240E04 44833000 */ mtc1 $v1, $f6 -/* B2D278 80240E08 00000000 */ nop -/* B2D27C 80240E0C 468031A0 */ cvt.s.w $f6, $f6 -/* B2D280 80240E10 44073000 */ mfc1 $a3, $f6 -/* B2D284 80240E14 27A20028 */ addiu $v0, $sp, 0x28 -/* B2D288 80240E18 AFA20020 */ sw $v0, 0x20($sp) -/* B2D28C 80240E1C E7A00010 */ swc1 $f0, 0x10($sp) -/* B2D290 80240E20 E7A20014 */ swc1 $f2, 0x14($sp) -/* B2D294 80240E24 0C01BFA4 */ jal fx_emote -/* B2D298 80240E28 E7A40018 */ swc1 $f4, 0x18($sp) -/* B2D29C 80240E2C 8E4200CC */ lw $v0, 0xcc($s2) -/* B2D2A0 80240E30 8C430000 */ lw $v1, ($v0) -/* B2D2A4 80240E34 24020019 */ addiu $v0, $zero, 0x19 -/* B2D2A8 80240E38 A602008E */ sh $v0, 0x8e($s0) -/* B2D2AC 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* B2D2B0 80240E40 0809039F */ j .L80240E7C -/* B2D2B4 80240E44 AE030028 */ sw $v1, 0x28($s0) -.L80240E48: -/* B2D2B8 80240E48 0C00F598 */ jal func_8003D660 -/* B2D2BC 80240E4C 24050001 */ addiu $a1, $zero, 1 -/* B2D2C0 80240E50 8E050018 */ lw $a1, 0x18($s0) -/* B2D2C4 80240E54 8E06000C */ lw $a2, 0xc($s0) -/* B2D2C8 80240E58 0C00EA95 */ jal npc_move_heading -/* B2D2CC 80240E5C 0200202D */ daddu $a0, $s0, $zero -/* B2D2D0 80240E60 8602008E */ lh $v0, 0x8e($s0) -/* B2D2D4 80240E64 9603008E */ lhu $v1, 0x8e($s0) -/* B2D2D8 80240E68 18400003 */ blez $v0, .L80240E78 -/* B2D2DC 80240E6C 2462FFFF */ addiu $v0, $v1, -1 -/* B2D2E0 80240E70 080903A0 */ j .L80240E80 -/* B2D2E4 80240E74 A602008E */ sh $v0, 0x8e($s0) -.L80240E78: -/* B2D2E8 80240E78 2402000C */ addiu $v0, $zero, 0xc -.L80240E7C: -/* B2D2EC 80240E7C AE620070 */ sw $v0, 0x70($s3) -.L80240E80: -/* B2D2F0 80240E80 8FBF0040 */ lw $ra, 0x40($sp) -/* B2D2F4 80240E84 8FB3003C */ lw $s3, 0x3c($sp) -/* B2D2F8 80240E88 8FB20038 */ lw $s2, 0x38($sp) -/* B2D2FC 80240E8C 8FB10034 */ lw $s1, 0x34($sp) -/* B2D300 80240E90 8FB00030 */ lw $s0, 0x30($sp) -/* B2D304 80240E94 03E00008 */ jr $ra -/* B2D308 80240E98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s deleted file mode 100644 index f65ef55836..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240F04_B2D374.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F04_B2D374 -/* B2D374 80240F04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2D378 80240F08 AFB10014 */ sw $s1, 0x14($sp) -/* B2D37C 80240F0C 0080882D */ daddu $s1, $a0, $zero -/* B2D380 80240F10 AFBF001C */ sw $ra, 0x1c($sp) -/* B2D384 80240F14 AFB20018 */ sw $s2, 0x18($sp) -/* B2D388 80240F18 AFB00010 */ sw $s0, 0x10($sp) -/* B2D38C 80240F1C 8E300148 */ lw $s0, 0x148($s1) -/* B2D390 80240F20 86040008 */ lh $a0, 8($s0) -/* B2D394 80240F24 0C00EABB */ jal get_npc_unsafe -/* B2D398 80240F28 00A0902D */ daddu $s2, $a1, $zero -/* B2D39C 80240F2C 8E0300D0 */ lw $v1, 0xd0($s0) -/* B2D3A0 80240F30 8E240078 */ lw $a0, 0x78($s1) -/* B2D3A4 80240F34 8C630000 */ lw $v1, ($v1) -/* B2D3A8 80240F38 0083182A */ slt $v1, $a0, $v1 -/* B2D3AC 80240F3C 10600013 */ beqz $v1, .L80240F8C -/* B2D3B0 80240F40 0040302D */ daddu $a2, $v0, $zero -/* B2D3B4 80240F44 00041040 */ sll $v0, $a0, 1 -/* B2D3B8 80240F48 00441021 */ addu $v0, $v0, $a0 -/* B2D3BC 80240F4C 00022880 */ sll $a1, $v0, 2 -.L80240F50: -/* B2D3C0 80240F50 8E0300D0 */ lw $v1, 0xd0($s0) -/* B2D3C4 80240F54 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* B2D3C8 80240F58 00A31021 */ addu $v0, $a1, $v1 -/* B2D3CC 80240F5C C4400008 */ lwc1 $f0, 8($v0) -/* B2D3D0 80240F60 46800020 */ cvt.s.w $f0, $f0 -/* B2D3D4 80240F64 4602003E */ c.le.s $f0, $f2 -/* B2D3D8 80240F68 00000000 */ nop -/* B2D3DC 80240F6C 45020003 */ bc1fl .L80240F7C -/* B2D3E0 80240F70 24840001 */ addiu $a0, $a0, 1 -/* B2D3E4 80240F74 080903E3 */ j .L80240F8C -/* B2D3E8 80240F78 AE240078 */ sw $a0, 0x78($s1) -.L80240F7C: -/* B2D3EC 80240F7C 8C620000 */ lw $v0, ($v1) -/* B2D3F0 80240F80 0082102A */ slt $v0, $a0, $v0 -/* B2D3F4 80240F84 1440FFF2 */ bnez $v0, .L80240F50 -/* B2D3F8 80240F88 24A5000C */ addiu $a1, $a1, 0xc -.L80240F8C: -/* B2D3FC 80240F8C C6400000 */ lwc1 $f0, ($s2) -/* B2D400 80240F90 E4C00018 */ swc1 $f0, 0x18($a2) -/* B2D404 80240F94 8E0200CC */ lw $v0, 0xcc($s0) -/* B2D408 80240F98 8C420004 */ lw $v0, 4($v0) -/* B2D40C 80240F9C ACC20028 */ sw $v0, 0x28($a2) -/* B2D410 80240FA0 24020001 */ addiu $v0, $zero, 1 -/* B2D414 80240FA4 AE200074 */ sw $zero, 0x74($s1) -/* B2D418 80240FA8 AE220070 */ sw $v0, 0x70($s1) -/* B2D41C 80240FAC 8FBF001C */ lw $ra, 0x1c($sp) -/* B2D420 80240FB0 8FB20018 */ lw $s2, 0x18($sp) -/* B2D424 80240FB4 8FB10014 */ lw $s1, 0x14($sp) -/* B2D428 80240FB8 8FB00010 */ lw $s0, 0x10($sp) -/* B2D42C 80240FBC 03E00008 */ jr $ra -/* B2D430 80240FC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 611983d58b..1a7ae29de8 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -137,7 +137,7 @@ glabel L802411A8_B2D618 glabel L802411B8_B2D628 /* B2D628 802411B8 0280202D */ daddu $a0, $s4, $zero /* B2D62C 802411BC 0260282D */ daddu $a1, $s3, $zero -/* B2D630 802411C0 0C090162 */ jal func_80240588_B2C9F8 +/* B2D630 802411C0 0C090162 */ jal jan_02_UnkFunc13 /* B2D634 802411C4 02A0302D */ daddu $a2, $s5, $zero /* B2D638 802411C8 080904A6 */ j L80241298_B2D708 /* B2D63C 802411CC 00000000 */ nop @@ -149,7 +149,7 @@ glabel L802411D0_B2D640 glabel L802411E0_B2D650 /* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero -/* B2D658 802411E8 0C09023C */ jal func_802408F0_B2CD60 +/* B2D658 802411E8 0C09023C */ jal jan_02_UnkFunc14 /* B2D65C 802411EC 02A0302D */ daddu $a2, $s5, $zero /* B2D660 802411F0 080904A6 */ j L80241298_B2D708 /* B2D664 802411F4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241238_B2D6A8 glabel L80241248_B2D6B8 /* B2D6B8 80241248 0280202D */ daddu $a0, $s4, $zero /* B2D6BC 8024124C 0260282D */ daddu $a1, $s3, $zero -/* B2D6C0 80241250 0C09035F */ jal func_80240D7C_B2D1EC +/* B2D6C0 80241250 0C09035F */ jal jan_02_UnkFunc15 /* B2D6C4 80241254 02A0302D */ daddu $a2, $s5, $zero /* B2D6C8 80241258 080904A6 */ j L80241298_B2D708 /* B2D6CC 8024125C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241260_B2D6D0 glabel L80241278_B2D6E8 /* B2D6E8 80241278 0280202D */ daddu $a0, $s4, $zero /* B2D6EC 8024127C 0260282D */ daddu $a1, $s3, $zero -/* B2D6F0 80241280 0C0903C1 */ jal func_80240F04_B2D374 +/* B2D6F0 80241280 0C0903C1 */ jal jan_02_UnkFunc16 /* B2D6F4 80241284 02A0302D */ daddu $a2, $s5, $zero /* B2D6F8 80241288 080904A6 */ j L80241298_B2D708 /* B2D6FC 8024128C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s deleted file mode 100644 index ab0fcd6ed1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240778_B35348 -/* B35348 80240778 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B3534C 8024077C AFB20038 */ sw $s2, 0x38($sp) -/* B35350 80240780 0080902D */ daddu $s2, $a0, $zero -/* B35354 80240784 AFBF0044 */ sw $ra, 0x44($sp) -/* B35358 80240788 AFB40040 */ sw $s4, 0x40($sp) -/* B3535C 8024078C AFB3003C */ sw $s3, 0x3c($sp) -/* B35360 80240790 AFB10034 */ sw $s1, 0x34($sp) -/* B35364 80240794 AFB00030 */ sw $s0, 0x30($sp) -/* B35368 80240798 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B3536C 8024079C F7B40048 */ sdc1 $f20, 0x48($sp) -/* B35370 802407A0 8E510148 */ lw $s1, 0x148($s2) -/* B35374 802407A4 00A0982D */ daddu $s3, $a1, $zero -/* B35378 802407A8 86240008 */ lh $a0, 8($s1) -/* B3537C 802407AC 0C00EABB */ jal get_npc_unsafe -/* B35380 802407B0 00C0A02D */ daddu $s4, $a2, $zero -/* B35384 802407B4 8E630014 */ lw $v1, 0x14($s3) -/* B35388 802407B8 04600030 */ bltz $v1, .L8024087C -/* B3538C 802407BC 0040802D */ daddu $s0, $v0, $zero -/* B35390 802407C0 8E420074 */ lw $v0, 0x74($s2) -/* B35394 802407C4 1C40002C */ bgtz $v0, .L80240878 -/* B35398 802407C8 2442FFFF */ addiu $v0, $v0, -1 -/* B3539C 802407CC 0280202D */ daddu $a0, $s4, $zero -/* B353A0 802407D0 AE430074 */ sw $v1, 0x74($s2) -/* B353A4 802407D4 AFA00010 */ sw $zero, 0x10($sp) -/* B353A8 802407D8 8E66000C */ lw $a2, 0xc($s3) -/* B353AC 802407DC 8E670010 */ lw $a3, 0x10($s3) -/* B353B0 802407E0 0C01242D */ jal func_800490B4 -/* B353B4 802407E4 0220282D */ daddu $a1, $s1, $zero -/* B353B8 802407E8 10400021 */ beqz $v0, .L80240870 -/* B353BC 802407EC 0000202D */ daddu $a0, $zero, $zero -/* B353C0 802407F0 0200282D */ daddu $a1, $s0, $zero -/* B353C4 802407F4 0000302D */ daddu $a2, $zero, $zero -/* B353C8 802407F8 860300A8 */ lh $v1, 0xa8($s0) -/* B353CC 802407FC 3C013F80 */ lui $at, 0x3f80 -/* B353D0 80240800 44810000 */ mtc1 $at, $f0 -/* B353D4 80240804 3C014000 */ lui $at, 0x4000 -/* B353D8 80240808 44811000 */ mtc1 $at, $f2 -/* B353DC 8024080C 3C01C1A0 */ lui $at, 0xc1a0 -/* B353E0 80240810 44812000 */ mtc1 $at, $f4 -/* B353E4 80240814 2402000F */ addiu $v0, $zero, 0xf -/* B353E8 80240818 AFA2001C */ sw $v0, 0x1c($sp) -/* B353EC 8024081C 44833000 */ mtc1 $v1, $f6 -/* B353F0 80240820 00000000 */ nop -/* B353F4 80240824 468031A0 */ cvt.s.w $f6, $f6 -/* B353F8 80240828 44073000 */ mfc1 $a3, $f6 -/* B353FC 8024082C 27A20028 */ addiu $v0, $sp, 0x28 -/* B35400 80240830 AFA20020 */ sw $v0, 0x20($sp) -/* B35404 80240834 E7A00010 */ swc1 $f0, 0x10($sp) -/* B35408 80240838 E7A20014 */ swc1 $f2, 0x14($sp) -/* B3540C 8024083C 0C01BFA4 */ jal fx_emote -/* B35410 80240840 E7A40018 */ swc1 $f4, 0x18($sp) -/* B35414 80240844 0200202D */ daddu $a0, $s0, $zero -/* B35418 80240848 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B3541C 8024084C 0C012530 */ jal func_800494C0 -/* B35420 80240850 3C060020 */ lui $a2, 0x20 -/* B35424 80240854 8E220018 */ lw $v0, 0x18($s1) -/* B35428 80240858 9442002A */ lhu $v0, 0x2a($v0) -/* B3542C 8024085C 30420001 */ andi $v0, $v0, 1 -/* B35430 80240860 14400064 */ bnez $v0, .L802409F4 -/* B35434 80240864 2402000A */ addiu $v0, $zero, 0xa -/* B35438 80240868 0809027D */ j .L802409F4 -/* B3543C 8024086C 2402000C */ addiu $v0, $zero, 0xc -.L80240870: -/* B35440 80240870 8E420074 */ lw $v0, 0x74($s2) -/* B35444 80240874 2442FFFF */ addiu $v0, $v0, -1 -.L80240878: -/* B35448 80240878 AE420074 */ sw $v0, 0x74($s2) -.L8024087C: -/* B3544C 8024087C 8602008C */ lh $v0, 0x8c($s0) -/* B35450 80240880 1440005D */ bnez $v0, .L802409F8 -/* B35454 80240884 00000000 */ nop -/* B35458 80240888 C6000018 */ lwc1 $f0, 0x18($s0) -/* B3545C 8024088C 3C014010 */ lui $at, 0x4010 -/* B35460 80240890 44811800 */ mtc1 $at, $f3 -/* B35464 80240894 44801000 */ mtc1 $zero, $f2 -/* B35468 80240898 46000021 */ cvt.d.s $f0, $f0 -/* B3546C 8024089C 4622003C */ c.lt.d $f0, $f2 -/* B35470 802408A0 00000000 */ nop -/* B35474 802408A4 45000003 */ bc1f .L802408B4 -/* B35478 802408A8 0200202D */ daddu $a0, $s0, $zero -/* B3547C 802408AC 0809022E */ j .L802408B8 -/* B35480 802408B0 0000282D */ daddu $a1, $zero, $zero -.L802408B4: -/* B35484 802408B4 24050001 */ addiu $a1, $zero, 1 -.L802408B8: -/* B35488 802408B8 0C00F598 */ jal func_8003D660 -/* B3548C 802408BC 00000000 */ nop -/* B35490 802408C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B35494 802408C4 8E430078 */ lw $v1, 0x78($s2) -/* B35498 802408C8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B3549C 802408CC 00031040 */ sll $v0, $v1, 1 -/* B354A0 802408D0 00431021 */ addu $v0, $v0, $v1 -/* B354A4 802408D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B354A8 802408D8 00021080 */ sll $v0, $v0, 2 -/* B354AC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* B354B0 802408E0 C4560004 */ lwc1 $f22, 4($v0) -/* B354B4 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B354B8 802408E8 C454000C */ lwc1 $f20, 0xc($v0) -/* B354BC 802408EC 4680A520 */ cvt.s.w $f20, $f20 -/* B354C0 802408F0 4406B000 */ mfc1 $a2, $f22 -/* B354C4 802408F4 4407A000 */ mfc1 $a3, $f20 -/* B354C8 802408F8 0C00A720 */ jal atan2 -/* B354CC 802408FC 00000000 */ nop -/* B354D0 80240900 8E050018 */ lw $a1, 0x18($s0) -/* B354D4 80240904 44060000 */ mfc1 $a2, $f0 -/* B354D8 80240908 0200202D */ daddu $a0, $s0, $zero -/* B354DC 8024090C 0C00EA95 */ jal npc_move_heading -/* B354E0 80240910 AE06000C */ sw $a2, 0xc($s0) -/* B354E4 80240914 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B354E8 80240918 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B354EC 8024091C 4406B000 */ mfc1 $a2, $f22 -/* B354F0 80240920 4407A000 */ mfc1 $a3, $f20 -/* B354F4 80240924 0C00A7B5 */ jal dist2D -/* B354F8 80240928 00000000 */ nop -/* B354FC 8024092C C6020018 */ lwc1 $f2, 0x18($s0) -/* B35500 80240930 4602003E */ c.le.s $f0, $f2 -/* B35504 80240934 00000000 */ nop -/* B35508 80240938 4500002F */ bc1f .L802409F8 -/* B3550C 8024093C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B35510 80240940 24020002 */ addiu $v0, $zero, 2 -/* B35514 80240944 0C00A67F */ jal rand_int -/* B35518 80240948 AE420070 */ sw $v0, 0x70($s2) -/* B3551C 8024094C 3C035555 */ lui $v1, 0x5555 -/* B35520 80240950 34635556 */ ori $v1, $v1, 0x5556 -/* B35524 80240954 00430018 */ mult $v0, $v1 -/* B35528 80240958 000227C3 */ sra $a0, $v0, 0x1f -/* B3552C 8024095C 00004010 */ mfhi $t0 -/* B35530 80240960 01042023 */ subu $a0, $t0, $a0 -/* B35534 80240964 00041840 */ sll $v1, $a0, 1 -/* B35538 80240968 00641821 */ addu $v1, $v1, $a0 -/* B3553C 8024096C 00431023 */ subu $v0, $v0, $v1 -/* B35540 80240970 24430002 */ addiu $v1, $v0, 2 -/* B35544 80240974 AE430074 */ sw $v1, 0x74($s2) -/* B35548 80240978 8E62002C */ lw $v0, 0x2c($s3) -/* B3554C 8024097C 18400009 */ blez $v0, .L802409A4 -/* B35550 80240980 24020004 */ addiu $v0, $zero, 4 -/* B35554 80240984 8E620004 */ lw $v0, 4($s3) -/* B35558 80240988 18400006 */ blez $v0, .L802409A4 -/* B3555C 8024098C 24020004 */ addiu $v0, $zero, 4 -/* B35560 80240990 8E620008 */ lw $v0, 8($s3) -/* B35564 80240994 18400003 */ blez $v0, .L802409A4 -/* B35568 80240998 24020004 */ addiu $v0, $zero, 4 -/* B3556C 8024099C 14600002 */ bnez $v1, .L802409A8 -/* B35570 802409A0 00000000 */ nop -.L802409A4: -/* B35574 802409A4 AE420070 */ sw $v0, 0x70($s2) -.L802409A8: -/* B35578 802409A8 0C00A67F */ jal rand_int -/* B3557C 802409AC 24042710 */ addiu $a0, $zero, 0x2710 -/* B35580 802409B0 3C0351EB */ lui $v1, 0x51eb -/* B35584 802409B4 3463851F */ ori $v1, $v1, 0x851f -/* B35588 802409B8 00430018 */ mult $v0, $v1 -/* B3558C 802409BC 00021FC3 */ sra $v1, $v0, 0x1f -/* B35590 802409C0 00004010 */ mfhi $t0 -/* B35594 802409C4 00082143 */ sra $a0, $t0, 5 -/* B35598 802409C8 00832023 */ subu $a0, $a0, $v1 -/* B3559C 802409CC 00041840 */ sll $v1, $a0, 1 -/* B355A0 802409D0 00641821 */ addu $v1, $v1, $a0 -/* B355A4 802409D4 000318C0 */ sll $v1, $v1, 3 -/* B355A8 802409D8 00641821 */ addu $v1, $v1, $a0 -/* B355AC 802409DC 00031880 */ sll $v1, $v1, 2 -/* B355B0 802409E0 8E640004 */ lw $a0, 4($s3) -/* B355B4 802409E4 00431023 */ subu $v0, $v0, $v1 -/* B355B8 802409E8 0044102A */ slt $v0, $v0, $a0 -/* B355BC 802409EC 10400002 */ beqz $v0, .L802409F8 -/* B355C0 802409F0 24020004 */ addiu $v0, $zero, 4 -.L802409F4: -/* B355C4 802409F4 AE420070 */ sw $v0, 0x70($s2) -.L802409F8: -/* B355C8 802409F8 8FBF0044 */ lw $ra, 0x44($sp) -/* B355CC 802409FC 8FB40040 */ lw $s4, 0x40($sp) -/* B355D0 80240A00 8FB3003C */ lw $s3, 0x3c($sp) -/* B355D4 80240A04 8FB20038 */ lw $s2, 0x38($sp) -/* B355D8 80240A08 8FB10034 */ lw $s1, 0x34($sp) -/* B355DC 80240A0C 8FB00030 */ lw $s0, 0x30($sp) -/* B355E0 80240A10 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B355E4 80240A14 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B355E8 80240A18 03E00008 */ jr $ra -/* B355EC 80240A1C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s deleted file mode 100644 index 732299f181..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240AE0_B356B0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE0_B356B0 -/* B356B0 80240AE0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B356B4 80240AE4 AFB40040 */ sw $s4, 0x40($sp) -/* B356B8 80240AE8 0080A02D */ daddu $s4, $a0, $zero -/* B356BC 80240AEC AFBF0044 */ sw $ra, 0x44($sp) -/* B356C0 80240AF0 AFB3003C */ sw $s3, 0x3c($sp) -/* B356C4 80240AF4 AFB20038 */ sw $s2, 0x38($sp) -/* B356C8 80240AF8 AFB10034 */ sw $s1, 0x34($sp) -/* B356CC 80240AFC AFB00030 */ sw $s0, 0x30($sp) -/* B356D0 80240B00 8E910148 */ lw $s1, 0x148($s4) -/* B356D4 80240B04 00A0902D */ daddu $s2, $a1, $zero -/* B356D8 80240B08 86240008 */ lh $a0, 8($s1) -/* B356DC 80240B0C 0C00EABB */ jal get_npc_unsafe -/* B356E0 80240B10 00C0982D */ daddu $s3, $a2, $zero -/* B356E4 80240B14 8E430014 */ lw $v1, 0x14($s2) -/* B356E8 80240B18 04600031 */ bltz $v1, .L80240BE0 -/* B356EC 80240B1C 0040802D */ daddu $s0, $v0, $zero -/* B356F0 80240B20 0260202D */ daddu $a0, $s3, $zero -/* B356F4 80240B24 AFA00010 */ sw $zero, 0x10($sp) -/* B356F8 80240B28 8E460024 */ lw $a2, 0x24($s2) -/* B356FC 80240B2C 8E470028 */ lw $a3, 0x28($s2) -/* B35700 80240B30 0C01242D */ jal func_800490B4 -/* B35704 80240B34 0220282D */ daddu $a1, $s1, $zero -/* B35708 80240B38 10400029 */ beqz $v0, .L80240BE0 -/* B3570C 80240B3C 0000202D */ daddu $a0, $zero, $zero -/* B35710 80240B40 0200282D */ daddu $a1, $s0, $zero -/* B35714 80240B44 0000302D */ daddu $a2, $zero, $zero -/* B35718 80240B48 860300A8 */ lh $v1, 0xa8($s0) -/* B3571C 80240B4C 3C013F80 */ lui $at, 0x3f80 -/* B35720 80240B50 44810000 */ mtc1 $at, $f0 -/* B35724 80240B54 3C014000 */ lui $at, 0x4000 -/* B35728 80240B58 44811000 */ mtc1 $at, $f2 -/* B3572C 80240B5C 3C01C1A0 */ lui $at, 0xc1a0 -/* B35730 80240B60 44812000 */ mtc1 $at, $f4 -/* B35734 80240B64 2402000F */ addiu $v0, $zero, 0xf -/* B35738 80240B68 AFA2001C */ sw $v0, 0x1c($sp) -/* B3573C 80240B6C 44833000 */ mtc1 $v1, $f6 -/* B35740 80240B70 00000000 */ nop -/* B35744 80240B74 468031A0 */ cvt.s.w $f6, $f6 -/* B35748 80240B78 44073000 */ mfc1 $a3, $f6 -/* B3574C 80240B7C 27A20028 */ addiu $v0, $sp, 0x28 -/* B35750 80240B80 AFA20020 */ sw $v0, 0x20($sp) -/* B35754 80240B84 E7A00010 */ swc1 $f0, 0x10($sp) -/* B35758 80240B88 E7A20014 */ swc1 $f2, 0x14($sp) -/* B3575C 80240B8C 0C01BFA4 */ jal fx_emote -/* B35760 80240B90 E7A40018 */ swc1 $f4, 0x18($sp) -/* B35764 80240B94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B35768 80240B98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B3576C 80240B9C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B35770 80240BA0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B35774 80240BA4 8C460028 */ lw $a2, 0x28($v0) -/* B35778 80240BA8 0C00A720 */ jal atan2 -/* B3577C 80240BAC 8C470030 */ lw $a3, 0x30($v0) -/* B35780 80240BB0 0200202D */ daddu $a0, $s0, $zero -/* B35784 80240BB4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B35788 80240BB8 3C060020 */ lui $a2, 0x20 -/* B3578C 80240BBC 0C012530 */ jal func_800494C0 -/* B35790 80240BC0 E480000C */ swc1 $f0, 0xc($a0) -/* B35794 80240BC4 8E220018 */ lw $v0, 0x18($s1) -/* B35798 80240BC8 9442002A */ lhu $v0, 0x2a($v0) -/* B3579C 80240BCC 30420001 */ andi $v0, $v0, 1 -/* B357A0 80240BD0 14400029 */ bnez $v0, .L80240C78 -/* B357A4 80240BD4 2402000A */ addiu $v0, $zero, 0xa -/* B357A8 80240BD8 0809031E */ j .L80240C78 -/* B357AC 80240BDC 2402000C */ addiu $v0, $zero, 0xc -.L80240BE0: -/* B357B0 80240BE0 8602008C */ lh $v0, 0x8c($s0) -/* B357B4 80240BE4 14400025 */ bnez $v0, .L80240C7C -/* B357B8 80240BE8 00000000 */ nop -/* B357BC 80240BEC 9602008E */ lhu $v0, 0x8e($s0) -/* B357C0 80240BF0 2442FFFF */ addiu $v0, $v0, -1 -/* B357C4 80240BF4 A602008E */ sh $v0, 0x8e($s0) -/* B357C8 80240BF8 00021400 */ sll $v0, $v0, 0x10 -/* B357CC 80240BFC 1440001F */ bnez $v0, .L80240C7C -/* B357D0 80240C00 00000000 */ nop -/* B357D4 80240C04 8E820074 */ lw $v0, 0x74($s4) -/* B357D8 80240C08 2442FFFF */ addiu $v0, $v0, -1 -/* B357DC 80240C0C 10400019 */ beqz $v0, .L80240C74 -/* B357E0 80240C10 AE820074 */ sw $v0, 0x74($s4) -/* B357E4 80240C14 8E220018 */ lw $v0, 0x18($s1) -/* B357E8 80240C18 9442002A */ lhu $v0, 0x2a($v0) -/* B357EC 80240C1C 30420010 */ andi $v0, $v0, 0x10 -/* B357F0 80240C20 14400007 */ bnez $v0, .L80240C40 -/* B357F4 80240C24 00000000 */ nop -/* B357F8 80240C28 C600000C */ lwc1 $f0, 0xc($s0) -/* B357FC 80240C2C 3C014334 */ lui $at, 0x4334 -/* B35800 80240C30 44816000 */ mtc1 $at, $f12 -/* B35804 80240C34 0C00A6C9 */ jal clamp_angle -/* B35808 80240C38 460C0300 */ add.s $f12, $f0, $f12 -/* B3580C 80240C3C E600000C */ swc1 $f0, 0xc($s0) -.L80240C40: -/* B35810 80240C40 8E440008 */ lw $a0, 8($s2) -/* B35814 80240C44 000417C2 */ srl $v0, $a0, 0x1f -/* B35818 80240C48 00822021 */ addu $a0, $a0, $v0 -/* B3581C 80240C4C 00042043 */ sra $a0, $a0, 1 -/* B35820 80240C50 0C00A67F */ jal rand_int -/* B35824 80240C54 24840001 */ addiu $a0, $a0, 1 -/* B35828 80240C58 8E430008 */ lw $v1, 8($s2) -/* B3582C 80240C5C 000327C2 */ srl $a0, $v1, 0x1f -/* B35830 80240C60 00641821 */ addu $v1, $v1, $a0 -/* B35834 80240C64 00031843 */ sra $v1, $v1, 1 -/* B35838 80240C68 00621821 */ addu $v1, $v1, $v0 -/* B3583C 80240C6C 0809031F */ j .L80240C7C -/* B35840 80240C70 A603008E */ sh $v1, 0x8e($s0) -.L80240C74: -/* B35844 80240C74 24020004 */ addiu $v0, $zero, 4 -.L80240C78: -/* B35848 80240C78 AE820070 */ sw $v0, 0x70($s4) -.L80240C7C: -/* B3584C 80240C7C 8FBF0044 */ lw $ra, 0x44($sp) -/* B35850 80240C80 8FB40040 */ lw $s4, 0x40($sp) -/* B35854 80240C84 8FB3003C */ lw $s3, 0x3c($sp) -/* B35858 80240C88 8FB20038 */ lw $s2, 0x38($sp) -/* B3585C 80240C8C 8FB10034 */ lw $s1, 0x34($sp) -/* B35860 80240C90 8FB00030 */ lw $s0, 0x30($sp) -/* B35864 80240C94 03E00008 */ jr $ra -/* B35868 80240C98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s deleted file mode 100644 index 0325f51fdf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F6C_B35B3C -/* B35B3C 80240F6C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B35B40 80240F70 AFB3003C */ sw $s3, 0x3c($sp) -/* B35B44 80240F74 0080982D */ daddu $s3, $a0, $zero -/* B35B48 80240F78 AFBF0040 */ sw $ra, 0x40($sp) -/* B35B4C 80240F7C AFB20038 */ sw $s2, 0x38($sp) -/* B35B50 80240F80 AFB10034 */ sw $s1, 0x34($sp) -/* B35B54 80240F84 AFB00030 */ sw $s0, 0x30($sp) -/* B35B58 80240F88 8E720148 */ lw $s2, 0x148($s3) -/* B35B5C 80240F8C 00A0882D */ daddu $s1, $a1, $zero -/* B35B60 80240F90 86440008 */ lh $a0, 8($s2) -/* B35B64 80240F94 0C00EABB */ jal get_npc_unsafe -/* B35B68 80240F98 00C0802D */ daddu $s0, $a2, $zero -/* B35B6C 80240F9C 0200202D */ daddu $a0, $s0, $zero -/* B35B70 80240FA0 0240282D */ daddu $a1, $s2, $zero -/* B35B74 80240FA4 24030001 */ addiu $v1, $zero, 1 -/* B35B78 80240FA8 AFA30010 */ sw $v1, 0x10($sp) -/* B35B7C 80240FAC 8E260024 */ lw $a2, 0x24($s1) -/* B35B80 80240FB0 8E270028 */ lw $a3, 0x28($s1) -/* B35B84 80240FB4 0C01242D */ jal func_800490B4 -/* B35B88 80240FB8 0040802D */ daddu $s0, $v0, $zero -/* B35B8C 80240FBC 1440001E */ bnez $v0, .L80241038 -/* B35B90 80240FC0 0200202D */ daddu $a0, $s0, $zero -/* B35B94 80240FC4 24040002 */ addiu $a0, $zero, 2 -/* B35B98 80240FC8 0200282D */ daddu $a1, $s0, $zero -/* B35B9C 80240FCC 0000302D */ daddu $a2, $zero, $zero -/* B35BA0 80240FD0 860300A8 */ lh $v1, 0xa8($s0) -/* B35BA4 80240FD4 3C013F80 */ lui $at, 0x3f80 -/* B35BA8 80240FD8 44810000 */ mtc1 $at, $f0 -/* B35BAC 80240FDC 3C014000 */ lui $at, 0x4000 -/* B35BB0 80240FE0 44811000 */ mtc1 $at, $f2 -/* B35BB4 80240FE4 3C01C1A0 */ lui $at, 0xc1a0 -/* B35BB8 80240FE8 44812000 */ mtc1 $at, $f4 -/* B35BBC 80240FEC 2402000F */ addiu $v0, $zero, 0xf -/* B35BC0 80240FF0 AFA2001C */ sw $v0, 0x1c($sp) -/* B35BC4 80240FF4 44833000 */ mtc1 $v1, $f6 -/* B35BC8 80240FF8 00000000 */ nop -/* B35BCC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 -/* B35BD0 80241000 44073000 */ mfc1 $a3, $f6 -/* B35BD4 80241004 27A20028 */ addiu $v0, $sp, 0x28 -/* B35BD8 80241008 AFA20020 */ sw $v0, 0x20($sp) -/* B35BDC 8024100C E7A00010 */ swc1 $f0, 0x10($sp) -/* B35BE0 80241010 E7A20014 */ swc1 $f2, 0x14($sp) -/* B35BE4 80241014 0C01BFA4 */ jal fx_emote -/* B35BE8 80241018 E7A40018 */ swc1 $f4, 0x18($sp) -/* B35BEC 8024101C 8E4200CC */ lw $v0, 0xcc($s2) -/* B35BF0 80241020 8C430000 */ lw $v1, ($v0) -/* B35BF4 80241024 24020019 */ addiu $v0, $zero, 0x19 -/* B35BF8 80241028 A602008E */ sh $v0, 0x8e($s0) -/* B35BFC 8024102C 2402000E */ addiu $v0, $zero, 0xe -/* B35C00 80241030 0809041B */ j .L8024106C -/* B35C04 80241034 AE030028 */ sw $v1, 0x28($s0) -.L80241038: -/* B35C08 80241038 0C00F598 */ jal func_8003D660 -/* B35C0C 8024103C 24050001 */ addiu $a1, $zero, 1 -/* B35C10 80241040 8E050018 */ lw $a1, 0x18($s0) -/* B35C14 80241044 8E06000C */ lw $a2, 0xc($s0) -/* B35C18 80241048 0C00EA95 */ jal npc_move_heading -/* B35C1C 8024104C 0200202D */ daddu $a0, $s0, $zero -/* B35C20 80241050 8602008E */ lh $v0, 0x8e($s0) -/* B35C24 80241054 9603008E */ lhu $v1, 0x8e($s0) -/* B35C28 80241058 18400003 */ blez $v0, .L80241068 -/* B35C2C 8024105C 2462FFFF */ addiu $v0, $v1, -1 -/* B35C30 80241060 0809041C */ j .L80241070 -/* B35C34 80241064 A602008E */ sh $v0, 0x8e($s0) -.L80241068: -/* B35C38 80241068 2402000C */ addiu $v0, $zero, 0xc -.L8024106C: -/* B35C3C 8024106C AE620070 */ sw $v0, 0x70($s3) -.L80241070: -/* B35C40 80241070 8FBF0040 */ lw $ra, 0x40($sp) -/* B35C44 80241074 8FB3003C */ lw $s3, 0x3c($sp) -/* B35C48 80241078 8FB20038 */ lw $s2, 0x38($sp) -/* B35C4C 8024107C 8FB10034 */ lw $s1, 0x34($sp) -/* B35C50 80241080 8FB00030 */ lw $s0, 0x30($sp) -/* B35C54 80241084 03E00008 */ jr $ra -/* B35C58 80241088 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s deleted file mode 100644 index c5f25f08e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410F4_B35CC4 -/* B35CC4 802410F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35CC8 802410F8 AFB10014 */ sw $s1, 0x14($sp) -/* B35CCC 802410FC 0080882D */ daddu $s1, $a0, $zero -/* B35CD0 80241100 AFBF001C */ sw $ra, 0x1c($sp) -/* B35CD4 80241104 AFB20018 */ sw $s2, 0x18($sp) -/* B35CD8 80241108 AFB00010 */ sw $s0, 0x10($sp) -/* B35CDC 8024110C 8E300148 */ lw $s0, 0x148($s1) -/* B35CE0 80241110 86040008 */ lh $a0, 8($s0) -/* B35CE4 80241114 0C00EABB */ jal get_npc_unsafe -/* B35CE8 80241118 00A0902D */ daddu $s2, $a1, $zero -/* B35CEC 8024111C 8E0300D0 */ lw $v1, 0xd0($s0) -/* B35CF0 80241120 8E240078 */ lw $a0, 0x78($s1) -/* B35CF4 80241124 8C630000 */ lw $v1, ($v1) -/* B35CF8 80241128 0083182A */ slt $v1, $a0, $v1 -/* B35CFC 8024112C 10600013 */ beqz $v1, .L8024117C -/* B35D00 80241130 0040302D */ daddu $a2, $v0, $zero -/* B35D04 80241134 00041040 */ sll $v0, $a0, 1 -/* B35D08 80241138 00441021 */ addu $v0, $v0, $a0 -/* B35D0C 8024113C 00022880 */ sll $a1, $v0, 2 -.L80241140: -/* B35D10 80241140 8E0300D0 */ lw $v1, 0xd0($s0) -/* B35D14 80241144 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* B35D18 80241148 00A31021 */ addu $v0, $a1, $v1 -/* B35D1C 8024114C C4400008 */ lwc1 $f0, 8($v0) -/* B35D20 80241150 46800020 */ cvt.s.w $f0, $f0 -/* B35D24 80241154 4602003E */ c.le.s $f0, $f2 -/* B35D28 80241158 00000000 */ nop -/* B35D2C 8024115C 45020003 */ bc1fl .L8024116C -/* B35D30 80241160 24840001 */ addiu $a0, $a0, 1 -/* B35D34 80241164 0809045F */ j .L8024117C -/* B35D38 80241168 AE240078 */ sw $a0, 0x78($s1) -.L8024116C: -/* B35D3C 8024116C 8C620000 */ lw $v0, ($v1) -/* B35D40 80241170 0082102A */ slt $v0, $a0, $v0 -/* B35D44 80241174 1440FFF2 */ bnez $v0, .L80241140 -/* B35D48 80241178 24A5000C */ addiu $a1, $a1, 0xc -.L8024117C: -/* B35D4C 8024117C C6400000 */ lwc1 $f0, ($s2) -/* B35D50 80241180 E4C00018 */ swc1 $f0, 0x18($a2) -/* B35D54 80241184 8E0200CC */ lw $v0, 0xcc($s0) -/* B35D58 80241188 8C420004 */ lw $v0, 4($v0) -/* B35D5C 8024118C ACC20028 */ sw $v0, 0x28($a2) -/* B35D60 80241190 24020001 */ addiu $v0, $zero, 1 -/* B35D64 80241194 AE200074 */ sw $zero, 0x74($s1) -/* B35D68 80241198 AE220070 */ sw $v0, 0x70($s1) -/* B35D6C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* B35D70 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* B35D74 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* B35D78 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* B35D7C 802411AC 03E00008 */ jr $ra -/* B35D80 802411B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index db866bb254..9d9b392853 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -137,7 +137,7 @@ glabel L80241398_B35F68 glabel L802413A8_B35F78 /* B35F78 802413A8 0280202D */ daddu $a0, $s4, $zero /* B35F7C 802413AC 0260282D */ daddu $a1, $s3, $zero -/* B35F80 802413B0 0C0901DE */ jal func_80240778_B35348 +/* B35F80 802413B0 0C0901DE */ jal jan_03_UnkFunc13 /* B35F84 802413B4 02A0302D */ daddu $a2, $s5, $zero /* B35F88 802413B8 08090522 */ j L80241488_B36058 /* B35F8C 802413BC 00000000 */ nop @@ -149,7 +149,7 @@ glabel L802413C0_B35F90 glabel L802413D0_B35FA0 /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* B35FA8 802413D8 0C0902B8 */ jal func_80240AE0_B356B0 +/* B35FA8 802413D8 0C0902B8 */ jal jan_03_UnkFunc14 /* B35FAC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* B35FB0 802413E0 08090522 */ j L80241488_B36058 /* B35FB4 802413E4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241428_B35FF8 glabel L80241438_B36008 /* B36008 80241438 0280202D */ daddu $a0, $s4, $zero /* B3600C 8024143C 0260282D */ daddu $a1, $s3, $zero -/* B36010 80241440 0C0903DB */ jal func_80240F6C_B35B3C +/* B36010 80241440 0C0903DB */ jal jan_03_UnkFunc15 /* B36014 80241444 02A0302D */ daddu $a2, $s5, $zero /* B36018 80241448 08090522 */ j L80241488_B36058 /* B3601C 8024144C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241450_B36020 glabel L80241468_B36038 /* B36038 80241468 0280202D */ daddu $a0, $s4, $zero /* B3603C 8024146C 0260282D */ daddu $a1, $s3, $zero -/* B36040 80241470 0C09043D */ jal func_802410F4_B35CC4 +/* B36040 80241470 0C09043D */ jal jan_03_UnkFunc16 /* B36044 80241474 02A0302D */ daddu $a2, $s5, $zero /* B36048 80241478 08090522 */ j L80241488_B36058 /* B3604C 8024147C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s deleted file mode 100644 index 58ddd79860..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241C88_B4C6F8.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C88_B4C6F8 -/* B4C6F8 80241C88 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B4C6FC 80241C8C AFB40028 */ sw $s4, 0x28($sp) -/* B4C700 80241C90 0080A02D */ daddu $s4, $a0, $zero -/* B4C704 80241C94 AFBF002C */ sw $ra, 0x2c($sp) -/* B4C708 80241C98 AFB30024 */ sw $s3, 0x24($sp) -/* B4C70C 80241C9C AFB20020 */ sw $s2, 0x20($sp) -/* B4C710 80241CA0 AFB1001C */ sw $s1, 0x1c($sp) -/* B4C714 80241CA4 AFB00018 */ sw $s0, 0x18($sp) -/* B4C718 80241CA8 8E910148 */ lw $s1, 0x148($s4) -/* B4C71C 80241CAC 86240008 */ lh $a0, 8($s1) -/* B4C720 80241CB0 0C00EABB */ jal get_npc_unsafe -/* B4C724 80241CB4 00A0802D */ daddu $s0, $a1, $zero -/* B4C728 80241CB8 16000005 */ bnez $s0, .L80241CD0 -/* B4C72C 80241CBC 0040902D */ daddu $s2, $v0, $zero -/* B4C730 80241CC0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4C734 80241CC4 30420004 */ andi $v0, $v0, 4 -/* B4C738 80241CC8 10400015 */ beqz $v0, .L80241D20 -/* B4C73C 80241CCC 00000000 */ nop -.L80241CD0: -/* B4C740 80241CD0 AE800070 */ sw $zero, 0x70($s4) -/* B4C744 80241CD4 8E420000 */ lw $v0, ($s2) -/* B4C748 80241CD8 3C031F30 */ lui $v1, 0x1f30 -/* B4C74C 80241CDC A640008E */ sh $zero, 0x8e($s2) -/* B4C750 80241CE0 34420102 */ ori $v0, $v0, 0x102 -/* B4C754 80241CE4 AE420000 */ sw $v0, ($s2) -/* B4C758 80241CE8 8E220000 */ lw $v0, ($s1) -/* B4C75C 80241CEC 3C01C47A */ lui $at, 0xc47a -/* B4C760 80241CF0 44810000 */ mtc1 $at, $f0 -/* B4C764 80241CF4 00431025 */ or $v0, $v0, $v1 -/* B4C768 80241CF8 AE220000 */ sw $v0, ($s1) -/* B4C76C 80241CFC AE400038 */ sw $zero, 0x38($s2) -/* B4C770 80241D00 E640003C */ swc1 $f0, 0x3c($s2) -/* B4C774 80241D04 AE400040 */ sw $zero, 0x40($s2) -/* B4C778 80241D08 8E2300B0 */ lw $v1, 0xb0($s1) -/* B4C77C 80241D0C 30620004 */ andi $v0, $v1, 4 -/* B4C780 80241D10 10400003 */ beqz $v0, .L80241D20 -/* B4C784 80241D14 2402FFFB */ addiu $v0, $zero, -5 -/* B4C788 80241D18 00621024 */ and $v0, $v1, $v0 -/* B4C78C 80241D1C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241D20: -/* B4C790 80241D20 8E930070 */ lw $s3, 0x70($s4) -/* B4C794 80241D24 12600005 */ beqz $s3, .L80241D3C -/* B4C798 80241D28 24020001 */ addiu $v0, $zero, 1 -/* B4C79C 80241D2C 12620048 */ beq $s3, $v0, .L80241E50 -/* B4C7A0 80241D30 00000000 */ nop -/* B4C7A4 80241D34 080907B1 */ j .L80241EC4 -/* B4C7A8 80241D38 00000000 */ nop -.L80241D3C: -/* B4C7AC 80241D3C 86240008 */ lh $a0, 8($s1) -/* B4C7B0 80241D40 0C00FB3A */ jal get_enemy -/* B4C7B4 80241D44 2484FFFF */ addiu $a0, $a0, -1 -/* B4C7B8 80241D48 0040802D */ daddu $s0, $v0, $zero -/* B4C7BC 80241D4C 0C00EABB */ jal get_npc_unsafe -/* B4C7C0 80241D50 86040008 */ lh $a0, 8($s0) -/* B4C7C4 80241D54 24030001 */ addiu $v1, $zero, 1 -/* B4C7C8 80241D58 0040982D */ daddu $s3, $v0, $zero -/* B4C7CC 80241D5C A2230007 */ sb $v1, 7($s1) -/* B4C7D0 80241D60 8E03006C */ lw $v1, 0x6c($s0) -/* B4C7D4 80241D64 24020003 */ addiu $v0, $zero, 3 -/* B4C7D8 80241D68 14620056 */ bne $v1, $v0, .L80241EC4 -/* B4C7DC 80241D6C 00000000 */ nop -/* B4C7E0 80241D70 8E2500A8 */ lw $a1, 0xa8($s1) -/* B4C7E4 80241D74 10A00003 */ beqz $a1, .L80241D84 -/* B4C7E8 80241D78 0260202D */ daddu $a0, $s3, $zero -/* B4C7EC 80241D7C 0C012530 */ jal func_800494C0 -/* B4C7F0 80241D80 0000302D */ daddu $a2, $zero, $zero -.L80241D84: -/* B4C7F4 80241D84 27A40010 */ addiu $a0, $sp, 0x10 -/* B4C7F8 80241D88 C6280070 */ lwc1 $f8, 0x70($s1) -/* B4C7FC 80241D8C 46804220 */ cvt.s.w $f8, $f8 -/* B4C800 80241D90 C6620034 */ lwc1 $f2, 0x34($s3) -/* B4C804 80241D94 3C014387 */ lui $at, 0x4387 -/* B4C808 80241D98 44810000 */ mtc1 $at, $f0 -/* B4C80C 80241D9C 44064000 */ mfc1 $a2, $f8 -/* B4C810 80241DA0 46020001 */ sub.s $f0, $f0, $f2 -/* B4C814 80241DA4 C6660038 */ lwc1 $f6, 0x38($s3) -/* B4C818 80241DA8 C6640040 */ lwc1 $f4, 0x40($s3) -/* B4C81C 80241DAC 44070000 */ mfc1 $a3, $f0 -/* B4C820 80241DB0 27A50014 */ addiu $a1, $sp, 0x14 -/* B4C824 80241DB4 E7A60010 */ swc1 $f6, 0x10($sp) -/* B4C828 80241DB8 0C00A7E7 */ jal add_vec2D_polar -/* B4C82C 80241DBC E7A40014 */ swc1 $f4, 0x14($sp) -/* B4C830 80241DC0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B4C834 80241DC4 4600020D */ trunc.w.s $f8, $f0 -/* B4C838 80241DC8 44024000 */ mfc1 $v0, $f8 -/* B4C83C 80241DCC E6400038 */ swc1 $f0, 0x38($s2) -/* B4C840 80241DD0 A6220010 */ sh $v0, 0x10($s1) -/* B4C844 80241DD4 C660003C */ lwc1 $f0, 0x3c($s3) -/* B4C848 80241DD8 C622006C */ lwc1 $f2, 0x6c($s1) -/* B4C84C 80241DDC 468010A0 */ cvt.s.w $f2, $f2 -/* B4C850 80241DE0 46020000 */ add.s $f0, $f0, $f2 -/* B4C854 80241DE4 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B4C858 80241DE8 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B4C85C 80241DEC E640003C */ swc1 $f0, 0x3c($s2) -/* B4C860 80241DF0 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B4C864 80241DF4 4600020D */ trunc.w.s $f8, $f0 -/* B4C868 80241DF8 44024000 */ mfc1 $v0, $f8 -/* B4C86C 80241DFC 00000000 */ nop -/* B4C870 80241E00 A6220012 */ sh $v0, 0x12($s1) -/* B4C874 80241E04 4600120D */ trunc.w.s $f8, $f2 -/* B4C878 80241E08 44024000 */ mfc1 $v0, $f8 -/* B4C87C 80241E0C E6420040 */ swc1 $f2, 0x40($s2) -/* B4C880 80241E10 A6220014 */ sh $v0, 0x14($s1) -/* B4C884 80241E14 8C660028 */ lw $a2, 0x28($v1) -/* B4C888 80241E18 8C670030 */ lw $a3, 0x30($v1) -/* B4C88C 80241E1C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B4C890 80241E20 0C00A720 */ jal atan2 -/* B4C894 80241E24 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B4C898 80241E28 3C03E0EF */ lui $v1, 0xe0ef -/* B4C89C 80241E2C E640000C */ swc1 $f0, 0xc($s2) -/* B4C8A0 80241E30 8E220000 */ lw $v0, ($s1) -/* B4C8A4 80241E34 3463FFFF */ ori $v1, $v1, 0xffff -/* B4C8A8 80241E38 00431024 */ and $v0, $v0, $v1 -/* B4C8AC 80241E3C AE220000 */ sw $v0, ($s1) -/* B4C8B0 80241E40 24020001 */ addiu $v0, $zero, 1 -/* B4C8B4 80241E44 A640008E */ sh $zero, 0x8e($s2) -/* B4C8B8 80241E48 080907B1 */ j .L80241EC4 -/* B4C8BC 80241E4C AE820070 */ sw $v0, 0x70($s4) -.L80241E50: -/* B4C8C0 80241E50 86240008 */ lh $a0, 8($s1) -/* B4C8C4 80241E54 0C00FB3A */ jal get_enemy -/* B4C8C8 80241E58 2484FFFF */ addiu $a0, $a0, -1 -/* B4C8CC 80241E5C 0040802D */ daddu $s0, $v0, $zero -/* B4C8D0 80241E60 0C00EABB */ jal get_npc_unsafe -/* B4C8D4 80241E64 86040008 */ lh $a0, 8($s0) -/* B4C8D8 80241E68 9642008E */ lhu $v0, 0x8e($s2) -/* B4C8DC 80241E6C 24420001 */ addiu $v0, $v0, 1 -/* B4C8E0 80241E70 A642008E */ sh $v0, 0x8e($s2) -/* B4C8E4 80241E74 00021400 */ sll $v0, $v0, 0x10 -/* B4C8E8 80241E78 8E23007C */ lw $v1, 0x7c($s1) -/* B4C8EC 80241E7C 00021403 */ sra $v0, $v0, 0x10 -/* B4C8F0 80241E80 0043102A */ slt $v0, $v0, $v1 -/* B4C8F4 80241E84 50400001 */ beql $v0, $zero, .L80241E8C -/* B4C8F8 80241E88 A2200007 */ sb $zero, 7($s1) -.L80241E8C: -/* B4C8FC 80241E8C 8E03006C */ lw $v1, 0x6c($s0) -/* B4C900 80241E90 24020004 */ addiu $v0, $zero, 4 -/* B4C904 80241E94 1462000B */ bne $v1, $v0, .L80241EC4 -/* B4C908 80241E98 3C021F10 */ lui $v0, 0x1f10 -/* B4C90C 80241E9C 8E230000 */ lw $v1, ($s1) -/* B4C910 80241EA0 3C01C47A */ lui $at, 0xc47a -/* B4C914 80241EA4 44810000 */ mtc1 $at, $f0 -/* B4C918 80241EA8 00621825 */ or $v1, $v1, $v0 -/* B4C91C 80241EAC AE230000 */ sw $v1, ($s1) -/* B4C920 80241EB0 AE400038 */ sw $zero, 0x38($s2) -/* B4C924 80241EB4 E640003C */ swc1 $f0, 0x3c($s2) -/* B4C928 80241EB8 AE400040 */ sw $zero, 0x40($s2) -/* B4C92C 80241EBC A2330007 */ sb $s3, 7($s1) -/* B4C930 80241EC0 AE800070 */ sw $zero, 0x70($s4) -.L80241EC4: -/* B4C934 80241EC4 8FBF002C */ lw $ra, 0x2c($sp) -/* B4C938 80241EC8 8FB40028 */ lw $s4, 0x28($sp) -/* B4C93C 80241ECC 8FB30024 */ lw $s3, 0x24($sp) -/* B4C940 80241ED0 8FB20020 */ lw $s2, 0x20($sp) -/* B4C944 80241ED4 8FB1001C */ lw $s1, 0x1c($sp) -/* B4C948 80241ED8 8FB00018 */ lw $s0, 0x18($sp) -/* B4C94C 80241EDC 0000102D */ daddu $v0, $zero, $zero -/* B4C950 80241EE0 03E00008 */ jr $ra -/* B4C954 80241EE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s deleted file mode 100644 index ed7213509c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241BD8_B54408.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD8_B54408 -/* B54408 80241BD8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5440C 80241BDC AFB40028 */ sw $s4, 0x28($sp) -/* B54410 80241BE0 0080A02D */ daddu $s4, $a0, $zero -/* B54414 80241BE4 AFBF002C */ sw $ra, 0x2c($sp) -/* B54418 80241BE8 AFB30024 */ sw $s3, 0x24($sp) -/* B5441C 80241BEC AFB20020 */ sw $s2, 0x20($sp) -/* B54420 80241BF0 AFB1001C */ sw $s1, 0x1c($sp) -/* B54424 80241BF4 AFB00018 */ sw $s0, 0x18($sp) -/* B54428 80241BF8 8E910148 */ lw $s1, 0x148($s4) -/* B5442C 80241BFC 86240008 */ lh $a0, 8($s1) -/* B54430 80241C00 0C00EABB */ jal get_npc_unsafe -/* B54434 80241C04 00A0802D */ daddu $s0, $a1, $zero -/* B54438 80241C08 16000005 */ bnez $s0, .L80241C20 -/* B5443C 80241C0C 0040902D */ daddu $s2, $v0, $zero -/* B54440 80241C10 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54444 80241C14 30420004 */ andi $v0, $v0, 4 -/* B54448 80241C18 10400015 */ beqz $v0, .L80241C70 -/* B5444C 80241C1C 00000000 */ nop -.L80241C20: -/* B54450 80241C20 AE800070 */ sw $zero, 0x70($s4) -/* B54454 80241C24 8E420000 */ lw $v0, ($s2) -/* B54458 80241C28 3C031F30 */ lui $v1, 0x1f30 -/* B5445C 80241C2C A640008E */ sh $zero, 0x8e($s2) -/* B54460 80241C30 34420102 */ ori $v0, $v0, 0x102 -/* B54464 80241C34 AE420000 */ sw $v0, ($s2) -/* B54468 80241C38 8E220000 */ lw $v0, ($s1) -/* B5446C 80241C3C 3C01C47A */ lui $at, 0xc47a -/* B54470 80241C40 44810000 */ mtc1 $at, $f0 -/* B54474 80241C44 00431025 */ or $v0, $v0, $v1 -/* B54478 80241C48 AE220000 */ sw $v0, ($s1) -/* B5447C 80241C4C AE400038 */ sw $zero, 0x38($s2) -/* B54480 80241C50 E640003C */ swc1 $f0, 0x3c($s2) -/* B54484 80241C54 AE400040 */ sw $zero, 0x40($s2) -/* B54488 80241C58 8E2300B0 */ lw $v1, 0xb0($s1) -/* B5448C 80241C5C 30620004 */ andi $v0, $v1, 4 -/* B54490 80241C60 10400003 */ beqz $v0, .L80241C70 -/* B54494 80241C64 2402FFFB */ addiu $v0, $zero, -5 -/* B54498 80241C68 00621024 */ and $v0, $v1, $v0 -/* B5449C 80241C6C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241C70: -/* B544A0 80241C70 8E930070 */ lw $s3, 0x70($s4) -/* B544A4 80241C74 12600005 */ beqz $s3, .L80241C8C -/* B544A8 80241C78 24020001 */ addiu $v0, $zero, 1 -/* B544AC 80241C7C 12620048 */ beq $s3, $v0, .L80241DA0 -/* B544B0 80241C80 00000000 */ nop -/* B544B4 80241C84 08090785 */ j .L80241E14 -/* B544B8 80241C88 00000000 */ nop -.L80241C8C: -/* B544BC 80241C8C 86240008 */ lh $a0, 8($s1) -/* B544C0 80241C90 0C00FB3A */ jal get_enemy -/* B544C4 80241C94 2484FFFF */ addiu $a0, $a0, -1 -/* B544C8 80241C98 0040802D */ daddu $s0, $v0, $zero -/* B544CC 80241C9C 0C00EABB */ jal get_npc_unsafe -/* B544D0 80241CA0 86040008 */ lh $a0, 8($s0) -/* B544D4 80241CA4 24030001 */ addiu $v1, $zero, 1 -/* B544D8 80241CA8 0040982D */ daddu $s3, $v0, $zero -/* B544DC 80241CAC A2230007 */ sb $v1, 7($s1) -/* B544E0 80241CB0 8E03006C */ lw $v1, 0x6c($s0) -/* B544E4 80241CB4 24020003 */ addiu $v0, $zero, 3 -/* B544E8 80241CB8 14620056 */ bne $v1, $v0, .L80241E14 -/* B544EC 80241CBC 00000000 */ nop -/* B544F0 80241CC0 8E2500A8 */ lw $a1, 0xa8($s1) -/* B544F4 80241CC4 10A00003 */ beqz $a1, .L80241CD4 -/* B544F8 80241CC8 0260202D */ daddu $a0, $s3, $zero -/* B544FC 80241CCC 0C012530 */ jal func_800494C0 -/* B54500 80241CD0 0000302D */ daddu $a2, $zero, $zero -.L80241CD4: -/* B54504 80241CD4 27A40010 */ addiu $a0, $sp, 0x10 -/* B54508 80241CD8 C6280070 */ lwc1 $f8, 0x70($s1) -/* B5450C 80241CDC 46804220 */ cvt.s.w $f8, $f8 -/* B54510 80241CE0 C6620034 */ lwc1 $f2, 0x34($s3) -/* B54514 80241CE4 3C014387 */ lui $at, 0x4387 -/* B54518 80241CE8 44810000 */ mtc1 $at, $f0 -/* B5451C 80241CEC 44064000 */ mfc1 $a2, $f8 -/* B54520 80241CF0 46020001 */ sub.s $f0, $f0, $f2 -/* B54524 80241CF4 C6660038 */ lwc1 $f6, 0x38($s3) -/* B54528 80241CF8 C6640040 */ lwc1 $f4, 0x40($s3) -/* B5452C 80241CFC 44070000 */ mfc1 $a3, $f0 -/* B54530 80241D00 27A50014 */ addiu $a1, $sp, 0x14 -/* B54534 80241D04 E7A60010 */ swc1 $f6, 0x10($sp) -/* B54538 80241D08 0C00A7E7 */ jal add_vec2D_polar -/* B5453C 80241D0C E7A40014 */ swc1 $f4, 0x14($sp) -/* B54540 80241D10 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B54544 80241D14 4600020D */ trunc.w.s $f8, $f0 -/* B54548 80241D18 44024000 */ mfc1 $v0, $f8 -/* B5454C 80241D1C E6400038 */ swc1 $f0, 0x38($s2) -/* B54550 80241D20 A6220010 */ sh $v0, 0x10($s1) -/* B54554 80241D24 C660003C */ lwc1 $f0, 0x3c($s3) -/* B54558 80241D28 C622006C */ lwc1 $f2, 0x6c($s1) -/* B5455C 80241D2C 468010A0 */ cvt.s.w $f2, $f2 -/* B54560 80241D30 46020000 */ add.s $f0, $f0, $f2 -/* B54564 80241D34 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B54568 80241D38 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B5456C 80241D3C E640003C */ swc1 $f0, 0x3c($s2) -/* B54570 80241D40 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B54574 80241D44 4600020D */ trunc.w.s $f8, $f0 -/* B54578 80241D48 44024000 */ mfc1 $v0, $f8 -/* B5457C 80241D4C 00000000 */ nop -/* B54580 80241D50 A6220012 */ sh $v0, 0x12($s1) -/* B54584 80241D54 4600120D */ trunc.w.s $f8, $f2 -/* B54588 80241D58 44024000 */ mfc1 $v0, $f8 -/* B5458C 80241D5C E6420040 */ swc1 $f2, 0x40($s2) -/* B54590 80241D60 A6220014 */ sh $v0, 0x14($s1) -/* B54594 80241D64 8C660028 */ lw $a2, 0x28($v1) -/* B54598 80241D68 8C670030 */ lw $a3, 0x30($v1) -/* B5459C 80241D6C C64C0038 */ lwc1 $f12, 0x38($s2) -/* B545A0 80241D70 0C00A720 */ jal atan2 -/* B545A4 80241D74 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B545A8 80241D78 3C03E0EF */ lui $v1, 0xe0ef -/* B545AC 80241D7C E640000C */ swc1 $f0, 0xc($s2) -/* B545B0 80241D80 8E220000 */ lw $v0, ($s1) -/* B545B4 80241D84 3463FFFF */ ori $v1, $v1, 0xffff -/* B545B8 80241D88 00431024 */ and $v0, $v0, $v1 -/* B545BC 80241D8C AE220000 */ sw $v0, ($s1) -/* B545C0 80241D90 24020001 */ addiu $v0, $zero, 1 -/* B545C4 80241D94 A640008E */ sh $zero, 0x8e($s2) -/* B545C8 80241D98 08090785 */ j .L80241E14 -/* B545CC 80241D9C AE820070 */ sw $v0, 0x70($s4) -.L80241DA0: -/* B545D0 80241DA0 86240008 */ lh $a0, 8($s1) -/* B545D4 80241DA4 0C00FB3A */ jal get_enemy -/* B545D8 80241DA8 2484FFFF */ addiu $a0, $a0, -1 -/* B545DC 80241DAC 0040802D */ daddu $s0, $v0, $zero -/* B545E0 80241DB0 0C00EABB */ jal get_npc_unsafe -/* B545E4 80241DB4 86040008 */ lh $a0, 8($s0) -/* B545E8 80241DB8 9642008E */ lhu $v0, 0x8e($s2) -/* B545EC 80241DBC 24420001 */ addiu $v0, $v0, 1 -/* B545F0 80241DC0 A642008E */ sh $v0, 0x8e($s2) -/* B545F4 80241DC4 00021400 */ sll $v0, $v0, 0x10 -/* B545F8 80241DC8 8E23007C */ lw $v1, 0x7c($s1) -/* B545FC 80241DCC 00021403 */ sra $v0, $v0, 0x10 -/* B54600 80241DD0 0043102A */ slt $v0, $v0, $v1 -/* B54604 80241DD4 50400001 */ beql $v0, $zero, .L80241DDC -/* B54608 80241DD8 A2200007 */ sb $zero, 7($s1) -.L80241DDC: -/* B5460C 80241DDC 8E03006C */ lw $v1, 0x6c($s0) -/* B54610 80241DE0 24020004 */ addiu $v0, $zero, 4 -/* B54614 80241DE4 1462000B */ bne $v1, $v0, .L80241E14 -/* B54618 80241DE8 3C021F10 */ lui $v0, 0x1f10 -/* B5461C 80241DEC 8E230000 */ lw $v1, ($s1) -/* B54620 80241DF0 3C01C47A */ lui $at, 0xc47a -/* B54624 80241DF4 44810000 */ mtc1 $at, $f0 -/* B54628 80241DF8 00621825 */ or $v1, $v1, $v0 -/* B5462C 80241DFC AE230000 */ sw $v1, ($s1) -/* B54630 80241E00 AE400038 */ sw $zero, 0x38($s2) -/* B54634 80241E04 E640003C */ swc1 $f0, 0x3c($s2) -/* B54638 80241E08 AE400040 */ sw $zero, 0x40($s2) -/* B5463C 80241E0C A2330007 */ sb $s3, 7($s1) -/* B54640 80241E10 AE800070 */ sw $zero, 0x70($s4) -.L80241E14: -/* B54644 80241E14 8FBF002C */ lw $ra, 0x2c($sp) -/* B54648 80241E18 8FB40028 */ lw $s4, 0x28($sp) -/* B5464C 80241E1C 8FB30024 */ lw $s3, 0x24($sp) -/* B54650 80241E20 8FB20020 */ lw $s2, 0x20($sp) -/* B54654 80241E24 8FB1001C */ lw $s1, 0x1c($sp) -/* B54658 80241E28 8FB00018 */ lw $s0, 0x18($sp) -/* B5465C 80241E2C 0000102D */ daddu $v0, $zero, $zero -/* B54660 80241E30 03E00008 */ jr $ra -/* B54664 80241E34 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s deleted file mode 100644 index 5a3b3e23ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802405D0_B59E40.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0_B59E40 -/* B59E40 802405D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B59E44 802405D4 AFB40028 */ sw $s4, 0x28($sp) -/* B59E48 802405D8 0080A02D */ daddu $s4, $a0, $zero -/* B59E4C 802405DC AFBF002C */ sw $ra, 0x2c($sp) -/* B59E50 802405E0 AFB30024 */ sw $s3, 0x24($sp) -/* B59E54 802405E4 AFB20020 */ sw $s2, 0x20($sp) -/* B59E58 802405E8 AFB1001C */ sw $s1, 0x1c($sp) -/* B59E5C 802405EC AFB00018 */ sw $s0, 0x18($sp) -/* B59E60 802405F0 8E910148 */ lw $s1, 0x148($s4) -/* B59E64 802405F4 86240008 */ lh $a0, 8($s1) -/* B59E68 802405F8 0C00EABB */ jal get_npc_unsafe -/* B59E6C 802405FC 00A0802D */ daddu $s0, $a1, $zero -/* B59E70 80240600 16000005 */ bnez $s0, .L80240618 -/* B59E74 80240604 0040902D */ daddu $s2, $v0, $zero -/* B59E78 80240608 8E2200B0 */ lw $v0, 0xb0($s1) -/* B59E7C 8024060C 30420004 */ andi $v0, $v0, 4 -/* B59E80 80240610 10400015 */ beqz $v0, .L80240668 -/* B59E84 80240614 00000000 */ nop -.L80240618: -/* B59E88 80240618 AE800070 */ sw $zero, 0x70($s4) -/* B59E8C 8024061C 8E420000 */ lw $v0, ($s2) -/* B59E90 80240620 3C031F30 */ lui $v1, 0x1f30 -/* B59E94 80240624 A640008E */ sh $zero, 0x8e($s2) -/* B59E98 80240628 34420102 */ ori $v0, $v0, 0x102 -/* B59E9C 8024062C AE420000 */ sw $v0, ($s2) -/* B59EA0 80240630 8E220000 */ lw $v0, ($s1) -/* B59EA4 80240634 3C01C47A */ lui $at, 0xc47a -/* B59EA8 80240638 44810000 */ mtc1 $at, $f0 -/* B59EAC 8024063C 00431025 */ or $v0, $v0, $v1 -/* B59EB0 80240640 AE220000 */ sw $v0, ($s1) -/* B59EB4 80240644 AE400038 */ sw $zero, 0x38($s2) -/* B59EB8 80240648 E640003C */ swc1 $f0, 0x3c($s2) -/* B59EBC 8024064C AE400040 */ sw $zero, 0x40($s2) -/* B59EC0 80240650 8E2300B0 */ lw $v1, 0xb0($s1) -/* B59EC4 80240654 30620004 */ andi $v0, $v1, 4 -/* B59EC8 80240658 10400003 */ beqz $v0, .L80240668 -/* B59ECC 8024065C 2402FFFB */ addiu $v0, $zero, -5 -/* B59ED0 80240660 00621024 */ and $v0, $v1, $v0 -/* B59ED4 80240664 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240668: -/* B59ED8 80240668 8E930070 */ lw $s3, 0x70($s4) -/* B59EDC 8024066C 12600005 */ beqz $s3, .L80240684 -/* B59EE0 80240670 24020001 */ addiu $v0, $zero, 1 -/* B59EE4 80240674 12620048 */ beq $s3, $v0, .L80240798 -/* B59EE8 80240678 00000000 */ nop -/* B59EEC 8024067C 08090203 */ j .L8024080C -/* B59EF0 80240680 00000000 */ nop -.L80240684: -/* B59EF4 80240684 86240008 */ lh $a0, 8($s1) -/* B59EF8 80240688 0C00FB3A */ jal get_enemy -/* B59EFC 8024068C 2484FFFF */ addiu $a0, $a0, -1 -/* B59F00 80240690 0040802D */ daddu $s0, $v0, $zero -/* B59F04 80240694 0C00EABB */ jal get_npc_unsafe -/* B59F08 80240698 86040008 */ lh $a0, 8($s0) -/* B59F0C 8024069C 24030001 */ addiu $v1, $zero, 1 -/* B59F10 802406A0 0040982D */ daddu $s3, $v0, $zero -/* B59F14 802406A4 A2230007 */ sb $v1, 7($s1) -/* B59F18 802406A8 8E03006C */ lw $v1, 0x6c($s0) -/* B59F1C 802406AC 24020003 */ addiu $v0, $zero, 3 -/* B59F20 802406B0 14620056 */ bne $v1, $v0, .L8024080C -/* B59F24 802406B4 00000000 */ nop -/* B59F28 802406B8 8E2500A8 */ lw $a1, 0xa8($s1) -/* B59F2C 802406BC 10A00003 */ beqz $a1, .L802406CC -/* B59F30 802406C0 0260202D */ daddu $a0, $s3, $zero -/* B59F34 802406C4 0C012530 */ jal func_800494C0 -/* B59F38 802406C8 0000302D */ daddu $a2, $zero, $zero -.L802406CC: -/* B59F3C 802406CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B59F40 802406D0 C6280070 */ lwc1 $f8, 0x70($s1) -/* B59F44 802406D4 46804220 */ cvt.s.w $f8, $f8 -/* B59F48 802406D8 C6620034 */ lwc1 $f2, 0x34($s3) -/* B59F4C 802406DC 3C014387 */ lui $at, 0x4387 -/* B59F50 802406E0 44810000 */ mtc1 $at, $f0 -/* B59F54 802406E4 44064000 */ mfc1 $a2, $f8 -/* B59F58 802406E8 46020001 */ sub.s $f0, $f0, $f2 -/* B59F5C 802406EC C6660038 */ lwc1 $f6, 0x38($s3) -/* B59F60 802406F0 C6640040 */ lwc1 $f4, 0x40($s3) -/* B59F64 802406F4 44070000 */ mfc1 $a3, $f0 -/* B59F68 802406F8 27A50014 */ addiu $a1, $sp, 0x14 -/* B59F6C 802406FC E7A60010 */ swc1 $f6, 0x10($sp) -/* B59F70 80240700 0C00A7E7 */ jal add_vec2D_polar -/* B59F74 80240704 E7A40014 */ swc1 $f4, 0x14($sp) -/* B59F78 80240708 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B59F7C 8024070C 4600020D */ trunc.w.s $f8, $f0 -/* B59F80 80240710 44024000 */ mfc1 $v0, $f8 -/* B59F84 80240714 E6400038 */ swc1 $f0, 0x38($s2) -/* B59F88 80240718 A6220010 */ sh $v0, 0x10($s1) -/* B59F8C 8024071C C660003C */ lwc1 $f0, 0x3c($s3) -/* B59F90 80240720 C622006C */ lwc1 $f2, 0x6c($s1) -/* B59F94 80240724 468010A0 */ cvt.s.w $f2, $f2 -/* B59F98 80240728 46020000 */ add.s $f0, $f0, $f2 -/* B59F9C 8024072C 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B59FA0 80240730 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B59FA4 80240734 E640003C */ swc1 $f0, 0x3c($s2) -/* B59FA8 80240738 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B59FAC 8024073C 4600020D */ trunc.w.s $f8, $f0 -/* B59FB0 80240740 44024000 */ mfc1 $v0, $f8 -/* B59FB4 80240744 00000000 */ nop -/* B59FB8 80240748 A6220012 */ sh $v0, 0x12($s1) -/* B59FBC 8024074C 4600120D */ trunc.w.s $f8, $f2 -/* B59FC0 80240750 44024000 */ mfc1 $v0, $f8 -/* B59FC4 80240754 E6420040 */ swc1 $f2, 0x40($s2) -/* B59FC8 80240758 A6220014 */ sh $v0, 0x14($s1) -/* B59FCC 8024075C 8C660028 */ lw $a2, 0x28($v1) -/* B59FD0 80240760 8C670030 */ lw $a3, 0x30($v1) -/* B59FD4 80240764 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B59FD8 80240768 0C00A720 */ jal atan2 -/* B59FDC 8024076C C64E0040 */ lwc1 $f14, 0x40($s2) -/* B59FE0 80240770 3C03E0EF */ lui $v1, 0xe0ef -/* B59FE4 80240774 E640000C */ swc1 $f0, 0xc($s2) -/* B59FE8 80240778 8E220000 */ lw $v0, ($s1) -/* B59FEC 8024077C 3463FFFF */ ori $v1, $v1, 0xffff -/* B59FF0 80240780 00431024 */ and $v0, $v0, $v1 -/* B59FF4 80240784 AE220000 */ sw $v0, ($s1) -/* B59FF8 80240788 24020001 */ addiu $v0, $zero, 1 -/* B59FFC 8024078C A640008E */ sh $zero, 0x8e($s2) -/* B5A000 80240790 08090203 */ j .L8024080C -/* B5A004 80240794 AE820070 */ sw $v0, 0x70($s4) -.L80240798: -/* B5A008 80240798 86240008 */ lh $a0, 8($s1) -/* B5A00C 8024079C 0C00FB3A */ jal get_enemy -/* B5A010 802407A0 2484FFFF */ addiu $a0, $a0, -1 -/* B5A014 802407A4 0040802D */ daddu $s0, $v0, $zero -/* B5A018 802407A8 0C00EABB */ jal get_npc_unsafe -/* B5A01C 802407AC 86040008 */ lh $a0, 8($s0) -/* B5A020 802407B0 9642008E */ lhu $v0, 0x8e($s2) -/* B5A024 802407B4 24420001 */ addiu $v0, $v0, 1 -/* B5A028 802407B8 A642008E */ sh $v0, 0x8e($s2) -/* B5A02C 802407BC 00021400 */ sll $v0, $v0, 0x10 -/* B5A030 802407C0 8E23007C */ lw $v1, 0x7c($s1) -/* B5A034 802407C4 00021403 */ sra $v0, $v0, 0x10 -/* B5A038 802407C8 0043102A */ slt $v0, $v0, $v1 -/* B5A03C 802407CC 50400001 */ beql $v0, $zero, .L802407D4 -/* B5A040 802407D0 A2200007 */ sb $zero, 7($s1) -.L802407D4: -/* B5A044 802407D4 8E03006C */ lw $v1, 0x6c($s0) -/* B5A048 802407D8 24020004 */ addiu $v0, $zero, 4 -/* B5A04C 802407DC 1462000B */ bne $v1, $v0, .L8024080C -/* B5A050 802407E0 3C021F10 */ lui $v0, 0x1f10 -/* B5A054 802407E4 8E230000 */ lw $v1, ($s1) -/* B5A058 802407E8 3C01C47A */ lui $at, 0xc47a -/* B5A05C 802407EC 44810000 */ mtc1 $at, $f0 -/* B5A060 802407F0 00621825 */ or $v1, $v1, $v0 -/* B5A064 802407F4 AE230000 */ sw $v1, ($s1) -/* B5A068 802407F8 AE400038 */ sw $zero, 0x38($s2) -/* B5A06C 802407FC E640003C */ swc1 $f0, 0x3c($s2) -/* B5A070 80240800 AE400040 */ sw $zero, 0x40($s2) -/* B5A074 80240804 A2330007 */ sb $s3, 7($s1) -/* B5A078 80240808 AE800070 */ sw $zero, 0x70($s4) -.L8024080C: -/* B5A07C 8024080C 8FBF002C */ lw $ra, 0x2c($sp) -/* B5A080 80240810 8FB40028 */ lw $s4, 0x28($sp) -/* B5A084 80240814 8FB30024 */ lw $s3, 0x24($sp) -/* B5A088 80240818 8FB20020 */ lw $s2, 0x20($sp) -/* B5A08C 8024081C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5A090 80240820 8FB00018 */ lw $s0, 0x18($sp) -/* B5A094 80240824 0000102D */ daddu $v0, $zero, $zero -/* B5A098 80240828 03E00008 */ jr $ra -/* B5A09C 8024082C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024067C_B5E92C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024067C_B5E92C.s deleted file mode 100644 index de047581ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024067C_B5E92C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C_B5E92C -/* B5E92C 8024067C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* B5E930 80240680 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* B5E934 80240684 8C430000 */ lw $v1, ($v0) -/* B5E938 80240688 2404FFBF */ addiu $a0, $zero, -0x41 -/* B5E93C 8024068C 00641824 */ and $v1, $v1, $a0 -/* B5E940 80240690 AC430000 */ sw $v1, ($v0) -/* B5E944 80240694 03E00008 */ jr $ra -/* B5E948 80240698 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802406C8_B5E978.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802406C8_B5E978.s deleted file mode 100644 index 690eb8a044..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802406C8_B5E978.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C8_B5E978 -/* B5E978 802406C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5E97C 802406CC AFB00010 */ sw $s0, 0x10($sp) -/* B5E980 802406D0 0080802D */ daddu $s0, $a0, $zero -/* B5E984 802406D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B5E988 802406D8 AFB10014 */ sw $s1, 0x14($sp) -/* B5E98C 802406DC 8E11000C */ lw $s1, 0xc($s0) -/* B5E990 802406E0 8E250000 */ lw $a1, ($s1) -/* B5E994 802406E4 0C0B1EAF */ jal get_variable -/* B5E998 802406E8 26310004 */ addiu $s1, $s1, 4 -/* B5E99C 802406EC 0200202D */ daddu $a0, $s0, $zero -/* B5E9A0 802406F0 3C038011 */ lui $v1, %hi(gPlayerData) -/* B5E9A4 802406F4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* B5E9A8 802406F8 000210C0 */ sll $v0, $v0, 3 -/* B5E9AC 802406FC 00431021 */ addu $v0, $v0, $v1 -/* B5E9B0 80240700 90460015 */ lbu $a2, 0x15($v0) -/* B5E9B4 80240704 8E250000 */ lw $a1, ($s1) -/* B5E9B8 80240708 24C60001 */ addiu $a2, $a2, 1 -/* B5E9BC 8024070C A0460015 */ sb $a2, 0x15($v0) -/* B5E9C0 80240710 00063600 */ sll $a2, $a2, 0x18 -/* B5E9C4 80240714 0C0B2026 */ jal set_variable -/* B5E9C8 80240718 00063603 */ sra $a2, $a2, 0x18 -/* B5E9CC 8024071C 8FBF0018 */ lw $ra, 0x18($sp) -/* B5E9D0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* B5E9D4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* B5E9D8 80240728 24020002 */ addiu $v0, $zero, 2 -/* B5E9DC 8024072C 03E00008 */ jr $ra -/* B5E9E0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s deleted file mode 100644 index 7f1d37fb8d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA8_B5ED58 -/* B5ED58 80240AA8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* B5ED60 80240AB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5ED64 80240AB4 AFBF0010 */ sw $ra, 0x10($sp) -/* B5ED68 80240AB8 00021100 */ sll $v0, $v0, 4 -/* B5ED6C 80240ABC 3C048009 */ lui $a0, %hi(D_8008EF20) -/* B5ED70 80240AC0 00822021 */ addu $a0, $a0, $v0 -/* B5ED74 80240AC4 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* B5ED78 80240AC8 0C0496CF */ jal set_message_string -/* B5ED7C 80240ACC 0000282D */ daddu $a1, $zero, $zero -/* B5ED80 80240AD0 8FBF0010 */ lw $ra, 0x10($sp) -/* B5ED84 80240AD4 24020002 */ addiu $v0, $zero, 2 -/* B5ED88 80240AD8 03E00008 */ jr $ra -/* B5ED8C 80240ADC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AE0_B5ED90.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AE0_B5ED90.s deleted file mode 100644 index 3e68e7d156..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AE0_B5ED90.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE0_B5ED90 -/* B5ED90 80240AE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5ED94 80240AE4 AFB1001C */ sw $s1, 0x1c($sp) -/* B5ED98 80240AE8 0080882D */ daddu $s1, $a0, $zero -/* B5ED9C 80240AEC AFBF0020 */ sw $ra, 0x20($sp) -/* B5EDA0 80240AF0 AFB00018 */ sw $s0, 0x18($sp) -/* B5EDA4 80240AF4 8E30000C */ lw $s0, 0xc($s1) -/* B5EDA8 80240AF8 8E050000 */ lw $a1, ($s0) -/* B5EDAC 80240AFC 0C0B1EAF */ jal get_variable -/* B5EDB0 80240B00 26100004 */ addiu $s0, $s0, 4 -/* B5EDB4 80240B04 0C04417A */ jal get_entity_by_index -/* B5EDB8 80240B08 0040202D */ daddu $a0, $v0, $zero -/* B5EDBC 80240B0C 8E100000 */ lw $s0, ($s0) -/* B5EDC0 80240B10 C444004C */ lwc1 $f4, 0x4c($v0) -/* B5EDC4 80240B14 3C014148 */ lui $at, 0x4148 -/* B5EDC8 80240B18 44810000 */ mtc1 $at, $f0 -/* B5EDCC 80240B1C 3C013F33 */ lui $at, 0x3f33 -/* B5EDD0 80240B20 34213333 */ ori $at, $at, 0x3333 -/* B5EDD4 80240B24 44811000 */ mtc1 $at, $f2 -/* B5EDD8 80240B28 AFA00014 */ sw $zero, 0x14($sp) -/* B5EDDC 80240B2C 46002100 */ add.s $f4, $f4, $f0 -/* B5EDE0 80240B30 E7A20010 */ swc1 $f2, 0x10($sp) -/* B5EDE4 80240B34 8C450048 */ lw $a1, 0x48($v0) -/* B5EDE8 80240B38 8C470050 */ lw $a3, 0x50($v0) -/* B5EDEC 80240B3C 44062000 */ mfc1 $a2, $f4 -/* B5EDF0 80240B40 0C01C5D4 */ jal func_80071750 -/* B5EDF4 80240B44 0000202D */ daddu $a0, $zero, $zero -/* B5EDF8 80240B48 0220202D */ daddu $a0, $s1, $zero -/* B5EDFC 80240B4C 0200282D */ daddu $a1, $s0, $zero -/* B5EE00 80240B50 0C0B2026 */ jal set_variable -/* B5EE04 80240B54 0040302D */ daddu $a2, $v0, $zero -/* B5EE08 80240B58 8FBF0020 */ lw $ra, 0x20($sp) -/* B5EE0C 80240B5C 8FB1001C */ lw $s1, 0x1c($sp) -/* B5EE10 80240B60 8FB00018 */ lw $s0, 0x18($sp) -/* B5EE14 80240B64 24020002 */ addiu $v0, $zero, 2 -/* B5EE18 80240B68 03E00008 */ jr $ra -/* B5EE1C 80240B6C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s deleted file mode 100644 index c981cc2f70..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA4_B5EE54 -/* B5EE54 80240BA4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5EE58 80240BA8 AFBF0018 */ sw $ra, 0x18($sp) -/* B5EE5C 80240BAC 8C82000C */ lw $v0, 0xc($a0) -/* B5EE60 80240BB0 0C0B1EAF */ jal get_variable -/* B5EE64 80240BB4 8C450000 */ lw $a1, ($v0) -/* B5EE68 80240BB8 0C04417A */ jal get_entity_by_index -/* B5EE6C 80240BBC 0040202D */ daddu $a0, $v0, $zero -/* B5EE70 80240BC0 3C013F80 */ lui $at, 0x3f80 -/* B5EE74 80240BC4 44810000 */ mtc1 $at, $f0 -/* B5EE78 80240BC8 C442004C */ lwc1 $f2, 0x4c($v0) -/* B5EE7C 80240BCC E7A00010 */ swc1 $f0, 0x10($sp) -/* B5EE80 80240BD0 3C014148 */ lui $at, 0x4148 -/* B5EE84 80240BD4 44810000 */ mtc1 $at, $f0 -/* B5EE88 80240BD8 2403004B */ addiu $v1, $zero, 0x4b -/* B5EE8C 80240BDC AFA30014 */ sw $v1, 0x14($sp) -/* B5EE90 80240BE0 46001080 */ add.s $f2, $f2, $f0 -/* B5EE94 80240BE4 8C450048 */ lw $a1, 0x48($v0) -/* B5EE98 80240BE8 8C470050 */ lw $a3, 0x50($v0) -/* B5EE9C 80240BEC 44061000 */ mfc1 $a2, $f2 -/* B5EEA0 80240BF0 0C01C2EC */ jal func_80070BB0 -/* B5EEA4 80240BF4 24040004 */ addiu $a0, $zero, 4 -/* B5EEA8 80240BF8 8FBF0018 */ lw $ra, 0x18($sp) -/* B5EEAC 80240BFC 24020002 */ addiu $v0, $zero, 2 -/* B5EEB0 80240C00 03E00008 */ jr $ra -/* B5EEB4 80240C04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C08_B5EEB8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C08_B5EEB8.s deleted file mode 100644 index 5cbcb22095..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C08_B5EEB8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C08_B5EEB8 -/* B5EEB8 80240C08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5EEBC 80240C0C AFBF0018 */ sw $ra, 0x18($sp) -/* B5EEC0 80240C10 0C00EAD2 */ jal get_npc_safe -/* B5EEC4 80240C14 2404FFFC */ addiu $a0, $zero, -4 -/* B5EEC8 80240C18 C444003C */ lwc1 $f4, 0x3c($v0) -/* B5EECC 80240C1C 3C014148 */ lui $at, 0x4148 -/* B5EED0 80240C20 44811000 */ mtc1 $at, $f2 -/* B5EED4 80240C24 3C013F80 */ lui $at, 0x3f80 -/* B5EED8 80240C28 44810000 */ mtc1 $at, $f0 -/* B5EEDC 80240C2C 2403001E */ addiu $v1, $zero, 0x1e -/* B5EEE0 80240C30 AFA30014 */ sw $v1, 0x14($sp) -/* B5EEE4 80240C34 46022100 */ add.s $f4, $f4, $f2 -/* B5EEE8 80240C38 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5EEEC 80240C3C 8C450038 */ lw $a1, 0x38($v0) -/* B5EEF0 80240C40 8C470040 */ lw $a3, 0x40($v0) -/* B5EEF4 80240C44 44062000 */ mfc1 $a2, $f4 -/* B5EEF8 80240C48 0C01C2EC */ jal func_80070BB0 -/* B5EEFC 80240C4C 24040009 */ addiu $a0, $zero, 9 -/* B5EF00 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* B5EF04 80240C54 24020002 */ addiu $v0, $zero, 2 -/* B5EF08 80240C58 03E00008 */ jr $ra -/* B5EF0C 80240C5C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s deleted file mode 100644 index bc368075d9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241198_B5F448 -/* B5F448 80241198 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F44C 8024119C AFB10014 */ sw $s1, 0x14($sp) -/* B5F450 802411A0 0080882D */ daddu $s1, $a0, $zero -/* B5F454 802411A4 AFB20018 */ sw $s2, 0x18($sp) -/* B5F458 802411A8 AFBF001C */ sw $ra, 0x1c($sp) -/* B5F45C 802411AC AFB00010 */ sw $s0, 0x10($sp) -/* B5F460 802411B0 8E30000C */ lw $s0, 0xc($s1) -/* B5F464 802411B4 10A00010 */ beqz $a1, .L802411F8 -/* B5F468 802411B8 0000902D */ daddu $s2, $zero, $zero -/* B5F46C 802411BC 8E050000 */ lw $a1, ($s0) -/* B5F470 802411C0 0C0B1EAF */ jal get_variable -/* B5F474 802411C4 26100004 */ addiu $s0, $s0, 4 -/* B5F478 802411C8 AE220084 */ sw $v0, 0x84($s1) -/* B5F47C 802411CC 8E050000 */ lw $a1, ($s0) -/* B5F480 802411D0 0C0B1EAF */ jal get_variable -/* B5F484 802411D4 0220202D */ daddu $a0, $s1, $zero -/* B5F488 802411D8 0240202D */ daddu $a0, $s2, $zero -/* B5F48C 802411DC 240500D0 */ addiu $a1, $zero, 0xd0 -/* B5F490 802411E0 00A0302D */ daddu $a2, $a1, $zero -/* B5F494 802411E4 00A0382D */ daddu $a3, $a1, $zero -/* B5F498 802411E8 AE220088 */ sw $v0, 0x88($s1) -/* B5F49C 802411EC AE200070 */ sw $zero, 0x70($s1) -/* B5F4A0 802411F0 0C04DF84 */ jal set_transition_stencil_color -/* B5F4A4 802411F4 AE200074 */ sw $zero, 0x74($s1) -.L802411F8: -/* B5F4A8 802411F8 8E230070 */ lw $v1, 0x70($s1) -/* B5F4AC 802411FC 24040001 */ addiu $a0, $zero, 1 -/* B5F4B0 80241200 10640019 */ beq $v1, $a0, .L80241268 -/* B5F4B4 80241204 28620002 */ slti $v0, $v1, 2 -/* B5F4B8 80241208 10400005 */ beqz $v0, .L80241220 -/* B5F4BC 8024120C 24020002 */ addiu $v0, $zero, 2 -/* B5F4C0 80241210 10600007 */ beqz $v1, .L80241230 -/* B5F4C4 80241214 240500FF */ addiu $a1, $zero, 0xff -/* B5F4C8 80241218 080904AA */ j .L802412A8 -/* B5F4CC 8024121C 00000000 */ nop -.L80241220: -/* B5F4D0 80241220 10620019 */ beq $v1, $v0, .L80241288 -/* B5F4D4 80241224 00000000 */ nop -/* B5F4D8 80241228 080904AA */ j .L802412A8 -/* B5F4DC 8024122C 00000000 */ nop -.L80241230: -/* B5F4E0 80241230 8E220074 */ lw $v0, 0x74($s1) -/* B5F4E4 80241234 14450004 */ bne $v0, $a1, .L80241248 -/* B5F4E8 80241238 00000000 */ nop -/* B5F4EC 8024123C AE240070 */ sw $a0, 0x70($s1) -/* B5F4F0 80241240 AE200078 */ sw $zero, 0x78($s1) -/* B5F4F4 80241244 8E220074 */ lw $v0, 0x74($s1) -.L80241248: -/* B5F4F8 80241248 8E230084 */ lw $v1, 0x84($s1) -/* B5F4FC 8024124C 00431021 */ addu $v0, $v0, $v1 -/* B5F500 80241250 AE220074 */ sw $v0, 0x74($s1) -/* B5F504 80241254 28420100 */ slti $v0, $v0, 0x100 -/* B5F508 80241258 50400013 */ beql $v0, $zero, .L802412A8 -/* B5F50C 8024125C AE250074 */ sw $a1, 0x74($s1) -/* B5F510 80241260 080904AA */ j .L802412A8 -/* B5F514 80241264 00000000 */ nop -.L80241268: -/* B5F518 80241268 8E220078 */ lw $v0, 0x78($s1) -/* B5F51C 8024126C 24420001 */ addiu $v0, $v0, 1 -/* B5F520 80241270 AE220078 */ sw $v0, 0x78($s1) -/* B5F524 80241274 28420002 */ slti $v0, $v0, 2 -/* B5F528 80241278 1440000B */ bnez $v0, .L802412A8 -/* B5F52C 8024127C 24020002 */ addiu $v0, $zero, 2 -/* B5F530 80241280 080904AA */ j .L802412A8 -/* B5F534 80241284 AE220070 */ sw $v0, 0x70($s1) -.L80241288: -/* B5F538 80241288 8E230074 */ lw $v1, 0x74($s1) -/* B5F53C 8024128C 50600001 */ beql $v1, $zero, .L80241294 -/* B5F540 80241290 24120001 */ addiu $s2, $zero, 1 -.L80241294: -/* B5F544 80241294 8E220088 */ lw $v0, 0x88($s1) -/* B5F548 80241298 00621023 */ subu $v0, $v1, $v0 -/* B5F54C 8024129C 04410002 */ bgez $v0, .L802412A8 -/* B5F550 802412A0 AE220074 */ sw $v0, 0x74($s1) -/* B5F554 802412A4 AE200074 */ sw $zero, 0x74($s1) -.L802412A8: -/* B5F558 802412A8 C6200074 */ lwc1 $f0, 0x74($s1) -/* B5F55C 802412AC 46800020 */ cvt.s.w $f0, $f0 -/* B5F560 802412B0 44050000 */ mfc1 $a1, $f0 -/* B5F564 802412B4 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* B5F568 802412B8 24040001 */ addiu $a0, $zero, 1 -/* B5F56C 802412BC 0240102D */ daddu $v0, $s2, $zero -/* B5F570 802412C0 8FBF001C */ lw $ra, 0x1c($sp) -/* B5F574 802412C4 8FB20018 */ lw $s2, 0x18($sp) -/* B5F578 802412C8 8FB10014 */ lw $s1, 0x14($sp) -/* B5F57C 802412CC 8FB00010 */ lw $s0, 0x10($sp) -/* B5F580 802412D0 03E00008 */ jr $ra -/* B5F584 802412D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s deleted file mode 100644 index 80fb87cad0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241A24_B5FCD4.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A24_B5FCD4 -/* B5FCD4 80241A24 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5FCD8 80241A28 AFB40028 */ sw $s4, 0x28($sp) -/* B5FCDC 80241A2C 0080A02D */ daddu $s4, $a0, $zero -/* B5FCE0 80241A30 AFBF002C */ sw $ra, 0x2c($sp) -/* B5FCE4 80241A34 AFB30024 */ sw $s3, 0x24($sp) -/* B5FCE8 80241A38 AFB20020 */ sw $s2, 0x20($sp) -/* B5FCEC 80241A3C AFB1001C */ sw $s1, 0x1c($sp) -/* B5FCF0 80241A40 AFB00018 */ sw $s0, 0x18($sp) -/* B5FCF4 80241A44 8E910148 */ lw $s1, 0x148($s4) -/* B5FCF8 80241A48 86240008 */ lh $a0, 8($s1) -/* B5FCFC 80241A4C 0C00EABB */ jal get_npc_unsafe -/* B5FD00 80241A50 00A0802D */ daddu $s0, $a1, $zero -/* B5FD04 80241A54 16000005 */ bnez $s0, .L80241A6C -/* B5FD08 80241A58 0040902D */ daddu $s2, $v0, $zero -/* B5FD0C 80241A5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5FD10 80241A60 30420004 */ andi $v0, $v0, 4 -/* B5FD14 80241A64 10400015 */ beqz $v0, .L80241ABC -/* B5FD18 80241A68 00000000 */ nop -.L80241A6C: -/* B5FD1C 80241A6C AE800070 */ sw $zero, 0x70($s4) -/* B5FD20 80241A70 8E420000 */ lw $v0, ($s2) -/* B5FD24 80241A74 3C031F30 */ lui $v1, 0x1f30 -/* B5FD28 80241A78 A640008E */ sh $zero, 0x8e($s2) -/* B5FD2C 80241A7C 34420102 */ ori $v0, $v0, 0x102 -/* B5FD30 80241A80 AE420000 */ sw $v0, ($s2) -/* B5FD34 80241A84 8E220000 */ lw $v0, ($s1) -/* B5FD38 80241A88 3C01C47A */ lui $at, 0xc47a -/* B5FD3C 80241A8C 44810000 */ mtc1 $at, $f0 -/* B5FD40 80241A90 00431025 */ or $v0, $v0, $v1 -/* B5FD44 80241A94 AE220000 */ sw $v0, ($s1) -/* B5FD48 80241A98 AE400038 */ sw $zero, 0x38($s2) -/* B5FD4C 80241A9C E640003C */ swc1 $f0, 0x3c($s2) -/* B5FD50 80241AA0 AE400040 */ sw $zero, 0x40($s2) -/* B5FD54 80241AA4 8E2300B0 */ lw $v1, 0xb0($s1) -/* B5FD58 80241AA8 30620004 */ andi $v0, $v1, 4 -/* B5FD5C 80241AAC 10400003 */ beqz $v0, .L80241ABC -/* B5FD60 80241AB0 2402FFFB */ addiu $v0, $zero, -5 -/* B5FD64 80241AB4 00621024 */ and $v0, $v1, $v0 -/* B5FD68 80241AB8 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241ABC: -/* B5FD6C 80241ABC 8E930070 */ lw $s3, 0x70($s4) -/* B5FD70 80241AC0 12600005 */ beqz $s3, .L80241AD8 -/* B5FD74 80241AC4 24020001 */ addiu $v0, $zero, 1 -/* B5FD78 80241AC8 12620048 */ beq $s3, $v0, .L80241BEC -/* B5FD7C 80241ACC 00000000 */ nop -/* B5FD80 80241AD0 08090718 */ j .L80241C60 -/* B5FD84 80241AD4 00000000 */ nop -.L80241AD8: -/* B5FD88 80241AD8 86240008 */ lh $a0, 8($s1) -/* B5FD8C 80241ADC 0C00FB3A */ jal get_enemy -/* B5FD90 80241AE0 2484FFFF */ addiu $a0, $a0, -1 -/* B5FD94 80241AE4 0040802D */ daddu $s0, $v0, $zero -/* B5FD98 80241AE8 0C00EABB */ jal get_npc_unsafe -/* B5FD9C 80241AEC 86040008 */ lh $a0, 8($s0) -/* B5FDA0 80241AF0 24030001 */ addiu $v1, $zero, 1 -/* B5FDA4 80241AF4 0040982D */ daddu $s3, $v0, $zero -/* B5FDA8 80241AF8 A2230007 */ sb $v1, 7($s1) -/* B5FDAC 80241AFC 8E03006C */ lw $v1, 0x6c($s0) -/* B5FDB0 80241B00 24020003 */ addiu $v0, $zero, 3 -/* B5FDB4 80241B04 14620056 */ bne $v1, $v0, .L80241C60 -/* B5FDB8 80241B08 00000000 */ nop -/* B5FDBC 80241B0C 8E2500A8 */ lw $a1, 0xa8($s1) -/* B5FDC0 80241B10 10A00003 */ beqz $a1, .L80241B20 -/* B5FDC4 80241B14 0260202D */ daddu $a0, $s3, $zero -/* B5FDC8 80241B18 0C012530 */ jal func_800494C0 -/* B5FDCC 80241B1C 0000302D */ daddu $a2, $zero, $zero -.L80241B20: -/* B5FDD0 80241B20 27A40010 */ addiu $a0, $sp, 0x10 -/* B5FDD4 80241B24 C6280070 */ lwc1 $f8, 0x70($s1) -/* B5FDD8 80241B28 46804220 */ cvt.s.w $f8, $f8 -/* B5FDDC 80241B2C C6620034 */ lwc1 $f2, 0x34($s3) -/* B5FDE0 80241B30 3C014387 */ lui $at, 0x4387 -/* B5FDE4 80241B34 44810000 */ mtc1 $at, $f0 -/* B5FDE8 80241B38 44064000 */ mfc1 $a2, $f8 -/* B5FDEC 80241B3C 46020001 */ sub.s $f0, $f0, $f2 -/* B5FDF0 80241B40 C6660038 */ lwc1 $f6, 0x38($s3) -/* B5FDF4 80241B44 C6640040 */ lwc1 $f4, 0x40($s3) -/* B5FDF8 80241B48 44070000 */ mfc1 $a3, $f0 -/* B5FDFC 80241B4C 27A50014 */ addiu $a1, $sp, 0x14 -/* B5FE00 80241B50 E7A60010 */ swc1 $f6, 0x10($sp) -/* B5FE04 80241B54 0C00A7E7 */ jal add_vec2D_polar -/* B5FE08 80241B58 E7A40014 */ swc1 $f4, 0x14($sp) -/* B5FE0C 80241B5C C7A00010 */ lwc1 $f0, 0x10($sp) -/* B5FE10 80241B60 4600020D */ trunc.w.s $f8, $f0 -/* B5FE14 80241B64 44024000 */ mfc1 $v0, $f8 -/* B5FE18 80241B68 E6400038 */ swc1 $f0, 0x38($s2) -/* B5FE1C 80241B6C A6220010 */ sh $v0, 0x10($s1) -/* B5FE20 80241B70 C660003C */ lwc1 $f0, 0x3c($s3) -/* B5FE24 80241B74 C622006C */ lwc1 $f2, 0x6c($s1) -/* B5FE28 80241B78 468010A0 */ cvt.s.w $f2, $f2 -/* B5FE2C 80241B7C 46020000 */ add.s $f0, $f0, $f2 -/* B5FE30 80241B80 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B5FE34 80241B84 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B5FE38 80241B88 E640003C */ swc1 $f0, 0x3c($s2) -/* B5FE3C 80241B8C C7A20014 */ lwc1 $f2, 0x14($sp) -/* B5FE40 80241B90 4600020D */ trunc.w.s $f8, $f0 -/* B5FE44 80241B94 44024000 */ mfc1 $v0, $f8 -/* B5FE48 80241B98 00000000 */ nop -/* B5FE4C 80241B9C A6220012 */ sh $v0, 0x12($s1) -/* B5FE50 80241BA0 4600120D */ trunc.w.s $f8, $f2 -/* B5FE54 80241BA4 44024000 */ mfc1 $v0, $f8 -/* B5FE58 80241BA8 E6420040 */ swc1 $f2, 0x40($s2) -/* B5FE5C 80241BAC A6220014 */ sh $v0, 0x14($s1) -/* B5FE60 80241BB0 8C660028 */ lw $a2, 0x28($v1) -/* B5FE64 80241BB4 8C670030 */ lw $a3, 0x30($v1) -/* B5FE68 80241BB8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B5FE6C 80241BBC 0C00A720 */ jal atan2 -/* B5FE70 80241BC0 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B5FE74 80241BC4 3C03E0EF */ lui $v1, 0xe0ef -/* B5FE78 80241BC8 E640000C */ swc1 $f0, 0xc($s2) -/* B5FE7C 80241BCC 8E220000 */ lw $v0, ($s1) -/* B5FE80 80241BD0 3463FFFF */ ori $v1, $v1, 0xffff -/* B5FE84 80241BD4 00431024 */ and $v0, $v0, $v1 -/* B5FE88 80241BD8 AE220000 */ sw $v0, ($s1) -/* B5FE8C 80241BDC 24020001 */ addiu $v0, $zero, 1 -/* B5FE90 80241BE0 A640008E */ sh $zero, 0x8e($s2) -/* B5FE94 80241BE4 08090718 */ j .L80241C60 -/* B5FE98 80241BE8 AE820070 */ sw $v0, 0x70($s4) -.L80241BEC: -/* B5FE9C 80241BEC 86240008 */ lh $a0, 8($s1) -/* B5FEA0 80241BF0 0C00FB3A */ jal get_enemy -/* B5FEA4 80241BF4 2484FFFF */ addiu $a0, $a0, -1 -/* B5FEA8 80241BF8 0040802D */ daddu $s0, $v0, $zero -/* B5FEAC 80241BFC 0C00EABB */ jal get_npc_unsafe -/* B5FEB0 80241C00 86040008 */ lh $a0, 8($s0) -/* B5FEB4 80241C04 9642008E */ lhu $v0, 0x8e($s2) -/* B5FEB8 80241C08 24420001 */ addiu $v0, $v0, 1 -/* B5FEBC 80241C0C A642008E */ sh $v0, 0x8e($s2) -/* B5FEC0 80241C10 00021400 */ sll $v0, $v0, 0x10 -/* B5FEC4 80241C14 8E23007C */ lw $v1, 0x7c($s1) -/* B5FEC8 80241C18 00021403 */ sra $v0, $v0, 0x10 -/* B5FECC 80241C1C 0043102A */ slt $v0, $v0, $v1 -/* B5FED0 80241C20 50400001 */ beql $v0, $zero, .L80241C28 -/* B5FED4 80241C24 A2200007 */ sb $zero, 7($s1) -.L80241C28: -/* B5FED8 80241C28 8E03006C */ lw $v1, 0x6c($s0) -/* B5FEDC 80241C2C 24020004 */ addiu $v0, $zero, 4 -/* B5FEE0 80241C30 1462000B */ bne $v1, $v0, .L80241C60 -/* B5FEE4 80241C34 3C021F10 */ lui $v0, 0x1f10 -/* B5FEE8 80241C38 8E230000 */ lw $v1, ($s1) -/* B5FEEC 80241C3C 3C01C47A */ lui $at, 0xc47a -/* B5FEF0 80241C40 44810000 */ mtc1 $at, $f0 -/* B5FEF4 80241C44 00621825 */ or $v1, $v1, $v0 -/* B5FEF8 80241C48 AE230000 */ sw $v1, ($s1) -/* B5FEFC 80241C4C AE400038 */ sw $zero, 0x38($s2) -/* B5FF00 80241C50 E640003C */ swc1 $f0, 0x3c($s2) -/* B5FF04 80241C54 AE400040 */ sw $zero, 0x40($s2) -/* B5FF08 80241C58 A2330007 */ sb $s3, 7($s1) -/* B5FF0C 80241C5C AE800070 */ sw $zero, 0x70($s4) -.L80241C60: -/* B5FF10 80241C60 8FBF002C */ lw $ra, 0x2c($sp) -/* B5FF14 80241C64 8FB40028 */ lw $s4, 0x28($sp) -/* B5FF18 80241C68 8FB30024 */ lw $s3, 0x24($sp) -/* B5FF1C 80241C6C 8FB20020 */ lw $s2, 0x20($sp) -/* B5FF20 80241C70 8FB1001C */ lw $s1, 0x1c($sp) -/* B5FF24 80241C74 8FB00018 */ lw $s0, 0x18($sp) -/* B5FF28 80241C78 0000102D */ daddu $v0, $zero, $zero -/* B5FF2C 80241C7C 03E00008 */ jr $ra -/* B5FF30 80241C80 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s deleted file mode 100644 index 5b5a34d37a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240F10_B669C0.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F10_B669C0 -/* B669C0 80240F10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B669C4 80240F14 AFB40028 */ sw $s4, 0x28($sp) -/* B669C8 80240F18 0080A02D */ daddu $s4, $a0, $zero -/* B669CC 80240F1C AFBF002C */ sw $ra, 0x2c($sp) -/* B669D0 80240F20 AFB30024 */ sw $s3, 0x24($sp) -/* B669D4 80240F24 AFB20020 */ sw $s2, 0x20($sp) -/* B669D8 80240F28 AFB1001C */ sw $s1, 0x1c($sp) -/* B669DC 80240F2C AFB00018 */ sw $s0, 0x18($sp) -/* B669E0 80240F30 8E910148 */ lw $s1, 0x148($s4) -/* B669E4 80240F34 86240008 */ lh $a0, 8($s1) -/* B669E8 80240F38 0C00EABB */ jal get_npc_unsafe -/* B669EC 80240F3C 00A0802D */ daddu $s0, $a1, $zero -/* B669F0 80240F40 16000005 */ bnez $s0, .L80240F58 -/* B669F4 80240F44 0040902D */ daddu $s2, $v0, $zero -/* B669F8 80240F48 8E2200B0 */ lw $v0, 0xb0($s1) -/* B669FC 80240F4C 30420004 */ andi $v0, $v0, 4 -/* B66A00 80240F50 10400015 */ beqz $v0, .L80240FA8 -/* B66A04 80240F54 00000000 */ nop -.L80240F58: -/* B66A08 80240F58 AE800070 */ sw $zero, 0x70($s4) -/* B66A0C 80240F5C 8E420000 */ lw $v0, ($s2) -/* B66A10 80240F60 3C031F30 */ lui $v1, 0x1f30 -/* B66A14 80240F64 A640008E */ sh $zero, 0x8e($s2) -/* B66A18 80240F68 34420102 */ ori $v0, $v0, 0x102 -/* B66A1C 80240F6C AE420000 */ sw $v0, ($s2) -/* B66A20 80240F70 8E220000 */ lw $v0, ($s1) -/* B66A24 80240F74 3C01C47A */ lui $at, 0xc47a -/* B66A28 80240F78 44810000 */ mtc1 $at, $f0 -/* B66A2C 80240F7C 00431025 */ or $v0, $v0, $v1 -/* B66A30 80240F80 AE220000 */ sw $v0, ($s1) -/* B66A34 80240F84 AE400038 */ sw $zero, 0x38($s2) -/* B66A38 80240F88 E640003C */ swc1 $f0, 0x3c($s2) -/* B66A3C 80240F8C AE400040 */ sw $zero, 0x40($s2) -/* B66A40 80240F90 8E2300B0 */ lw $v1, 0xb0($s1) -/* B66A44 80240F94 30620004 */ andi $v0, $v1, 4 -/* B66A48 80240F98 10400003 */ beqz $v0, .L80240FA8 -/* B66A4C 80240F9C 2402FFFB */ addiu $v0, $zero, -5 -/* B66A50 80240FA0 00621024 */ and $v0, $v1, $v0 -/* B66A54 80240FA4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240FA8: -/* B66A58 80240FA8 8E930070 */ lw $s3, 0x70($s4) -/* B66A5C 80240FAC 12600005 */ beqz $s3, .L80240FC4 -/* B66A60 80240FB0 24020001 */ addiu $v0, $zero, 1 -/* B66A64 80240FB4 12620048 */ beq $s3, $v0, .L802410D8 -/* B66A68 80240FB8 00000000 */ nop -/* B66A6C 80240FBC 08090453 */ j .L8024114C -/* B66A70 80240FC0 00000000 */ nop -.L80240FC4: -/* B66A74 80240FC4 86240008 */ lh $a0, 8($s1) -/* B66A78 80240FC8 0C00FB3A */ jal get_enemy -/* B66A7C 80240FCC 2484FFFF */ addiu $a0, $a0, -1 -/* B66A80 80240FD0 0040802D */ daddu $s0, $v0, $zero -/* B66A84 80240FD4 0C00EABB */ jal get_npc_unsafe -/* B66A88 80240FD8 86040008 */ lh $a0, 8($s0) -/* B66A8C 80240FDC 24030001 */ addiu $v1, $zero, 1 -/* B66A90 80240FE0 0040982D */ daddu $s3, $v0, $zero -/* B66A94 80240FE4 A2230007 */ sb $v1, 7($s1) -/* B66A98 80240FE8 8E03006C */ lw $v1, 0x6c($s0) -/* B66A9C 80240FEC 24020003 */ addiu $v0, $zero, 3 -/* B66AA0 80240FF0 14620056 */ bne $v1, $v0, .L8024114C -/* B66AA4 80240FF4 00000000 */ nop -/* B66AA8 80240FF8 8E2500A8 */ lw $a1, 0xa8($s1) -/* B66AAC 80240FFC 10A00003 */ beqz $a1, .L8024100C -/* B66AB0 80241000 0260202D */ daddu $a0, $s3, $zero -/* B66AB4 80241004 0C012530 */ jal func_800494C0 -/* B66AB8 80241008 0000302D */ daddu $a2, $zero, $zero -.L8024100C: -/* B66ABC 8024100C 27A40010 */ addiu $a0, $sp, 0x10 -/* B66AC0 80241010 C6280070 */ lwc1 $f8, 0x70($s1) -/* B66AC4 80241014 46804220 */ cvt.s.w $f8, $f8 -/* B66AC8 80241018 C6620034 */ lwc1 $f2, 0x34($s3) -/* B66ACC 8024101C 3C014387 */ lui $at, 0x4387 -/* B66AD0 80241020 44810000 */ mtc1 $at, $f0 -/* B66AD4 80241024 44064000 */ mfc1 $a2, $f8 -/* B66AD8 80241028 46020001 */ sub.s $f0, $f0, $f2 -/* B66ADC 8024102C C6660038 */ lwc1 $f6, 0x38($s3) -/* B66AE0 80241030 C6640040 */ lwc1 $f4, 0x40($s3) -/* B66AE4 80241034 44070000 */ mfc1 $a3, $f0 -/* B66AE8 80241038 27A50014 */ addiu $a1, $sp, 0x14 -/* B66AEC 8024103C E7A60010 */ swc1 $f6, 0x10($sp) -/* B66AF0 80241040 0C00A7E7 */ jal add_vec2D_polar -/* B66AF4 80241044 E7A40014 */ swc1 $f4, 0x14($sp) -/* B66AF8 80241048 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B66AFC 8024104C 4600020D */ trunc.w.s $f8, $f0 -/* B66B00 80241050 44024000 */ mfc1 $v0, $f8 -/* B66B04 80241054 E6400038 */ swc1 $f0, 0x38($s2) -/* B66B08 80241058 A6220010 */ sh $v0, 0x10($s1) -/* B66B0C 8024105C C660003C */ lwc1 $f0, 0x3c($s3) -/* B66B10 80241060 C622006C */ lwc1 $f2, 0x6c($s1) -/* B66B14 80241064 468010A0 */ cvt.s.w $f2, $f2 -/* B66B18 80241068 46020000 */ add.s $f0, $f0, $f2 -/* B66B1C 8024106C 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B66B20 80241070 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B66B24 80241074 E640003C */ swc1 $f0, 0x3c($s2) -/* B66B28 80241078 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B66B2C 8024107C 4600020D */ trunc.w.s $f8, $f0 -/* B66B30 80241080 44024000 */ mfc1 $v0, $f8 -/* B66B34 80241084 00000000 */ nop -/* B66B38 80241088 A6220012 */ sh $v0, 0x12($s1) -/* B66B3C 8024108C 4600120D */ trunc.w.s $f8, $f2 -/* B66B40 80241090 44024000 */ mfc1 $v0, $f8 -/* B66B44 80241094 E6420040 */ swc1 $f2, 0x40($s2) -/* B66B48 80241098 A6220014 */ sh $v0, 0x14($s1) -/* B66B4C 8024109C 8C660028 */ lw $a2, 0x28($v1) -/* B66B50 802410A0 8C670030 */ lw $a3, 0x30($v1) -/* B66B54 802410A4 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B66B58 802410A8 0C00A720 */ jal atan2 -/* B66B5C 802410AC C64E0040 */ lwc1 $f14, 0x40($s2) -/* B66B60 802410B0 3C03E0EF */ lui $v1, 0xe0ef -/* B66B64 802410B4 E640000C */ swc1 $f0, 0xc($s2) -/* B66B68 802410B8 8E220000 */ lw $v0, ($s1) -/* B66B6C 802410BC 3463FFFF */ ori $v1, $v1, 0xffff -/* B66B70 802410C0 00431024 */ and $v0, $v0, $v1 -/* B66B74 802410C4 AE220000 */ sw $v0, ($s1) -/* B66B78 802410C8 24020001 */ addiu $v0, $zero, 1 -/* B66B7C 802410CC A640008E */ sh $zero, 0x8e($s2) -/* B66B80 802410D0 08090453 */ j .L8024114C -/* B66B84 802410D4 AE820070 */ sw $v0, 0x70($s4) -.L802410D8: -/* B66B88 802410D8 86240008 */ lh $a0, 8($s1) -/* B66B8C 802410DC 0C00FB3A */ jal get_enemy -/* B66B90 802410E0 2484FFFF */ addiu $a0, $a0, -1 -/* B66B94 802410E4 0040802D */ daddu $s0, $v0, $zero -/* B66B98 802410E8 0C00EABB */ jal get_npc_unsafe -/* B66B9C 802410EC 86040008 */ lh $a0, 8($s0) -/* B66BA0 802410F0 9642008E */ lhu $v0, 0x8e($s2) -/* B66BA4 802410F4 24420001 */ addiu $v0, $v0, 1 -/* B66BA8 802410F8 A642008E */ sh $v0, 0x8e($s2) -/* B66BAC 802410FC 00021400 */ sll $v0, $v0, 0x10 -/* B66BB0 80241100 8E23007C */ lw $v1, 0x7c($s1) -/* B66BB4 80241104 00021403 */ sra $v0, $v0, 0x10 -/* B66BB8 80241108 0043102A */ slt $v0, $v0, $v1 -/* B66BBC 8024110C 50400001 */ beql $v0, $zero, .L80241114 -/* B66BC0 80241110 A2200007 */ sb $zero, 7($s1) -.L80241114: -/* B66BC4 80241114 8E03006C */ lw $v1, 0x6c($s0) -/* B66BC8 80241118 24020004 */ addiu $v0, $zero, 4 -/* B66BCC 8024111C 1462000B */ bne $v1, $v0, .L8024114C -/* B66BD0 80241120 3C021F10 */ lui $v0, 0x1f10 -/* B66BD4 80241124 8E230000 */ lw $v1, ($s1) -/* B66BD8 80241128 3C01C47A */ lui $at, 0xc47a -/* B66BDC 8024112C 44810000 */ mtc1 $at, $f0 -/* B66BE0 80241130 00621825 */ or $v1, $v1, $v0 -/* B66BE4 80241134 AE230000 */ sw $v1, ($s1) -/* B66BE8 80241138 AE400038 */ sw $zero, 0x38($s2) -/* B66BEC 8024113C E640003C */ swc1 $f0, 0x3c($s2) -/* B66BF0 80241140 AE400040 */ sw $zero, 0x40($s2) -/* B66BF4 80241144 A2330007 */ sb $s3, 7($s1) -/* B66BF8 80241148 AE800070 */ sw $zero, 0x70($s4) -.L8024114C: -/* B66BFC 8024114C 8FBF002C */ lw $ra, 0x2c($sp) -/* B66C00 80241150 8FB40028 */ lw $s4, 0x28($sp) -/* B66C04 80241154 8FB30024 */ lw $s3, 0x24($sp) -/* B66C08 80241158 8FB20020 */ lw $s2, 0x20($sp) -/* B66C0C 8024115C 8FB1001C */ lw $s1, 0x1c($sp) -/* B66C10 80241160 8FB00018 */ lw $s0, 0x18($sp) -/* B66C14 80241164 0000102D */ daddu $v0, $zero, $zero -/* B66C18 80241168 03E00008 */ jr $ra -/* B66C1C 8024116C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s deleted file mode 100644 index 10292566de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A90_B73B40 -/* B73B40 80240A90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B73B44 80240A94 AFB40028 */ sw $s4, 0x28($sp) -/* B73B48 80240A98 0080A02D */ daddu $s4, $a0, $zero -/* B73B4C 80240A9C AFBF002C */ sw $ra, 0x2c($sp) -/* B73B50 80240AA0 AFB30024 */ sw $s3, 0x24($sp) -/* B73B54 80240AA4 AFB20020 */ sw $s2, 0x20($sp) -/* B73B58 80240AA8 AFB1001C */ sw $s1, 0x1c($sp) -/* B73B5C 80240AAC AFB00018 */ sw $s0, 0x18($sp) -/* B73B60 80240AB0 8E910148 */ lw $s1, 0x148($s4) -/* B73B64 80240AB4 86240008 */ lh $a0, 8($s1) -/* B73B68 80240AB8 0C00EABB */ jal get_npc_unsafe -/* B73B6C 80240ABC 00A0802D */ daddu $s0, $a1, $zero -/* B73B70 80240AC0 16000005 */ bnez $s0, .L80240AD8 -/* B73B74 80240AC4 0040902D */ daddu $s2, $v0, $zero -/* B73B78 80240AC8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B73B7C 80240ACC 30420004 */ andi $v0, $v0, 4 -/* B73B80 80240AD0 10400015 */ beqz $v0, .L80240B28 -/* B73B84 80240AD4 00000000 */ nop -.L80240AD8: -/* B73B88 80240AD8 AE800070 */ sw $zero, 0x70($s4) -/* B73B8C 80240ADC 8E420000 */ lw $v0, ($s2) -/* B73B90 80240AE0 3C031F30 */ lui $v1, 0x1f30 -/* B73B94 80240AE4 A640008E */ sh $zero, 0x8e($s2) -/* B73B98 80240AE8 34420102 */ ori $v0, $v0, 0x102 -/* B73B9C 80240AEC AE420000 */ sw $v0, ($s2) -/* B73BA0 80240AF0 8E220000 */ lw $v0, ($s1) -/* B73BA4 80240AF4 3C01C47A */ lui $at, 0xc47a -/* B73BA8 80240AF8 44810000 */ mtc1 $at, $f0 -/* B73BAC 80240AFC 00431025 */ or $v0, $v0, $v1 -/* B73BB0 80240B00 AE220000 */ sw $v0, ($s1) -/* B73BB4 80240B04 AE400038 */ sw $zero, 0x38($s2) -/* B73BB8 80240B08 E640003C */ swc1 $f0, 0x3c($s2) -/* B73BBC 80240B0C AE400040 */ sw $zero, 0x40($s2) -/* B73BC0 80240B10 8E2300B0 */ lw $v1, 0xb0($s1) -/* B73BC4 80240B14 30620004 */ andi $v0, $v1, 4 -/* B73BC8 80240B18 10400003 */ beqz $v0, .L80240B28 -/* B73BCC 80240B1C 2402FFFB */ addiu $v0, $zero, -5 -/* B73BD0 80240B20 00621024 */ and $v0, $v1, $v0 -/* B73BD4 80240B24 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240B28: -/* B73BD8 80240B28 8E930070 */ lw $s3, 0x70($s4) -/* B73BDC 80240B2C 12600005 */ beqz $s3, .L80240B44 -/* B73BE0 80240B30 24020001 */ addiu $v0, $zero, 1 -/* B73BE4 80240B34 12620048 */ beq $s3, $v0, .L80240C58 -/* B73BE8 80240B38 00000000 */ nop -/* B73BEC 80240B3C 08090333 */ j .L80240CCC -/* B73BF0 80240B40 00000000 */ nop -.L80240B44: -/* B73BF4 80240B44 86240008 */ lh $a0, 8($s1) -/* B73BF8 80240B48 0C00FB3A */ jal get_enemy -/* B73BFC 80240B4C 2484FFFF */ addiu $a0, $a0, -1 -/* B73C00 80240B50 0040802D */ daddu $s0, $v0, $zero -/* B73C04 80240B54 0C00EABB */ jal get_npc_unsafe -/* B73C08 80240B58 86040008 */ lh $a0, 8($s0) -/* B73C0C 80240B5C 24030001 */ addiu $v1, $zero, 1 -/* B73C10 80240B60 0040982D */ daddu $s3, $v0, $zero -/* B73C14 80240B64 A2230007 */ sb $v1, 7($s1) -/* B73C18 80240B68 8E03006C */ lw $v1, 0x6c($s0) -/* B73C1C 80240B6C 24020003 */ addiu $v0, $zero, 3 -/* B73C20 80240B70 14620056 */ bne $v1, $v0, .L80240CCC -/* B73C24 80240B74 00000000 */ nop -/* B73C28 80240B78 8E2500A8 */ lw $a1, 0xa8($s1) -/* B73C2C 80240B7C 10A00003 */ beqz $a1, .L80240B8C -/* B73C30 80240B80 0260202D */ daddu $a0, $s3, $zero -/* B73C34 80240B84 0C012530 */ jal func_800494C0 -/* B73C38 80240B88 0000302D */ daddu $a2, $zero, $zero -.L80240B8C: -/* B73C3C 80240B8C 27A40010 */ addiu $a0, $sp, 0x10 -/* B73C40 80240B90 C6280070 */ lwc1 $f8, 0x70($s1) -/* B73C44 80240B94 46804220 */ cvt.s.w $f8, $f8 -/* B73C48 80240B98 C6620034 */ lwc1 $f2, 0x34($s3) -/* B73C4C 80240B9C 3C014387 */ lui $at, 0x4387 -/* B73C50 80240BA0 44810000 */ mtc1 $at, $f0 -/* B73C54 80240BA4 44064000 */ mfc1 $a2, $f8 -/* B73C58 80240BA8 46020001 */ sub.s $f0, $f0, $f2 -/* B73C5C 80240BAC C6660038 */ lwc1 $f6, 0x38($s3) -/* B73C60 80240BB0 C6640040 */ lwc1 $f4, 0x40($s3) -/* B73C64 80240BB4 44070000 */ mfc1 $a3, $f0 -/* B73C68 80240BB8 27A50014 */ addiu $a1, $sp, 0x14 -/* B73C6C 80240BBC E7A60010 */ swc1 $f6, 0x10($sp) -/* B73C70 80240BC0 0C00A7E7 */ jal add_vec2D_polar -/* B73C74 80240BC4 E7A40014 */ swc1 $f4, 0x14($sp) -/* B73C78 80240BC8 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B73C7C 80240BCC 4600020D */ trunc.w.s $f8, $f0 -/* B73C80 80240BD0 44024000 */ mfc1 $v0, $f8 -/* B73C84 80240BD4 E6400038 */ swc1 $f0, 0x38($s2) -/* B73C88 80240BD8 A6220010 */ sh $v0, 0x10($s1) -/* B73C8C 80240BDC C660003C */ lwc1 $f0, 0x3c($s3) -/* B73C90 80240BE0 C622006C */ lwc1 $f2, 0x6c($s1) -/* B73C94 80240BE4 468010A0 */ cvt.s.w $f2, $f2 -/* B73C98 80240BE8 46020000 */ add.s $f0, $f0, $f2 -/* B73C9C 80240BEC 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B73CA0 80240BF0 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B73CA4 80240BF4 E640003C */ swc1 $f0, 0x3c($s2) -/* B73CA8 80240BF8 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B73CAC 80240BFC 4600020D */ trunc.w.s $f8, $f0 -/* B73CB0 80240C00 44024000 */ mfc1 $v0, $f8 -/* B73CB4 80240C04 00000000 */ nop -/* B73CB8 80240C08 A6220012 */ sh $v0, 0x12($s1) -/* B73CBC 80240C0C 4600120D */ trunc.w.s $f8, $f2 -/* B73CC0 80240C10 44024000 */ mfc1 $v0, $f8 -/* B73CC4 80240C14 E6420040 */ swc1 $f2, 0x40($s2) -/* B73CC8 80240C18 A6220014 */ sh $v0, 0x14($s1) -/* B73CCC 80240C1C 8C660028 */ lw $a2, 0x28($v1) -/* B73CD0 80240C20 8C670030 */ lw $a3, 0x30($v1) -/* B73CD4 80240C24 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B73CD8 80240C28 0C00A720 */ jal atan2 -/* B73CDC 80240C2C C64E0040 */ lwc1 $f14, 0x40($s2) -/* B73CE0 80240C30 3C03E0EF */ lui $v1, 0xe0ef -/* B73CE4 80240C34 E640000C */ swc1 $f0, 0xc($s2) -/* B73CE8 80240C38 8E220000 */ lw $v0, ($s1) -/* B73CEC 80240C3C 3463FFFF */ ori $v1, $v1, 0xffff -/* B73CF0 80240C40 00431024 */ and $v0, $v0, $v1 -/* B73CF4 80240C44 AE220000 */ sw $v0, ($s1) -/* B73CF8 80240C48 24020001 */ addiu $v0, $zero, 1 -/* B73CFC 80240C4C A640008E */ sh $zero, 0x8e($s2) -/* B73D00 80240C50 08090333 */ j .L80240CCC -/* B73D04 80240C54 AE820070 */ sw $v0, 0x70($s4) -.L80240C58: -/* B73D08 80240C58 86240008 */ lh $a0, 8($s1) -/* B73D0C 80240C5C 0C00FB3A */ jal get_enemy -/* B73D10 80240C60 2484FFFF */ addiu $a0, $a0, -1 -/* B73D14 80240C64 0040802D */ daddu $s0, $v0, $zero -/* B73D18 80240C68 0C00EABB */ jal get_npc_unsafe -/* B73D1C 80240C6C 86040008 */ lh $a0, 8($s0) -/* B73D20 80240C70 9642008E */ lhu $v0, 0x8e($s2) -/* B73D24 80240C74 24420001 */ addiu $v0, $v0, 1 -/* B73D28 80240C78 A642008E */ sh $v0, 0x8e($s2) -/* B73D2C 80240C7C 00021400 */ sll $v0, $v0, 0x10 -/* B73D30 80240C80 8E23007C */ lw $v1, 0x7c($s1) -/* B73D34 80240C84 00021403 */ sra $v0, $v0, 0x10 -/* B73D38 80240C88 0043102A */ slt $v0, $v0, $v1 -/* B73D3C 80240C8C 50400001 */ beql $v0, $zero, .L80240C94 -/* B73D40 80240C90 A2200007 */ sb $zero, 7($s1) -.L80240C94: -/* B73D44 80240C94 8E03006C */ lw $v1, 0x6c($s0) -/* B73D48 80240C98 24020004 */ addiu $v0, $zero, 4 -/* B73D4C 80240C9C 1462000B */ bne $v1, $v0, .L80240CCC -/* B73D50 80240CA0 3C021F10 */ lui $v0, 0x1f10 -/* B73D54 80240CA4 8E230000 */ lw $v1, ($s1) -/* B73D58 80240CA8 3C01C47A */ lui $at, 0xc47a -/* B73D5C 80240CAC 44810000 */ mtc1 $at, $f0 -/* B73D60 80240CB0 00621825 */ or $v1, $v1, $v0 -/* B73D64 80240CB4 AE230000 */ sw $v1, ($s1) -/* B73D68 80240CB8 AE400038 */ sw $zero, 0x38($s2) -/* B73D6C 80240CBC E640003C */ swc1 $f0, 0x3c($s2) -/* B73D70 80240CC0 AE400040 */ sw $zero, 0x40($s2) -/* B73D74 80240CC4 A2330007 */ sb $s3, 7($s1) -/* B73D78 80240CC8 AE800070 */ sw $zero, 0x70($s4) -.L80240CCC: -/* B73D7C 80240CCC 8FBF002C */ lw $ra, 0x2c($sp) -/* B73D80 80240CD0 8FB40028 */ lw $s4, 0x28($sp) -/* B73D84 80240CD4 8FB30024 */ lw $s3, 0x24($sp) -/* B73D88 80240CD8 8FB20020 */ lw $s2, 0x20($sp) -/* B73D8C 80240CDC 8FB1001C */ lw $s1, 0x1c($sp) -/* B73D90 80240CE0 8FB00018 */ lw $s0, 0x18($sp) -/* B73D94 80240CE4 0000102D */ daddu $v0, $zero, $zero -/* B73D98 80240CE8 03E00008 */ jr $ra -/* B73D9C 80240CEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s deleted file mode 100644 index eaebae3176..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240158_B842D8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_B842D8 -/* B842D8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B842DC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* B842E0 80240160 0080902D */ daddu $s2, $a0, $zero -/* B842E4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* B842E8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* B842EC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* B842F0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* B842F4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* B842F8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B842FC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* B84300 80240180 8E510148 */ lw $s1, 0x148($s2) -/* B84304 80240184 00A0982D */ daddu $s3, $a1, $zero -/* B84308 80240188 86240008 */ lh $a0, 8($s1) -/* B8430C 8024018C 0C00EABB */ jal get_npc_unsafe -/* B84310 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* B84314 80240194 8E630014 */ lw $v1, 0x14($s3) -/* B84318 80240198 04600030 */ bltz $v1, .L8024025C -/* B8431C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* B84320 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* B84324 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* B84328 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* B8432C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* B84330 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* B84334 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* B84338 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* B8433C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* B84340 802401C0 0C01242D */ jal func_800490B4 -/* B84344 802401C4 0220282D */ daddu $a1, $s1, $zero -/* B84348 802401C8 10400021 */ beqz $v0, .L80240250 -/* B8434C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* B84350 802401D0 0200282D */ daddu $a1, $s0, $zero -/* B84354 802401D4 0000302D */ daddu $a2, $zero, $zero -/* B84358 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* B8435C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* B84360 802401E0 44810000 */ mtc1 $at, $f0 -/* B84364 802401E4 3C014000 */ lui $at, 0x4000 -/* B84368 802401E8 44811000 */ mtc1 $at, $f2 -/* B8436C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* B84370 802401F0 44812000 */ mtc1 $at, $f4 -/* B84374 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* B84378 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* B8437C 802401FC 44833000 */ mtc1 $v1, $f6 -/* B84380 80240200 00000000 */ nop -/* B84384 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* B84388 80240208 44073000 */ mfc1 $a3, $f6 -/* B8438C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* B84390 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* B84394 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* B84398 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* B8439C 8024021C 0C01BFA4 */ jal fx_emote -/* B843A0 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* B843A4 80240224 0200202D */ daddu $a0, $s0, $zero -/* B843A8 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B843AC 8024022C 0C012530 */ jal func_800494C0 -/* B843B0 80240230 3C060020 */ lui $a2, 0x20 -/* B843B4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* B843B8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* B843BC 8024023C 30420001 */ andi $v0, $v0, 1 -/* B843C0 80240240 14400064 */ bnez $v0, .L802403D4 -/* B843C4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* B843C8 80240248 080900F5 */ j .L802403D4 -/* B843CC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* B843D0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* B843D4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* B843D8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* B843DC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* B843E0 80240260 1440005D */ bnez $v0, .L802403D8 -/* B843E4 80240264 00000000 */ nop -/* B843E8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* B843EC 8024026C 3C014010 */ lui $at, 0x4010 -/* B843F0 80240270 44811800 */ mtc1 $at, $f3 -/* B843F4 80240274 44801000 */ mtc1 $zero, $f2 -/* B843F8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* B843FC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* B84400 80240280 00000000 */ nop -/* B84404 80240284 45000003 */ bc1f .L80240294 -/* B84408 80240288 0200202D */ daddu $a0, $s0, $zero -/* B8440C 8024028C 080900A6 */ j .L80240298 -/* B84410 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* B84414 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* B84418 80240298 0C00F598 */ jal func_8003D660 -/* B8441C 8024029C 00000000 */ nop -/* B84420 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B84424 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* B84428 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B8442C 802402AC 00031040 */ sll $v0, $v1, 1 -/* B84430 802402B0 00431021 */ addu $v0, $v0, $v1 -/* B84434 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B84438 802402B8 00021080 */ sll $v0, $v0, 2 -/* B8443C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* B84440 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* B84444 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B84448 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* B8444C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* B84450 802402D0 4406B000 */ mfc1 $a2, $f22 -/* B84454 802402D4 4407A000 */ mfc1 $a3, $f20 -/* B84458 802402D8 0C00A720 */ jal atan2 -/* B8445C 802402DC 00000000 */ nop -/* B84460 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* B84464 802402E4 44060000 */ mfc1 $a2, $f0 -/* B84468 802402E8 0200202D */ daddu $a0, $s0, $zero -/* B8446C 802402EC 0C00EA95 */ jal npc_move_heading -/* B84470 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* B84474 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B84478 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B8447C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* B84480 80240300 4407A000 */ mfc1 $a3, $f20 -/* B84484 80240304 0C00A7B5 */ jal dist2D -/* B84488 80240308 00000000 */ nop -/* B8448C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* B84490 80240310 4602003E */ c.le.s $f0, $f2 -/* B84494 80240314 00000000 */ nop -/* B84498 80240318 4500002F */ bc1f .L802403D8 -/* B8449C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B844A0 80240320 24020002 */ addiu $v0, $zero, 2 -/* B844A4 80240324 0C00A67F */ jal rand_int -/* B844A8 80240328 AE420070 */ sw $v0, 0x70($s2) -/* B844AC 8024032C 3C035555 */ lui $v1, 0x5555 -/* B844B0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* B844B4 80240334 00430018 */ mult $v0, $v1 -/* B844B8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* B844BC 8024033C 00004010 */ mfhi $t0 -/* B844C0 80240340 01042023 */ subu $a0, $t0, $a0 -/* B844C4 80240344 00041840 */ sll $v1, $a0, 1 -/* B844C8 80240348 00641821 */ addu $v1, $v1, $a0 -/* B844CC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* B844D0 80240350 24430002 */ addiu $v1, $v0, 2 -/* B844D4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* B844D8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* B844DC 8024035C 18400009 */ blez $v0, .L80240384 -/* B844E0 80240360 24020004 */ addiu $v0, $zero, 4 -/* B844E4 80240364 8E620004 */ lw $v0, 4($s3) -/* B844E8 80240368 18400006 */ blez $v0, .L80240384 -/* B844EC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* B844F0 80240370 8E620008 */ lw $v0, 8($s3) -/* B844F4 80240374 18400003 */ blez $v0, .L80240384 -/* B844F8 80240378 24020004 */ addiu $v0, $zero, 4 -/* B844FC 8024037C 14600002 */ bnez $v1, .L80240388 -/* B84500 80240380 00000000 */ nop -.L80240384: -/* B84504 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* B84508 80240388 0C00A67F */ jal rand_int -/* B8450C 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* B84510 80240390 3C0351EB */ lui $v1, 0x51eb -/* B84514 80240394 3463851F */ ori $v1, $v1, 0x851f -/* B84518 80240398 00430018 */ mult $v0, $v1 -/* B8451C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* B84520 802403A0 00004010 */ mfhi $t0 -/* B84524 802403A4 00082143 */ sra $a0, $t0, 5 -/* B84528 802403A8 00832023 */ subu $a0, $a0, $v1 -/* B8452C 802403AC 00041840 */ sll $v1, $a0, 1 -/* B84530 802403B0 00641821 */ addu $v1, $v1, $a0 -/* B84534 802403B4 000318C0 */ sll $v1, $v1, 3 -/* B84538 802403B8 00641821 */ addu $v1, $v1, $a0 -/* B8453C 802403BC 00031880 */ sll $v1, $v1, 2 -/* B84540 802403C0 8E640004 */ lw $a0, 4($s3) -/* B84544 802403C4 00431023 */ subu $v0, $v0, $v1 -/* B84548 802403C8 0044102A */ slt $v0, $v0, $a0 -/* B8454C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* B84550 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* B84554 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* B84558 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* B8455C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* B84560 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* B84564 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* B84568 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* B8456C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* B84570 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B84574 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B84578 802403F8 03E00008 */ jr $ra -/* B8457C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s deleted file mode 100644 index 83a631c36f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_802404C0_B84640.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_B84640 -/* B84640 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B84644 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* B84648 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* B8464C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* B84650 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* B84654 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* B84658 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* B8465C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* B84660 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* B84664 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* B84668 802404E8 86240008 */ lh $a0, 8($s1) -/* B8466C 802404EC 0C00EABB */ jal get_npc_unsafe -/* B84670 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* B84674 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* B84678 802404F8 04600031 */ bltz $v1, .L802405C0 -/* B8467C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* B84680 80240500 0260202D */ daddu $a0, $s3, $zero -/* B84684 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* B84688 80240508 8E460024 */ lw $a2, 0x24($s2) -/* B8468C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* B84690 80240510 0C01242D */ jal func_800490B4 -/* B84694 80240514 0220282D */ daddu $a1, $s1, $zero -/* B84698 80240518 10400029 */ beqz $v0, .L802405C0 -/* B8469C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* B846A0 80240520 0200282D */ daddu $a1, $s0, $zero -/* B846A4 80240524 0000302D */ daddu $a2, $zero, $zero -/* B846A8 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* B846AC 8024052C 3C013F80 */ lui $at, 0x3f80 -/* B846B0 80240530 44810000 */ mtc1 $at, $f0 -/* B846B4 80240534 3C014000 */ lui $at, 0x4000 -/* B846B8 80240538 44811000 */ mtc1 $at, $f2 -/* B846BC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* B846C0 80240540 44812000 */ mtc1 $at, $f4 -/* B846C4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* B846C8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* B846CC 8024054C 44833000 */ mtc1 $v1, $f6 -/* B846D0 80240550 00000000 */ nop -/* B846D4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* B846D8 80240558 44073000 */ mfc1 $a3, $f6 -/* B846DC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* B846E0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* B846E4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* B846E8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* B846EC 8024056C 0C01BFA4 */ jal fx_emote -/* B846F0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* B846F4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B846F8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B846FC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B84700 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B84704 80240584 8C460028 */ lw $a2, 0x28($v0) -/* B84708 80240588 0C00A720 */ jal atan2 -/* B8470C 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* B84710 80240590 0200202D */ daddu $a0, $s0, $zero -/* B84714 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B84718 80240598 3C060020 */ lui $a2, 0x20 -/* B8471C 8024059C 0C012530 */ jal func_800494C0 -/* B84720 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* B84724 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* B84728 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* B8472C 802405AC 30420001 */ andi $v0, $v0, 1 -/* B84730 802405B0 14400029 */ bnez $v0, .L80240658 -/* B84734 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* B84738 802405B8 08090196 */ j .L80240658 -/* B8473C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* B84740 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* B84744 802405C4 14400025 */ bnez $v0, .L8024065C -/* B84748 802405C8 00000000 */ nop -/* B8474C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* B84750 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* B84754 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* B84758 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* B8475C 802405DC 1440001F */ bnez $v0, .L8024065C -/* B84760 802405E0 00000000 */ nop -/* B84764 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* B84768 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* B8476C 802405EC 10400019 */ beqz $v0, .L80240654 -/* B84770 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* B84774 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* B84778 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* B8477C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* B84780 80240600 14400007 */ bnez $v0, .L80240620 -/* B84784 80240604 00000000 */ nop -/* B84788 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* B8478C 8024060C 3C014334 */ lui $at, 0x4334 -/* B84790 80240610 44816000 */ mtc1 $at, $f12 -/* B84794 80240614 0C00A6C9 */ jal clamp_angle -/* B84798 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* B8479C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* B847A0 80240620 8E440008 */ lw $a0, 8($s2) -/* B847A4 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* B847A8 80240628 00822021 */ addu $a0, $a0, $v0 -/* B847AC 8024062C 00042043 */ sra $a0, $a0, 1 -/* B847B0 80240630 0C00A67F */ jal rand_int -/* B847B4 80240634 24840001 */ addiu $a0, $a0, 1 -/* B847B8 80240638 8E430008 */ lw $v1, 8($s2) -/* B847BC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* B847C0 80240640 00641821 */ addu $v1, $v1, $a0 -/* B847C4 80240644 00031843 */ sra $v1, $v1, 1 -/* B847C8 80240648 00621821 */ addu $v1, $v1, $v0 -/* B847CC 8024064C 08090197 */ j .L8024065C -/* B847D0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* B847D4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* B847D8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* B847DC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* B847E0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* B847E4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* B847E8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* B847EC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* B847F0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* B847F4 80240674 03E00008 */ jr $ra -/* B847F8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s deleted file mode 100644 index 503a330f7d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024094C_B84ACC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_B84ACC -/* B84ACC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B84AD0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* B84AD4 80240954 0080982D */ daddu $s3, $a0, $zero -/* B84AD8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* B84ADC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* B84AE0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* B84AE4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* B84AE8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* B84AEC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* B84AF0 80240970 86440008 */ lh $a0, 8($s2) -/* B84AF4 80240974 0C00EABB */ jal get_npc_unsafe -/* B84AF8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* B84AFC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* B84B00 80240980 0240282D */ daddu $a1, $s2, $zero -/* B84B04 80240984 24030001 */ addiu $v1, $zero, 1 -/* B84B08 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* B84B0C 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* B84B10 80240990 8E270028 */ lw $a3, 0x28($s1) -/* B84B14 80240994 0C01242D */ jal func_800490B4 -/* B84B18 80240998 0040802D */ daddu $s0, $v0, $zero -/* B84B1C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* B84B20 802409A0 0200202D */ daddu $a0, $s0, $zero -/* B84B24 802409A4 24040002 */ addiu $a0, $zero, 2 -/* B84B28 802409A8 0200282D */ daddu $a1, $s0, $zero -/* B84B2C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* B84B30 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* B84B34 802409B4 3C013F80 */ lui $at, 0x3f80 -/* B84B38 802409B8 44810000 */ mtc1 $at, $f0 -/* B84B3C 802409BC 3C014000 */ lui $at, 0x4000 -/* B84B40 802409C0 44811000 */ mtc1 $at, $f2 -/* B84B44 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* B84B48 802409C8 44812000 */ mtc1 $at, $f4 -/* B84B4C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* B84B50 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* B84B54 802409D4 44833000 */ mtc1 $v1, $f6 -/* B84B58 802409D8 00000000 */ nop -/* B84B5C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* B84B60 802409E0 44073000 */ mfc1 $a3, $f6 -/* B84B64 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* B84B68 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* B84B6C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* B84B70 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B84B74 802409F4 0C01BFA4 */ jal fx_emote -/* B84B78 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* B84B7C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* B84B80 80240A00 8C430000 */ lw $v1, ($v0) -/* B84B84 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* B84B88 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* B84B8C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* B84B90 80240A10 08090293 */ j .L80240A4C -/* B84B94 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* B84B98 80240A18 0C00F598 */ jal func_8003D660 -/* B84B9C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* B84BA0 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* B84BA4 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* B84BA8 80240A28 0C00EA95 */ jal npc_move_heading -/* B84BAC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* B84BB0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* B84BB4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* B84BB8 80240A38 18400003 */ blez $v0, .L80240A48 -/* B84BBC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* B84BC0 80240A40 08090294 */ j .L80240A50 -/* B84BC4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* B84BC8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* B84BCC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* B84BD0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* B84BD4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* B84BD8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* B84BDC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* B84BE0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* B84BE4 80240A64 03E00008 */ jr $ra -/* B84BE8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s deleted file mode 100644 index 7537995c3b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240AD4_B84C54.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_B84C54 -/* B84C54 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84C58 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* B84C5C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* B84C60 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* B84C64 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* B84C68 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* B84C6C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* B84C70 80240AF0 86040008 */ lh $a0, 8($s0) -/* B84C74 80240AF4 0C00EABB */ jal get_npc_unsafe -/* B84C78 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* B84C7C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* B84C80 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* B84C84 80240B04 8C630000 */ lw $v1, ($v1) -/* B84C88 80240B08 0083182A */ slt $v1, $a0, $v1 -/* B84C8C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* B84C90 80240B10 0040302D */ daddu $a2, $v0, $zero -/* B84C94 80240B14 00041040 */ sll $v0, $a0, 1 -/* B84C98 80240B18 00441021 */ addu $v0, $v0, $a0 -/* B84C9C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* B84CA0 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* B84CA4 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* B84CA8 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* B84CAC 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* B84CB0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* B84CB4 80240B34 4602003E */ c.le.s $f0, $f2 -/* B84CB8 80240B38 00000000 */ nop -/* B84CBC 80240B3C 45020003 */ bc1fl .L80240B4C -/* B84CC0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* B84CC4 80240B44 080902D7 */ j .L80240B5C -/* B84CC8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* B84CCC 80240B4C 8C620000 */ lw $v0, ($v1) -/* B84CD0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* B84CD4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* B84CD8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* B84CDC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* B84CE0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* B84CE4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* B84CE8 80240B68 8C420004 */ lw $v0, 4($v0) -/* B84CEC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* B84CF0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* B84CF4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* B84CF8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* B84CFC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* B84D00 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* B84D04 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* B84D08 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* B84D0C 80240B8C 03E00008 */ jr $ra -/* B84D10 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index faaaeb6280..b34107cdd5 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -137,7 +137,7 @@ glabel L80240D78_B84EF8 glabel L80240D88_B84F08 /* B84F08 80240D88 0280202D */ daddu $a0, $s4, $zero /* B84F0C 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* B84F10 80240D90 0C090056 */ jal func_80240158_B842D8 +/* B84F10 80240D90 0C090056 */ jal jan_22_UnkFunc13 /* B84F14 80240D94 02A0302D */ daddu $a2, $s5, $zero /* B84F18 80240D98 0809039A */ j L80240E68_B84FE8 /* B84F1C 80240D9C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80240DA0_B84F20 glabel L80240DB0_B84F30 /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* B84F38 80240DB8 0C090130 */ jal func_802404C0_B84640 +/* B84F38 80240DB8 0C090130 */ jal jan_22_UnkFunc14 /* B84F3C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* B84F40 80240DC0 0809039A */ j L80240E68_B84FE8 /* B84F44 80240DC4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80240E08_B84F88 glabel L80240E18_B84F98 /* B84F98 80240E18 0280202D */ daddu $a0, $s4, $zero /* B84F9C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* B84FA0 80240E20 0C090253 */ jal func_8024094C_B84ACC +/* B84FA0 80240E20 0C090253 */ jal jan_22_UnkFunc15 /* B84FA4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* B84FA8 80240E28 0809039A */ j L80240E68_B84FE8 /* B84FAC 80240E2C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80240E30_B84FB0 glabel L80240E48_B84FC8 /* B84FC8 80240E48 0280202D */ daddu $a0, $s4, $zero /* B84FCC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* B84FD0 80240E50 0C0902B5 */ jal func_80240AD4_B84C54 +/* B84FD0 80240E50 0C0902B5 */ jal jan_22_UnkFunc16 /* B84FD4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* B84FD8 80240E58 0809039A */ j L80240E68_B84FE8 /* B84FDC 80240E5C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s deleted file mode 100644 index 9405b034b2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240208_ABB498.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208_ABB498 -/* ABB498 80240208 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* ABB49C 8024020C AFB20038 */ sw $s2, 0x38($sp) -/* ABB4A0 80240210 0080902D */ daddu $s2, $a0, $zero -/* ABB4A4 80240214 AFBF0044 */ sw $ra, 0x44($sp) -/* ABB4A8 80240218 AFB40040 */ sw $s4, 0x40($sp) -/* ABB4AC 8024021C AFB3003C */ sw $s3, 0x3c($sp) -/* ABB4B0 80240220 AFB10034 */ sw $s1, 0x34($sp) -/* ABB4B4 80240224 AFB00030 */ sw $s0, 0x30($sp) -/* ABB4B8 80240228 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ABB4BC 8024022C F7B40048 */ sdc1 $f20, 0x48($sp) -/* ABB4C0 80240230 8E510148 */ lw $s1, 0x148($s2) -/* ABB4C4 80240234 00A0982D */ daddu $s3, $a1, $zero -/* ABB4C8 80240238 86240008 */ lh $a0, 8($s1) -/* ABB4CC 8024023C 0C00EABB */ jal get_npc_unsafe -/* ABB4D0 80240240 00C0A02D */ daddu $s4, $a2, $zero -/* ABB4D4 80240244 8E630014 */ lw $v1, 0x14($s3) -/* ABB4D8 80240248 04600030 */ bltz $v1, .L8024030C -/* ABB4DC 8024024C 0040802D */ daddu $s0, $v0, $zero -/* ABB4E0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* ABB4E4 80240254 1C40002C */ bgtz $v0, .L80240308 -/* ABB4E8 80240258 2442FFFF */ addiu $v0, $v0, -1 -/* ABB4EC 8024025C 0280202D */ daddu $a0, $s4, $zero -/* ABB4F0 80240260 AE430074 */ sw $v1, 0x74($s2) -/* ABB4F4 80240264 AFA00010 */ sw $zero, 0x10($sp) -/* ABB4F8 80240268 8E66000C */ lw $a2, 0xc($s3) -/* ABB4FC 8024026C 8E670010 */ lw $a3, 0x10($s3) -/* ABB500 80240270 0C01242D */ jal func_800490B4 -/* ABB504 80240274 0220282D */ daddu $a1, $s1, $zero -/* ABB508 80240278 10400021 */ beqz $v0, .L80240300 -/* ABB50C 8024027C 0000202D */ daddu $a0, $zero, $zero -/* ABB510 80240280 0200282D */ daddu $a1, $s0, $zero -/* ABB514 80240284 0000302D */ daddu $a2, $zero, $zero -/* ABB518 80240288 860300A8 */ lh $v1, 0xa8($s0) -/* ABB51C 8024028C 3C013F80 */ lui $at, 0x3f80 -/* ABB520 80240290 44810000 */ mtc1 $at, $f0 -/* ABB524 80240294 3C014000 */ lui $at, 0x4000 -/* ABB528 80240298 44811000 */ mtc1 $at, $f2 -/* ABB52C 8024029C 3C01C1A0 */ lui $at, 0xc1a0 -/* ABB530 802402A0 44812000 */ mtc1 $at, $f4 -/* ABB534 802402A4 2402000F */ addiu $v0, $zero, 0xf -/* ABB538 802402A8 AFA2001C */ sw $v0, 0x1c($sp) -/* ABB53C 802402AC 44833000 */ mtc1 $v1, $f6 -/* ABB540 802402B0 00000000 */ nop -/* ABB544 802402B4 468031A0 */ cvt.s.w $f6, $f6 -/* ABB548 802402B8 44073000 */ mfc1 $a3, $f6 -/* ABB54C 802402BC 27A20028 */ addiu $v0, $sp, 0x28 -/* ABB550 802402C0 AFA20020 */ sw $v0, 0x20($sp) -/* ABB554 802402C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* ABB558 802402C8 E7A20014 */ swc1 $f2, 0x14($sp) -/* ABB55C 802402CC 0C01BFA4 */ jal fx_emote -/* ABB560 802402D0 E7A40018 */ swc1 $f4, 0x18($sp) -/* ABB564 802402D4 0200202D */ daddu $a0, $s0, $zero -/* ABB568 802402D8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* ABB56C 802402DC 0C012530 */ jal func_800494C0 -/* ABB570 802402E0 3C060020 */ lui $a2, 0x20 -/* ABB574 802402E4 8E220018 */ lw $v0, 0x18($s1) -/* ABB578 802402E8 9442002A */ lhu $v0, 0x2a($v0) -/* ABB57C 802402EC 30420001 */ andi $v0, $v0, 1 -/* ABB580 802402F0 14400064 */ bnez $v0, .L80240484 -/* ABB584 802402F4 2402000A */ addiu $v0, $zero, 0xa -/* ABB588 802402F8 08090121 */ j .L80240484 -/* ABB58C 802402FC 2402000C */ addiu $v0, $zero, 0xc -.L80240300: -/* ABB590 80240300 8E420074 */ lw $v0, 0x74($s2) -/* ABB594 80240304 2442FFFF */ addiu $v0, $v0, -1 -.L80240308: -/* ABB598 80240308 AE420074 */ sw $v0, 0x74($s2) -.L8024030C: -/* ABB59C 8024030C 8602008C */ lh $v0, 0x8c($s0) -/* ABB5A0 80240310 1440005D */ bnez $v0, .L80240488 -/* ABB5A4 80240314 00000000 */ nop -/* ABB5A8 80240318 C6000018 */ lwc1 $f0, 0x18($s0) -/* ABB5AC 8024031C 3C014010 */ lui $at, 0x4010 -/* ABB5B0 80240320 44811800 */ mtc1 $at, $f3 -/* ABB5B4 80240324 44801000 */ mtc1 $zero, $f2 -/* ABB5B8 80240328 46000021 */ cvt.d.s $f0, $f0 -/* ABB5BC 8024032C 4622003C */ c.lt.d $f0, $f2 -/* ABB5C0 80240330 00000000 */ nop -/* ABB5C4 80240334 45000003 */ bc1f .L80240344 -/* ABB5C8 80240338 0200202D */ daddu $a0, $s0, $zero -/* ABB5CC 8024033C 080900D2 */ j .L80240348 -/* ABB5D0 80240340 0000282D */ daddu $a1, $zero, $zero -.L80240344: -/* ABB5D4 80240344 24050001 */ addiu $a1, $zero, 1 -.L80240348: -/* ABB5D8 80240348 0C00F598 */ jal func_8003D660 -/* ABB5DC 8024034C 00000000 */ nop -/* ABB5E0 80240350 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ABB5E4 80240354 8E430078 */ lw $v1, 0x78($s2) -/* ABB5E8 80240358 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ABB5EC 8024035C 00031040 */ sll $v0, $v1, 1 -/* ABB5F0 80240360 00431021 */ addu $v0, $v0, $v1 -/* ABB5F4 80240364 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABB5F8 80240368 00021080 */ sll $v0, $v0, 2 -/* ABB5FC 8024036C 00431021 */ addu $v0, $v0, $v1 -/* ABB600 80240370 C4560004 */ lwc1 $f22, 4($v0) -/* ABB604 80240374 4680B5A0 */ cvt.s.w $f22, $f22 -/* ABB608 80240378 C454000C */ lwc1 $f20, 0xc($v0) -/* ABB60C 8024037C 4680A520 */ cvt.s.w $f20, $f20 -/* ABB610 80240380 4406B000 */ mfc1 $a2, $f22 -/* ABB614 80240384 4407A000 */ mfc1 $a3, $f20 -/* ABB618 80240388 0C00A720 */ jal atan2 -/* ABB61C 8024038C 00000000 */ nop -/* ABB620 80240390 8E050018 */ lw $a1, 0x18($s0) -/* ABB624 80240394 44060000 */ mfc1 $a2, $f0 -/* ABB628 80240398 0200202D */ daddu $a0, $s0, $zero -/* ABB62C 8024039C 0C00EA95 */ jal npc_move_heading -/* ABB630 802403A0 AE06000C */ sw $a2, 0xc($s0) -/* ABB634 802403A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ABB638 802403A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ABB63C 802403AC 4406B000 */ mfc1 $a2, $f22 -/* ABB640 802403B0 4407A000 */ mfc1 $a3, $f20 -/* ABB644 802403B4 0C00A7B5 */ jal dist2D -/* ABB648 802403B8 00000000 */ nop -/* ABB64C 802403BC C6020018 */ lwc1 $f2, 0x18($s0) -/* ABB650 802403C0 4602003E */ c.le.s $f0, $f2 -/* ABB654 802403C4 00000000 */ nop -/* ABB658 802403C8 4500002F */ bc1f .L80240488 -/* ABB65C 802403CC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* ABB660 802403D0 24020002 */ addiu $v0, $zero, 2 -/* ABB664 802403D4 0C00A67F */ jal rand_int -/* ABB668 802403D8 AE420070 */ sw $v0, 0x70($s2) -/* ABB66C 802403DC 3C035555 */ lui $v1, 0x5555 -/* ABB670 802403E0 34635556 */ ori $v1, $v1, 0x5556 -/* ABB674 802403E4 00430018 */ mult $v0, $v1 -/* ABB678 802403E8 000227C3 */ sra $a0, $v0, 0x1f -/* ABB67C 802403EC 00004010 */ mfhi $t0 -/* ABB680 802403F0 01042023 */ subu $a0, $t0, $a0 -/* ABB684 802403F4 00041840 */ sll $v1, $a0, 1 -/* ABB688 802403F8 00641821 */ addu $v1, $v1, $a0 -/* ABB68C 802403FC 00431023 */ subu $v0, $v0, $v1 -/* ABB690 80240400 24430002 */ addiu $v1, $v0, 2 -/* ABB694 80240404 AE430074 */ sw $v1, 0x74($s2) -/* ABB698 80240408 8E62002C */ lw $v0, 0x2c($s3) -/* ABB69C 8024040C 18400009 */ blez $v0, .L80240434 -/* ABB6A0 80240410 24020004 */ addiu $v0, $zero, 4 -/* ABB6A4 80240414 8E620004 */ lw $v0, 4($s3) -/* ABB6A8 80240418 18400006 */ blez $v0, .L80240434 -/* ABB6AC 8024041C 24020004 */ addiu $v0, $zero, 4 -/* ABB6B0 80240420 8E620008 */ lw $v0, 8($s3) -/* ABB6B4 80240424 18400003 */ blez $v0, .L80240434 -/* ABB6B8 80240428 24020004 */ addiu $v0, $zero, 4 -/* ABB6BC 8024042C 14600002 */ bnez $v1, .L80240438 -/* ABB6C0 80240430 00000000 */ nop -.L80240434: -/* ABB6C4 80240434 AE420070 */ sw $v0, 0x70($s2) -.L80240438: -/* ABB6C8 80240438 0C00A67F */ jal rand_int -/* ABB6CC 8024043C 24042710 */ addiu $a0, $zero, 0x2710 -/* ABB6D0 80240440 3C0351EB */ lui $v1, 0x51eb -/* ABB6D4 80240444 3463851F */ ori $v1, $v1, 0x851f -/* ABB6D8 80240448 00430018 */ mult $v0, $v1 -/* ABB6DC 8024044C 00021FC3 */ sra $v1, $v0, 0x1f -/* ABB6E0 80240450 00004010 */ mfhi $t0 -/* ABB6E4 80240454 00082143 */ sra $a0, $t0, 5 -/* ABB6E8 80240458 00832023 */ subu $a0, $a0, $v1 -/* ABB6EC 8024045C 00041840 */ sll $v1, $a0, 1 -/* ABB6F0 80240460 00641821 */ addu $v1, $v1, $a0 -/* ABB6F4 80240464 000318C0 */ sll $v1, $v1, 3 -/* ABB6F8 80240468 00641821 */ addu $v1, $v1, $a0 -/* ABB6FC 8024046C 00031880 */ sll $v1, $v1, 2 -/* ABB700 80240470 8E640004 */ lw $a0, 4($s3) -/* ABB704 80240474 00431023 */ subu $v0, $v0, $v1 -/* ABB708 80240478 0044102A */ slt $v0, $v0, $a0 -/* ABB70C 8024047C 10400002 */ beqz $v0, .L80240488 -/* ABB710 80240480 24020004 */ addiu $v0, $zero, 4 -.L80240484: -/* ABB714 80240484 AE420070 */ sw $v0, 0x70($s2) -.L80240488: -/* ABB718 80240488 8FBF0044 */ lw $ra, 0x44($sp) -/* ABB71C 8024048C 8FB40040 */ lw $s4, 0x40($sp) -/* ABB720 80240490 8FB3003C */ lw $s3, 0x3c($sp) -/* ABB724 80240494 8FB20038 */ lw $s2, 0x38($sp) -/* ABB728 80240498 8FB10034 */ lw $s1, 0x34($sp) -/* ABB72C 8024049C 8FB00030 */ lw $s0, 0x30($sp) -/* ABB730 802404A0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* ABB734 802404A4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* ABB738 802404A8 03E00008 */ jr $ra -/* ABB73C 802404AC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s deleted file mode 100644 index ba134dc7e0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240570_ABB800.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570_ABB800 -/* ABB800 80240570 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ABB804 80240574 AFB40040 */ sw $s4, 0x40($sp) -/* ABB808 80240578 0080A02D */ daddu $s4, $a0, $zero -/* ABB80C 8024057C AFBF0044 */ sw $ra, 0x44($sp) -/* ABB810 80240580 AFB3003C */ sw $s3, 0x3c($sp) -/* ABB814 80240584 AFB20038 */ sw $s2, 0x38($sp) -/* ABB818 80240588 AFB10034 */ sw $s1, 0x34($sp) -/* ABB81C 8024058C AFB00030 */ sw $s0, 0x30($sp) -/* ABB820 80240590 8E910148 */ lw $s1, 0x148($s4) -/* ABB824 80240594 00A0902D */ daddu $s2, $a1, $zero -/* ABB828 80240598 86240008 */ lh $a0, 8($s1) -/* ABB82C 8024059C 0C00EABB */ jal get_npc_unsafe -/* ABB830 802405A0 00C0982D */ daddu $s3, $a2, $zero -/* ABB834 802405A4 8E430014 */ lw $v1, 0x14($s2) -/* ABB838 802405A8 04600031 */ bltz $v1, .L80240670 -/* ABB83C 802405AC 0040802D */ daddu $s0, $v0, $zero -/* ABB840 802405B0 0260202D */ daddu $a0, $s3, $zero -/* ABB844 802405B4 AFA00010 */ sw $zero, 0x10($sp) -/* ABB848 802405B8 8E460024 */ lw $a2, 0x24($s2) -/* ABB84C 802405BC 8E470028 */ lw $a3, 0x28($s2) -/* ABB850 802405C0 0C01242D */ jal func_800490B4 -/* ABB854 802405C4 0220282D */ daddu $a1, $s1, $zero -/* ABB858 802405C8 10400029 */ beqz $v0, .L80240670 -/* ABB85C 802405CC 0000202D */ daddu $a0, $zero, $zero -/* ABB860 802405D0 0200282D */ daddu $a1, $s0, $zero -/* ABB864 802405D4 0000302D */ daddu $a2, $zero, $zero -/* ABB868 802405D8 860300A8 */ lh $v1, 0xa8($s0) -/* ABB86C 802405DC 3C013F80 */ lui $at, 0x3f80 -/* ABB870 802405E0 44810000 */ mtc1 $at, $f0 -/* ABB874 802405E4 3C014000 */ lui $at, 0x4000 -/* ABB878 802405E8 44811000 */ mtc1 $at, $f2 -/* ABB87C 802405EC 3C01C1A0 */ lui $at, 0xc1a0 -/* ABB880 802405F0 44812000 */ mtc1 $at, $f4 -/* ABB884 802405F4 2402000F */ addiu $v0, $zero, 0xf -/* ABB888 802405F8 AFA2001C */ sw $v0, 0x1c($sp) -/* ABB88C 802405FC 44833000 */ mtc1 $v1, $f6 -/* ABB890 80240600 00000000 */ nop -/* ABB894 80240604 468031A0 */ cvt.s.w $f6, $f6 -/* ABB898 80240608 44073000 */ mfc1 $a3, $f6 -/* ABB89C 8024060C 27A20028 */ addiu $v0, $sp, 0x28 -/* ABB8A0 80240610 AFA20020 */ sw $v0, 0x20($sp) -/* ABB8A4 80240614 E7A00010 */ swc1 $f0, 0x10($sp) -/* ABB8A8 80240618 E7A20014 */ swc1 $f2, 0x14($sp) -/* ABB8AC 8024061C 0C01BFA4 */ jal fx_emote -/* ABB8B0 80240620 E7A40018 */ swc1 $f4, 0x18($sp) -/* ABB8B4 80240624 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* ABB8B8 80240628 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* ABB8BC 8024062C C60C0038 */ lwc1 $f12, 0x38($s0) -/* ABB8C0 80240630 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ABB8C4 80240634 8C460028 */ lw $a2, 0x28($v0) -/* ABB8C8 80240638 0C00A720 */ jal atan2 -/* ABB8CC 8024063C 8C470030 */ lw $a3, 0x30($v0) -/* ABB8D0 80240640 0200202D */ daddu $a0, $s0, $zero -/* ABB8D4 80240644 240502F4 */ addiu $a1, $zero, 0x2f4 -/* ABB8D8 80240648 3C060020 */ lui $a2, 0x20 -/* ABB8DC 8024064C 0C012530 */ jal func_800494C0 -/* ABB8E0 80240650 E480000C */ swc1 $f0, 0xc($a0) -/* ABB8E4 80240654 8E220018 */ lw $v0, 0x18($s1) -/* ABB8E8 80240658 9442002A */ lhu $v0, 0x2a($v0) -/* ABB8EC 8024065C 30420001 */ andi $v0, $v0, 1 -/* ABB8F0 80240660 14400029 */ bnez $v0, .L80240708 -/* ABB8F4 80240664 2402000A */ addiu $v0, $zero, 0xa -/* ABB8F8 80240668 080901C2 */ j .L80240708 -/* ABB8FC 8024066C 2402000C */ addiu $v0, $zero, 0xc -.L80240670: -/* ABB900 80240670 8602008C */ lh $v0, 0x8c($s0) -/* ABB904 80240674 14400025 */ bnez $v0, .L8024070C -/* ABB908 80240678 00000000 */ nop -/* ABB90C 8024067C 9602008E */ lhu $v0, 0x8e($s0) -/* ABB910 80240680 2442FFFF */ addiu $v0, $v0, -1 -/* ABB914 80240684 A602008E */ sh $v0, 0x8e($s0) -/* ABB918 80240688 00021400 */ sll $v0, $v0, 0x10 -/* ABB91C 8024068C 1440001F */ bnez $v0, .L8024070C -/* ABB920 80240690 00000000 */ nop -/* ABB924 80240694 8E820074 */ lw $v0, 0x74($s4) -/* ABB928 80240698 2442FFFF */ addiu $v0, $v0, -1 -/* ABB92C 8024069C 10400019 */ beqz $v0, .L80240704 -/* ABB930 802406A0 AE820074 */ sw $v0, 0x74($s4) -/* ABB934 802406A4 8E220018 */ lw $v0, 0x18($s1) -/* ABB938 802406A8 9442002A */ lhu $v0, 0x2a($v0) -/* ABB93C 802406AC 30420010 */ andi $v0, $v0, 0x10 -/* ABB940 802406B0 14400007 */ bnez $v0, .L802406D0 -/* ABB944 802406B4 00000000 */ nop -/* ABB948 802406B8 C600000C */ lwc1 $f0, 0xc($s0) -/* ABB94C 802406BC 3C014334 */ lui $at, 0x4334 -/* ABB950 802406C0 44816000 */ mtc1 $at, $f12 -/* ABB954 802406C4 0C00A6C9 */ jal clamp_angle -/* ABB958 802406C8 460C0300 */ add.s $f12, $f0, $f12 -/* ABB95C 802406CC E600000C */ swc1 $f0, 0xc($s0) -.L802406D0: -/* ABB960 802406D0 8E440008 */ lw $a0, 8($s2) -/* ABB964 802406D4 000417C2 */ srl $v0, $a0, 0x1f -/* ABB968 802406D8 00822021 */ addu $a0, $a0, $v0 -/* ABB96C 802406DC 00042043 */ sra $a0, $a0, 1 -/* ABB970 802406E0 0C00A67F */ jal rand_int -/* ABB974 802406E4 24840001 */ addiu $a0, $a0, 1 -/* ABB978 802406E8 8E430008 */ lw $v1, 8($s2) -/* ABB97C 802406EC 000327C2 */ srl $a0, $v1, 0x1f -/* ABB980 802406F0 00641821 */ addu $v1, $v1, $a0 -/* ABB984 802406F4 00031843 */ sra $v1, $v1, 1 -/* ABB988 802406F8 00621821 */ addu $v1, $v1, $v0 -/* ABB98C 802406FC 080901C3 */ j .L8024070C -/* ABB990 80240700 A603008E */ sh $v1, 0x8e($s0) -.L80240704: -/* ABB994 80240704 24020004 */ addiu $v0, $zero, 4 -.L80240708: -/* ABB998 80240708 AE820070 */ sw $v0, 0x70($s4) -.L8024070C: -/* ABB99C 8024070C 8FBF0044 */ lw $ra, 0x44($sp) -/* ABB9A0 80240710 8FB40040 */ lw $s4, 0x40($sp) -/* ABB9A4 80240714 8FB3003C */ lw $s3, 0x3c($sp) -/* ABB9A8 80240718 8FB20038 */ lw $s2, 0x38($sp) -/* ABB9AC 8024071C 8FB10034 */ lw $s1, 0x34($sp) -/* ABB9B0 80240720 8FB00030 */ lw $s0, 0x30($sp) -/* ABB9B4 80240724 03E00008 */ jr $ra -/* ABB9B8 80240728 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s deleted file mode 100644 index 2ebf14715d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802409FC_ABBC8C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409FC_ABBC8C -/* ABBC8C 802409FC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ABBC90 80240A00 AFB3003C */ sw $s3, 0x3c($sp) -/* ABBC94 80240A04 0080982D */ daddu $s3, $a0, $zero -/* ABBC98 80240A08 AFBF0040 */ sw $ra, 0x40($sp) -/* ABBC9C 80240A0C AFB20038 */ sw $s2, 0x38($sp) -/* ABBCA0 80240A10 AFB10034 */ sw $s1, 0x34($sp) -/* ABBCA4 80240A14 AFB00030 */ sw $s0, 0x30($sp) -/* ABBCA8 80240A18 8E720148 */ lw $s2, 0x148($s3) -/* ABBCAC 80240A1C 00A0882D */ daddu $s1, $a1, $zero -/* ABBCB0 80240A20 86440008 */ lh $a0, 8($s2) -/* ABBCB4 80240A24 0C00EABB */ jal get_npc_unsafe -/* ABBCB8 80240A28 00C0802D */ daddu $s0, $a2, $zero -/* ABBCBC 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* ABBCC0 80240A30 0240282D */ daddu $a1, $s2, $zero -/* ABBCC4 80240A34 24030001 */ addiu $v1, $zero, 1 -/* ABBCC8 80240A38 AFA30010 */ sw $v1, 0x10($sp) -/* ABBCCC 80240A3C 8E260024 */ lw $a2, 0x24($s1) -/* ABBCD0 80240A40 8E270028 */ lw $a3, 0x28($s1) -/* ABBCD4 80240A44 0C01242D */ jal func_800490B4 -/* ABBCD8 80240A48 0040802D */ daddu $s0, $v0, $zero -/* ABBCDC 80240A4C 1440001E */ bnez $v0, .L80240AC8 -/* ABBCE0 80240A50 0200202D */ daddu $a0, $s0, $zero -/* ABBCE4 80240A54 24040002 */ addiu $a0, $zero, 2 -/* ABBCE8 80240A58 0200282D */ daddu $a1, $s0, $zero -/* ABBCEC 80240A5C 0000302D */ daddu $a2, $zero, $zero -/* ABBCF0 80240A60 860300A8 */ lh $v1, 0xa8($s0) -/* ABBCF4 80240A64 3C013F80 */ lui $at, 0x3f80 -/* ABBCF8 80240A68 44810000 */ mtc1 $at, $f0 -/* ABBCFC 80240A6C 3C014000 */ lui $at, 0x4000 -/* ABBD00 80240A70 44811000 */ mtc1 $at, $f2 -/* ABBD04 80240A74 3C01C1A0 */ lui $at, 0xc1a0 -/* ABBD08 80240A78 44812000 */ mtc1 $at, $f4 -/* ABBD0C 80240A7C 2402000F */ addiu $v0, $zero, 0xf -/* ABBD10 80240A80 AFA2001C */ sw $v0, 0x1c($sp) -/* ABBD14 80240A84 44833000 */ mtc1 $v1, $f6 -/* ABBD18 80240A88 00000000 */ nop -/* ABBD1C 80240A8C 468031A0 */ cvt.s.w $f6, $f6 -/* ABBD20 80240A90 44073000 */ mfc1 $a3, $f6 -/* ABBD24 80240A94 27A20028 */ addiu $v0, $sp, 0x28 -/* ABBD28 80240A98 AFA20020 */ sw $v0, 0x20($sp) -/* ABBD2C 80240A9C E7A00010 */ swc1 $f0, 0x10($sp) -/* ABBD30 80240AA0 E7A20014 */ swc1 $f2, 0x14($sp) -/* ABBD34 80240AA4 0C01BFA4 */ jal fx_emote -/* ABBD38 80240AA8 E7A40018 */ swc1 $f4, 0x18($sp) -/* ABBD3C 80240AAC 8E4200CC */ lw $v0, 0xcc($s2) -/* ABBD40 80240AB0 8C430000 */ lw $v1, ($v0) -/* ABBD44 80240AB4 24020019 */ addiu $v0, $zero, 0x19 -/* ABBD48 80240AB8 A602008E */ sh $v0, 0x8e($s0) -/* ABBD4C 80240ABC 2402000E */ addiu $v0, $zero, 0xe -/* ABBD50 80240AC0 080902BF */ j .L80240AFC -/* ABBD54 80240AC4 AE030028 */ sw $v1, 0x28($s0) -.L80240AC8: -/* ABBD58 80240AC8 0C00F598 */ jal func_8003D660 -/* ABBD5C 80240ACC 24050001 */ addiu $a1, $zero, 1 -/* ABBD60 80240AD0 8E050018 */ lw $a1, 0x18($s0) -/* ABBD64 80240AD4 8E06000C */ lw $a2, 0xc($s0) -/* ABBD68 80240AD8 0C00EA95 */ jal npc_move_heading -/* ABBD6C 80240ADC 0200202D */ daddu $a0, $s0, $zero -/* ABBD70 80240AE0 8602008E */ lh $v0, 0x8e($s0) -/* ABBD74 80240AE4 9603008E */ lhu $v1, 0x8e($s0) -/* ABBD78 80240AE8 18400003 */ blez $v0, .L80240AF8 -/* ABBD7C 80240AEC 2462FFFF */ addiu $v0, $v1, -1 -/* ABBD80 80240AF0 080902C0 */ j .L80240B00 -/* ABBD84 80240AF4 A602008E */ sh $v0, 0x8e($s0) -.L80240AF8: -/* ABBD88 80240AF8 2402000C */ addiu $v0, $zero, 0xc -.L80240AFC: -/* ABBD8C 80240AFC AE620070 */ sw $v0, 0x70($s3) -.L80240B00: -/* ABBD90 80240B00 8FBF0040 */ lw $ra, 0x40($sp) -/* ABBD94 80240B04 8FB3003C */ lw $s3, 0x3c($sp) -/* ABBD98 80240B08 8FB20038 */ lw $s2, 0x38($sp) -/* ABBD9C 80240B0C 8FB10034 */ lw $s1, 0x34($sp) -/* ABBDA0 80240B10 8FB00030 */ lw $s0, 0x30($sp) -/* ABBDA4 80240B14 03E00008 */ jr $ra -/* ABBDA8 80240B18 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s deleted file mode 100644 index 3afe85fe72..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B84_ABBE14 -/* ABBE14 80240B84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBE18 80240B88 AFB10014 */ sw $s1, 0x14($sp) -/* ABBE1C 80240B8C 0080882D */ daddu $s1, $a0, $zero -/* ABBE20 80240B90 AFBF001C */ sw $ra, 0x1c($sp) -/* ABBE24 80240B94 AFB20018 */ sw $s2, 0x18($sp) -/* ABBE28 80240B98 AFB00010 */ sw $s0, 0x10($sp) -/* ABBE2C 80240B9C 8E300148 */ lw $s0, 0x148($s1) -/* ABBE30 80240BA0 86040008 */ lh $a0, 8($s0) -/* ABBE34 80240BA4 0C00EABB */ jal get_npc_unsafe -/* ABBE38 80240BA8 00A0902D */ daddu $s2, $a1, $zero -/* ABBE3C 80240BAC 8E0300D0 */ lw $v1, 0xd0($s0) -/* ABBE40 80240BB0 8E240078 */ lw $a0, 0x78($s1) -/* ABBE44 80240BB4 8C630000 */ lw $v1, ($v1) -/* ABBE48 80240BB8 0083182A */ slt $v1, $a0, $v1 -/* ABBE4C 80240BBC 10600013 */ beqz $v1, .L80240C0C -/* ABBE50 80240BC0 0040302D */ daddu $a2, $v0, $zero -/* ABBE54 80240BC4 00041040 */ sll $v0, $a0, 1 -/* ABBE58 80240BC8 00441021 */ addu $v0, $v0, $a0 -/* ABBE5C 80240BCC 00022880 */ sll $a1, $v0, 2 -.L80240BD0: -/* ABBE60 80240BD0 8E0300D0 */ lw $v1, 0xd0($s0) -/* ABBE64 80240BD4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* ABBE68 80240BD8 00A31021 */ addu $v0, $a1, $v1 -/* ABBE6C 80240BDC C4400008 */ lwc1 $f0, 8($v0) -/* ABBE70 80240BE0 46800020 */ cvt.s.w $f0, $f0 -/* ABBE74 80240BE4 4602003E */ c.le.s $f0, $f2 -/* ABBE78 80240BE8 00000000 */ nop -/* ABBE7C 80240BEC 45020003 */ bc1fl .L80240BFC -/* ABBE80 80240BF0 24840001 */ addiu $a0, $a0, 1 -/* ABBE84 80240BF4 08090303 */ j .L80240C0C -/* ABBE88 80240BF8 AE240078 */ sw $a0, 0x78($s1) -.L80240BFC: -/* ABBE8C 80240BFC 8C620000 */ lw $v0, ($v1) -/* ABBE90 80240C00 0082102A */ slt $v0, $a0, $v0 -/* ABBE94 80240C04 1440FFF2 */ bnez $v0, .L80240BD0 -/* ABBE98 80240C08 24A5000C */ addiu $a1, $a1, 0xc -.L80240C0C: -/* ABBE9C 80240C0C C6400000 */ lwc1 $f0, ($s2) -/* ABBEA0 80240C10 E4C00018 */ swc1 $f0, 0x18($a2) -/* ABBEA4 80240C14 8E0200CC */ lw $v0, 0xcc($s0) -/* ABBEA8 80240C18 8C420004 */ lw $v0, 4($v0) -/* ABBEAC 80240C1C ACC20028 */ sw $v0, 0x28($a2) -/* ABBEB0 80240C20 24020001 */ addiu $v0, $zero, 1 -/* ABBEB4 80240C24 AE200074 */ sw $zero, 0x74($s1) -/* ABBEB8 80240C28 AE220070 */ sw $v0, 0x70($s1) -/* ABBEBC 80240C2C 8FBF001C */ lw $ra, 0x1c($sp) -/* ABBEC0 80240C30 8FB20018 */ lw $s2, 0x18($sp) -/* ABBEC4 80240C34 8FB10014 */ lw $s1, 0x14($sp) -/* ABBEC8 80240C38 8FB00010 */ lw $s0, 0x10($sp) -/* ABBECC 80240C3C 03E00008 */ jr $ra -/* ABBED0 80240C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index a518a1b2e5..02cf0e2f61 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -137,7 +137,7 @@ glabel L80240E28_ABC0B8 glabel L80240E38_ABC0C8 /* ABC0C8 80240E38 0280202D */ daddu $a0, $s4, $zero /* ABC0CC 80240E3C 0260282D */ daddu $a1, $s3, $zero -/* ABC0D0 80240E40 0C090082 */ jal func_80240208_ABB498 +/* ABC0D0 80240E40 0C090082 */ jal kkj_00_UnkFunc13 /* ABC0D4 80240E44 02A0302D */ daddu $a2, $s5, $zero /* ABC0D8 80240E48 080903C6 */ j L80240F18_ABC1A8 /* ABC0DC 80240E4C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80240E50_ABC0E0 glabel L80240E60_ABC0F0 /* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero -/* ABC0F8 80240E68 0C09015C */ jal func_80240570_ABB800 +/* ABC0F8 80240E68 0C09015C */ jal kkj_00_UnkFunc14 /* ABC0FC 80240E6C 02A0302D */ daddu $a2, $s5, $zero /* ABC100 80240E70 080903C6 */ j L80240F18_ABC1A8 /* ABC104 80240E74 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80240EB8_ABC148 glabel L80240EC8_ABC158 /* ABC158 80240EC8 0280202D */ daddu $a0, $s4, $zero /* ABC15C 80240ECC 0260282D */ daddu $a1, $s3, $zero -/* ABC160 80240ED0 0C09027F */ jal func_802409FC_ABBC8C +/* ABC160 80240ED0 0C09027F */ jal kkj_00_UnkFunc15 /* ABC164 80240ED4 02A0302D */ daddu $a2, $s5, $zero /* ABC168 80240ED8 080903C6 */ j L80240F18_ABC1A8 /* ABC16C 80240EDC 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80240EE0_ABC170 glabel L80240EF8_ABC188 /* ABC188 80240EF8 0280202D */ daddu $a0, $s4, $zero /* ABC18C 80240EFC 0260282D */ daddu $a1, $s3, $zero -/* ABC190 80240F00 0C0902E1 */ jal func_80240B84_ABBE14 +/* ABC190 80240F00 0C0902E1 */ jal kkj_00_UnkFunc16 /* ABC194 80240F04 02A0302D */ daddu $a2, $s5, $zero /* ABC198 80240F08 080903C6 */ j L80240F18_ABC1A8 /* ABC19C 80240F0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s deleted file mode 100644 index fdeded45fd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240158_AC52C8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_AC52C8 -/* AC52C8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* AC52CC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* AC52D0 80240160 0080902D */ daddu $s2, $a0, $zero -/* AC52D4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* AC52D8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* AC52DC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* AC52E0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* AC52E4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* AC52E8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* AC52EC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* AC52F0 80240180 8E510148 */ lw $s1, 0x148($s2) -/* AC52F4 80240184 00A0982D */ daddu $s3, $a1, $zero -/* AC52F8 80240188 86240008 */ lh $a0, 8($s1) -/* AC52FC 8024018C 0C00EABB */ jal get_npc_unsafe -/* AC5300 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* AC5304 80240194 8E630014 */ lw $v1, 0x14($s3) -/* AC5308 80240198 04600030 */ bltz $v1, .L8024025C -/* AC530C 8024019C 0040802D */ daddu $s0, $v0, $zero -/* AC5310 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* AC5314 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* AC5318 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* AC531C 802401AC 0280202D */ daddu $a0, $s4, $zero -/* AC5320 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* AC5324 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* AC5328 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* AC532C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* AC5330 802401C0 0C01242D */ jal func_800490B4 -/* AC5334 802401C4 0220282D */ daddu $a1, $s1, $zero -/* AC5338 802401C8 10400021 */ beqz $v0, .L80240250 -/* AC533C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* AC5340 802401D0 0200282D */ daddu $a1, $s0, $zero -/* AC5344 802401D4 0000302D */ daddu $a2, $zero, $zero -/* AC5348 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* AC534C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* AC5350 802401E0 44810000 */ mtc1 $at, $f0 -/* AC5354 802401E4 3C014000 */ lui $at, 0x4000 -/* AC5358 802401E8 44811000 */ mtc1 $at, $f2 -/* AC535C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* AC5360 802401F0 44812000 */ mtc1 $at, $f4 -/* AC5364 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* AC5368 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* AC536C 802401FC 44833000 */ mtc1 $v1, $f6 -/* AC5370 80240200 00000000 */ nop -/* AC5374 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* AC5378 80240208 44073000 */ mfc1 $a3, $f6 -/* AC537C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* AC5380 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* AC5384 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* AC5388 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* AC538C 8024021C 0C01BFA4 */ jal fx_emote -/* AC5390 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* AC5394 80240224 0200202D */ daddu $a0, $s0, $zero -/* AC5398 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* AC539C 8024022C 0C012530 */ jal func_800494C0 -/* AC53A0 80240230 3C060020 */ lui $a2, 0x20 -/* AC53A4 80240234 8E220018 */ lw $v0, 0x18($s1) -/* AC53A8 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* AC53AC 8024023C 30420001 */ andi $v0, $v0, 1 -/* AC53B0 80240240 14400064 */ bnez $v0, .L802403D4 -/* AC53B4 80240244 2402000A */ addiu $v0, $zero, 0xa -/* AC53B8 80240248 080900F5 */ j .L802403D4 -/* AC53BC 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* AC53C0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* AC53C4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* AC53C8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* AC53CC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* AC53D0 80240260 1440005D */ bnez $v0, .L802403D8 -/* AC53D4 80240264 00000000 */ nop -/* AC53D8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* AC53DC 8024026C 3C014010 */ lui $at, 0x4010 -/* AC53E0 80240270 44811800 */ mtc1 $at, $f3 -/* AC53E4 80240274 44801000 */ mtc1 $zero, $f2 -/* AC53E8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* AC53EC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* AC53F0 80240280 00000000 */ nop -/* AC53F4 80240284 45000003 */ bc1f .L80240294 -/* AC53F8 80240288 0200202D */ daddu $a0, $s0, $zero -/* AC53FC 8024028C 080900A6 */ j .L80240298 -/* AC5400 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* AC5404 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* AC5408 80240298 0C00F598 */ jal func_8003D660 -/* AC540C 8024029C 00000000 */ nop -/* AC5410 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AC5414 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* AC5418 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AC541C 802402AC 00031040 */ sll $v0, $v1, 1 -/* AC5420 802402B0 00431021 */ addu $v0, $v0, $v1 -/* AC5424 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* AC5428 802402B8 00021080 */ sll $v0, $v0, 2 -/* AC542C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* AC5430 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* AC5434 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* AC5438 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* AC543C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* AC5440 802402D0 4406B000 */ mfc1 $a2, $f22 -/* AC5444 802402D4 4407A000 */ mfc1 $a3, $f20 -/* AC5448 802402D8 0C00A720 */ jal atan2 -/* AC544C 802402DC 00000000 */ nop -/* AC5450 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* AC5454 802402E4 44060000 */ mfc1 $a2, $f0 -/* AC5458 802402E8 0200202D */ daddu $a0, $s0, $zero -/* AC545C 802402EC 0C00EA95 */ jal npc_move_heading -/* AC5460 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* AC5464 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AC5468 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AC546C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* AC5470 80240300 4407A000 */ mfc1 $a3, $f20 -/* AC5474 80240304 0C00A7B5 */ jal dist2D -/* AC5478 80240308 00000000 */ nop -/* AC547C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* AC5480 80240310 4602003E */ c.le.s $f0, $f2 -/* AC5484 80240314 00000000 */ nop -/* AC5488 80240318 4500002F */ bc1f .L802403D8 -/* AC548C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* AC5490 80240320 24020002 */ addiu $v0, $zero, 2 -/* AC5494 80240324 0C00A67F */ jal rand_int -/* AC5498 80240328 AE420070 */ sw $v0, 0x70($s2) -/* AC549C 8024032C 3C035555 */ lui $v1, 0x5555 -/* AC54A0 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* AC54A4 80240334 00430018 */ mult $v0, $v1 -/* AC54A8 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* AC54AC 8024033C 00004010 */ mfhi $t0 -/* AC54B0 80240340 01042023 */ subu $a0, $t0, $a0 -/* AC54B4 80240344 00041840 */ sll $v1, $a0, 1 -/* AC54B8 80240348 00641821 */ addu $v1, $v1, $a0 -/* AC54BC 8024034C 00431023 */ subu $v0, $v0, $v1 -/* AC54C0 80240350 24430002 */ addiu $v1, $v0, 2 -/* AC54C4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* AC54C8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* AC54CC 8024035C 18400009 */ blez $v0, .L80240384 -/* AC54D0 80240360 24020004 */ addiu $v0, $zero, 4 -/* AC54D4 80240364 8E620004 */ lw $v0, 4($s3) -/* AC54D8 80240368 18400006 */ blez $v0, .L80240384 -/* AC54DC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* AC54E0 80240370 8E620008 */ lw $v0, 8($s3) -/* AC54E4 80240374 18400003 */ blez $v0, .L80240384 -/* AC54E8 80240378 24020004 */ addiu $v0, $zero, 4 -/* AC54EC 8024037C 14600002 */ bnez $v1, .L80240388 -/* AC54F0 80240380 00000000 */ nop -.L80240384: -/* AC54F4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* AC54F8 80240388 0C00A67F */ jal rand_int -/* AC54FC 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* AC5500 80240390 3C0351EB */ lui $v1, 0x51eb -/* AC5504 80240394 3463851F */ ori $v1, $v1, 0x851f -/* AC5508 80240398 00430018 */ mult $v0, $v1 -/* AC550C 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* AC5510 802403A0 00004010 */ mfhi $t0 -/* AC5514 802403A4 00082143 */ sra $a0, $t0, 5 -/* AC5518 802403A8 00832023 */ subu $a0, $a0, $v1 -/* AC551C 802403AC 00041840 */ sll $v1, $a0, 1 -/* AC5520 802403B0 00641821 */ addu $v1, $v1, $a0 -/* AC5524 802403B4 000318C0 */ sll $v1, $v1, 3 -/* AC5528 802403B8 00641821 */ addu $v1, $v1, $a0 -/* AC552C 802403BC 00031880 */ sll $v1, $v1, 2 -/* AC5530 802403C0 8E640004 */ lw $a0, 4($s3) -/* AC5534 802403C4 00431023 */ subu $v0, $v0, $v1 -/* AC5538 802403C8 0044102A */ slt $v0, $v0, $a0 -/* AC553C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* AC5540 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* AC5544 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* AC5548 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* AC554C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* AC5550 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* AC5554 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* AC5558 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* AC555C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* AC5560 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* AC5564 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* AC5568 802403F8 03E00008 */ jr $ra -/* AC556C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s deleted file mode 100644 index cd2e4bcf38..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_802404C0_AC5630.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_AC5630 -/* AC5630 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AC5634 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* AC5638 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* AC563C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* AC5640 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* AC5644 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* AC5648 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* AC564C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* AC5650 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* AC5654 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* AC5658 802404E8 86240008 */ lh $a0, 8($s1) -/* AC565C 802404EC 0C00EABB */ jal get_npc_unsafe -/* AC5660 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* AC5664 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* AC5668 802404F8 04600031 */ bltz $v1, .L802405C0 -/* AC566C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* AC5670 80240500 0260202D */ daddu $a0, $s3, $zero -/* AC5674 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* AC5678 80240508 8E460024 */ lw $a2, 0x24($s2) -/* AC567C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* AC5680 80240510 0C01242D */ jal func_800490B4 -/* AC5684 80240514 0220282D */ daddu $a1, $s1, $zero -/* AC5688 80240518 10400029 */ beqz $v0, .L802405C0 -/* AC568C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* AC5690 80240520 0200282D */ daddu $a1, $s0, $zero -/* AC5694 80240524 0000302D */ daddu $a2, $zero, $zero -/* AC5698 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* AC569C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* AC56A0 80240530 44810000 */ mtc1 $at, $f0 -/* AC56A4 80240534 3C014000 */ lui $at, 0x4000 -/* AC56A8 80240538 44811000 */ mtc1 $at, $f2 -/* AC56AC 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* AC56B0 80240540 44812000 */ mtc1 $at, $f4 -/* AC56B4 80240544 2402000F */ addiu $v0, $zero, 0xf -/* AC56B8 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* AC56BC 8024054C 44833000 */ mtc1 $v1, $f6 -/* AC56C0 80240550 00000000 */ nop -/* AC56C4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* AC56C8 80240558 44073000 */ mfc1 $a3, $f6 -/* AC56CC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* AC56D0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* AC56D4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* AC56D8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* AC56DC 8024056C 0C01BFA4 */ jal fx_emote -/* AC56E0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* AC56E4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* AC56E8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* AC56EC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* AC56F0 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AC56F4 80240584 8C460028 */ lw $a2, 0x28($v0) -/* AC56F8 80240588 0C00A720 */ jal atan2 -/* AC56FC 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* AC5700 80240590 0200202D */ daddu $a0, $s0, $zero -/* AC5704 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* AC5708 80240598 3C060020 */ lui $a2, 0x20 -/* AC570C 8024059C 0C012530 */ jal func_800494C0 -/* AC5710 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* AC5714 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* AC5718 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* AC571C 802405AC 30420001 */ andi $v0, $v0, 1 -/* AC5720 802405B0 14400029 */ bnez $v0, .L80240658 -/* AC5724 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* AC5728 802405B8 08090196 */ j .L80240658 -/* AC572C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* AC5730 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* AC5734 802405C4 14400025 */ bnez $v0, .L8024065C -/* AC5738 802405C8 00000000 */ nop -/* AC573C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* AC5740 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* AC5744 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* AC5748 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* AC574C 802405DC 1440001F */ bnez $v0, .L8024065C -/* AC5750 802405E0 00000000 */ nop -/* AC5754 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* AC5758 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* AC575C 802405EC 10400019 */ beqz $v0, .L80240654 -/* AC5760 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* AC5764 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* AC5768 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* AC576C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* AC5770 80240600 14400007 */ bnez $v0, .L80240620 -/* AC5774 80240604 00000000 */ nop -/* AC5778 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* AC577C 8024060C 3C014334 */ lui $at, 0x4334 -/* AC5780 80240610 44816000 */ mtc1 $at, $f12 -/* AC5784 80240614 0C00A6C9 */ jal clamp_angle -/* AC5788 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* AC578C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* AC5790 80240620 8E440008 */ lw $a0, 8($s2) -/* AC5794 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* AC5798 80240628 00822021 */ addu $a0, $a0, $v0 -/* AC579C 8024062C 00042043 */ sra $a0, $a0, 1 -/* AC57A0 80240630 0C00A67F */ jal rand_int -/* AC57A4 80240634 24840001 */ addiu $a0, $a0, 1 -/* AC57A8 80240638 8E430008 */ lw $v1, 8($s2) -/* AC57AC 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* AC57B0 80240640 00641821 */ addu $v1, $v1, $a0 -/* AC57B4 80240644 00031843 */ sra $v1, $v1, 1 -/* AC57B8 80240648 00621821 */ addu $v1, $v1, $v0 -/* AC57BC 8024064C 08090197 */ j .L8024065C -/* AC57C0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* AC57C4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* AC57C8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* AC57CC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* AC57D0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* AC57D4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* AC57D8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* AC57DC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* AC57E0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* AC57E4 80240674 03E00008 */ jr $ra -/* AC57E8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s deleted file mode 100644 index 66479c1f6d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024094C_AC5ABC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_AC5ABC -/* AC5ABC 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AC5AC0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* AC5AC4 80240954 0080982D */ daddu $s3, $a0, $zero -/* AC5AC8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* AC5ACC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* AC5AD0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* AC5AD4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* AC5AD8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* AC5ADC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* AC5AE0 80240970 86440008 */ lh $a0, 8($s2) -/* AC5AE4 80240974 0C00EABB */ jal get_npc_unsafe -/* AC5AE8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* AC5AEC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* AC5AF0 80240980 0240282D */ daddu $a1, $s2, $zero -/* AC5AF4 80240984 24030001 */ addiu $v1, $zero, 1 -/* AC5AF8 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* AC5AFC 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* AC5B00 80240990 8E270028 */ lw $a3, 0x28($s1) -/* AC5B04 80240994 0C01242D */ jal func_800490B4 -/* AC5B08 80240998 0040802D */ daddu $s0, $v0, $zero -/* AC5B0C 8024099C 1440001E */ bnez $v0, .L80240A18 -/* AC5B10 802409A0 0200202D */ daddu $a0, $s0, $zero -/* AC5B14 802409A4 24040002 */ addiu $a0, $zero, 2 -/* AC5B18 802409A8 0200282D */ daddu $a1, $s0, $zero -/* AC5B1C 802409AC 0000302D */ daddu $a2, $zero, $zero -/* AC5B20 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* AC5B24 802409B4 3C013F80 */ lui $at, 0x3f80 -/* AC5B28 802409B8 44810000 */ mtc1 $at, $f0 -/* AC5B2C 802409BC 3C014000 */ lui $at, 0x4000 -/* AC5B30 802409C0 44811000 */ mtc1 $at, $f2 -/* AC5B34 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* AC5B38 802409C8 44812000 */ mtc1 $at, $f4 -/* AC5B3C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* AC5B40 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* AC5B44 802409D4 44833000 */ mtc1 $v1, $f6 -/* AC5B48 802409D8 00000000 */ nop -/* AC5B4C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* AC5B50 802409E0 44073000 */ mfc1 $a3, $f6 -/* AC5B54 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* AC5B58 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* AC5B5C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* AC5B60 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* AC5B64 802409F4 0C01BFA4 */ jal fx_emote -/* AC5B68 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* AC5B6C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* AC5B70 80240A00 8C430000 */ lw $v1, ($v0) -/* AC5B74 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* AC5B78 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* AC5B7C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* AC5B80 80240A10 08090293 */ j .L80240A4C -/* AC5B84 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* AC5B88 80240A18 0C00F598 */ jal func_8003D660 -/* AC5B8C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* AC5B90 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* AC5B94 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* AC5B98 80240A28 0C00EA95 */ jal npc_move_heading -/* AC5B9C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* AC5BA0 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* AC5BA4 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* AC5BA8 80240A38 18400003 */ blez $v0, .L80240A48 -/* AC5BAC 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* AC5BB0 80240A40 08090294 */ j .L80240A50 -/* AC5BB4 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* AC5BB8 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* AC5BBC 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* AC5BC0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* AC5BC4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* AC5BC8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* AC5BCC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* AC5BD0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* AC5BD4 80240A64 03E00008 */ jr $ra -/* AC5BD8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s deleted file mode 100644 index e5469c5ce1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240AD4_AC5C44.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_AC5C44 -/* AC5C44 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC5C48 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* AC5C4C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* AC5C50 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* AC5C54 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* AC5C58 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* AC5C5C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* AC5C60 80240AF0 86040008 */ lh $a0, 8($s0) -/* AC5C64 80240AF4 0C00EABB */ jal get_npc_unsafe -/* AC5C68 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* AC5C6C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* AC5C70 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* AC5C74 80240B04 8C630000 */ lw $v1, ($v1) -/* AC5C78 80240B08 0083182A */ slt $v1, $a0, $v1 -/* AC5C7C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* AC5C80 80240B10 0040302D */ daddu $a2, $v0, $zero -/* AC5C84 80240B14 00041040 */ sll $v0, $a0, 1 -/* AC5C88 80240B18 00441021 */ addu $v0, $v0, $a0 -/* AC5C8C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* AC5C90 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* AC5C94 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* AC5C98 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* AC5C9C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* AC5CA0 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* AC5CA4 80240B34 4602003E */ c.le.s $f0, $f2 -/* AC5CA8 80240B38 00000000 */ nop -/* AC5CAC 80240B3C 45020003 */ bc1fl .L80240B4C -/* AC5CB0 80240B40 24840001 */ addiu $a0, $a0, 1 -/* AC5CB4 80240B44 080902D7 */ j .L80240B5C -/* AC5CB8 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* AC5CBC 80240B4C 8C620000 */ lw $v0, ($v1) -/* AC5CC0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* AC5CC4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* AC5CC8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* AC5CCC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* AC5CD0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* AC5CD4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* AC5CD8 80240B68 8C420004 */ lw $v0, 4($v0) -/* AC5CDC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* AC5CE0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* AC5CE4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* AC5CE8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* AC5CEC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* AC5CF0 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* AC5CF4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* AC5CF8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* AC5CFC 80240B8C 03E00008 */ jr $ra -/* AC5D00 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index ee72893a58..c8b5bd7aa2 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -137,7 +137,7 @@ glabel L80240D78_AC5EE8 glabel L80240D88_AC5EF8 /* AC5EF8 80240D88 0280202D */ daddu $a0, $s4, $zero /* AC5EFC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* AC5F00 80240D90 0C090056 */ jal func_80240158_AC52C8 +/* AC5F00 80240D90 0C090056 */ jal kkj_01_UnkFunc13 /* AC5F04 80240D94 02A0302D */ daddu $a2, $s5, $zero /* AC5F08 80240D98 0809039A */ j L80240E68_AC5FD8 /* AC5F0C 80240D9C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80240DA0_AC5F10 glabel L80240DB0_AC5F20 /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* AC5F28 80240DB8 0C090130 */ jal func_802404C0_AC5630 +/* AC5F28 80240DB8 0C090130 */ jal kkj_01_UnkFunc14 /* AC5F2C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* AC5F30 80240DC0 0809039A */ j L80240E68_AC5FD8 /* AC5F34 80240DC4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80240E08_AC5F78 glabel L80240E18_AC5F88 /* AC5F88 80240E18 0280202D */ daddu $a0, $s4, $zero /* AC5F8C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* AC5F90 80240E20 0C090253 */ jal func_8024094C_AC5ABC +/* AC5F90 80240E20 0C090253 */ jal kkj_01_UnkFunc15 /* AC5F94 80240E24 02A0302D */ daddu $a2, $s5, $zero /* AC5F98 80240E28 0809039A */ j L80240E68_AC5FD8 /* AC5F9C 80240E2C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80240E30_AC5FA0 glabel L80240E48_AC5FB8 /* AC5FB8 80240E48 0280202D */ daddu $a0, $s4, $zero /* AC5FBC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* AC5FC0 80240E50 0C0902B5 */ jal func_80240AD4_AC5C44 +/* AC5FC0 80240E50 0C0902B5 */ jal kkj_01_UnkFunc16 /* AC5FC4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* AC5FC8 80240E58 0809039A */ j L80240E68_AC5FD8 /* AC5FCC 80240E5C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s deleted file mode 100644 index 962c6618dc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_8CE908 -/* 8CE908 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 8CE90C 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* 8CE910 802408A0 0080982D */ daddu $s3, $a0, $zero -/* 8CE914 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 8CE918 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* 8CE91C 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* 8CE920 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* 8CE924 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* 8CE928 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 8CE92C 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 8CE930 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 8CE934 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 8CE938 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* 8CE93C 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* 8CE940 802408D0 86240008 */ lh $a0, 8($s1) -/* 8CE944 802408D4 0C00EABB */ jal get_npc_unsafe -/* 8CE948 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* 8CE94C 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 8CE950 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8CE954 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* 8CE958 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* 8CE95C 802408EC 3C014059 */ lui $at, 0x4059 -/* 8CE960 802408F0 44811800 */ mtc1 $at, $f3 -/* 8CE964 802408F4 44801000 */ mtc1 $zero, $f2 -/* 8CE968 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* 8CE96C 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* 8CE970 80240900 46220003 */ div.d $f0, $f0, $f2 -/* 8CE974 80240904 46200620 */ cvt.s.d $f24, $f0 -/* 8CE978 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* 8CE97C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE980 80240910 46000021 */ cvt.d.s $f0, $f0 -/* 8CE984 80240914 46220003 */ div.d $f0, $f0, $f2 -/* 8CE988 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 8CE98C 8024091C 18400003 */ blez $v0, .L8024092C -/* 8CE990 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* 8CE994 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* 8CE998 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* 8CE99C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* 8CE9A0 80240930 18400034 */ blez $v0, .L80240A04 -/* 8CE9A4 80240934 00000000 */ nop -/* 8CE9A8 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8CE9AC 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* 8CE9B0 80240940 44820000 */ mtc1 $v0, $f0 -/* 8CE9B4 80240944 00000000 */ nop -/* 8CE9B8 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 8CE9BC 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 8CE9C0 80240950 46220003 */ div.d $f0, $f0, $f2 -/* 8CE9C4 80240954 0C00A8BB */ jal sin_deg -/* 8CE9C8 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* 8CE9CC 8024095C 8E020000 */ lw $v0, ($s0) -/* 8CE9D0 80240960 30420008 */ andi $v0, $v0, 8 -/* 8CE9D4 80240964 10400003 */ beqz $v0, .L80240974 -/* 8CE9D8 80240968 46000506 */ mov.s $f20, $f0 -/* 8CE9DC 8024096C 0809026D */ j .L802409B4 -/* 8CE9E0 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 8CE9E4 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE9E8 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE9EC 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE9F0 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE9F4 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CE9F8 80240988 3C01447A */ lui $at, 0x447a -/* 8CE9FC 8024098C 44813000 */ mtc1 $at, $f6 -/* 8CEA00 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CEA04 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CEA08 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8CEA0C 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* 8CEA10 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8CEA14 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* 8CEA18 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* 8CEA1C 802409AC 0C0372DF */ jal func_800DCB7C -/* 8CEA20 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* 8CEA24 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8CEA28 802409B8 00000000 */ nop -/* 8CEA2C 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8CEA30 802409C0 00000000 */ nop -/* 8CEA34 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8CEA38 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 8CEA3C 802409CC 08090278 */ j .L802409E0 -/* 8CEA40 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* 8CEA44 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8CEA48 802409D8 00000000 */ nop -/* 8CEA4C 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* 8CEA50 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 8CEA54 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* 8CEA58 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* 8CEA5C 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8CEA60 802409F0 00000000 */ nop -/* 8CEA64 802409F4 0C00A6C9 */ jal clamp_angle -/* 8CEA68 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* 8CEA6C 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* 8CEA70 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* 8CEA74 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* 8CEA78 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* 8CEA7C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 8CEA80 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* 8CEA84 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CEA88 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8CEA8C 80240A1C 00000000 */ nop -/* 8CEA90 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* 8CEA94 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CEA98 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CEA9C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* 8CEAA0 80240A30 3C014024 */ lui $at, 0x4024 -/* 8CEAA4 80240A34 44812800 */ mtc1 $at, $f5 -/* 8CEAA8 80240A38 44802000 */ mtc1 $zero, $f4 -/* 8CEAAC 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* 8CEAB0 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* 8CEAB4 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 8CEAB8 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* 8CEABC 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8CEAC0 80240A50 00000000 */ nop -/* 8CEAC4 80240A54 4500002E */ bc1f .L80240B10 -/* 8CEAC8 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 8CEACC 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 8CEAD0 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* 8CEAD4 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* 8CEAD8 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* 8CEADC 80240A6C 0C01242D */ jal func_800490B4 -/* 8CEAE0 80240A70 0220282D */ daddu $a1, $s1, $zero -/* 8CEAE4 80240A74 10400026 */ beqz $v0, .L80240B10 -/* 8CEAE8 80240A78 0000202D */ daddu $a0, $zero, $zero -/* 8CEAEC 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* 8CEAF0 80240A80 0000302D */ daddu $a2, $zero, $zero -/* 8CEAF4 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* 8CEAF8 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8CEAFC 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* 8CEB00 80240A90 44810000 */ mtc1 $at, $f0 -/* 8CEB04 80240A94 3C014000 */ lui $at, 0x4000 -/* 8CEB08 80240A98 44811000 */ mtc1 $at, $f2 -/* 8CEB0C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8CEB10 80240AA0 44812000 */ mtc1 $at, $f4 -/* 8CEB14 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8CEB18 80240AA8 00000000 */ nop -/* 8CEB1C 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* 8CEB20 80240AB0 44074000 */ mfc1 $a3, $f8 -/* 8CEB24 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* 8CEB28 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 8CEB2C 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* 8CEB30 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CEB34 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8CEB38 80240AC8 0C01BFA4 */ jal fx_emote -/* 8CEB3C 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8CEB40 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* 8CEB44 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8CEB48 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8CEB4C 80240ADC 3C060020 */ lui $a2, 0x20 -/* 8CEB50 80240AE0 0C012530 */ jal func_800494C0 -/* 8CEB54 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8CEB58 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 8CEB5C 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 8CEB60 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 8CEB64 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* 8CEB68 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 8CEB6C 80240AFC 080902EB */ j .L80240BAC -/* 8CEB70 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* 8CEB74 80240B04 080902EB */ j .L80240BAC -/* 8CEB78 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* 8CEB7C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* 8CEB80 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 8CEB84 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8CEB88 80240B18 00000000 */ nop -/* 8CEB8C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* 8CEB90 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8CEB94 80240B24 00000000 */ nop -/* 8CEB98 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* 8CEB9C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* 8CEBA0 80240B30 1840001D */ blez $v0, .L80240BA8 -/* 8CEBA4 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* 8CEBA8 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* 8CEBAC 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* 8CEBB0 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* 8CEBB4 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8CEBB8 80240B48 00000000 */ nop -/* 8CEBBC 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* 8CEBC0 80240B50 3C014334 */ lui $at, 0x4334 -/* 8CEBC4 80240B54 44816000 */ mtc1 $at, $f12 -/* 8CEBC8 80240B58 0C00A6C9 */ jal clamp_angle -/* 8CEBCC 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* 8CEBD0 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* 8CEBD4 80240B64 0C00A67F */ jal rand_int -/* 8CEBD8 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8CEBDC 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* 8CEBE0 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 8CEBE4 80240B74 00430018 */ mult $v0, $v1 -/* 8CEBE8 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* 8CEBEC 80240B7C 00004010 */ mfhi $t0 -/* 8CEBF0 80240B80 00082043 */ sra $a0, $t0, 1 -/* 8CEBF4 80240B84 00832023 */ subu $a0, $a0, $v1 -/* 8CEBF8 80240B88 00041840 */ sll $v1, $a0, 1 -/* 8CEBFC 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* 8CEC00 80240B90 00031880 */ sll $v1, $v1, 2 -/* 8CEC04 80240B94 00641823 */ subu $v1, $v1, $a0 -/* 8CEC08 80240B98 00431023 */ subu $v0, $v0, $v1 -/* 8CEC0C 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* 8CEC10 80240BA0 080902EB */ j .L80240BAC -/* 8CEC14 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* 8CEC18 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* 8CEC1C 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* 8CEC20 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* 8CEC24 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* 8CEC28 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* 8CEC2C 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* 8CEC30 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* 8CEC34 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 8CEC38 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 8CEC3C 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 8CEC40 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 8CEC44 80240BD4 03E00008 */ jr $ra -/* 8CEC48 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s deleted file mode 100644 index e7d976a5fc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_8CEEC8 -/* 8CEEC8 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8CEECC 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* 8CEED0 80240E60 0080902D */ daddu $s2, $a0, $zero -/* 8CEED4 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* 8CEED8 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* 8CEEDC 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* 8CEEE0 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* 8CEEE4 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8CEEE8 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8CEEEC 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* 8CEEF0 80240E80 86240008 */ lh $a0, 8($s1) -/* 8CEEF4 80240E84 0C00EABB */ jal get_npc_unsafe -/* 8CEEF8 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* 8CEEFC 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* 8CEF00 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 8CEF04 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8CEF08 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* 8CEF0C 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* 8CEF10 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CEF14 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* 8CEF18 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* 8CEF1C 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* 8CEF20 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* 8CEF24 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8CEF28 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* 8CEF2C 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* 8CEF30 80240EC0 3C014059 */ lui $at, 0x4059 -/* 8CEF34 80240EC4 44812800 */ mtc1 $at, $f5 -/* 8CEF38 80240EC8 44802000 */ mtc1 $zero, $f4 -/* 8CEF3C 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* 8CEF40 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* 8CEF44 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* 8CEF48 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* 8CEF4C 80240EDC 0C00EA95 */ jal npc_move_heading -/* 8CEF50 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* 8CEF54 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CEF58 80240EE8 44801000 */ mtc1 $zero, $f2 -/* 8CEF5C 80240EEC 44801800 */ mtc1 $zero, $f3 -/* 8CEF60 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* 8CEF64 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8CEF68 80240EF8 00000000 */ nop -/* 8CEF6C 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8CEF70 80240F00 00000000 */ nop -/* 8CEF74 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CEF78 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* 8CEF7C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* 8CEF80 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* 8CEF84 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* 8CEF88 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 8CEF8C 80240F1C A2200007 */ sb $zero, 7($s1) -/* 8CEF90 80240F20 8E020000 */ lw $v0, ($s0) -/* 8CEF94 80240F24 30420008 */ andi $v0, $v0, 8 -/* 8CEF98 80240F28 14400011 */ bnez $v0, .L80240F70 -/* 8CEF9C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* 8CEFA0 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* 8CEFA4 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* 8CEFA8 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CEFAC 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CEFB0 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CEFB4 80240F44 3C01447A */ lui $at, 0x447a -/* 8CEFB8 80240F48 44813000 */ mtc1 $at, $f6 -/* 8CEFBC 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* 8CEFC0 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CEFC4 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8CEFC8 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* 8CEFCC 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* 8CEFD0 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* 8CEFD4 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* 8CEFD8 80240F68 0C0372DF */ jal func_800DCB7C -/* 8CEFDC 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* 8CEFE0 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8CEFE4 80240F74 00000000 */ nop -/* 8CEFE8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8CEFEC 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* 8CEFF0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CEFF4 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8CEFF8 80240F88 00000000 */ nop -/* 8CEFFC 80240F8C 4500008D */ bc1f .L802411C4 -/* 8CF000 80240F90 00000000 */ nop -/* 8CF004 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* 8CF008 80240F98 08090471 */ j .L802411C4 -/* 8CF00C 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* 8CF010 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CF014 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8CF018 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8CF01C 80240FAC 00000000 */ nop -/* 8CF020 80240FB0 45030084 */ bc1tl .L802411C4 -/* 8CF024 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* 8CF028 80240FB8 08090471 */ j .L802411C4 -/* 8CF02C 80240FBC 00000000 */ nop -.L80240FC0: -/* 8CF030 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8CF034 80240FC4 00000000 */ nop -/* 8CF038 80240FC8 4500007E */ bc1f .L802411C4 -/* 8CF03C 80240FCC 00000000 */ nop -/* 8CF040 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* 8CF044 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* 8CF048 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* 8CF04C 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* 8CF050 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* 8CF054 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* 8CF058 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* 8CF05C 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8CF060 80240FF0 00000000 */ nop -/* 8CF064 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CF068 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CF06C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CF070 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CF074 80241004 A600008E */ sh $zero, 0x8e($s0) -/* 8CF078 80241008 8C460028 */ lw $a2, 0x28($v0) -/* 8CF07C 8024100C 0C00A720 */ jal atan2 -/* 8CF080 80241010 8C470030 */ lw $a3, 0x30($v0) -/* 8CF084 80241014 46000506 */ mov.s $f20, $f0 -/* 8CF088 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8CF08C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* 8CF090 80241020 4600A386 */ mov.s $f14, $f20 -/* 8CF094 80241024 46000086 */ mov.s $f2, $f0 -/* 8CF098 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* 8CF09C 8024102C 46001005 */ abs.s $f0, $f2 -/* 8CF0A0 80241030 44822000 */ mtc1 $v0, $f4 -/* 8CF0A4 80241034 00000000 */ nop -/* 8CF0A8 80241038 46802120 */ cvt.s.w $f4, $f4 -/* 8CF0AC 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8CF0B0 80241040 00000000 */ nop -/* 8CF0B4 80241044 4500000D */ bc1f .L8024107C -/* 8CF0B8 80241048 00000000 */ nop -/* 8CF0BC 8024104C 44800000 */ mtc1 $zero, $f0 -/* 8CF0C0 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* 8CF0C4 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8CF0C8 80241058 00000000 */ nop -/* 8CF0CC 8024105C 45000006 */ bc1f .L80241078 -/* 8CF0D0 80241060 00021023 */ negu $v0, $v0 -/* 8CF0D4 80241064 44820000 */ mtc1 $v0, $f0 -/* 8CF0D8 80241068 00000000 */ nop -/* 8CF0DC 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* 8CF0E0 80241070 0809041F */ j .L8024107C -/* 8CF0E4 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* 8CF0E8 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* 8CF0EC 8024107C 0C00A6C9 */ jal clamp_angle -/* 8CF0F0 80241080 4600A306 */ mov.s $f12, $f20 -/* 8CF0F4 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* 8CF0F8 80241088 8E020000 */ lw $v0, ($s0) -/* 8CF0FC 8024108C 30420008 */ andi $v0, $v0, 8 -/* 8CF100 80241090 1040000A */ beqz $v0, .L802410BC -/* 8CF104 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* 8CF108 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CF10C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* 8CF110 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* 8CF114 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8CF118 802410A8 00000000 */ nop -/* 8CF11C 802410AC 45020045 */ bc1fl .L802411C4 -/* 8CF120 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* 8CF124 802410B4 08090470 */ j .L802411C0 -/* 8CF128 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* 8CF12C 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CF130 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* 8CF134 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CF138 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* 8CF13C 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* 8CF140 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 8CF144 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8CF148 802410D8 00000000 */ nop -/* 8CF14C 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* 8CF150 802410E0 46000005 */ abs.s $f0, $f0 -/* 8CF154 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* 8CF158 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 8CF15C 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* 8CF160 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* 8CF164 802410F4 3C014024 */ lui $at, 0x4024 -/* 8CF168 802410F8 44811800 */ mtc1 $at, $f3 -/* 8CF16C 802410FC 44801000 */ mtc1 $zero, $f2 -/* 8CF170 80241100 46000021 */ cvt.d.s $f0, $f0 -/* 8CF174 80241104 46220000 */ add.d $f0, $f0, $f2 -/* 8CF178 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* 8CF17C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8CF180 80241110 46200020 */ cvt.s.d $f0, $f0 -/* 8CF184 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* 8CF188 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* 8CF18C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* 8CF190 80241120 0C0372DF */ jal func_800DCB7C -/* 8CF194 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* 8CF198 80241128 10400015 */ beqz $v0, .L80241180 -/* 8CF19C 8024112C 00000000 */ nop -/* 8CF1A0 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* 8CF1A4 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CF1A8 80241138 44820000 */ mtc1 $v0, $f0 -/* 8CF1AC 8024113C 00000000 */ nop -/* 8CF1B0 80241140 46800020 */ cvt.s.w $f0, $f0 -/* 8CF1B4 80241144 46002085 */ abs.s $f2, $f4 -/* 8CF1B8 80241148 46020000 */ add.s $f0, $f0, $f2 -/* 8CF1BC 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8CF1C0 80241150 4600103E */ c.le.s $f2, $f0 -/* 8CF1C4 80241154 00000000 */ nop -/* 8CF1C8 80241158 45000005 */ bc1f .L80241170 -/* 8CF1CC 8024115C 00000000 */ nop -/* 8CF1D0 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8CF1D4 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* 8CF1D8 80241168 08090471 */ j .L802411C4 -/* 8CF1DC 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* 8CF1E0 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CF1E4 80241174 46040000 */ add.s $f0, $f0, $f4 -/* 8CF1E8 80241178 08090471 */ j .L802411C4 -/* 8CF1EC 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* 8CF1F0 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* 8CF1F4 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* 8CF1F8 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* 8CF1FC 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8CF200 80241190 00000000 */ nop -/* 8CF204 80241194 46800020 */ cvt.s.w $f0, $f0 -/* 8CF208 80241198 46001080 */ add.s $f2, $f2, $f0 -/* 8CF20C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CF210 802411A0 46002005 */ abs.s $f0, $f4 -/* 8CF214 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8CF218 802411A8 00000000 */ nop -/* 8CF21C 802411AC 45020005 */ bc1fl .L802411C4 -/* 8CF220 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* 8CF224 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* 8CF228 802411B8 08090471 */ j .L802411C4 -/* 8CF22C 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* 8CF230 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* 8CF234 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* 8CF238 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* 8CF23C 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* 8CF240 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 8CF244 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* 8CF248 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8CF24C 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8CF250 802411E0 03E00008 */ jr $ra -/* 8CF254 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s deleted file mode 100644 index 323a48f142..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_8CF258 -/* 8CF258 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8CF25C 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* 8CF260 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* 8CF264 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 8CF268 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* 8CF26C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 8CF270 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* 8CF274 80241204 AE200070 */ sw $zero, 0x70($s1) -/* 8CF278 80241208 8C830000 */ lw $v1, ($a0) -/* 8CF27C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8CF280 80241210 A480008E */ sh $zero, 0x8e($a0) -/* 8CF284 80241214 00621824 */ and $v1, $v1, $v0 -/* 8CF288 80241218 34650800 */ ori $a1, $v1, 0x800 -/* 8CF28C 8024121C AC850000 */ sw $a1, ($a0) -/* 8CF290 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8CF294 80241224 8C420034 */ lw $v0, 0x34($v0) -/* 8CF298 80241228 10400003 */ beqz $v0, .L80241238 -/* 8CF29C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* 8CF2A0 80241230 08090490 */ j .L80241240 -/* 8CF2A4 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* 8CF2A8 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* 8CF2AC 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* 8CF2B0 80241240 AC820000 */ sw $v0, ($a0) -/* 8CF2B4 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* 8CF2B8 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* 8CF2BC 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* 8CF2C0 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8CF2C4 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* 8CF2C8 80241258 3C01447A */ lui $at, 0x447a -/* 8CF2CC 8024125C 44813000 */ mtc1 $at, $f6 -/* 8CF2D0 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* 8CF2D4 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CF2D8 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8CF2DC 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8CF2E0 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* 8CF2E4 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* 8CF2E8 80241278 8C840080 */ lw $a0, 0x80($a0) -/* 8CF2EC 8024127C 0C0372DF */ jal func_800DCB7C -/* 8CF2F0 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* 8CF2F4 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8CF2F8 80241288 3C014059 */ lui $at, 0x4059 -/* 8CF2FC 8024128C 44812800 */ mtc1 $at, $f5 -/* 8CF300 80241290 44802000 */ mtc1 $zero, $f4 -/* 8CF304 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* 8CF308 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8CF30C 8024129C 00000000 */ nop -/* 8CF310 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8CF314 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* 8CF318 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8CF31C 802412AC 00000000 */ nop -/* 8CF320 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* 8CF324 802412B4 44812800 */ mtc1 $at, $f5 -/* 8CF328 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8CF32C 802412BC 00000000 */ nop -/* 8CF330 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* 8CF334 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* 8CF338 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* 8CF33C 802412CC AE000090 */ sw $zero, 0x90($s0) -/* 8CF340 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* 8CF344 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* 8CF348 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* 8CF34C 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* 8CF350 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* 8CF354 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* 8CF358 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8CF35C 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* 8CF360 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 8CF364 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8CF368 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* 8CF36C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* 8CF370 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* 8CF374 80241304 03E00008 */ jr $ra -/* 8CF378 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 6905ccc518..84dadffa31 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -46,7 +46,7 @@ glabel func_8024130C_8CF37C /* 8CF420 802413B0 02A0202D */ daddu $a0, $s5, $zero /* 8CF424 802413B4 0240282D */ daddu $a1, $s2, $zero /* 8CF428 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8CF42C 802413BC 0C09047A */ jal func_802411E8_8CF258 +/* 8CF42C 802413BC 0C09047A */ jal kmr_05_UnkFunc5 /* 8CF430 802413C0 0200382D */ daddu $a3, $s0, $zero .L802413C4: /* 8CF434 802413C4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241440_8CF4B0 glabel L80241450_8CF4C0 /* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero /* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8CF4C8 80241458 0C090226 */ jal func_80240898_8CE908 +/* 8CF4C8 80241458 0C090226 */ jal kmr_05_UnkFunc4 /* 8CF4CC 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8CF4D0 80241460 08090535 */ j .L802414D4 /* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802414A8_8CF518 glabel L802414C0_8CF530 /* 8CF530 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8CF534 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8CF538 802414C8 0C090396 */ jal func_80240E58_8CEEC8 +/* 8CF538 802414C8 0C090396 */ jal kmr_05_UnkFunc6 /* 8CF53C 802414CC 0260302D */ daddu $a2, $s3, $zero glabel L802414D0_8CF540 /* 8CF540 802414D0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s deleted file mode 100644 index 577f52fa3f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240898_8D1DA8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_8D1DA8 -/* 8D1DA8 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 8D1DAC 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* 8D1DB0 802408A0 0080982D */ daddu $s3, $a0, $zero -/* 8D1DB4 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 8D1DB8 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* 8D1DBC 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* 8D1DC0 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* 8D1DC4 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* 8D1DC8 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 8D1DCC 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 8D1DD0 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 8D1DD4 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 8D1DD8 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* 8D1DDC 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* 8D1DE0 802408D0 86240008 */ lh $a0, 8($s1) -/* 8D1DE4 802408D4 0C00EABB */ jal get_npc_unsafe -/* 8D1DE8 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* 8D1DEC 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 8D1DF0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D1DF4 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* 8D1DF8 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* 8D1DFC 802408EC 3C014059 */ lui $at, 0x4059 -/* 8D1E00 802408F0 44811800 */ mtc1 $at, $f3 -/* 8D1E04 802408F4 44801000 */ mtc1 $zero, $f2 -/* 8D1E08 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* 8D1E0C 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* 8D1E10 80240900 46220003 */ div.d $f0, $f0, $f2 -/* 8D1E14 80240904 46200620 */ cvt.s.d $f24, $f0 -/* 8D1E18 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* 8D1E1C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1E20 80240910 46000021 */ cvt.d.s $f0, $f0 -/* 8D1E24 80240914 46220003 */ div.d $f0, $f0, $f2 -/* 8D1E28 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 8D1E2C 8024091C 18400003 */ blez $v0, .L8024092C -/* 8D1E30 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* 8D1E34 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* 8D1E38 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* 8D1E3C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* 8D1E40 80240930 18400034 */ blez $v0, .L80240A04 -/* 8D1E44 80240934 00000000 */ nop -/* 8D1E48 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D1E4C 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* 8D1E50 80240940 44820000 */ mtc1 $v0, $f0 -/* 8D1E54 80240944 00000000 */ nop -/* 8D1E58 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 8D1E5C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 8D1E60 80240950 46220003 */ div.d $f0, $f0, $f2 -/* 8D1E64 80240954 0C00A8BB */ jal sin_deg -/* 8D1E68 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* 8D1E6C 8024095C 8E020000 */ lw $v0, ($s0) -/* 8D1E70 80240960 30420008 */ andi $v0, $v0, 8 -/* 8D1E74 80240964 10400003 */ beqz $v0, .L80240974 -/* 8D1E78 80240968 46000506 */ mov.s $f20, $f0 -/* 8D1E7C 8024096C 0809026D */ j .L802409B4 -/* 8D1E80 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 8D1E84 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D1E88 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D1E8C 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D1E90 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D1E94 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D1E98 80240988 3C01447A */ lui $at, 0x447a -/* 8D1E9C 8024098C 44813000 */ mtc1 $at, $f6 -/* 8D1EA0 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D1EA4 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D1EA8 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D1EAC 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D1EB0 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D1EB4 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D1EB8 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* 8D1EBC 802409AC 0C0372DF */ jal func_800DCB7C -/* 8D1EC0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* 8D1EC4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8D1EC8 802409B8 00000000 */ nop -/* 8D1ECC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D1ED0 802409C0 00000000 */ nop -/* 8D1ED4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D1ED8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 8D1EDC 802409CC 08090278 */ j .L802409E0 -/* 8D1EE0 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* 8D1EE4 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D1EE8 802409D8 00000000 */ nop -/* 8D1EEC 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* 8D1EF0 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D1EF4 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* 8D1EF8 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* 8D1EFC 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8D1F00 802409F0 00000000 */ nop -/* 8D1F04 802409F4 0C00A6C9 */ jal clamp_angle -/* 8D1F08 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* 8D1F0C 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* 8D1F10 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* 8D1F14 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* 8D1F18 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* 8D1F1C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D1F20 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* 8D1F24 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D1F28 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8D1F2C 80240A1C 00000000 */ nop -/* 8D1F30 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1F34 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D1F38 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D1F3C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* 8D1F40 80240A30 3C014024 */ lui $at, 0x4024 -/* 8D1F44 80240A34 44812800 */ mtc1 $at, $f5 -/* 8D1F48 80240A38 44802000 */ mtc1 $zero, $f4 -/* 8D1F4C 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* 8D1F50 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* 8D1F54 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 8D1F58 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* 8D1F5C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8D1F60 80240A50 00000000 */ nop -/* 8D1F64 80240A54 4500002E */ bc1f .L80240B10 -/* 8D1F68 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 8D1F6C 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 8D1F70 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D1F74 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* 8D1F78 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* 8D1F7C 80240A6C 0C01242D */ jal func_800490B4 -/* 8D1F80 80240A70 0220282D */ daddu $a1, $s1, $zero -/* 8D1F84 80240A74 10400026 */ beqz $v0, .L80240B10 -/* 8D1F88 80240A78 0000202D */ daddu $a0, $zero, $zero -/* 8D1F8C 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* 8D1F90 80240A80 0000302D */ daddu $a2, $zero, $zero -/* 8D1F94 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* 8D1F98 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8D1F9C 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* 8D1FA0 80240A90 44810000 */ mtc1 $at, $f0 -/* 8D1FA4 80240A94 3C014000 */ lui $at, 0x4000 -/* 8D1FA8 80240A98 44811000 */ mtc1 $at, $f2 -/* 8D1FAC 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D1FB0 80240AA0 44812000 */ mtc1 $at, $f4 -/* 8D1FB4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8D1FB8 80240AA8 00000000 */ nop -/* 8D1FBC 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* 8D1FC0 80240AB0 44074000 */ mfc1 $a3, $f8 -/* 8D1FC4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D1FC8 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D1FCC 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* 8D1FD0 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D1FD4 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D1FD8 80240AC8 0C01BFA4 */ jal fx_emote -/* 8D1FDC 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D1FE0 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* 8D1FE4 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D1FE8 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D1FEC 80240ADC 3C060020 */ lui $a2, 0x20 -/* 8D1FF0 80240AE0 0C012530 */ jal func_800494C0 -/* 8D1FF4 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D1FF8 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 8D1FFC 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D2000 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 8D2004 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* 8D2008 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 8D200C 80240AFC 080902EB */ j .L80240BAC -/* 8D2010 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* 8D2014 80240B04 080902EB */ j .L80240BAC -/* 8D2018 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* 8D201C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* 8D2020 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 8D2024 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8D2028 80240B18 00000000 */ nop -/* 8D202C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* 8D2030 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8D2034 80240B24 00000000 */ nop -/* 8D2038 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* 8D203C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D2040 80240B30 1840001D */ blez $v0, .L80240BA8 -/* 8D2044 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* 8D2048 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* 8D204C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* 8D2050 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* 8D2054 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8D2058 80240B48 00000000 */ nop -/* 8D205C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* 8D2060 80240B50 3C014334 */ lui $at, 0x4334 -/* 8D2064 80240B54 44816000 */ mtc1 $at, $f12 -/* 8D2068 80240B58 0C00A6C9 */ jal clamp_angle -/* 8D206C 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* 8D2070 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* 8D2074 80240B64 0C00A67F */ jal rand_int -/* 8D2078 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D207C 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* 8D2080 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 8D2084 80240B74 00430018 */ mult $v0, $v1 -/* 8D2088 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* 8D208C 80240B7C 00004010 */ mfhi $t0 -/* 8D2090 80240B80 00082043 */ sra $a0, $t0, 1 -/* 8D2094 80240B84 00832023 */ subu $a0, $a0, $v1 -/* 8D2098 80240B88 00041840 */ sll $v1, $a0, 1 -/* 8D209C 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* 8D20A0 80240B90 00031880 */ sll $v1, $v1, 2 -/* 8D20A4 80240B94 00641823 */ subu $v1, $v1, $a0 -/* 8D20A8 80240B98 00431023 */ subu $v0, $v0, $v1 -/* 8D20AC 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* 8D20B0 80240BA0 080902EB */ j .L80240BAC -/* 8D20B4 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* 8D20B8 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* 8D20BC 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* 8D20C0 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* 8D20C4 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D20C8 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* 8D20CC 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* 8D20D0 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* 8D20D4 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 8D20D8 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 8D20DC 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 8D20E0 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 8D20E4 80240BD4 03E00008 */ jr $ra -/* 8D20E8 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s deleted file mode 100644 index f43c06201e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240E58_8D2368.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_8D2368 -/* 8D2368 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D236C 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* 8D2370 80240E60 0080902D */ daddu $s2, $a0, $zero -/* 8D2374 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* 8D2378 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* 8D237C 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* 8D2380 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* 8D2384 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8D2388 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8D238C 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* 8D2390 80240E80 86240008 */ lh $a0, 8($s1) -/* 8D2394 80240E84 0C00EABB */ jal get_npc_unsafe -/* 8D2398 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* 8D239C 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* 8D23A0 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 8D23A4 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D23A8 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* 8D23AC 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* 8D23B0 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D23B4 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* 8D23B8 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* 8D23BC 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* 8D23C0 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* 8D23C4 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D23C8 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* 8D23CC 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* 8D23D0 80240EC0 3C014059 */ lui $at, 0x4059 -/* 8D23D4 80240EC4 44812800 */ mtc1 $at, $f5 -/* 8D23D8 80240EC8 44802000 */ mtc1 $zero, $f4 -/* 8D23DC 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* 8D23E0 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* 8D23E4 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* 8D23E8 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* 8D23EC 80240EDC 0C00EA95 */ jal npc_move_heading -/* 8D23F0 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* 8D23F4 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D23F8 80240EE8 44801000 */ mtc1 $zero, $f2 -/* 8D23FC 80240EEC 44801800 */ mtc1 $zero, $f3 -/* 8D2400 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* 8D2404 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8D2408 80240EF8 00000000 */ nop -/* 8D240C 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8D2410 80240F00 00000000 */ nop -/* 8D2414 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D2418 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* 8D241C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* 8D2420 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D2424 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* 8D2428 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 8D242C 80240F1C A2200007 */ sb $zero, 7($s1) -/* 8D2430 80240F20 8E020000 */ lw $v0, ($s0) -/* 8D2434 80240F24 30420008 */ andi $v0, $v0, 8 -/* 8D2438 80240F28 14400011 */ bnez $v0, .L80240F70 -/* 8D243C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* 8D2440 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D2444 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D2448 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D244C 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D2450 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D2454 80240F44 3C01447A */ lui $at, 0x447a -/* 8D2458 80240F48 44813000 */ mtc1 $at, $f6 -/* 8D245C 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D2460 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D2464 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D2468 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D246C 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D2470 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2474 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* 8D2478 80240F68 0C0372DF */ jal func_800DCB7C -/* 8D247C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* 8D2480 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8D2484 80240F74 00000000 */ nop -/* 8D2488 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D248C 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* 8D2490 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D2494 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8D2498 80240F88 00000000 */ nop -/* 8D249C 80240F8C 4500008D */ bc1f .L802411C4 -/* 8D24A0 80240F90 00000000 */ nop -/* 8D24A4 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D24A8 80240F98 08090471 */ j .L802411C4 -/* 8D24AC 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* 8D24B0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D24B4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8D24B8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8D24BC 80240FAC 00000000 */ nop -/* 8D24C0 80240FB0 45030084 */ bc1tl .L802411C4 -/* 8D24C4 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* 8D24C8 80240FB8 08090471 */ j .L802411C4 -/* 8D24CC 80240FBC 00000000 */ nop -.L80240FC0: -/* 8D24D0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8D24D4 80240FC4 00000000 */ nop -/* 8D24D8 80240FC8 4500007E */ bc1f .L802411C4 -/* 8D24DC 80240FCC 00000000 */ nop -/* 8D24E0 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* 8D24E4 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* 8D24E8 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* 8D24EC 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* 8D24F0 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* 8D24F4 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* 8D24F8 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* 8D24FC 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8D2500 80240FF0 00000000 */ nop -/* 8D2504 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D2508 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D250C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D2510 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D2514 80241004 A600008E */ sh $zero, 0x8e($s0) -/* 8D2518 80241008 8C460028 */ lw $a2, 0x28($v0) -/* 8D251C 8024100C 0C00A720 */ jal atan2 -/* 8D2520 80241010 8C470030 */ lw $a3, 0x30($v0) -/* 8D2524 80241014 46000506 */ mov.s $f20, $f0 -/* 8D2528 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D252C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* 8D2530 80241020 4600A386 */ mov.s $f14, $f20 -/* 8D2534 80241024 46000086 */ mov.s $f2, $f0 -/* 8D2538 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* 8D253C 8024102C 46001005 */ abs.s $f0, $f2 -/* 8D2540 80241030 44822000 */ mtc1 $v0, $f4 -/* 8D2544 80241034 00000000 */ nop -/* 8D2548 80241038 46802120 */ cvt.s.w $f4, $f4 -/* 8D254C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8D2550 80241040 00000000 */ nop -/* 8D2554 80241044 4500000D */ bc1f .L8024107C -/* 8D2558 80241048 00000000 */ nop -/* 8D255C 8024104C 44800000 */ mtc1 $zero, $f0 -/* 8D2560 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* 8D2564 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8D2568 80241058 00000000 */ nop -/* 8D256C 8024105C 45000006 */ bc1f .L80241078 -/* 8D2570 80241060 00021023 */ negu $v0, $v0 -/* 8D2574 80241064 44820000 */ mtc1 $v0, $f0 -/* 8D2578 80241068 00000000 */ nop -/* 8D257C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* 8D2580 80241070 0809041F */ j .L8024107C -/* 8D2584 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* 8D2588 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* 8D258C 8024107C 0C00A6C9 */ jal clamp_angle -/* 8D2590 80241080 4600A306 */ mov.s $f12, $f20 -/* 8D2594 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* 8D2598 80241088 8E020000 */ lw $v0, ($s0) -/* 8D259C 8024108C 30420008 */ andi $v0, $v0, 8 -/* 8D25A0 80241090 1040000A */ beqz $v0, .L802410BC -/* 8D25A4 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D25A8 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D25AC 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D25B0 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* 8D25B4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8D25B8 802410A8 00000000 */ nop -/* 8D25BC 802410AC 45020045 */ bc1fl .L802411C4 -/* 8D25C0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D25C4 802410B4 08090470 */ j .L802411C0 -/* 8D25C8 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* 8D25CC 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D25D0 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D25D4 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D25D8 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* 8D25DC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D25E0 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 8D25E4 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8D25E8 802410D8 00000000 */ nop -/* 8D25EC 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* 8D25F0 802410E0 46000005 */ abs.s $f0, $f0 -/* 8D25F4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* 8D25F8 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 8D25FC 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D2600 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* 8D2604 802410F4 3C014024 */ lui $at, 0x4024 -/* 8D2608 802410F8 44811800 */ mtc1 $at, $f3 -/* 8D260C 802410FC 44801000 */ mtc1 $zero, $f2 -/* 8D2610 80241100 46000021 */ cvt.d.s $f0, $f0 -/* 8D2614 80241104 46220000 */ add.d $f0, $f0, $f2 -/* 8D2618 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* 8D261C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8D2620 80241110 46200020 */ cvt.s.d $f0, $f0 -/* 8D2624 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* 8D2628 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* 8D262C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* 8D2630 80241120 0C0372DF */ jal func_800DCB7C -/* 8D2634 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D2638 80241128 10400015 */ beqz $v0, .L80241180 -/* 8D263C 8024112C 00000000 */ nop -/* 8D2640 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* 8D2644 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D2648 80241138 44820000 */ mtc1 $v0, $f0 -/* 8D264C 8024113C 00000000 */ nop -/* 8D2650 80241140 46800020 */ cvt.s.w $f0, $f0 -/* 8D2654 80241144 46002085 */ abs.s $f2, $f4 -/* 8D2658 80241148 46020000 */ add.s $f0, $f0, $f2 -/* 8D265C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D2660 80241150 4600103E */ c.le.s $f2, $f0 -/* 8D2664 80241154 00000000 */ nop -/* 8D2668 80241158 45000005 */ bc1f .L80241170 -/* 8D266C 8024115C 00000000 */ nop -/* 8D2670 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D2674 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* 8D2678 80241168 08090471 */ j .L802411C4 -/* 8D267C 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* 8D2680 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D2684 80241174 46040000 */ add.s $f0, $f0, $f4 -/* 8D2688 80241178 08090471 */ j .L802411C4 -/* 8D268C 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* 8D2690 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* 8D2694 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* 8D2698 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* 8D269C 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8D26A0 80241190 00000000 */ nop -/* 8D26A4 80241194 46800020 */ cvt.s.w $f0, $f0 -/* 8D26A8 80241198 46001080 */ add.s $f2, $f2, $f0 -/* 8D26AC 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D26B0 802411A0 46002005 */ abs.s $f0, $f4 -/* 8D26B4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8D26B8 802411A8 00000000 */ nop -/* 8D26BC 802411AC 45020005 */ bc1fl .L802411C4 -/* 8D26C0 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* 8D26C4 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* 8D26C8 802411B8 08090471 */ j .L802411C4 -/* 8D26CC 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* 8D26D0 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* 8D26D4 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* 8D26D8 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* 8D26DC 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* 8D26E0 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D26E4 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* 8D26E8 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8D26EC 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8D26F0 802411E0 03E00008 */ jr $ra -/* 8D26F4 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s deleted file mode 100644 index a101b1d928..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802411E8_8D26F8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_8D26F8 -/* 8D26F8 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D26FC 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* 8D2700 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* 8D2704 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 8D2708 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* 8D270C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 8D2710 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* 8D2714 80241204 AE200070 */ sw $zero, 0x70($s1) -/* 8D2718 80241208 8C830000 */ lw $v1, ($a0) -/* 8D271C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8D2720 80241210 A480008E */ sh $zero, 0x8e($a0) -/* 8D2724 80241214 00621824 */ and $v1, $v1, $v0 -/* 8D2728 80241218 34650800 */ ori $a1, $v1, 0x800 -/* 8D272C 8024121C AC850000 */ sw $a1, ($a0) -/* 8D2730 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8D2734 80241224 8C420034 */ lw $v0, 0x34($v0) -/* 8D2738 80241228 10400003 */ beqz $v0, .L80241238 -/* 8D273C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* 8D2740 80241230 08090490 */ j .L80241240 -/* 8D2744 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* 8D2748 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* 8D274C 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* 8D2750 80241240 AC820000 */ sw $v0, ($a0) -/* 8D2754 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D2758 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D275C 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* 8D2760 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8D2764 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* 8D2768 80241258 3C01447A */ lui $at, 0x447a -/* 8D276C 8024125C 44813000 */ mtc1 $at, $f6 -/* 8D2770 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D2774 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D2778 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D277C 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D2780 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D2784 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2788 80241278 8C840080 */ lw $a0, 0x80($a0) -/* 8D278C 8024127C 0C0372DF */ jal func_800DCB7C -/* 8D2790 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D2794 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D2798 80241288 3C014059 */ lui $at, 0x4059 -/* 8D279C 8024128C 44812800 */ mtc1 $at, $f5 -/* 8D27A0 80241290 44802000 */ mtc1 $zero, $f4 -/* 8D27A4 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* 8D27A8 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8D27AC 8024129C 00000000 */ nop -/* 8D27B0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D27B4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* 8D27B8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8D27BC 802412AC 00000000 */ nop -/* 8D27C0 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* 8D27C4 802412B4 44812800 */ mtc1 $at, $f5 -/* 8D27C8 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8D27CC 802412BC 00000000 */ nop -/* 8D27D0 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* 8D27D4 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* 8D27D8 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* 8D27DC 802412CC AE000090 */ sw $zero, 0x90($s0) -/* 8D27E0 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* 8D27E4 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* 8D27E8 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* 8D27EC 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* 8D27F0 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* 8D27F4 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* 8D27F8 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8D27FC 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* 8D2800 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 8D2804 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8D2808 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* 8D280C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D2810 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* 8D2814 80241304 03E00008 */ jr $ra -/* 8D2818 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index 29f8f8ee9d..98a0af9d85 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -46,7 +46,7 @@ glabel func_8024130C_8D281C /* 8D28C0 802413B0 02A0202D */ daddu $a0, $s5, $zero /* 8D28C4 802413B4 0240282D */ daddu $a1, $s2, $zero /* 8D28C8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D28CC 802413BC 0C09047A */ jal func_802411E8_8D26F8 +/* 8D28CC 802413BC 0C09047A */ jal kmr_06_UnkFunc5 /* 8D28D0 802413C0 0200382D */ daddu $a3, $s0, $zero .L802413C4: /* 8D28D4 802413C4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241440_8D2950 glabel L80241450_8D2960 /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D2968 80241458 0C090226 */ jal func_80240898_8D1DA8 +/* 8D2968 80241458 0C090226 */ jal kmr_06_UnkFunc4 /* 8D296C 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8D2970 80241460 08090535 */ j .L802414D4 /* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802414A8_8D29B8 glabel L802414C0_8D29D0 /* 8D29D0 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8D29D4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D29D8 802414C8 0C090396 */ jal func_80240E58_8D2368 +/* 8D29D8 802414C8 0C090396 */ jal kmr_06_UnkFunc6 /* 8D29DC 802414CC 0260302D */ daddu $a2, $s3, $zero glabel L802414D0_8D29E0 /* 8D29E0 802414D0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s deleted file mode 100644 index 0beed7aa03..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240898_8D6698.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898_8D6698 -/* 8D6698 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 8D669C 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* 8D66A0 802408A0 0080982D */ daddu $s3, $a0, $zero -/* 8D66A4 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 8D66A8 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* 8D66AC 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* 8D66B0 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* 8D66B4 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* 8D66B8 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 8D66BC 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 8D66C0 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 8D66C4 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 8D66C8 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* 8D66CC 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* 8D66D0 802408D0 86240008 */ lh $a0, 8($s1) -/* 8D66D4 802408D4 0C00EABB */ jal get_npc_unsafe -/* 8D66D8 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* 8D66DC 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 8D66E0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D66E4 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* 8D66E8 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* 8D66EC 802408EC 3C014059 */ lui $at, 0x4059 -/* 8D66F0 802408F0 44811800 */ mtc1 $at, $f3 -/* 8D66F4 802408F4 44801000 */ mtc1 $zero, $f2 -/* 8D66F8 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* 8D66FC 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* 8D6700 80240900 46220003 */ div.d $f0, $f0, $f2 -/* 8D6704 80240904 46200620 */ cvt.s.d $f24, $f0 -/* 8D6708 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* 8D670C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6710 80240910 46000021 */ cvt.d.s $f0, $f0 -/* 8D6714 80240914 46220003 */ div.d $f0, $f0, $f2 -/* 8D6718 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 8D671C 8024091C 18400003 */ blez $v0, .L8024092C -/* 8D6720 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* 8D6724 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* 8D6728 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* 8D672C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* 8D6730 80240930 18400034 */ blez $v0, .L80240A04 -/* 8D6734 80240934 00000000 */ nop -/* 8D6738 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8D673C 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* 8D6740 80240940 44820000 */ mtc1 $v0, $f0 -/* 8D6744 80240944 00000000 */ nop -/* 8D6748 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 8D674C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 8D6750 80240950 46220003 */ div.d $f0, $f0, $f2 -/* 8D6754 80240954 0C00A8BB */ jal sin_deg -/* 8D6758 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* 8D675C 8024095C 8E020000 */ lw $v0, ($s0) -/* 8D6760 80240960 30420008 */ andi $v0, $v0, 8 -/* 8D6764 80240964 10400003 */ beqz $v0, .L80240974 -/* 8D6768 80240968 46000506 */ mov.s $f20, $f0 -/* 8D676C 8024096C 0809026D */ j .L802409B4 -/* 8D6770 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 8D6774 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* 8D6778 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* 8D677C 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6780 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6784 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D6788 80240988 3C01447A */ lui $at, 0x447a -/* 8D678C 8024098C 44813000 */ mtc1 $at, $f6 -/* 8D6790 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* 8D6794 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D6798 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8D679C 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* 8D67A0 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8D67A4 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* 8D67A8 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* 8D67AC 802409AC 0C0372DF */ jal func_800DCB7C -/* 8D67B0 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* 8D67B4 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8D67B8 802409B8 00000000 */ nop -/* 8D67BC 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8D67C0 802409C0 00000000 */ nop -/* 8D67C4 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8D67C8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 8D67CC 802409CC 08090278 */ j .L802409E0 -/* 8D67D0 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* 8D67D4 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8D67D8 802409D8 00000000 */ nop -/* 8D67DC 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* 8D67E0 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 8D67E4 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* 8D67E8 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* 8D67EC 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8D67F0 802409F0 00000000 */ nop -/* 8D67F4 802409F4 0C00A6C9 */ jal clamp_angle -/* 8D67F8 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* 8D67FC 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* 8D6800 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* 8D6804 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* 8D6808 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* 8D680C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D6810 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6814 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6818 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8D681C 80240A1C 00000000 */ nop -/* 8D6820 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6824 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6828 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D682C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* 8D6830 80240A30 3C014024 */ lui $at, 0x4024 -/* 8D6834 80240A34 44812800 */ mtc1 $at, $f5 -/* 8D6838 80240A38 44802000 */ mtc1 $zero, $f4 -/* 8D683C 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* 8D6840 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* 8D6844 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 8D6848 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* 8D684C 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8D6850 80240A50 00000000 */ nop -/* 8D6854 80240A54 4500002E */ bc1f .L80240B10 -/* 8D6858 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 8D685C 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 8D6860 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D6864 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* 8D6868 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* 8D686C 80240A6C 0C01242D */ jal func_800490B4 -/* 8D6870 80240A70 0220282D */ daddu $a1, $s1, $zero -/* 8D6874 80240A74 10400026 */ beqz $v0, .L80240B10 -/* 8D6878 80240A78 0000202D */ daddu $a0, $zero, $zero -/* 8D687C 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* 8D6880 80240A80 0000302D */ daddu $a2, $zero, $zero -/* 8D6884 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* 8D6888 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8D688C 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* 8D6890 80240A90 44810000 */ mtc1 $at, $f0 -/* 8D6894 80240A94 3C014000 */ lui $at, 0x4000 -/* 8D6898 80240A98 44811000 */ mtc1 $at, $f2 -/* 8D689C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D68A0 80240AA0 44812000 */ mtc1 $at, $f4 -/* 8D68A4 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8D68A8 80240AA8 00000000 */ nop -/* 8D68AC 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* 8D68B0 80240AB0 44074000 */ mfc1 $a3, $f8 -/* 8D68B4 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* 8D68B8 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 8D68BC 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* 8D68C0 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D68C4 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D68C8 80240AC8 0C01BFA4 */ jal fx_emote -/* 8D68CC 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D68D0 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* 8D68D4 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D68D8 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8D68DC 80240ADC 3C060020 */ lui $a2, 0x20 -/* 8D68E0 80240AE0 0C012530 */ jal func_800494C0 -/* 8D68E4 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8D68E8 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 8D68EC 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 8D68F0 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 8D68F4 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* 8D68F8 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 8D68FC 80240AFC 080902EB */ j .L80240BAC -/* 8D6900 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* 8D6904 80240B04 080902EB */ j .L80240BAC -/* 8D6908 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* 8D690C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* 8D6910 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 8D6914 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8D6918 80240B18 00000000 */ nop -/* 8D691C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* 8D6920 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8D6924 80240B24 00000000 */ nop -/* 8D6928 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* 8D692C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* 8D6930 80240B30 1840001D */ blez $v0, .L80240BA8 -/* 8D6934 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* 8D6938 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* 8D693C 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* 8D6940 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* 8D6944 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8D6948 80240B48 00000000 */ nop -/* 8D694C 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* 8D6950 80240B50 3C014334 */ lui $at, 0x4334 -/* 8D6954 80240B54 44816000 */ mtc1 $at, $f12 -/* 8D6958 80240B58 0C00A6C9 */ jal clamp_angle -/* 8D695C 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* 8D6960 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* 8D6964 80240B64 0C00A67F */ jal rand_int -/* 8D6968 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8D696C 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* 8D6970 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 8D6974 80240B74 00430018 */ mult $v0, $v1 -/* 8D6978 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* 8D697C 80240B7C 00004010 */ mfhi $t0 -/* 8D6980 80240B80 00082043 */ sra $a0, $t0, 1 -/* 8D6984 80240B84 00832023 */ subu $a0, $a0, $v1 -/* 8D6988 80240B88 00041840 */ sll $v1, $a0, 1 -/* 8D698C 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* 8D6990 80240B90 00031880 */ sll $v1, $v1, 2 -/* 8D6994 80240B94 00641823 */ subu $v1, $v1, $a0 -/* 8D6998 80240B98 00431023 */ subu $v0, $v0, $v1 -/* 8D699C 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* 8D69A0 80240BA0 080902EB */ j .L80240BAC -/* 8D69A4 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* 8D69A8 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* 8D69AC 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* 8D69B0 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* 8D69B4 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* 8D69B8 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* 8D69BC 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* 8D69C0 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* 8D69C4 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 8D69C8 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 8D69CC 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 8D69D0 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 8D69D4 80240BD4 03E00008 */ jr $ra -/* 8D69D8 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s deleted file mode 100644 index 2012851360..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240E58_8D6C58.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58_8D6C58 -/* 8D6C58 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D6C5C 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* 8D6C60 80240E60 0080902D */ daddu $s2, $a0, $zero -/* 8D6C64 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* 8D6C68 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* 8D6C6C 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* 8D6C70 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* 8D6C74 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8D6C78 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8D6C7C 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* 8D6C80 80240E80 86240008 */ lh $a0, 8($s1) -/* 8D6C84 80240E84 0C00EABB */ jal get_npc_unsafe -/* 8D6C88 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* 8D6C8C 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* 8D6C90 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 8D6C94 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8D6C98 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6C9C 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* 8D6CA0 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6CA4 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* 8D6CA8 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* 8D6CAC 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* 8D6CB0 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* 8D6CB4 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D6CB8 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* 8D6CBC 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* 8D6CC0 80240EC0 3C014059 */ lui $at, 0x4059 -/* 8D6CC4 80240EC4 44812800 */ mtc1 $at, $f5 -/* 8D6CC8 80240EC8 44802000 */ mtc1 $zero, $f4 -/* 8D6CCC 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* 8D6CD0 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* 8D6CD4 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* 8D6CD8 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* 8D6CDC 80240EDC 0C00EA95 */ jal npc_move_heading -/* 8D6CE0 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* 8D6CE4 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6CE8 80240EE8 44801000 */ mtc1 $zero, $f2 -/* 8D6CEC 80240EEC 44801800 */ mtc1 $zero, $f3 -/* 8D6CF0 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* 8D6CF4 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8D6CF8 80240EF8 00000000 */ nop -/* 8D6CFC 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8D6D00 80240F00 00000000 */ nop -/* 8D6D04 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6D08 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* 8D6D0C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* 8D6D10 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D6D14 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* 8D6D18 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 8D6D1C 80240F1C A2200007 */ sb $zero, 7($s1) -/* 8D6D20 80240F20 8E020000 */ lw $v0, ($s0) -/* 8D6D24 80240F24 30420008 */ andi $v0, $v0, 8 -/* 8D6D28 80240F28 14400011 */ bnez $v0, .L80240F70 -/* 8D6D2C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* 8D6D30 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D6D34 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D6D38 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6D3C 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6D40 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8D6D44 80240F44 3C01447A */ lui $at, 0x447a -/* 8D6D48 80240F48 44813000 */ mtc1 $at, $f6 -/* 8D6D4C 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D6D50 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D6D54 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D6D58 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D6D5C 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D6D60 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* 8D6D64 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* 8D6D68 80240F68 0C0372DF */ jal func_800DCB7C -/* 8D6D6C 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* 8D6D70 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8D6D74 80240F74 00000000 */ nop -/* 8D6D78 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D6D7C 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* 8D6D80 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6D84 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8D6D88 80240F88 00000000 */ nop -/* 8D6D8C 80240F8C 4500008D */ bc1f .L802411C4 -/* 8D6D90 80240F90 00000000 */ nop -/* 8D6D94 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D6D98 80240F98 08090471 */ j .L802411C4 -/* 8D6D9C 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* 8D6DA0 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6DA4 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8D6DA8 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8D6DAC 80240FAC 00000000 */ nop -/* 8D6DB0 80240FB0 45030084 */ bc1tl .L802411C4 -/* 8D6DB4 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* 8D6DB8 80240FB8 08090471 */ j .L802411C4 -/* 8D6DBC 80240FBC 00000000 */ nop -.L80240FC0: -/* 8D6DC0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8D6DC4 80240FC4 00000000 */ nop -/* 8D6DC8 80240FC8 4500007E */ bc1f .L802411C4 -/* 8D6DCC 80240FCC 00000000 */ nop -/* 8D6DD0 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* 8D6DD4 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* 8D6DD8 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* 8D6DDC 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* 8D6DE0 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* 8D6DE4 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* 8D6DE8 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* 8D6DEC 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8D6DF0 80240FF0 00000000 */ nop -/* 8D6DF4 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D6DF8 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D6DFC 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D6E00 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D6E04 80241004 A600008E */ sh $zero, 0x8e($s0) -/* 8D6E08 80241008 8C460028 */ lw $a2, 0x28($v0) -/* 8D6E0C 8024100C 0C00A720 */ jal atan2 -/* 8D6E10 80241010 8C470030 */ lw $a3, 0x30($v0) -/* 8D6E14 80241014 46000506 */ mov.s $f20, $f0 -/* 8D6E18 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D6E1C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* 8D6E20 80241020 4600A386 */ mov.s $f14, $f20 -/* 8D6E24 80241024 46000086 */ mov.s $f2, $f0 -/* 8D6E28 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* 8D6E2C 8024102C 46001005 */ abs.s $f0, $f2 -/* 8D6E30 80241030 44822000 */ mtc1 $v0, $f4 -/* 8D6E34 80241034 00000000 */ nop -/* 8D6E38 80241038 46802120 */ cvt.s.w $f4, $f4 -/* 8D6E3C 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8D6E40 80241040 00000000 */ nop -/* 8D6E44 80241044 4500000D */ bc1f .L8024107C -/* 8D6E48 80241048 00000000 */ nop -/* 8D6E4C 8024104C 44800000 */ mtc1 $zero, $f0 -/* 8D6E50 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* 8D6E54 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8D6E58 80241058 00000000 */ nop -/* 8D6E5C 8024105C 45000006 */ bc1f .L80241078 -/* 8D6E60 80241060 00021023 */ negu $v0, $v0 -/* 8D6E64 80241064 44820000 */ mtc1 $v0, $f0 -/* 8D6E68 80241068 00000000 */ nop -/* 8D6E6C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6E70 80241070 0809041F */ j .L8024107C -/* 8D6E74 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* 8D6E78 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* 8D6E7C 8024107C 0C00A6C9 */ jal clamp_angle -/* 8D6E80 80241080 4600A306 */ mov.s $f12, $f20 -/* 8D6E84 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* 8D6E88 80241088 8E020000 */ lw $v0, ($s0) -/* 8D6E8C 8024108C 30420008 */ andi $v0, $v0, 8 -/* 8D6E90 80241090 1040000A */ beqz $v0, .L802410BC -/* 8D6E94 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D6E98 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8D6E9C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D6EA0 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* 8D6EA4 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8D6EA8 802410A8 00000000 */ nop -/* 8D6EAC 802410AC 45020045 */ bc1fl .L802411C4 -/* 8D6EB0 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* 8D6EB4 802410B4 08090470 */ j .L802411C0 -/* 8D6EB8 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* 8D6EBC 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8D6EC0 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D6EC4 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D6EC8 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6ECC 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* 8D6ED0 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 8D6ED4 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8D6ED8 802410D8 00000000 */ nop -/* 8D6EDC 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* 8D6EE0 802410E0 46000005 */ abs.s $f0, $f0 -/* 8D6EE4 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* 8D6EE8 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 8D6EEC 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D6EF0 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* 8D6EF4 802410F4 3C014024 */ lui $at, 0x4024 -/* 8D6EF8 802410F8 44811800 */ mtc1 $at, $f3 -/* 8D6EFC 802410FC 44801000 */ mtc1 $zero, $f2 -/* 8D6F00 80241100 46000021 */ cvt.d.s $f0, $f0 -/* 8D6F04 80241104 46220000 */ add.d $f0, $f0, $f2 -/* 8D6F08 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* 8D6F0C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8D6F10 80241110 46200020 */ cvt.s.d $f0, $f0 -/* 8D6F14 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* 8D6F18 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* 8D6F1C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* 8D6F20 80241120 0C0372DF */ jal func_800DCB7C -/* 8D6F24 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D6F28 80241128 10400015 */ beqz $v0, .L80241180 -/* 8D6F2C 8024112C 00000000 */ nop -/* 8D6F30 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6F34 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6F38 80241138 44820000 */ mtc1 $v0, $f0 -/* 8D6F3C 8024113C 00000000 */ nop -/* 8D6F40 80241140 46800020 */ cvt.s.w $f0, $f0 -/* 8D6F44 80241144 46002085 */ abs.s $f2, $f4 -/* 8D6F48 80241148 46020000 */ add.s $f0, $f0, $f2 -/* 8D6F4C 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D6F50 80241150 4600103E */ c.le.s $f2, $f0 -/* 8D6F54 80241154 00000000 */ nop -/* 8D6F58 80241158 45000005 */ bc1f .L80241170 -/* 8D6F5C 8024115C 00000000 */ nop -/* 8D6F60 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D6F64 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* 8D6F68 80241168 08090471 */ j .L802411C4 -/* 8D6F6C 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* 8D6F70 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D6F74 80241174 46040000 */ add.s $f0, $f0, $f4 -/* 8D6F78 80241178 08090471 */ j .L802411C4 -/* 8D6F7C 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* 8D6F80 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* 8D6F84 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* 8D6F88 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* 8D6F8C 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8D6F90 80241190 00000000 */ nop -/* 8D6F94 80241194 46800020 */ cvt.s.w $f0, $f0 -/* 8D6F98 80241198 46001080 */ add.s $f2, $f2, $f0 -/* 8D6F9C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* 8D6FA0 802411A0 46002005 */ abs.s $f0, $f4 -/* 8D6FA4 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8D6FA8 802411A8 00000000 */ nop -/* 8D6FAC 802411AC 45020005 */ bc1fl .L802411C4 -/* 8D6FB0 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* 8D6FB4 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* 8D6FB8 802411B8 08090471 */ j .L802411C4 -/* 8D6FBC 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* 8D6FC0 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* 8D6FC4 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* 8D6FC8 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* 8D6FCC 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* 8D6FD0 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D6FD4 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* 8D6FD8 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8D6FDC 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8D6FE0 802411E0 03E00008 */ jr $ra -/* 8D6FE4 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s deleted file mode 100644 index c62f1cb59b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802411E8_8D6FE8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8_8D6FE8 -/* 8D6FE8 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D6FEC 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* 8D6FF0 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* 8D6FF4 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 8D6FF8 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* 8D6FFC 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 8D7000 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* 8D7004 80241204 AE200070 */ sw $zero, 0x70($s1) -/* 8D7008 80241208 8C830000 */ lw $v1, ($a0) -/* 8D700C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8D7010 80241210 A480008E */ sh $zero, 0x8e($a0) -/* 8D7014 80241214 00621824 */ and $v1, $v1, $v0 -/* 8D7018 80241218 34650800 */ ori $a1, $v1, 0x800 -/* 8D701C 8024121C AC850000 */ sw $a1, ($a0) -/* 8D7020 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8D7024 80241224 8C420034 */ lw $v0, 0x34($v0) -/* 8D7028 80241228 10400003 */ beqz $v0, .L80241238 -/* 8D702C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* 8D7030 80241230 08090490 */ j .L80241240 -/* 8D7034 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* 8D7038 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* 8D703C 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* 8D7040 80241240 AC820000 */ sw $v0, ($a0) -/* 8D7044 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* 8D7048 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* 8D704C 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* 8D7050 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8D7054 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* 8D7058 80241258 3C01447A */ lui $at, 0x447a -/* 8D705C 8024125C 44813000 */ mtc1 $at, $f6 -/* 8D7060 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* 8D7064 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D7068 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8D706C 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8D7070 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* 8D7074 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* 8D7078 80241278 8C840080 */ lw $a0, 0x80($a0) -/* 8D707C 8024127C 0C0372DF */ jal func_800DCB7C -/* 8D7080 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* 8D7084 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8D7088 80241288 3C014059 */ lui $at, 0x4059 -/* 8D708C 8024128C 44812800 */ mtc1 $at, $f5 -/* 8D7090 80241290 44802000 */ mtc1 $zero, $f4 -/* 8D7094 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* 8D7098 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8D709C 8024129C 00000000 */ nop -/* 8D70A0 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8D70A4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* 8D70A8 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8D70AC 802412AC 00000000 */ nop -/* 8D70B0 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* 8D70B4 802412B4 44812800 */ mtc1 $at, $f5 -/* 8D70B8 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8D70BC 802412BC 00000000 */ nop -/* 8D70C0 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* 8D70C4 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* 8D70C8 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* 8D70CC 802412CC AE000090 */ sw $zero, 0x90($s0) -/* 8D70D0 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* 8D70D4 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* 8D70D8 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* 8D70DC 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* 8D70E0 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* 8D70E4 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* 8D70E8 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8D70EC 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* 8D70F0 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 8D70F4 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8D70F8 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* 8D70FC 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* 8D7100 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* 8D7104 80241304 03E00008 */ jr $ra -/* 8D7108 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index c18bd02178..d817d310a9 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -46,7 +46,7 @@ glabel func_8024130C_8D710C /* 8D71B0 802413B0 02A0202D */ daddu $a0, $s5, $zero /* 8D71B4 802413B4 0240282D */ daddu $a1, $s2, $zero /* 8D71B8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D71BC 802413BC 0C09047A */ jal func_802411E8_8D6FE8 +/* 8D71BC 802413BC 0C09047A */ jal kmr_09_UnkFunc5 /* 8D71C0 802413C0 0200382D */ daddu $a3, $s0, $zero .L802413C4: /* 8D71C4 802413C4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241440_8D7240 glabel L80241450_8D7250 /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D7258 80241458 0C090226 */ jal func_80240898_8D6698 +/* 8D7258 80241458 0C090226 */ jal kmr_09_UnkFunc4 /* 8D725C 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8D7260 80241460 08090535 */ j .L802414D4 /* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802414A8_8D72A8 glabel L802414C0_8D72C0 /* 8D72C0 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8D72C4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D72C8 802414C8 0C090396 */ jal func_80240E58_8D6C58 +/* 8D72C8 802414C8 0C090396 */ jal kmr_09_UnkFunc6 /* 8D72CC 802414CC 0260302D */ daddu $a2, $s3, $zero glabel L802414D0_8D72D0 /* 8D72D0 802414D0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s deleted file mode 100644 index 81c31079dd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_04/A4BF60/func_80240000_A4BF60.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A4BF60 -/* A4BF60 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4BF64 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A4BF68 80240008 0080802D */ daddu $s0, $a0, $zero -/* A4BF6C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A4BF70 80240010 8E02000C */ lw $v0, 0xc($s0) -/* A4BF74 80240014 0C0B1EAF */ jal get_variable -/* A4BF78 80240018 8C450000 */ lw $a1, ($v0) -/* A4BF7C 8024001C 0040302D */ daddu $a2, $v0, $zero -/* A4BF80 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) -/* A4BF84 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) -/* A4BF88 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* A4BF8C 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* A4BF90 80240030 10A60004 */ beq $a1, $a2, .L80240044 -/* A4BF94 80240034 24020014 */ addiu $v0, $zero, 0x14 -/* A4BF98 80240038 808300B4 */ lb $v1, 0xb4($a0) -/* A4BF9C 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* A4BFA0 80240040 00000000 */ nop -.L80240044: -/* A4BFA4 80240044 8C820014 */ lw $v0, 0x14($a0) -/* A4BFA8 80240048 3C03FFFF */ lui $v1, 0xffff -/* A4BFAC 8024004C 00431024 */ and $v0, $v0, $v1 -/* A4BFB0 80240050 10400005 */ beqz $v0, .L80240068 -/* A4BFB4 80240054 00000000 */ nop -.L80240058: -/* A4BFB8 80240058 0C039769 */ jal set_action_state -/* A4BFBC 8024005C 0000202D */ daddu $a0, $zero, $zero -/* A4BFC0 80240060 0809002A */ j .L802400A8 -/* A4BFC4 80240064 AE000084 */ sw $zero, 0x84($s0) -.L80240068: -/* A4BFC8 80240068 54A6000F */ bnel $a1, $a2, .L802400A8 -/* A4BFCC 8024006C AE000084 */ sw $zero, 0x84($s0) -/* A4BFD0 80240070 808300B4 */ lb $v1, 0xb4($a0) -/* A4BFD4 80240074 24020014 */ addiu $v0, $zero, 0x14 -/* A4BFD8 80240078 10620005 */ beq $v1, $v0, .L80240090 -/* A4BFDC 8024007C 24020001 */ addiu $v0, $zero, 1 -/* A4BFE0 80240080 10620003 */ beq $v1, $v0, .L80240090 -/* A4BFE4 80240084 24020002 */ addiu $v0, $zero, 2 -/* A4BFE8 80240088 54620008 */ bnel $v1, $v0, .L802400AC -/* A4BFEC 8024008C AE000084 */ sw $zero, 0x84($s0) -.L80240090: -/* A4BFF0 80240090 8C820004 */ lw $v0, 4($a0) -/* A4BFF4 80240094 30420001 */ andi $v0, $v0, 1 -/* A4BFF8 80240098 54400003 */ bnel $v0, $zero, .L802400A8 -/* A4BFFC 8024009C AE000084 */ sw $zero, 0x84($s0) -/* A4C000 802400A0 24020001 */ addiu $v0, $zero, 1 -/* A4C004 802400A4 AE020084 */ sw $v0, 0x84($s0) -.L802400A8: -/* A4C008 802400A8 24020002 */ addiu $v0, $zero, 2 -.L802400AC: -/* A4C00C 802400AC 8FBF0014 */ lw $ra, 0x14($sp) -/* A4C010 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* A4C014 802400B4 03E00008 */ jr $ra -/* A4C018 802400B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s deleted file mode 100644 index c14ddb43a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240000_A99590.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A99590 -/* A99590 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A99594 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A99598 80240008 0080802D */ daddu $s0, $a0, $zero -/* A9959C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A995A0 80240010 8E02000C */ lw $v0, 0xc($s0) -/* A995A4 80240014 0C0B1EAF */ jal get_variable -/* A995A8 80240018 8C450000 */ lw $a1, ($v0) -/* A995AC 8024001C 0040302D */ daddu $a2, $v0, $zero -/* A995B0 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) -/* A995B4 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) -/* A995B8 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* A995BC 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* A995C0 80240030 10A60004 */ beq $a1, $a2, .L80240044 -/* A995C4 80240034 24020014 */ addiu $v0, $zero, 0x14 -/* A995C8 80240038 808300B4 */ lb $v1, 0xb4($a0) -/* A995CC 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* A995D0 80240040 00000000 */ nop -.L80240044: -/* A995D4 80240044 8C820014 */ lw $v0, 0x14($a0) -/* A995D8 80240048 3C03FFFF */ lui $v1, 0xffff -/* A995DC 8024004C 00431024 */ and $v0, $v0, $v1 -/* A995E0 80240050 10400005 */ beqz $v0, .L80240068 -/* A995E4 80240054 00000000 */ nop -.L80240058: -/* A995E8 80240058 0C039769 */ jal set_action_state -/* A995EC 8024005C 0000202D */ daddu $a0, $zero, $zero -/* A995F0 80240060 0809002A */ j .L802400A8 -/* A995F4 80240064 AE000084 */ sw $zero, 0x84($s0) -.L80240068: -/* A995F8 80240068 54A6000F */ bnel $a1, $a2, .L802400A8 -/* A995FC 8024006C AE000084 */ sw $zero, 0x84($s0) -/* A99600 80240070 808300B4 */ lb $v1, 0xb4($a0) -/* A99604 80240074 24020014 */ addiu $v0, $zero, 0x14 -/* A99608 80240078 10620005 */ beq $v1, $v0, .L80240090 -/* A9960C 8024007C 24020001 */ addiu $v0, $zero, 1 -/* A99610 80240080 10620003 */ beq $v1, $v0, .L80240090 -/* A99614 80240084 24020002 */ addiu $v0, $zero, 2 -/* A99618 80240088 54620008 */ bnel $v1, $v0, .L802400AC -/* A9961C 8024008C AE000084 */ sw $zero, 0x84($s0) -.L80240090: -/* A99620 80240090 8C820004 */ lw $v0, 4($a0) -/* A99624 80240094 30420001 */ andi $v0, $v0, 1 -/* A99628 80240098 54400003 */ bnel $v0, $zero, .L802400A8 -/* A9962C 8024009C AE000084 */ sw $zero, 0x84($s0) -/* A99630 802400A0 24020001 */ addiu $v0, $zero, 1 -/* A99634 802400A4 AE020084 */ sw $v0, 0x84($s0) -.L802400A8: -/* A99638 802400A8 24020002 */ addiu $v0, $zero, 2 -.L802400AC: -/* A9963C 802400AC 8FBF0014 */ lw $ra, 0x14($sp) -/* A99640 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* A99644 802400B4 03E00008 */ jr $ra -/* A99648 802400B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s deleted file mode 100644 index 97851e8a90..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802400BC_A9964C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_A9964C -/* A9964C 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A99650 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* A99654 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* A99658 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* A9965C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A99660 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A99664 802400D4 14400005 */ bnez $v0, .L802400EC -/* A99668 802400D8 00000000 */ nop -/* A9966C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* A99670 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* A99674 802400E4 0809003E */ j .L802400F8 -/* A99678 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* A9967C 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* A99680 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A99684 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* A99688 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* A9968C 802400FC 0000202D */ daddu $a0, $zero, $zero -/* A99690 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* A99694 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* A99698 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* A9969C 8024010C 3C014120 */ lui $at, 0x4120 -/* A996A0 80240110 44811000 */ mtc1 $at, $f2 -/* A996A4 80240114 3C014220 */ lui $at, 0x4220 -/* A996A8 80240118 44813000 */ mtc1 $at, $f6 -/* A996AC 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* A996B0 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* A996B4 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* A996B8 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* A996BC 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* A996C0 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* A996C4 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* A996C8 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A996CC 8024013C 0C0372DF */ jal func_800DCB7C -/* A996D0 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* A996D4 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A996D8 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A996DC 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A996E0 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* A996E4 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* A996E8 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* A996EC 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* A996F0 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* A996F4 80240164 24020002 */ addiu $v0, $zero, 2 -/* A996F8 80240168 03E00008 */ jr $ra -/* A996FC 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s deleted file mode 100644 index 10943f472b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240040_A9CC70.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040_A9CC70 -/* A9CC70 80240040 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9CC74 80240044 AFB00010 */ sw $s0, 0x10($sp) -/* A9CC78 80240048 0080802D */ daddu $s0, $a0, $zero -/* A9CC7C 8024004C AFBF0014 */ sw $ra, 0x14($sp) -/* A9CC80 80240050 8E02000C */ lw $v0, 0xc($s0) -/* A9CC84 80240054 0C0B1EAF */ jal get_variable -/* A9CC88 80240058 8C450000 */ lw $a1, ($v0) -/* A9CC8C 8024005C 0040302D */ daddu $a2, $v0, $zero -/* A9CC90 80240060 3C058016 */ lui $a1, %hi(gCollisionStatus) -/* A9CC94 80240064 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) -/* A9CC98 80240068 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* A9CC9C 8024006C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* A9CCA0 80240070 10A60004 */ beq $a1, $a2, .L80240084 -/* A9CCA4 80240074 24020014 */ addiu $v0, $zero, 0x14 -/* A9CCA8 80240078 808300B4 */ lb $v1, 0xb4($a0) -/* A9CCAC 8024007C 10620006 */ beq $v1, $v0, .L80240098 -/* A9CCB0 80240080 00000000 */ nop -.L80240084: -/* A9CCB4 80240084 8C820014 */ lw $v0, 0x14($a0) -/* A9CCB8 80240088 3C03FFFF */ lui $v1, 0xffff -/* A9CCBC 8024008C 00431024 */ and $v0, $v0, $v1 -/* A9CCC0 80240090 10400005 */ beqz $v0, .L802400A8 -/* A9CCC4 80240094 00000000 */ nop -.L80240098: -/* A9CCC8 80240098 0C039769 */ jal set_action_state -/* A9CCCC 8024009C 0000202D */ daddu $a0, $zero, $zero -/* A9CCD0 802400A0 0809003A */ j .L802400E8 -/* A9CCD4 802400A4 AE000084 */ sw $zero, 0x84($s0) -.L802400A8: -/* A9CCD8 802400A8 54A6000F */ bnel $a1, $a2, .L802400E8 -/* A9CCDC 802400AC AE000084 */ sw $zero, 0x84($s0) -/* A9CCE0 802400B0 808300B4 */ lb $v1, 0xb4($a0) -/* A9CCE4 802400B4 24020014 */ addiu $v0, $zero, 0x14 -/* A9CCE8 802400B8 10620005 */ beq $v1, $v0, .L802400D0 -/* A9CCEC 802400BC 24020001 */ addiu $v0, $zero, 1 -/* A9CCF0 802400C0 10620003 */ beq $v1, $v0, .L802400D0 -/* A9CCF4 802400C4 24020002 */ addiu $v0, $zero, 2 -/* A9CCF8 802400C8 54620008 */ bnel $v1, $v0, .L802400EC -/* A9CCFC 802400CC AE000084 */ sw $zero, 0x84($s0) -.L802400D0: -/* A9CD00 802400D0 8C820004 */ lw $v0, 4($a0) -/* A9CD04 802400D4 30420001 */ andi $v0, $v0, 1 -/* A9CD08 802400D8 54400003 */ bnel $v0, $zero, .L802400E8 -/* A9CD0C 802400DC AE000084 */ sw $zero, 0x84($s0) -/* A9CD10 802400E0 24020001 */ addiu $v0, $zero, 1 -/* A9CD14 802400E4 AE020084 */ sw $v0, 0x84($s0) -.L802400E8: -/* A9CD18 802400E8 24020002 */ addiu $v0, $zero, 2 -.L802400EC: -/* A9CD1C 802400EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9CD20 802400F0 8FB00010 */ lw $s0, 0x10($sp) -/* A9CD24 802400F4 03E00008 */ jr $ra -/* A9CD28 802400F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s deleted file mode 100644 index fdd3c176aa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC_A9CD2C -/* A9CD2C 802400FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9CD30 80240100 AFBF002C */ sw $ra, 0x2c($sp) -/* A9CD34 80240104 AFB00028 */ sw $s0, 0x28($sp) -/* A9CD38 80240108 8C820098 */ lw $v0, 0x98($a0) -/* A9CD3C 8024010C 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A9CD40 80240110 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A9CD44 80240114 14400005 */ bnez $v0, .L8024012C -/* A9CD48 80240118 00000000 */ nop -/* A9CD4C 8024011C C4800084 */ lwc1 $f0, 0x84($a0) -/* A9CD50 80240120 46800020 */ cvt.s.w $f0, $f0 -/* A9CD54 80240124 0809004E */ j .L80240138 -/* A9CD58 80240128 E6000028 */ swc1 $f0, 0x28($s0) -.L8024012C: -/* A9CD5C 8024012C C4800084 */ lwc1 $f0, 0x84($a0) -/* A9CD60 80240130 46800020 */ cvt.s.w $f0, $f0 -/* A9CD64 80240134 E6000030 */ swc1 $f0, 0x30($s0) -.L80240138: -/* A9CD68 80240138 27A20024 */ addiu $v0, $sp, 0x24 -/* A9CD6C 8024013C 0000202D */ daddu $a0, $zero, $zero -/* A9CD70 80240140 27A50018 */ addiu $a1, $sp, 0x18 -/* A9CD74 80240144 27A6001C */ addiu $a2, $sp, 0x1c -/* A9CD78 80240148 C6000028 */ lwc1 $f0, 0x28($s0) -/* A9CD7C 8024014C 3C014120 */ lui $at, 0x4120 -/* A9CD80 80240150 44811000 */ mtc1 $at, $f2 -/* A9CD84 80240154 3C014220 */ lui $at, 0x4220 -/* A9CD88 80240158 44813000 */ mtc1 $at, $f6 -/* A9CD8C 8024015C 27A70020 */ addiu $a3, $sp, 0x20 -/* A9CD90 80240160 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9CD94 80240164 C600002C */ lwc1 $f0, 0x2c($s0) -/* A9CD98 80240168 C6040030 */ lwc1 $f4, 0x30($s0) -/* A9CD9C 8024016C 46020000 */ add.s $f0, $f0, $f2 -/* A9CDA0 80240170 E7A60024 */ swc1 $f6, 0x24($sp) -/* A9CDA4 80240174 E7A40020 */ swc1 $f4, 0x20($sp) -/* A9CDA8 80240178 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9CDAC 8024017C 0C0372DF */ jal func_800DCB7C -/* A9CDB0 80240180 AFA20010 */ sw $v0, 0x10($sp) -/* A9CDB4 80240184 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A9CDB8 80240188 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A9CDBC 8024018C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A9CDC0 80240190 E6000028 */ swc1 $f0, 0x28($s0) -/* A9CDC4 80240194 E602002C */ swc1 $f2, 0x2c($s0) -/* A9CDC8 80240198 E6040030 */ swc1 $f4, 0x30($s0) -/* A9CDCC 8024019C 8FBF002C */ lw $ra, 0x2c($sp) -/* A9CDD0 802401A0 8FB00028 */ lw $s0, 0x28($sp) -/* A9CDD4 802401A4 24020002 */ addiu $v0, $zero, 2 -/* A9CDD8 802401A8 03E00008 */ jr $ra -/* A9CDDC 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s deleted file mode 100644 index 1c5e31efa6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240000_A9ED40.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A9ED40 -/* A9ED40 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9ED44 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* A9ED48 80240008 0080802D */ daddu $s0, $a0, $zero -/* A9ED4C 8024000C AFBF0014 */ sw $ra, 0x14($sp) -/* A9ED50 80240010 8E02000C */ lw $v0, 0xc($s0) -/* A9ED54 80240014 0C0B1EAF */ jal get_variable -/* A9ED58 80240018 8C450000 */ lw $a1, ($v0) -/* A9ED5C 8024001C 0040302D */ daddu $a2, $v0, $zero -/* A9ED60 80240020 3C058016 */ lui $a1, %hi(gCollisionStatus) -/* A9ED64 80240024 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) -/* A9ED68 80240028 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* A9ED6C 8024002C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* A9ED70 80240030 10A60004 */ beq $a1, $a2, .L80240044 -/* A9ED74 80240034 24020014 */ addiu $v0, $zero, 0x14 -/* A9ED78 80240038 808300B4 */ lb $v1, 0xb4($a0) -/* A9ED7C 8024003C 10620006 */ beq $v1, $v0, .L80240058 -/* A9ED80 80240040 00000000 */ nop -.L80240044: -/* A9ED84 80240044 8C820014 */ lw $v0, 0x14($a0) -/* A9ED88 80240048 3C03FFFF */ lui $v1, 0xffff -/* A9ED8C 8024004C 00431024 */ and $v0, $v0, $v1 -/* A9ED90 80240050 10400005 */ beqz $v0, .L80240068 -/* A9ED94 80240054 00000000 */ nop -.L80240058: -/* A9ED98 80240058 0C039769 */ jal set_action_state -/* A9ED9C 8024005C 0000202D */ daddu $a0, $zero, $zero -/* A9EDA0 80240060 0809002A */ j .L802400A8 -/* A9EDA4 80240064 AE000084 */ sw $zero, 0x84($s0) -.L80240068: -/* A9EDA8 80240068 54A6000F */ bnel $a1, $a2, .L802400A8 -/* A9EDAC 8024006C AE000084 */ sw $zero, 0x84($s0) -/* A9EDB0 80240070 808300B4 */ lb $v1, 0xb4($a0) -/* A9EDB4 80240074 24020014 */ addiu $v0, $zero, 0x14 -/* A9EDB8 80240078 10620005 */ beq $v1, $v0, .L80240090 -/* A9EDBC 8024007C 24020001 */ addiu $v0, $zero, 1 -/* A9EDC0 80240080 10620003 */ beq $v1, $v0, .L80240090 -/* A9EDC4 80240084 24020002 */ addiu $v0, $zero, 2 -/* A9EDC8 80240088 54620008 */ bnel $v1, $v0, .L802400AC -/* A9EDCC 8024008C AE000084 */ sw $zero, 0x84($s0) -.L80240090: -/* A9EDD0 80240090 8C820004 */ lw $v0, 4($a0) -/* A9EDD4 80240094 30420001 */ andi $v0, $v0, 1 -/* A9EDD8 80240098 54400003 */ bnel $v0, $zero, .L802400A8 -/* A9EDDC 8024009C AE000084 */ sw $zero, 0x84($s0) -/* A9EDE0 802400A0 24020001 */ addiu $v0, $zero, 1 -/* A9EDE4 802400A4 AE020084 */ sw $v0, 0x84($s0) -.L802400A8: -/* A9EDE8 802400A8 24020002 */ addiu $v0, $zero, 2 -.L802400AC: -/* A9EDEC 802400AC 8FBF0014 */ lw $ra, 0x14($sp) -/* A9EDF0 802400B0 8FB00010 */ lw $s0, 0x10($sp) -/* A9EDF4 802400B4 03E00008 */ jr $ra -/* A9EDF8 802400B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s deleted file mode 100644 index d0be199355..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802400BC_A9EDFC.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC_A9EDFC -/* A9EDFC 802400BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9EE00 802400C0 AFBF002C */ sw $ra, 0x2c($sp) -/* A9EE04 802400C4 AFB00028 */ sw $s0, 0x28($sp) -/* A9EE08 802400C8 8C820098 */ lw $v0, 0x98($a0) -/* A9EE0C 802400CC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A9EE10 802400D0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A9EE14 802400D4 14400005 */ bnez $v0, .L802400EC -/* A9EE18 802400D8 00000000 */ nop -/* A9EE1C 802400DC C4800084 */ lwc1 $f0, 0x84($a0) -/* A9EE20 802400E0 46800020 */ cvt.s.w $f0, $f0 -/* A9EE24 802400E4 0809003E */ j .L802400F8 -/* A9EE28 802400E8 E6000028 */ swc1 $f0, 0x28($s0) -.L802400EC: -/* A9EE2C 802400EC C4800084 */ lwc1 $f0, 0x84($a0) -/* A9EE30 802400F0 46800020 */ cvt.s.w $f0, $f0 -/* A9EE34 802400F4 E6000030 */ swc1 $f0, 0x30($s0) -.L802400F8: -/* A9EE38 802400F8 27A20024 */ addiu $v0, $sp, 0x24 -/* A9EE3C 802400FC 0000202D */ daddu $a0, $zero, $zero -/* A9EE40 80240100 27A50018 */ addiu $a1, $sp, 0x18 -/* A9EE44 80240104 27A6001C */ addiu $a2, $sp, 0x1c -/* A9EE48 80240108 C6000028 */ lwc1 $f0, 0x28($s0) -/* A9EE4C 8024010C 3C014120 */ lui $at, 0x4120 -/* A9EE50 80240110 44811000 */ mtc1 $at, $f2 -/* A9EE54 80240114 3C014220 */ lui $at, 0x4220 -/* A9EE58 80240118 44813000 */ mtc1 $at, $f6 -/* A9EE5C 8024011C 27A70020 */ addiu $a3, $sp, 0x20 -/* A9EE60 80240120 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9EE64 80240124 C600002C */ lwc1 $f0, 0x2c($s0) -/* A9EE68 80240128 C6040030 */ lwc1 $f4, 0x30($s0) -/* A9EE6C 8024012C 46020000 */ add.s $f0, $f0, $f2 -/* A9EE70 80240130 E7A60024 */ swc1 $f6, 0x24($sp) -/* A9EE74 80240134 E7A40020 */ swc1 $f4, 0x20($sp) -/* A9EE78 80240138 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9EE7C 8024013C 0C0372DF */ jal func_800DCB7C -/* A9EE80 80240140 AFA20010 */ sw $v0, 0x10($sp) -/* A9EE84 80240144 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A9EE88 80240148 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A9EE8C 8024014C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A9EE90 80240150 E6000028 */ swc1 $f0, 0x28($s0) -/* A9EE94 80240154 E602002C */ swc1 $f2, 0x2c($s0) -/* A9EE98 80240158 E6040030 */ swc1 $f4, 0x30($s0) -/* A9EE9C 8024015C 8FBF002C */ lw $ra, 0x2c($sp) -/* A9EEA0 80240160 8FB00028 */ lw $s0, 0x28($sp) -/* A9EEA4 80240164 24020002 */ addiu $v0, $zero, 2 -/* A9EEA8 80240168 03E00008 */ jr $ra -/* A9EEAC 8024016C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s deleted file mode 100644 index 2d86a79b2d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240158_A86BA8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240158_A86BA8 -/* A86BA8 80240158 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A86BAC 8024015C AFB20038 */ sw $s2, 0x38($sp) -/* A86BB0 80240160 0080902D */ daddu $s2, $a0, $zero -/* A86BB4 80240164 AFBF0044 */ sw $ra, 0x44($sp) -/* A86BB8 80240168 AFB40040 */ sw $s4, 0x40($sp) -/* A86BBC 8024016C AFB3003C */ sw $s3, 0x3c($sp) -/* A86BC0 80240170 AFB10034 */ sw $s1, 0x34($sp) -/* A86BC4 80240174 AFB00030 */ sw $s0, 0x30($sp) -/* A86BC8 80240178 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A86BCC 8024017C F7B40048 */ sdc1 $f20, 0x48($sp) -/* A86BD0 80240180 8E510148 */ lw $s1, 0x148($s2) -/* A86BD4 80240184 00A0982D */ daddu $s3, $a1, $zero -/* A86BD8 80240188 86240008 */ lh $a0, 8($s1) -/* A86BDC 8024018C 0C00EABB */ jal get_npc_unsafe -/* A86BE0 80240190 00C0A02D */ daddu $s4, $a2, $zero -/* A86BE4 80240194 8E630014 */ lw $v1, 0x14($s3) -/* A86BE8 80240198 04600030 */ bltz $v1, .L8024025C -/* A86BEC 8024019C 0040802D */ daddu $s0, $v0, $zero -/* A86BF0 802401A0 8E420074 */ lw $v0, 0x74($s2) -/* A86BF4 802401A4 1C40002C */ bgtz $v0, .L80240258 -/* A86BF8 802401A8 2442FFFF */ addiu $v0, $v0, -1 -/* A86BFC 802401AC 0280202D */ daddu $a0, $s4, $zero -/* A86C00 802401B0 AE430074 */ sw $v1, 0x74($s2) -/* A86C04 802401B4 AFA00010 */ sw $zero, 0x10($sp) -/* A86C08 802401B8 8E66000C */ lw $a2, 0xc($s3) -/* A86C0C 802401BC 8E670010 */ lw $a3, 0x10($s3) -/* A86C10 802401C0 0C01242D */ jal func_800490B4 -/* A86C14 802401C4 0220282D */ daddu $a1, $s1, $zero -/* A86C18 802401C8 10400021 */ beqz $v0, .L80240250 -/* A86C1C 802401CC 0000202D */ daddu $a0, $zero, $zero -/* A86C20 802401D0 0200282D */ daddu $a1, $s0, $zero -/* A86C24 802401D4 0000302D */ daddu $a2, $zero, $zero -/* A86C28 802401D8 860300A8 */ lh $v1, 0xa8($s0) -/* A86C2C 802401DC 3C013F80 */ lui $at, 0x3f80 -/* A86C30 802401E0 44810000 */ mtc1 $at, $f0 -/* A86C34 802401E4 3C014000 */ lui $at, 0x4000 -/* A86C38 802401E8 44811000 */ mtc1 $at, $f2 -/* A86C3C 802401EC 3C01C1A0 */ lui $at, 0xc1a0 -/* A86C40 802401F0 44812000 */ mtc1 $at, $f4 -/* A86C44 802401F4 2402000F */ addiu $v0, $zero, 0xf -/* A86C48 802401F8 AFA2001C */ sw $v0, 0x1c($sp) -/* A86C4C 802401FC 44833000 */ mtc1 $v1, $f6 -/* A86C50 80240200 00000000 */ nop -/* A86C54 80240204 468031A0 */ cvt.s.w $f6, $f6 -/* A86C58 80240208 44073000 */ mfc1 $a3, $f6 -/* A86C5C 8024020C 27A20028 */ addiu $v0, $sp, 0x28 -/* A86C60 80240210 AFA20020 */ sw $v0, 0x20($sp) -/* A86C64 80240214 E7A00010 */ swc1 $f0, 0x10($sp) -/* A86C68 80240218 E7A20014 */ swc1 $f2, 0x14($sp) -/* A86C6C 8024021C 0C01BFA4 */ jal fx_emote -/* A86C70 80240220 E7A40018 */ swc1 $f4, 0x18($sp) -/* A86C74 80240224 0200202D */ daddu $a0, $s0, $zero -/* A86C78 80240228 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A86C7C 8024022C 0C012530 */ jal func_800494C0 -/* A86C80 80240230 3C060020 */ lui $a2, 0x20 -/* A86C84 80240234 8E220018 */ lw $v0, 0x18($s1) -/* A86C88 80240238 9442002A */ lhu $v0, 0x2a($v0) -/* A86C8C 8024023C 30420001 */ andi $v0, $v0, 1 -/* A86C90 80240240 14400064 */ bnez $v0, .L802403D4 -/* A86C94 80240244 2402000A */ addiu $v0, $zero, 0xa -/* A86C98 80240248 080900F5 */ j .L802403D4 -/* A86C9C 8024024C 2402000C */ addiu $v0, $zero, 0xc -.L80240250: -/* A86CA0 80240250 8E420074 */ lw $v0, 0x74($s2) -/* A86CA4 80240254 2442FFFF */ addiu $v0, $v0, -1 -.L80240258: -/* A86CA8 80240258 AE420074 */ sw $v0, 0x74($s2) -.L8024025C: -/* A86CAC 8024025C 8602008C */ lh $v0, 0x8c($s0) -/* A86CB0 80240260 1440005D */ bnez $v0, .L802403D8 -/* A86CB4 80240264 00000000 */ nop -/* A86CB8 80240268 C6000018 */ lwc1 $f0, 0x18($s0) -/* A86CBC 8024026C 3C014010 */ lui $at, 0x4010 -/* A86CC0 80240270 44811800 */ mtc1 $at, $f3 -/* A86CC4 80240274 44801000 */ mtc1 $zero, $f2 -/* A86CC8 80240278 46000021 */ cvt.d.s $f0, $f0 -/* A86CCC 8024027C 4622003C */ c.lt.d $f0, $f2 -/* A86CD0 80240280 00000000 */ nop -/* A86CD4 80240284 45000003 */ bc1f .L80240294 -/* A86CD8 80240288 0200202D */ daddu $a0, $s0, $zero -/* A86CDC 8024028C 080900A6 */ j .L80240298 -/* A86CE0 80240290 0000282D */ daddu $a1, $zero, $zero -.L80240294: -/* A86CE4 80240294 24050001 */ addiu $a1, $zero, 1 -.L80240298: -/* A86CE8 80240298 0C00F598 */ jal func_8003D660 -/* A86CEC 8024029C 00000000 */ nop -/* A86CF0 802402A0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A86CF4 802402A4 8E430078 */ lw $v1, 0x78($s2) -/* A86CF8 802402A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A86CFC 802402AC 00031040 */ sll $v0, $v1, 1 -/* A86D00 802402B0 00431021 */ addu $v0, $v0, $v1 -/* A86D04 802402B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A86D08 802402B8 00021080 */ sll $v0, $v0, 2 -/* A86D0C 802402BC 00431021 */ addu $v0, $v0, $v1 -/* A86D10 802402C0 C4560004 */ lwc1 $f22, 4($v0) -/* A86D14 802402C4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A86D18 802402C8 C454000C */ lwc1 $f20, 0xc($v0) -/* A86D1C 802402CC 4680A520 */ cvt.s.w $f20, $f20 -/* A86D20 802402D0 4406B000 */ mfc1 $a2, $f22 -/* A86D24 802402D4 4407A000 */ mfc1 $a3, $f20 -/* A86D28 802402D8 0C00A720 */ jal atan2 -/* A86D2C 802402DC 00000000 */ nop -/* A86D30 802402E0 8E050018 */ lw $a1, 0x18($s0) -/* A86D34 802402E4 44060000 */ mfc1 $a2, $f0 -/* A86D38 802402E8 0200202D */ daddu $a0, $s0, $zero -/* A86D3C 802402EC 0C00EA95 */ jal npc_move_heading -/* A86D40 802402F0 AE06000C */ sw $a2, 0xc($s0) -/* A86D44 802402F4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A86D48 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A86D4C 802402FC 4406B000 */ mfc1 $a2, $f22 -/* A86D50 80240300 4407A000 */ mfc1 $a3, $f20 -/* A86D54 80240304 0C00A7B5 */ jal dist2D -/* A86D58 80240308 00000000 */ nop -/* A86D5C 8024030C C6020018 */ lwc1 $f2, 0x18($s0) -/* A86D60 80240310 4602003E */ c.le.s $f0, $f2 -/* A86D64 80240314 00000000 */ nop -/* A86D68 80240318 4500002F */ bc1f .L802403D8 -/* A86D6C 8024031C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A86D70 80240320 24020002 */ addiu $v0, $zero, 2 -/* A86D74 80240324 0C00A67F */ jal rand_int -/* A86D78 80240328 AE420070 */ sw $v0, 0x70($s2) -/* A86D7C 8024032C 3C035555 */ lui $v1, 0x5555 -/* A86D80 80240330 34635556 */ ori $v1, $v1, 0x5556 -/* A86D84 80240334 00430018 */ mult $v0, $v1 -/* A86D88 80240338 000227C3 */ sra $a0, $v0, 0x1f -/* A86D8C 8024033C 00004010 */ mfhi $t0 -/* A86D90 80240340 01042023 */ subu $a0, $t0, $a0 -/* A86D94 80240344 00041840 */ sll $v1, $a0, 1 -/* A86D98 80240348 00641821 */ addu $v1, $v1, $a0 -/* A86D9C 8024034C 00431023 */ subu $v0, $v0, $v1 -/* A86DA0 80240350 24430002 */ addiu $v1, $v0, 2 -/* A86DA4 80240354 AE430074 */ sw $v1, 0x74($s2) -/* A86DA8 80240358 8E62002C */ lw $v0, 0x2c($s3) -/* A86DAC 8024035C 18400009 */ blez $v0, .L80240384 -/* A86DB0 80240360 24020004 */ addiu $v0, $zero, 4 -/* A86DB4 80240364 8E620004 */ lw $v0, 4($s3) -/* A86DB8 80240368 18400006 */ blez $v0, .L80240384 -/* A86DBC 8024036C 24020004 */ addiu $v0, $zero, 4 -/* A86DC0 80240370 8E620008 */ lw $v0, 8($s3) -/* A86DC4 80240374 18400003 */ blez $v0, .L80240384 -/* A86DC8 80240378 24020004 */ addiu $v0, $zero, 4 -/* A86DCC 8024037C 14600002 */ bnez $v1, .L80240388 -/* A86DD0 80240380 00000000 */ nop -.L80240384: -/* A86DD4 80240384 AE420070 */ sw $v0, 0x70($s2) -.L80240388: -/* A86DD8 80240388 0C00A67F */ jal rand_int -/* A86DDC 8024038C 24042710 */ addiu $a0, $zero, 0x2710 -/* A86DE0 80240390 3C0351EB */ lui $v1, 0x51eb -/* A86DE4 80240394 3463851F */ ori $v1, $v1, 0x851f -/* A86DE8 80240398 00430018 */ mult $v0, $v1 -/* A86DEC 8024039C 00021FC3 */ sra $v1, $v0, 0x1f -/* A86DF0 802403A0 00004010 */ mfhi $t0 -/* A86DF4 802403A4 00082143 */ sra $a0, $t0, 5 -/* A86DF8 802403A8 00832023 */ subu $a0, $a0, $v1 -/* A86DFC 802403AC 00041840 */ sll $v1, $a0, 1 -/* A86E00 802403B0 00641821 */ addu $v1, $v1, $a0 -/* A86E04 802403B4 000318C0 */ sll $v1, $v1, 3 -/* A86E08 802403B8 00641821 */ addu $v1, $v1, $a0 -/* A86E0C 802403BC 00031880 */ sll $v1, $v1, 2 -/* A86E10 802403C0 8E640004 */ lw $a0, 4($s3) -/* A86E14 802403C4 00431023 */ subu $v0, $v0, $v1 -/* A86E18 802403C8 0044102A */ slt $v0, $v0, $a0 -/* A86E1C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* A86E20 802403D0 24020004 */ addiu $v0, $zero, 4 -.L802403D4: -/* A86E24 802403D4 AE420070 */ sw $v0, 0x70($s2) -.L802403D8: -/* A86E28 802403D8 8FBF0044 */ lw $ra, 0x44($sp) -/* A86E2C 802403DC 8FB40040 */ lw $s4, 0x40($sp) -/* A86E30 802403E0 8FB3003C */ lw $s3, 0x3c($sp) -/* A86E34 802403E4 8FB20038 */ lw $s2, 0x38($sp) -/* A86E38 802403E8 8FB10034 */ lw $s1, 0x34($sp) -/* A86E3C 802403EC 8FB00030 */ lw $s0, 0x30($sp) -/* A86E40 802403F0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A86E44 802403F4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A86E48 802403F8 03E00008 */ jr $ra -/* A86E4C 802403FC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s deleted file mode 100644 index caea2e2b82..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802404C0_A86F10.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_A86F10 -/* A86F10 802404C0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A86F14 802404C4 AFB40040 */ sw $s4, 0x40($sp) -/* A86F18 802404C8 0080A02D */ daddu $s4, $a0, $zero -/* A86F1C 802404CC AFBF0044 */ sw $ra, 0x44($sp) -/* A86F20 802404D0 AFB3003C */ sw $s3, 0x3c($sp) -/* A86F24 802404D4 AFB20038 */ sw $s2, 0x38($sp) -/* A86F28 802404D8 AFB10034 */ sw $s1, 0x34($sp) -/* A86F2C 802404DC AFB00030 */ sw $s0, 0x30($sp) -/* A86F30 802404E0 8E910148 */ lw $s1, 0x148($s4) -/* A86F34 802404E4 00A0902D */ daddu $s2, $a1, $zero -/* A86F38 802404E8 86240008 */ lh $a0, 8($s1) -/* A86F3C 802404EC 0C00EABB */ jal get_npc_unsafe -/* A86F40 802404F0 00C0982D */ daddu $s3, $a2, $zero -/* A86F44 802404F4 8E430014 */ lw $v1, 0x14($s2) -/* A86F48 802404F8 04600031 */ bltz $v1, .L802405C0 -/* A86F4C 802404FC 0040802D */ daddu $s0, $v0, $zero -/* A86F50 80240500 0260202D */ daddu $a0, $s3, $zero -/* A86F54 80240504 AFA00010 */ sw $zero, 0x10($sp) -/* A86F58 80240508 8E460024 */ lw $a2, 0x24($s2) -/* A86F5C 8024050C 8E470028 */ lw $a3, 0x28($s2) -/* A86F60 80240510 0C01242D */ jal func_800490B4 -/* A86F64 80240514 0220282D */ daddu $a1, $s1, $zero -/* A86F68 80240518 10400029 */ beqz $v0, .L802405C0 -/* A86F6C 8024051C 0000202D */ daddu $a0, $zero, $zero -/* A86F70 80240520 0200282D */ daddu $a1, $s0, $zero -/* A86F74 80240524 0000302D */ daddu $a2, $zero, $zero -/* A86F78 80240528 860300A8 */ lh $v1, 0xa8($s0) -/* A86F7C 8024052C 3C013F80 */ lui $at, 0x3f80 -/* A86F80 80240530 44810000 */ mtc1 $at, $f0 -/* A86F84 80240534 3C014000 */ lui $at, 0x4000 -/* A86F88 80240538 44811000 */ mtc1 $at, $f2 -/* A86F8C 8024053C 3C01C1A0 */ lui $at, 0xc1a0 -/* A86F90 80240540 44812000 */ mtc1 $at, $f4 -/* A86F94 80240544 2402000F */ addiu $v0, $zero, 0xf -/* A86F98 80240548 AFA2001C */ sw $v0, 0x1c($sp) -/* A86F9C 8024054C 44833000 */ mtc1 $v1, $f6 -/* A86FA0 80240550 00000000 */ nop -/* A86FA4 80240554 468031A0 */ cvt.s.w $f6, $f6 -/* A86FA8 80240558 44073000 */ mfc1 $a3, $f6 -/* A86FAC 8024055C 27A20028 */ addiu $v0, $sp, 0x28 -/* A86FB0 80240560 AFA20020 */ sw $v0, 0x20($sp) -/* A86FB4 80240564 E7A00010 */ swc1 $f0, 0x10($sp) -/* A86FB8 80240568 E7A20014 */ swc1 $f2, 0x14($sp) -/* A86FBC 8024056C 0C01BFA4 */ jal fx_emote -/* A86FC0 80240570 E7A40018 */ swc1 $f4, 0x18($sp) -/* A86FC4 80240574 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A86FC8 80240578 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A86FCC 8024057C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A86FD0 80240580 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A86FD4 80240584 8C460028 */ lw $a2, 0x28($v0) -/* A86FD8 80240588 0C00A720 */ jal atan2 -/* A86FDC 8024058C 8C470030 */ lw $a3, 0x30($v0) -/* A86FE0 80240590 0200202D */ daddu $a0, $s0, $zero -/* A86FE4 80240594 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A86FE8 80240598 3C060020 */ lui $a2, 0x20 -/* A86FEC 8024059C 0C012530 */ jal func_800494C0 -/* A86FF0 802405A0 E480000C */ swc1 $f0, 0xc($a0) -/* A86FF4 802405A4 8E220018 */ lw $v0, 0x18($s1) -/* A86FF8 802405A8 9442002A */ lhu $v0, 0x2a($v0) -/* A86FFC 802405AC 30420001 */ andi $v0, $v0, 1 -/* A87000 802405B0 14400029 */ bnez $v0, .L80240658 -/* A87004 802405B4 2402000A */ addiu $v0, $zero, 0xa -/* A87008 802405B8 08090196 */ j .L80240658 -/* A8700C 802405BC 2402000C */ addiu $v0, $zero, 0xc -.L802405C0: -/* A87010 802405C0 8602008C */ lh $v0, 0x8c($s0) -/* A87014 802405C4 14400025 */ bnez $v0, .L8024065C -/* A87018 802405C8 00000000 */ nop -/* A8701C 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* A87020 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* A87024 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* A87028 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* A8702C 802405DC 1440001F */ bnez $v0, .L8024065C -/* A87030 802405E0 00000000 */ nop -/* A87034 802405E4 8E820074 */ lw $v0, 0x74($s4) -/* A87038 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* A8703C 802405EC 10400019 */ beqz $v0, .L80240654 -/* A87040 802405F0 AE820074 */ sw $v0, 0x74($s4) -/* A87044 802405F4 8E220018 */ lw $v0, 0x18($s1) -/* A87048 802405F8 9442002A */ lhu $v0, 0x2a($v0) -/* A8704C 802405FC 30420010 */ andi $v0, $v0, 0x10 -/* A87050 80240600 14400007 */ bnez $v0, .L80240620 -/* A87054 80240604 00000000 */ nop -/* A87058 80240608 C600000C */ lwc1 $f0, 0xc($s0) -/* A8705C 8024060C 3C014334 */ lui $at, 0x4334 -/* A87060 80240610 44816000 */ mtc1 $at, $f12 -/* A87064 80240614 0C00A6C9 */ jal clamp_angle -/* A87068 80240618 460C0300 */ add.s $f12, $f0, $f12 -/* A8706C 8024061C E600000C */ swc1 $f0, 0xc($s0) -.L80240620: -/* A87070 80240620 8E440008 */ lw $a0, 8($s2) -/* A87074 80240624 000417C2 */ srl $v0, $a0, 0x1f -/* A87078 80240628 00822021 */ addu $a0, $a0, $v0 -/* A8707C 8024062C 00042043 */ sra $a0, $a0, 1 -/* A87080 80240630 0C00A67F */ jal rand_int -/* A87084 80240634 24840001 */ addiu $a0, $a0, 1 -/* A87088 80240638 8E430008 */ lw $v1, 8($s2) -/* A8708C 8024063C 000327C2 */ srl $a0, $v1, 0x1f -/* A87090 80240640 00641821 */ addu $v1, $v1, $a0 -/* A87094 80240644 00031843 */ sra $v1, $v1, 1 -/* A87098 80240648 00621821 */ addu $v1, $v1, $v0 -/* A8709C 8024064C 08090197 */ j .L8024065C -/* A870A0 80240650 A603008E */ sh $v1, 0x8e($s0) -.L80240654: -/* A870A4 80240654 24020004 */ addiu $v0, $zero, 4 -.L80240658: -/* A870A8 80240658 AE820070 */ sw $v0, 0x70($s4) -.L8024065C: -/* A870AC 8024065C 8FBF0044 */ lw $ra, 0x44($sp) -/* A870B0 80240660 8FB40040 */ lw $s4, 0x40($sp) -/* A870B4 80240664 8FB3003C */ lw $s3, 0x3c($sp) -/* A870B8 80240668 8FB20038 */ lw $s2, 0x38($sp) -/* A870BC 8024066C 8FB10034 */ lw $s1, 0x34($sp) -/* A870C0 80240670 8FB00030 */ lw $s0, 0x30($sp) -/* A870C4 80240674 03E00008 */ jr $ra -/* A870C8 80240678 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s deleted file mode 100644 index b7894b54a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C_A8739C -/* A8739C 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A873A0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* A873A4 80240954 0080982D */ daddu $s3, $a0, $zero -/* A873A8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* A873AC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* A873B0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* A873B4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* A873B8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* A873BC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* A873C0 80240970 86440008 */ lh $a0, 8($s2) -/* A873C4 80240974 0C00EABB */ jal get_npc_unsafe -/* A873C8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* A873CC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* A873D0 80240980 0240282D */ daddu $a1, $s2, $zero -/* A873D4 80240984 24030001 */ addiu $v1, $zero, 1 -/* A873D8 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* A873DC 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* A873E0 80240990 8E270028 */ lw $a3, 0x28($s1) -/* A873E4 80240994 0C01242D */ jal func_800490B4 -/* A873E8 80240998 0040802D */ daddu $s0, $v0, $zero -/* A873EC 8024099C 1440001E */ bnez $v0, .L80240A18 -/* A873F0 802409A0 0200202D */ daddu $a0, $s0, $zero -/* A873F4 802409A4 24040002 */ addiu $a0, $zero, 2 -/* A873F8 802409A8 0200282D */ daddu $a1, $s0, $zero -/* A873FC 802409AC 0000302D */ daddu $a2, $zero, $zero -/* A87400 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* A87404 802409B4 3C013F80 */ lui $at, 0x3f80 -/* A87408 802409B8 44810000 */ mtc1 $at, $f0 -/* A8740C 802409BC 3C014000 */ lui $at, 0x4000 -/* A87410 802409C0 44811000 */ mtc1 $at, $f2 -/* A87414 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* A87418 802409C8 44812000 */ mtc1 $at, $f4 -/* A8741C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* A87420 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* A87424 802409D4 44833000 */ mtc1 $v1, $f6 -/* A87428 802409D8 00000000 */ nop -/* A8742C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* A87430 802409E0 44073000 */ mfc1 $a3, $f6 -/* A87434 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* A87438 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* A8743C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* A87440 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A87444 802409F4 0C01BFA4 */ jal fx_emote -/* A87448 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8744C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* A87450 80240A00 8C430000 */ lw $v1, ($v0) -/* A87454 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* A87458 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* A8745C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* A87460 80240A10 08090293 */ j .L80240A4C -/* A87464 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* A87468 80240A18 0C00F598 */ jal func_8003D660 -/* A8746C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* A87470 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* A87474 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* A87478 80240A28 0C00EA95 */ jal npc_move_heading -/* A8747C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* A87480 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* A87484 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* A87488 80240A38 18400003 */ blez $v0, .L80240A48 -/* A8748C 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* A87490 80240A40 08090294 */ j .L80240A50 -/* A87494 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* A87498 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* A8749C 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* A874A0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* A874A4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* A874A8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* A874AC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* A874B0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* A874B4 80240A64 03E00008 */ jr $ra -/* A874B8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s deleted file mode 100644 index 884b363061..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4_A87524 -/* A87524 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A87528 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* A8752C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* A87530 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* A87534 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* A87538 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* A8753C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* A87540 80240AF0 86040008 */ lh $a0, 8($s0) -/* A87544 80240AF4 0C00EABB */ jal get_npc_unsafe -/* A87548 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* A8754C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* A87550 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* A87554 80240B04 8C630000 */ lw $v1, ($v1) -/* A87558 80240B08 0083182A */ slt $v1, $a0, $v1 -/* A8755C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* A87560 80240B10 0040302D */ daddu $a2, $v0, $zero -/* A87564 80240B14 00041040 */ sll $v0, $a0, 1 -/* A87568 80240B18 00441021 */ addu $v0, $v0, $a0 -/* A8756C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* A87570 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* A87574 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* A87578 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* A8757C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* A87580 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* A87584 80240B34 4602003E */ c.le.s $f0, $f2 -/* A87588 80240B38 00000000 */ nop -/* A8758C 80240B3C 45020003 */ bc1fl .L80240B4C -/* A87590 80240B40 24840001 */ addiu $a0, $a0, 1 -/* A87594 80240B44 080902D7 */ j .L80240B5C -/* A87598 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* A8759C 80240B4C 8C620000 */ lw $v0, ($v1) -/* A875A0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* A875A4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* A875A8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* A875AC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* A875B0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* A875B4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* A875B8 80240B68 8C420004 */ lw $v0, 4($v0) -/* A875BC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* A875C0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* A875C4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* A875C8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* A875CC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* A875D0 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* A875D4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* A875D8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* A875DC 80240B8C 03E00008 */ jr $ra -/* A875E0 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 2ce0f07ca6..fb15f3d6ae 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -137,7 +137,7 @@ glabel L80240D78_A877C8 glabel L80240D88_A877D8 /* A877D8 80240D88 0280202D */ daddu $a0, $s4, $zero /* A877DC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* A877E0 80240D90 0C090056 */ jal func_80240158_A86BA8 +/* A877E0 80240D90 0C090056 */ jal kpa_91_UnkFunc13 /* A877E4 80240D94 02A0302D */ daddu $a2, $s5, $zero /* A877E8 80240D98 0809039A */ j L80240E68_A878B8 /* A877EC 80240D9C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80240DA0_A877F0 glabel L80240DB0_A87800 /* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* A87808 80240DB8 0C090130 */ jal func_802404C0_A86F10 +/* A87808 80240DB8 0C090130 */ jal kpa_91_UnkFunc14 /* A8780C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* A87810 80240DC0 0809039A */ j L80240E68_A878B8 /* A87814 80240DC4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80240E08_A87858 glabel L80240E18_A87868 /* A87868 80240E18 0280202D */ daddu $a0, $s4, $zero /* A8786C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* A87870 80240E20 0C090253 */ jal func_8024094C_A8739C +/* A87870 80240E20 0C090253 */ jal kpa_91_UnkFunc15 /* A87874 80240E24 02A0302D */ daddu $a2, $s5, $zero /* A87878 80240E28 0809039A */ j L80240E68_A878B8 /* A8787C 80240E2C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80240E30_A87880 glabel L80240E48_A87898 /* A87898 80240E48 0280202D */ daddu $a0, $s4, $zero /* A8789C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* A878A0 80240E50 0C0902B5 */ jal func_80240AD4_A87524 +/* A878A0 80240E50 0C0902B5 */ jal kpa_91_UnkFunc16 /* A878A4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* A878A8 80240E58 0809039A */ j L80240E68_A878B8 /* A878AC 80240E5C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 260777766e..905d7f71e9 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -149,7 +149,7 @@ glabel L80241430_A87E80 glabel L80241448_A87E98 /* A87E98 80241448 0260202D */ daddu $a0, $s3, $zero /* A87E9C 8024144C 0280282D */ daddu $a1, $s4, $zero -/* A87EA0 80241450 0C090056 */ jal func_80240158_A86BA8 +/* A87EA0 80241450 0C090056 */ jal kpa_91_UnkFunc13 /* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero /* A87EA8 80241458 08090540 */ j L80241500_A87F50 /* A87EAC 8024145C 00000000 */ nop @@ -161,7 +161,7 @@ glabel L80241460_A87EB0 glabel L80241470_A87EC0 /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero -/* A87EC8 80241478 0C090130 */ jal func_802404C0_A86F10 +/* A87EC8 80241478 0C090130 */ jal kpa_91_UnkFunc14 /* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero /* A87ED0 80241480 08090540 */ j L80241500_A87F50 /* A87ED4 80241484 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s deleted file mode 100644 index e91c9bcfe6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240238_A8CCB8 -/* A8CCB8 80240238 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A8CCBC 8024023C AFB20038 */ sw $s2, 0x38($sp) -/* A8CCC0 80240240 0080902D */ daddu $s2, $a0, $zero -/* A8CCC4 80240244 AFBF0044 */ sw $ra, 0x44($sp) -/* A8CCC8 80240248 AFB40040 */ sw $s4, 0x40($sp) -/* A8CCCC 8024024C AFB3003C */ sw $s3, 0x3c($sp) -/* A8CCD0 80240250 AFB10034 */ sw $s1, 0x34($sp) -/* A8CCD4 80240254 AFB00030 */ sw $s0, 0x30($sp) -/* A8CCD8 80240258 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A8CCDC 8024025C F7B40048 */ sdc1 $f20, 0x48($sp) -/* A8CCE0 80240260 8E510148 */ lw $s1, 0x148($s2) -/* A8CCE4 80240264 00A0982D */ daddu $s3, $a1, $zero -/* A8CCE8 80240268 86240008 */ lh $a0, 8($s1) -/* A8CCEC 8024026C 0C00EABB */ jal get_npc_unsafe -/* A8CCF0 80240270 00C0A02D */ daddu $s4, $a2, $zero -/* A8CCF4 80240274 8E630014 */ lw $v1, 0x14($s3) -/* A8CCF8 80240278 04600030 */ bltz $v1, .L8024033C -/* A8CCFC 8024027C 0040802D */ daddu $s0, $v0, $zero -/* A8CD00 80240280 8E420074 */ lw $v0, 0x74($s2) -/* A8CD04 80240284 1C40002C */ bgtz $v0, .L80240338 -/* A8CD08 80240288 2442FFFF */ addiu $v0, $v0, -1 -/* A8CD0C 8024028C 0280202D */ daddu $a0, $s4, $zero -/* A8CD10 80240290 AE430074 */ sw $v1, 0x74($s2) -/* A8CD14 80240294 AFA00010 */ sw $zero, 0x10($sp) -/* A8CD18 80240298 8E66000C */ lw $a2, 0xc($s3) -/* A8CD1C 8024029C 8E670010 */ lw $a3, 0x10($s3) -/* A8CD20 802402A0 0C01242D */ jal func_800490B4 -/* A8CD24 802402A4 0220282D */ daddu $a1, $s1, $zero -/* A8CD28 802402A8 10400021 */ beqz $v0, .L80240330 -/* A8CD2C 802402AC 0000202D */ daddu $a0, $zero, $zero -/* A8CD30 802402B0 0200282D */ daddu $a1, $s0, $zero -/* A8CD34 802402B4 0000302D */ daddu $a2, $zero, $zero -/* A8CD38 802402B8 860300A8 */ lh $v1, 0xa8($s0) -/* A8CD3C 802402BC 3C013F80 */ lui $at, 0x3f80 -/* A8CD40 802402C0 44810000 */ mtc1 $at, $f0 -/* A8CD44 802402C4 3C014000 */ lui $at, 0x4000 -/* A8CD48 802402C8 44811000 */ mtc1 $at, $f2 -/* A8CD4C 802402CC 3C01C1A0 */ lui $at, 0xc1a0 -/* A8CD50 802402D0 44812000 */ mtc1 $at, $f4 -/* A8CD54 802402D4 2402000F */ addiu $v0, $zero, 0xf -/* A8CD58 802402D8 AFA2001C */ sw $v0, 0x1c($sp) -/* A8CD5C 802402DC 44833000 */ mtc1 $v1, $f6 -/* A8CD60 802402E0 00000000 */ nop -/* A8CD64 802402E4 468031A0 */ cvt.s.w $f6, $f6 -/* A8CD68 802402E8 44073000 */ mfc1 $a3, $f6 -/* A8CD6C 802402EC 27A20028 */ addiu $v0, $sp, 0x28 -/* A8CD70 802402F0 AFA20020 */ sw $v0, 0x20($sp) -/* A8CD74 802402F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A8CD78 802402F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8CD7C 802402FC 0C01BFA4 */ jal fx_emote -/* A8CD80 80240300 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8CD84 80240304 0200202D */ daddu $a0, $s0, $zero -/* A8CD88 80240308 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A8CD8C 8024030C 0C012530 */ jal func_800494C0 -/* A8CD90 80240310 3C060020 */ lui $a2, 0x20 -/* A8CD94 80240314 8E220018 */ lw $v0, 0x18($s1) -/* A8CD98 80240318 9442002A */ lhu $v0, 0x2a($v0) -/* A8CD9C 8024031C 30420001 */ andi $v0, $v0, 1 -/* A8CDA0 80240320 14400064 */ bnez $v0, .L802404B4 -/* A8CDA4 80240324 2402000A */ addiu $v0, $zero, 0xa -/* A8CDA8 80240328 0809012D */ j .L802404B4 -/* A8CDAC 8024032C 2402000C */ addiu $v0, $zero, 0xc -.L80240330: -/* A8CDB0 80240330 8E420074 */ lw $v0, 0x74($s2) -/* A8CDB4 80240334 2442FFFF */ addiu $v0, $v0, -1 -.L80240338: -/* A8CDB8 80240338 AE420074 */ sw $v0, 0x74($s2) -.L8024033C: -/* A8CDBC 8024033C 8602008C */ lh $v0, 0x8c($s0) -/* A8CDC0 80240340 1440005D */ bnez $v0, .L802404B8 -/* A8CDC4 80240344 00000000 */ nop -/* A8CDC8 80240348 C6000018 */ lwc1 $f0, 0x18($s0) -/* A8CDCC 8024034C 3C014010 */ lui $at, 0x4010 -/* A8CDD0 80240350 44811800 */ mtc1 $at, $f3 -/* A8CDD4 80240354 44801000 */ mtc1 $zero, $f2 -/* A8CDD8 80240358 46000021 */ cvt.d.s $f0, $f0 -/* A8CDDC 8024035C 4622003C */ c.lt.d $f0, $f2 -/* A8CDE0 80240360 00000000 */ nop -/* A8CDE4 80240364 45000003 */ bc1f .L80240374 -/* A8CDE8 80240368 0200202D */ daddu $a0, $s0, $zero -/* A8CDEC 8024036C 080900DE */ j .L80240378 -/* A8CDF0 80240370 0000282D */ daddu $a1, $zero, $zero -.L80240374: -/* A8CDF4 80240374 24050001 */ addiu $a1, $zero, 1 -.L80240378: -/* A8CDF8 80240378 0C00F598 */ jal func_8003D660 -/* A8CDFC 8024037C 00000000 */ nop -/* A8CE00 80240380 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8CE04 80240384 8E430078 */ lw $v1, 0x78($s2) -/* A8CE08 80240388 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8CE0C 8024038C 00031040 */ sll $v0, $v1, 1 -/* A8CE10 80240390 00431021 */ addu $v0, $v0, $v1 -/* A8CE14 80240394 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8CE18 80240398 00021080 */ sll $v0, $v0, 2 -/* A8CE1C 8024039C 00431021 */ addu $v0, $v0, $v1 -/* A8CE20 802403A0 C4560004 */ lwc1 $f22, 4($v0) -/* A8CE24 802403A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A8CE28 802403A8 C454000C */ lwc1 $f20, 0xc($v0) -/* A8CE2C 802403AC 4680A520 */ cvt.s.w $f20, $f20 -/* A8CE30 802403B0 4406B000 */ mfc1 $a2, $f22 -/* A8CE34 802403B4 4407A000 */ mfc1 $a3, $f20 -/* A8CE38 802403B8 0C00A720 */ jal atan2 -/* A8CE3C 802403BC 00000000 */ nop -/* A8CE40 802403C0 8E050018 */ lw $a1, 0x18($s0) -/* A8CE44 802403C4 44060000 */ mfc1 $a2, $f0 -/* A8CE48 802403C8 0200202D */ daddu $a0, $s0, $zero -/* A8CE4C 802403CC 0C00EA95 */ jal npc_move_heading -/* A8CE50 802403D0 AE06000C */ sw $a2, 0xc($s0) -/* A8CE54 802403D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8CE58 802403D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8CE5C 802403DC 4406B000 */ mfc1 $a2, $f22 -/* A8CE60 802403E0 4407A000 */ mfc1 $a3, $f20 -/* A8CE64 802403E4 0C00A7B5 */ jal dist2D -/* A8CE68 802403E8 00000000 */ nop -/* A8CE6C 802403EC C6020018 */ lwc1 $f2, 0x18($s0) -/* A8CE70 802403F0 4602003E */ c.le.s $f0, $f2 -/* A8CE74 802403F4 00000000 */ nop -/* A8CE78 802403F8 4500002F */ bc1f .L802404B8 -/* A8CE7C 802403FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A8CE80 80240400 24020002 */ addiu $v0, $zero, 2 -/* A8CE84 80240404 0C00A67F */ jal rand_int -/* A8CE88 80240408 AE420070 */ sw $v0, 0x70($s2) -/* A8CE8C 8024040C 3C035555 */ lui $v1, 0x5555 -/* A8CE90 80240410 34635556 */ ori $v1, $v1, 0x5556 -/* A8CE94 80240414 00430018 */ mult $v0, $v1 -/* A8CE98 80240418 000227C3 */ sra $a0, $v0, 0x1f -/* A8CE9C 8024041C 00004010 */ mfhi $t0 -/* A8CEA0 80240420 01042023 */ subu $a0, $t0, $a0 -/* A8CEA4 80240424 00041840 */ sll $v1, $a0, 1 -/* A8CEA8 80240428 00641821 */ addu $v1, $v1, $a0 -/* A8CEAC 8024042C 00431023 */ subu $v0, $v0, $v1 -/* A8CEB0 80240430 24430002 */ addiu $v1, $v0, 2 -/* A8CEB4 80240434 AE430074 */ sw $v1, 0x74($s2) -/* A8CEB8 80240438 8E62002C */ lw $v0, 0x2c($s3) -/* A8CEBC 8024043C 18400009 */ blez $v0, .L80240464 -/* A8CEC0 80240440 24020004 */ addiu $v0, $zero, 4 -/* A8CEC4 80240444 8E620004 */ lw $v0, 4($s3) -/* A8CEC8 80240448 18400006 */ blez $v0, .L80240464 -/* A8CECC 8024044C 24020004 */ addiu $v0, $zero, 4 -/* A8CED0 80240450 8E620008 */ lw $v0, 8($s3) -/* A8CED4 80240454 18400003 */ blez $v0, .L80240464 -/* A8CED8 80240458 24020004 */ addiu $v0, $zero, 4 -/* A8CEDC 8024045C 14600002 */ bnez $v1, .L80240468 -/* A8CEE0 80240460 00000000 */ nop -.L80240464: -/* A8CEE4 80240464 AE420070 */ sw $v0, 0x70($s2) -.L80240468: -/* A8CEE8 80240468 0C00A67F */ jal rand_int -/* A8CEEC 8024046C 24042710 */ addiu $a0, $zero, 0x2710 -/* A8CEF0 80240470 3C0351EB */ lui $v1, 0x51eb -/* A8CEF4 80240474 3463851F */ ori $v1, $v1, 0x851f -/* A8CEF8 80240478 00430018 */ mult $v0, $v1 -/* A8CEFC 8024047C 00021FC3 */ sra $v1, $v0, 0x1f -/* A8CF00 80240480 00004010 */ mfhi $t0 -/* A8CF04 80240484 00082143 */ sra $a0, $t0, 5 -/* A8CF08 80240488 00832023 */ subu $a0, $a0, $v1 -/* A8CF0C 8024048C 00041840 */ sll $v1, $a0, 1 -/* A8CF10 80240490 00641821 */ addu $v1, $v1, $a0 -/* A8CF14 80240494 000318C0 */ sll $v1, $v1, 3 -/* A8CF18 80240498 00641821 */ addu $v1, $v1, $a0 -/* A8CF1C 8024049C 00031880 */ sll $v1, $v1, 2 -/* A8CF20 802404A0 8E640004 */ lw $a0, 4($s3) -/* A8CF24 802404A4 00431023 */ subu $v0, $v0, $v1 -/* A8CF28 802404A8 0044102A */ slt $v0, $v0, $a0 -/* A8CF2C 802404AC 10400002 */ beqz $v0, .L802404B8 -/* A8CF30 802404B0 24020004 */ addiu $v0, $zero, 4 -.L802404B4: -/* A8CF34 802404B4 AE420070 */ sw $v0, 0x70($s2) -.L802404B8: -/* A8CF38 802404B8 8FBF0044 */ lw $ra, 0x44($sp) -/* A8CF3C 802404BC 8FB40040 */ lw $s4, 0x40($sp) -/* A8CF40 802404C0 8FB3003C */ lw $s3, 0x3c($sp) -/* A8CF44 802404C4 8FB20038 */ lw $s2, 0x38($sp) -/* A8CF48 802404C8 8FB10034 */ lw $s1, 0x34($sp) -/* A8CF4C 802404CC 8FB00030 */ lw $s0, 0x30($sp) -/* A8CF50 802404D0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A8CF54 802404D4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A8CF58 802404D8 03E00008 */ jr $ra -/* A8CF5C 802404DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s deleted file mode 100644 index 559f603a73..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802405A0_A8D020.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A0_A8D020 -/* A8D020 802405A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8D024 802405A4 AFB40040 */ sw $s4, 0x40($sp) -/* A8D028 802405A8 0080A02D */ daddu $s4, $a0, $zero -/* A8D02C 802405AC AFBF0044 */ sw $ra, 0x44($sp) -/* A8D030 802405B0 AFB3003C */ sw $s3, 0x3c($sp) -/* A8D034 802405B4 AFB20038 */ sw $s2, 0x38($sp) -/* A8D038 802405B8 AFB10034 */ sw $s1, 0x34($sp) -/* A8D03C 802405BC AFB00030 */ sw $s0, 0x30($sp) -/* A8D040 802405C0 8E910148 */ lw $s1, 0x148($s4) -/* A8D044 802405C4 00A0902D */ daddu $s2, $a1, $zero -/* A8D048 802405C8 86240008 */ lh $a0, 8($s1) -/* A8D04C 802405CC 0C00EABB */ jal get_npc_unsafe -/* A8D050 802405D0 00C0982D */ daddu $s3, $a2, $zero -/* A8D054 802405D4 8E430014 */ lw $v1, 0x14($s2) -/* A8D058 802405D8 04600031 */ bltz $v1, .L802406A0 -/* A8D05C 802405DC 0040802D */ daddu $s0, $v0, $zero -/* A8D060 802405E0 0260202D */ daddu $a0, $s3, $zero -/* A8D064 802405E4 AFA00010 */ sw $zero, 0x10($sp) -/* A8D068 802405E8 8E460024 */ lw $a2, 0x24($s2) -/* A8D06C 802405EC 8E470028 */ lw $a3, 0x28($s2) -/* A8D070 802405F0 0C01242D */ jal func_800490B4 -/* A8D074 802405F4 0220282D */ daddu $a1, $s1, $zero -/* A8D078 802405F8 10400029 */ beqz $v0, .L802406A0 -/* A8D07C 802405FC 0000202D */ daddu $a0, $zero, $zero -/* A8D080 80240600 0200282D */ daddu $a1, $s0, $zero -/* A8D084 80240604 0000302D */ daddu $a2, $zero, $zero -/* A8D088 80240608 860300A8 */ lh $v1, 0xa8($s0) -/* A8D08C 8024060C 3C013F80 */ lui $at, 0x3f80 -/* A8D090 80240610 44810000 */ mtc1 $at, $f0 -/* A8D094 80240614 3C014000 */ lui $at, 0x4000 -/* A8D098 80240618 44811000 */ mtc1 $at, $f2 -/* A8D09C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 -/* A8D0A0 80240620 44812000 */ mtc1 $at, $f4 -/* A8D0A4 80240624 2402000F */ addiu $v0, $zero, 0xf -/* A8D0A8 80240628 AFA2001C */ sw $v0, 0x1c($sp) -/* A8D0AC 8024062C 44833000 */ mtc1 $v1, $f6 -/* A8D0B0 80240630 00000000 */ nop -/* A8D0B4 80240634 468031A0 */ cvt.s.w $f6, $f6 -/* A8D0B8 80240638 44073000 */ mfc1 $a3, $f6 -/* A8D0BC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 -/* A8D0C0 80240640 AFA20020 */ sw $v0, 0x20($sp) -/* A8D0C4 80240644 E7A00010 */ swc1 $f0, 0x10($sp) -/* A8D0C8 80240648 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8D0CC 8024064C 0C01BFA4 */ jal fx_emote -/* A8D0D0 80240650 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8D0D4 80240654 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A8D0D8 80240658 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A8D0DC 8024065C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8D0E0 80240660 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8D0E4 80240664 8C460028 */ lw $a2, 0x28($v0) -/* A8D0E8 80240668 0C00A720 */ jal atan2 -/* A8D0EC 8024066C 8C470030 */ lw $a3, 0x30($v0) -/* A8D0F0 80240670 0200202D */ daddu $a0, $s0, $zero -/* A8D0F4 80240674 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A8D0F8 80240678 3C060020 */ lui $a2, 0x20 -/* A8D0FC 8024067C 0C012530 */ jal func_800494C0 -/* A8D100 80240680 E480000C */ swc1 $f0, 0xc($a0) -/* A8D104 80240684 8E220018 */ lw $v0, 0x18($s1) -/* A8D108 80240688 9442002A */ lhu $v0, 0x2a($v0) -/* A8D10C 8024068C 30420001 */ andi $v0, $v0, 1 -/* A8D110 80240690 14400029 */ bnez $v0, .L80240738 -/* A8D114 80240694 2402000A */ addiu $v0, $zero, 0xa -/* A8D118 80240698 080901CE */ j .L80240738 -/* A8D11C 8024069C 2402000C */ addiu $v0, $zero, 0xc -.L802406A0: -/* A8D120 802406A0 8602008C */ lh $v0, 0x8c($s0) -/* A8D124 802406A4 14400025 */ bnez $v0, .L8024073C -/* A8D128 802406A8 00000000 */ nop -/* A8D12C 802406AC 9602008E */ lhu $v0, 0x8e($s0) -/* A8D130 802406B0 2442FFFF */ addiu $v0, $v0, -1 -/* A8D134 802406B4 A602008E */ sh $v0, 0x8e($s0) -/* A8D138 802406B8 00021400 */ sll $v0, $v0, 0x10 -/* A8D13C 802406BC 1440001F */ bnez $v0, .L8024073C -/* A8D140 802406C0 00000000 */ nop -/* A8D144 802406C4 8E820074 */ lw $v0, 0x74($s4) -/* A8D148 802406C8 2442FFFF */ addiu $v0, $v0, -1 -/* A8D14C 802406CC 10400019 */ beqz $v0, .L80240734 -/* A8D150 802406D0 AE820074 */ sw $v0, 0x74($s4) -/* A8D154 802406D4 8E220018 */ lw $v0, 0x18($s1) -/* A8D158 802406D8 9442002A */ lhu $v0, 0x2a($v0) -/* A8D15C 802406DC 30420010 */ andi $v0, $v0, 0x10 -/* A8D160 802406E0 14400007 */ bnez $v0, .L80240700 -/* A8D164 802406E4 00000000 */ nop -/* A8D168 802406E8 C600000C */ lwc1 $f0, 0xc($s0) -/* A8D16C 802406EC 3C014334 */ lui $at, 0x4334 -/* A8D170 802406F0 44816000 */ mtc1 $at, $f12 -/* A8D174 802406F4 0C00A6C9 */ jal clamp_angle -/* A8D178 802406F8 460C0300 */ add.s $f12, $f0, $f12 -/* A8D17C 802406FC E600000C */ swc1 $f0, 0xc($s0) -.L80240700: -/* A8D180 80240700 8E440008 */ lw $a0, 8($s2) -/* A8D184 80240704 000417C2 */ srl $v0, $a0, 0x1f -/* A8D188 80240708 00822021 */ addu $a0, $a0, $v0 -/* A8D18C 8024070C 00042043 */ sra $a0, $a0, 1 -/* A8D190 80240710 0C00A67F */ jal rand_int -/* A8D194 80240714 24840001 */ addiu $a0, $a0, 1 -/* A8D198 80240718 8E430008 */ lw $v1, 8($s2) -/* A8D19C 8024071C 000327C2 */ srl $a0, $v1, 0x1f -/* A8D1A0 80240720 00641821 */ addu $v1, $v1, $a0 -/* A8D1A4 80240724 00031843 */ sra $v1, $v1, 1 -/* A8D1A8 80240728 00621821 */ addu $v1, $v1, $v0 -/* A8D1AC 8024072C 080901CF */ j .L8024073C -/* A8D1B0 80240730 A603008E */ sh $v1, 0x8e($s0) -.L80240734: -/* A8D1B4 80240734 24020004 */ addiu $v0, $zero, 4 -.L80240738: -/* A8D1B8 80240738 AE820070 */ sw $v0, 0x70($s4) -.L8024073C: -/* A8D1BC 8024073C 8FBF0044 */ lw $ra, 0x44($sp) -/* A8D1C0 80240740 8FB40040 */ lw $s4, 0x40($sp) -/* A8D1C4 80240744 8FB3003C */ lw $s3, 0x3c($sp) -/* A8D1C8 80240748 8FB20038 */ lw $s2, 0x38($sp) -/* A8D1CC 8024074C 8FB10034 */ lw $s1, 0x34($sp) -/* A8D1D0 80240750 8FB00030 */ lw $s0, 0x30($sp) -/* A8D1D4 80240754 03E00008 */ jr $ra -/* A8D1D8 80240758 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s deleted file mode 100644 index 9d2539fde8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A2C_A8D4AC -/* A8D4AC 80240A2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8D4B0 80240A30 AFB3003C */ sw $s3, 0x3c($sp) -/* A8D4B4 80240A34 0080982D */ daddu $s3, $a0, $zero -/* A8D4B8 80240A38 AFBF0040 */ sw $ra, 0x40($sp) -/* A8D4BC 80240A3C AFB20038 */ sw $s2, 0x38($sp) -/* A8D4C0 80240A40 AFB10034 */ sw $s1, 0x34($sp) -/* A8D4C4 80240A44 AFB00030 */ sw $s0, 0x30($sp) -/* A8D4C8 80240A48 8E720148 */ lw $s2, 0x148($s3) -/* A8D4CC 80240A4C 00A0882D */ daddu $s1, $a1, $zero -/* A8D4D0 80240A50 86440008 */ lh $a0, 8($s2) -/* A8D4D4 80240A54 0C00EABB */ jal get_npc_unsafe -/* A8D4D8 80240A58 00C0802D */ daddu $s0, $a2, $zero -/* A8D4DC 80240A5C 0200202D */ daddu $a0, $s0, $zero -/* A8D4E0 80240A60 0240282D */ daddu $a1, $s2, $zero -/* A8D4E4 80240A64 24030001 */ addiu $v1, $zero, 1 -/* A8D4E8 80240A68 AFA30010 */ sw $v1, 0x10($sp) -/* A8D4EC 80240A6C 8E260024 */ lw $a2, 0x24($s1) -/* A8D4F0 80240A70 8E270028 */ lw $a3, 0x28($s1) -/* A8D4F4 80240A74 0C01242D */ jal func_800490B4 -/* A8D4F8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* A8D4FC 80240A7C 1440001E */ bnez $v0, .L80240AF8 -/* A8D500 80240A80 0200202D */ daddu $a0, $s0, $zero -/* A8D504 80240A84 24040002 */ addiu $a0, $zero, 2 -/* A8D508 80240A88 0200282D */ daddu $a1, $s0, $zero -/* A8D50C 80240A8C 0000302D */ daddu $a2, $zero, $zero -/* A8D510 80240A90 860300A8 */ lh $v1, 0xa8($s0) -/* A8D514 80240A94 3C013F80 */ lui $at, 0x3f80 -/* A8D518 80240A98 44810000 */ mtc1 $at, $f0 -/* A8D51C 80240A9C 3C014000 */ lui $at, 0x4000 -/* A8D520 80240AA0 44811000 */ mtc1 $at, $f2 -/* A8D524 80240AA4 3C01C1A0 */ lui $at, 0xc1a0 -/* A8D528 80240AA8 44812000 */ mtc1 $at, $f4 -/* A8D52C 80240AAC 2402000F */ addiu $v0, $zero, 0xf -/* A8D530 80240AB0 AFA2001C */ sw $v0, 0x1c($sp) -/* A8D534 80240AB4 44833000 */ mtc1 $v1, $f6 -/* A8D538 80240AB8 00000000 */ nop -/* A8D53C 80240ABC 468031A0 */ cvt.s.w $f6, $f6 -/* A8D540 80240AC0 44073000 */ mfc1 $a3, $f6 -/* A8D544 80240AC4 27A20028 */ addiu $v0, $sp, 0x28 -/* A8D548 80240AC8 AFA20020 */ sw $v0, 0x20($sp) -/* A8D54C 80240ACC E7A00010 */ swc1 $f0, 0x10($sp) -/* A8D550 80240AD0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8D554 80240AD4 0C01BFA4 */ jal fx_emote -/* A8D558 80240AD8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8D55C 80240ADC 8E4200CC */ lw $v0, 0xcc($s2) -/* A8D560 80240AE0 8C430000 */ lw $v1, ($v0) -/* A8D564 80240AE4 24020019 */ addiu $v0, $zero, 0x19 -/* A8D568 80240AE8 A602008E */ sh $v0, 0x8e($s0) -/* A8D56C 80240AEC 2402000E */ addiu $v0, $zero, 0xe -/* A8D570 80240AF0 080902CB */ j .L80240B2C -/* A8D574 80240AF4 AE030028 */ sw $v1, 0x28($s0) -.L80240AF8: -/* A8D578 80240AF8 0C00F598 */ jal func_8003D660 -/* A8D57C 80240AFC 24050001 */ addiu $a1, $zero, 1 -/* A8D580 80240B00 8E050018 */ lw $a1, 0x18($s0) -/* A8D584 80240B04 8E06000C */ lw $a2, 0xc($s0) -/* A8D588 80240B08 0C00EA95 */ jal npc_move_heading -/* A8D58C 80240B0C 0200202D */ daddu $a0, $s0, $zero -/* A8D590 80240B10 8602008E */ lh $v0, 0x8e($s0) -/* A8D594 80240B14 9603008E */ lhu $v1, 0x8e($s0) -/* A8D598 80240B18 18400003 */ blez $v0, .L80240B28 -/* A8D59C 80240B1C 2462FFFF */ addiu $v0, $v1, -1 -/* A8D5A0 80240B20 080902CC */ j .L80240B30 -/* A8D5A4 80240B24 A602008E */ sh $v0, 0x8e($s0) -.L80240B28: -/* A8D5A8 80240B28 2402000C */ addiu $v0, $zero, 0xc -.L80240B2C: -/* A8D5AC 80240B2C AE620070 */ sw $v0, 0x70($s3) -.L80240B30: -/* A8D5B0 80240B30 8FBF0040 */ lw $ra, 0x40($sp) -/* A8D5B4 80240B34 8FB3003C */ lw $s3, 0x3c($sp) -/* A8D5B8 80240B38 8FB20038 */ lw $s2, 0x38($sp) -/* A8D5BC 80240B3C 8FB10034 */ lw $s1, 0x34($sp) -/* A8D5C0 80240B40 8FB00030 */ lw $s0, 0x30($sp) -/* A8D5C4 80240B44 03E00008 */ jr $ra -/* A8D5C8 80240B48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s deleted file mode 100644 index d740886ec2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240BB4_A8D634.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB4_A8D634 -/* A8D634 80240BB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D638 80240BB8 AFB10014 */ sw $s1, 0x14($sp) -/* A8D63C 80240BBC 0080882D */ daddu $s1, $a0, $zero -/* A8D640 80240BC0 AFBF001C */ sw $ra, 0x1c($sp) -/* A8D644 80240BC4 AFB20018 */ sw $s2, 0x18($sp) -/* A8D648 80240BC8 AFB00010 */ sw $s0, 0x10($sp) -/* A8D64C 80240BCC 8E300148 */ lw $s0, 0x148($s1) -/* A8D650 80240BD0 86040008 */ lh $a0, 8($s0) -/* A8D654 80240BD4 0C00EABB */ jal get_npc_unsafe -/* A8D658 80240BD8 00A0902D */ daddu $s2, $a1, $zero -/* A8D65C 80240BDC 8E0300D0 */ lw $v1, 0xd0($s0) -/* A8D660 80240BE0 8E240078 */ lw $a0, 0x78($s1) -/* A8D664 80240BE4 8C630000 */ lw $v1, ($v1) -/* A8D668 80240BE8 0083182A */ slt $v1, $a0, $v1 -/* A8D66C 80240BEC 10600013 */ beqz $v1, .L80240C3C -/* A8D670 80240BF0 0040302D */ daddu $a2, $v0, $zero -/* A8D674 80240BF4 00041040 */ sll $v0, $a0, 1 -/* A8D678 80240BF8 00441021 */ addu $v0, $v0, $a0 -/* A8D67C 80240BFC 00022880 */ sll $a1, $v0, 2 -.L80240C00: -/* A8D680 80240C00 8E0300D0 */ lw $v1, 0xd0($s0) -/* A8D684 80240C04 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* A8D688 80240C08 00A31021 */ addu $v0, $a1, $v1 -/* A8D68C 80240C0C C4400008 */ lwc1 $f0, 8($v0) -/* A8D690 80240C10 46800020 */ cvt.s.w $f0, $f0 -/* A8D694 80240C14 4602003E */ c.le.s $f0, $f2 -/* A8D698 80240C18 00000000 */ nop -/* A8D69C 80240C1C 45020003 */ bc1fl .L80240C2C -/* A8D6A0 80240C20 24840001 */ addiu $a0, $a0, 1 -/* A8D6A4 80240C24 0809030F */ j .L80240C3C -/* A8D6A8 80240C28 AE240078 */ sw $a0, 0x78($s1) -.L80240C2C: -/* A8D6AC 80240C2C 8C620000 */ lw $v0, ($v1) -/* A8D6B0 80240C30 0082102A */ slt $v0, $a0, $v0 -/* A8D6B4 80240C34 1440FFF2 */ bnez $v0, .L80240C00 -/* A8D6B8 80240C38 24A5000C */ addiu $a1, $a1, 0xc -.L80240C3C: -/* A8D6BC 80240C3C C6400000 */ lwc1 $f0, ($s2) -/* A8D6C0 80240C40 E4C00018 */ swc1 $f0, 0x18($a2) -/* A8D6C4 80240C44 8E0200CC */ lw $v0, 0xcc($s0) -/* A8D6C8 80240C48 8C420004 */ lw $v0, 4($v0) -/* A8D6CC 80240C4C ACC20028 */ sw $v0, 0x28($a2) -/* A8D6D0 80240C50 24020001 */ addiu $v0, $zero, 1 -/* A8D6D4 80240C54 AE200074 */ sw $zero, 0x74($s1) -/* A8D6D8 80240C58 AE220070 */ sw $v0, 0x70($s1) -/* A8D6DC 80240C5C 8FBF001C */ lw $ra, 0x1c($sp) -/* A8D6E0 80240C60 8FB20018 */ lw $s2, 0x18($sp) -/* A8D6E4 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* A8D6E8 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* A8D6EC 80240C6C 03E00008 */ jr $ra -/* A8D6F0 80240C70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index 5c41f17f73..040e0bb14d 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -137,7 +137,7 @@ glabel L80240E58_A8D8D8 glabel L80240E68_A8D8E8 /* A8D8E8 80240E68 0280202D */ daddu $a0, $s4, $zero /* A8D8EC 80240E6C 0260282D */ daddu $a1, $s3, $zero -/* A8D8F0 80240E70 0C09008E */ jal func_80240238_A8CCB8 +/* A8D8F0 80240E70 0C09008E */ jal kpa_95_UnkFunc13 /* A8D8F4 80240E74 02A0302D */ daddu $a2, $s5, $zero /* A8D8F8 80240E78 080903D2 */ j L80240F48_A8D9C8 /* A8D8FC 80240E7C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80240E80_A8D900 glabel L80240E90_A8D910 /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero -/* A8D918 80240E98 0C090168 */ jal func_802405A0_A8D020 +/* A8D918 80240E98 0C090168 */ jal kpa_95_UnkFunc14 /* A8D91C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* A8D920 80240EA0 080903D2 */ j L80240F48_A8D9C8 /* A8D924 80240EA4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80240EE8_A8D968 glabel L80240EF8_A8D978 /* A8D978 80240EF8 0280202D */ daddu $a0, $s4, $zero /* A8D97C 80240EFC 0260282D */ daddu $a1, $s3, $zero -/* A8D980 80240F00 0C09028B */ jal func_80240A2C_A8D4AC +/* A8D980 80240F00 0C09028B */ jal kpa_95_UnkFunc15 /* A8D984 80240F04 02A0302D */ daddu $a2, $s5, $zero /* A8D988 80240F08 080903D2 */ j L80240F48_A8D9C8 /* A8D98C 80240F0C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80240F10_A8D990 glabel L80240F28_A8D9A8 /* A8D9A8 80240F28 0280202D */ daddu $a0, $s4, $zero /* A8D9AC 80240F2C 0260282D */ daddu $a1, $s3, $zero -/* A8D9B0 80240F30 0C0902ED */ jal func_80240BB4_A8D634 +/* A8D9B0 80240F30 0C0902ED */ jal kpa_95_UnkFunc16 /* A8D9B4 80240F34 02A0302D */ daddu $a2, $s5, $zero /* A8D9B8 80240F38 080903D2 */ j L80240F48_A8D9C8 /* A8D9BC 80240F3C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index b96f6b56a8..b1f4d49d8a 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -149,7 +149,7 @@ glabel L80241510_A8DF90 glabel L80241528_A8DFA8 /* A8DFA8 80241528 0260202D */ daddu $a0, $s3, $zero /* A8DFAC 8024152C 0280282D */ daddu $a1, $s4, $zero -/* A8DFB0 80241530 0C09008E */ jal func_80240238_A8CCB8 +/* A8DFB0 80241530 0C09008E */ jal kpa_95_UnkFunc13 /* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero /* A8DFB8 80241538 08090578 */ j L802415E0_A8E060 /* A8DFBC 8024153C 00000000 */ nop @@ -161,7 +161,7 @@ glabel L80241540_A8DFC0 glabel L80241550_A8DFD0 /* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero -/* A8DFD8 80241558 0C090168 */ jal func_802405A0_A8D020 +/* A8DFD8 80241558 0C090168 */ jal kpa_95_UnkFunc14 /* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero /* A8DFE0 80241560 08090578 */ j L802415E0_A8E060 /* A8DFE4 80241564 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s deleted file mode 100644 index 3a96141db0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D78_C5B4B8 -/* C5B4B8 80240D78 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C5B4BC 80240D7C AFB3004C */ sw $s3, 0x4c($sp) -/* C5B4C0 80240D80 0080982D */ daddu $s3, $a0, $zero -/* C5B4C4 80240D84 AFBF0054 */ sw $ra, 0x54($sp) -/* C5B4C8 80240D88 AFB40050 */ sw $s4, 0x50($sp) -/* C5B4CC 80240D8C AFB20048 */ sw $s2, 0x48($sp) -/* C5B4D0 80240D90 AFB10044 */ sw $s1, 0x44($sp) -/* C5B4D4 80240D94 AFB00040 */ sw $s0, 0x40($sp) -/* C5B4D8 80240D98 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C5B4DC 80240D9C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C5B4E0 80240DA0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C5B4E4 80240DA4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C5B4E8 80240DA8 8E710148 */ lw $s1, 0x148($s3) -/* C5B4EC 80240DAC 00A0902D */ daddu $s2, $a1, $zero -/* C5B4F0 80240DB0 86240008 */ lh $a0, 8($s1) -/* C5B4F4 80240DB4 0C00EABB */ jal get_npc_unsafe -/* C5B4F8 80240DB8 00C0A02D */ daddu $s4, $a2, $zero -/* C5B4FC 80240DBC 0040802D */ daddu $s0, $v0, $zero -/* C5B500 80240DC0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C5B504 80240DC4 46800020 */ cvt.s.w $f0, $f0 -/* C5B508 80240DC8 46000021 */ cvt.d.s $f0, $f0 -/* C5B50C 80240DCC 3C014059 */ lui $at, 0x4059 -/* C5B510 80240DD0 44811800 */ mtc1 $at, $f3 -/* C5B514 80240DD4 44801000 */ mtc1 $zero, $f2 -/* C5B518 80240DD8 8602008E */ lh $v0, 0x8e($s0) -/* C5B51C 80240DDC 9603008E */ lhu $v1, 0x8e($s0) -/* C5B520 80240DE0 46220003 */ div.d $f0, $f0, $f2 -/* C5B524 80240DE4 46200620 */ cvt.s.d $f24, $f0 -/* C5B528 80240DE8 C6200088 */ lwc1 $f0, 0x88($s1) -/* C5B52C 80240DEC 46800020 */ cvt.s.w $f0, $f0 -/* C5B530 80240DF0 46000021 */ cvt.d.s $f0, $f0 -/* C5B534 80240DF4 46220003 */ div.d $f0, $f0, $f2 -/* C5B538 80240DF8 46200020 */ cvt.s.d $f0, $f0 -/* C5B53C 80240DFC 18400003 */ blez $v0, .L80240E0C -/* C5B540 80240E00 4600C680 */ add.s $f26, $f24, $f0 -/* C5B544 80240E04 2462FFFF */ addiu $v0, $v1, -1 -/* C5B548 80240E08 A602008E */ sh $v0, 0x8e($s0) -.L80240E0C: -/* C5B54C 80240E0C 8E220070 */ lw $v0, 0x70($s1) -/* C5B550 80240E10 18400034 */ blez $v0, .L80240EE4 -/* C5B554 80240E14 00000000 */ nop -/* C5B558 80240E18 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C5B55C 80240E1C 46806320 */ cvt.s.w $f12, $f12 -/* C5B560 80240E20 44820000 */ mtc1 $v0, $f0 -/* C5B564 80240E24 00000000 */ nop -/* C5B568 80240E28 46800020 */ cvt.s.w $f0, $f0 -/* C5B56C 80240E2C 46000021 */ cvt.d.s $f0, $f0 -/* C5B570 80240E30 46220003 */ div.d $f0, $f0, $f2 -/* C5B574 80240E34 0C00A8BB */ jal sin_deg -/* C5B578 80240E38 462005A0 */ cvt.s.d $f22, $f0 -/* C5B57C 80240E3C 8E020000 */ lw $v0, ($s0) -/* C5B580 80240E40 30420008 */ andi $v0, $v0, 8 -/* C5B584 80240E44 10400003 */ beqz $v0, .L80240E54 -/* C5B588 80240E48 46000506 */ mov.s $f20, $f0 -/* C5B58C 80240E4C 080903A5 */ j .L80240E94 -/* C5B590 80240E50 0000102D */ daddu $v0, $zero, $zero -.L80240E54: -/* C5B594 80240E54 27A50028 */ addiu $a1, $sp, 0x28 -/* C5B598 80240E58 27A6002C */ addiu $a2, $sp, 0x2c -/* C5B59C 80240E5C C6000038 */ lwc1 $f0, 0x38($s0) -/* C5B5A0 80240E60 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5B5A4 80240E64 C6040040 */ lwc1 $f4, 0x40($s0) -/* C5B5A8 80240E68 3C01447A */ lui $at, 0x447a -/* C5B5AC 80240E6C 44813000 */ mtc1 $at, $f6 -/* C5B5B0 80240E70 27A20034 */ addiu $v0, $sp, 0x34 -/* C5B5B4 80240E74 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5B5B8 80240E78 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C5B5BC 80240E7C E7A40030 */ swc1 $f4, 0x30($sp) -/* C5B5C0 80240E80 E7A60034 */ swc1 $f6, 0x34($sp) -/* C5B5C4 80240E84 AFA20010 */ sw $v0, 0x10($sp) -/* C5B5C8 80240E88 8E040080 */ lw $a0, 0x80($s0) -/* C5B5CC 80240E8C 0C0372DF */ jal func_800DCB7C -/* C5B5D0 80240E90 27A70030 */ addiu $a3, $sp, 0x30 -.L80240E94: -/* C5B5D4 80240E94 10400007 */ beqz $v0, .L80240EB4 -/* C5B5D8 80240E98 00000000 */ nop -/* C5B5DC 80240E9C 4616A082 */ mul.s $f2, $f20, $f22 -/* C5B5E0 80240EA0 00000000 */ nop -/* C5B5E4 80240EA4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C5B5E8 80240EA8 46180000 */ add.s $f0, $f0, $f24 -/* C5B5EC 80240EAC 080903B0 */ j .L80240EC0 -/* C5B5F0 80240EB0 46020000 */ add.s $f0, $f0, $f2 -.L80240EB4: -/* C5B5F4 80240EB4 4616A002 */ mul.s $f0, $f20, $f22 -/* C5B5F8 80240EB8 00000000 */ nop -/* C5B5FC 80240EBC 4600D000 */ add.s $f0, $f26, $f0 -.L80240EC0: -/* C5B600 80240EC0 E600003C */ swc1 $f0, 0x3c($s0) -/* C5B604 80240EC4 8E220074 */ lw $v0, 0x74($s1) -/* C5B608 80240EC8 2442000A */ addiu $v0, $v0, 0xa -/* C5B60C 80240ECC 44826000 */ mtc1 $v0, $f12 -/* C5B610 80240ED0 00000000 */ nop -/* C5B614 80240ED4 0C00A6C9 */ jal clamp_angle -/* C5B618 80240ED8 46806320 */ cvt.s.w $f12, $f12 -/* C5B61C 80240EDC 4600020D */ trunc.w.s $f8, $f0 -/* C5B620 80240EE0 E6280074 */ swc1 $f8, 0x74($s1) -.L80240EE4: -/* C5B624 80240EE4 8E220090 */ lw $v0, 0x90($s1) -/* C5B628 80240EE8 1C400040 */ bgtz $v0, .L80240FEC -/* C5B62C 80240EEC 2442FFFF */ addiu $v0, $v0, -1 -/* C5B630 80240EF0 860200A8 */ lh $v0, 0xa8($s0) -/* C5B634 80240EF4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5B638 80240EF8 44821000 */ mtc1 $v0, $f2 -/* C5B63C 80240EFC 00000000 */ nop -/* C5B640 80240F00 468010A0 */ cvt.s.w $f2, $f2 -/* C5B644 80240F04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B648 80240F08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B64C 80240F0C 46020000 */ add.s $f0, $f0, $f2 -/* C5B650 80240F10 3C014024 */ lui $at, 0x4024 -/* C5B654 80240F14 44812800 */ mtc1 $at, $f5 -/* C5B658 80240F18 44802000 */ mtc1 $zero, $f4 -/* C5B65C 80240F1C C442002C */ lwc1 $f2, 0x2c($v0) -/* C5B660 80240F20 46000021 */ cvt.d.s $f0, $f0 -/* C5B664 80240F24 46240000 */ add.d $f0, $f0, $f4 -/* C5B668 80240F28 460010A1 */ cvt.d.s $f2, $f2 -/* C5B66C 80240F2C 4620103C */ c.lt.d $f2, $f0 -/* C5B670 80240F30 00000000 */ nop -/* C5B674 80240F34 4500002E */ bc1f .L80240FF0 -/* C5B678 80240F38 0280202D */ daddu $a0, $s4, $zero -/* C5B67C 80240F3C 24020001 */ addiu $v0, $zero, 1 -/* C5B680 80240F40 AFA20010 */ sw $v0, 0x10($sp) -/* C5B684 80240F44 8E460024 */ lw $a2, 0x24($s2) -/* C5B688 80240F48 8E470028 */ lw $a3, 0x28($s2) -/* C5B68C 80240F4C 0C01242D */ jal func_800490B4 -/* C5B690 80240F50 0220282D */ daddu $a1, $s1, $zero -/* C5B694 80240F54 10400026 */ beqz $v0, .L80240FF0 -/* C5B698 80240F58 0000202D */ daddu $a0, $zero, $zero -/* C5B69C 80240F5C 0200282D */ daddu $a1, $s0, $zero -/* C5B6A0 80240F60 0000302D */ daddu $a2, $zero, $zero -/* C5B6A4 80240F64 2412000C */ addiu $s2, $zero, 0xc -/* C5B6A8 80240F68 860300A8 */ lh $v1, 0xa8($s0) -/* C5B6AC 80240F6C 3C013F80 */ lui $at, 0x3f80 -/* C5B6B0 80240F70 44810000 */ mtc1 $at, $f0 -/* C5B6B4 80240F74 3C014000 */ lui $at, 0x4000 -/* C5B6B8 80240F78 44811000 */ mtc1 $at, $f2 -/* C5B6BC 80240F7C 3C01C1A0 */ lui $at, 0xc1a0 -/* C5B6C0 80240F80 44812000 */ mtc1 $at, $f4 -/* C5B6C4 80240F84 44834000 */ mtc1 $v1, $f8 -/* C5B6C8 80240F88 00000000 */ nop -/* C5B6CC 80240F8C 46804220 */ cvt.s.w $f8, $f8 -/* C5B6D0 80240F90 44074000 */ mfc1 $a3, $f8 -/* C5B6D4 80240F94 27A20038 */ addiu $v0, $sp, 0x38 -/* C5B6D8 80240F98 AFB2001C */ sw $s2, 0x1c($sp) -/* C5B6DC 80240F9C AFA20020 */ sw $v0, 0x20($sp) -/* C5B6E0 80240FA0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5B6E4 80240FA4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5B6E8 80240FA8 0C01BFA4 */ jal fx_emote -/* C5B6EC 80240FAC E7A40018 */ swc1 $f4, 0x18($sp) -/* C5B6F0 80240FB0 0200202D */ daddu $a0, $s0, $zero -/* C5B6F4 80240FB4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5B6F8 80240FB8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C5B6FC 80240FBC 3C060020 */ lui $a2, 0x20 -/* C5B700 80240FC0 0C012530 */ jal func_800494C0 -/* C5B704 80240FC4 E4800064 */ swc1 $f0, 0x64($a0) -/* C5B708 80240FC8 8E220018 */ lw $v0, 0x18($s1) -/* C5B70C 80240FCC 9442002A */ lhu $v0, 0x2a($v0) -/* C5B710 80240FD0 30420001 */ andi $v0, $v0, 1 -/* C5B714 80240FD4 10400003 */ beqz $v0, .L80240FE4 -/* C5B718 80240FD8 2402000A */ addiu $v0, $zero, 0xa -/* C5B71C 80240FDC 08090423 */ j .L8024108C -/* C5B720 80240FE0 AE620070 */ sw $v0, 0x70($s3) -.L80240FE4: -/* C5B724 80240FE4 08090423 */ j .L8024108C -/* C5B728 80240FE8 AE720070 */ sw $s2, 0x70($s3) -.L80240FEC: -/* C5B72C 80240FEC AE220090 */ sw $v0, 0x90($s1) -.L80240FF0: -/* C5B730 80240FF0 8602008C */ lh $v0, 0x8c($s0) -/* C5B734 80240FF4 14400025 */ bnez $v0, .L8024108C -/* C5B738 80240FF8 00000000 */ nop -/* C5B73C 80240FFC 8602008E */ lh $v0, 0x8e($s0) -/* C5B740 80241000 1C400022 */ bgtz $v0, .L8024108C -/* C5B744 80241004 00000000 */ nop -/* C5B748 80241008 8E620074 */ lw $v0, 0x74($s3) -/* C5B74C 8024100C 2442FFFF */ addiu $v0, $v0, -1 -/* C5B750 80241010 1840001D */ blez $v0, .L80241088 -/* C5B754 80241014 AE620074 */ sw $v0, 0x74($s3) -/* C5B758 80241018 8E220018 */ lw $v0, 0x18($s1) -/* C5B75C 8024101C 9442002A */ lhu $v0, 0x2a($v0) -/* C5B760 80241020 30420010 */ andi $v0, $v0, 0x10 -/* C5B764 80241024 14400007 */ bnez $v0, .L80241044 -/* C5B768 80241028 00000000 */ nop -/* C5B76C 8024102C C600000C */ lwc1 $f0, 0xc($s0) -/* C5B770 80241030 3C014334 */ lui $at, 0x4334 -/* C5B774 80241034 44816000 */ mtc1 $at, $f12 -/* C5B778 80241038 0C00A6C9 */ jal clamp_angle -/* C5B77C 8024103C 460C0300 */ add.s $f12, $f0, $f12 -/* C5B780 80241040 E600000C */ swc1 $f0, 0xc($s0) -.L80241044: -/* C5B784 80241044 0C00A67F */ jal rand_int -/* C5B788 80241048 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C5B78C 8024104C 3C032E8B */ lui $v1, 0x2e8b -/* C5B790 80241050 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C5B794 80241054 00430018 */ mult $v0, $v1 -/* C5B798 80241058 00021FC3 */ sra $v1, $v0, 0x1f -/* C5B79C 8024105C 00004010 */ mfhi $t0 -/* C5B7A0 80241060 00082043 */ sra $a0, $t0, 1 -/* C5B7A4 80241064 00832023 */ subu $a0, $a0, $v1 -/* C5B7A8 80241068 00041840 */ sll $v1, $a0, 1 -/* C5B7AC 8024106C 00641821 */ addu $v1, $v1, $a0 -/* C5B7B0 80241070 00031880 */ sll $v1, $v1, 2 -/* C5B7B4 80241074 00641823 */ subu $v1, $v1, $a0 -/* C5B7B8 80241078 00431023 */ subu $v0, $v0, $v1 -/* C5B7BC 8024107C 24420005 */ addiu $v0, $v0, 5 -/* C5B7C0 80241080 08090423 */ j .L8024108C -/* C5B7C4 80241084 A602008E */ sh $v0, 0x8e($s0) -.L80241088: -/* C5B7C8 80241088 AE600070 */ sw $zero, 0x70($s3) -.L8024108C: -/* C5B7CC 8024108C 8FBF0054 */ lw $ra, 0x54($sp) -/* C5B7D0 80241090 8FB40050 */ lw $s4, 0x50($sp) -/* C5B7D4 80241094 8FB3004C */ lw $s3, 0x4c($sp) -/* C5B7D8 80241098 8FB20048 */ lw $s2, 0x48($sp) -/* C5B7DC 8024109C 8FB10044 */ lw $s1, 0x44($sp) -/* C5B7E0 802410A0 8FB00040 */ lw $s0, 0x40($sp) -/* C5B7E4 802410A4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C5B7E8 802410A8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C5B7EC 802410AC D7B60060 */ ldc1 $f22, 0x60($sp) -/* C5B7F0 802410B0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C5B7F4 802410B4 03E00008 */ jr $ra -/* C5B7F8 802410B8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s deleted file mode 100644 index 5988561a98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241338_C5BA78.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241338_C5BA78 -/* C5BA78 80241338 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C5BA7C 8024133C AFB20030 */ sw $s2, 0x30($sp) -/* C5BA80 80241340 0080902D */ daddu $s2, $a0, $zero -/* C5BA84 80241344 AFBF0038 */ sw $ra, 0x38($sp) -/* C5BA88 80241348 AFB30034 */ sw $s3, 0x34($sp) -/* C5BA8C 8024134C AFB1002C */ sw $s1, 0x2c($sp) -/* C5BA90 80241350 AFB00028 */ sw $s0, 0x28($sp) -/* C5BA94 80241354 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C5BA98 80241358 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C5BA9C 8024135C 8E510148 */ lw $s1, 0x148($s2) -/* C5BAA0 80241360 86240008 */ lh $a0, 8($s1) -/* C5BAA4 80241364 0C00EABB */ jal get_npc_unsafe -/* C5BAA8 80241368 00A0982D */ daddu $s3, $a1, $zero -/* C5BAAC 8024136C 0040802D */ daddu $s0, $v0, $zero -/* C5BAB0 80241370 0200202D */ daddu $a0, $s0, $zero -/* C5BAB4 80241374 C6220088 */ lwc1 $f2, 0x88($s1) -/* C5BAB8 80241378 468010A0 */ cvt.s.w $f2, $f2 -/* C5BABC 8024137C 460010A1 */ cvt.d.s $f2, $f2 -/* C5BAC0 80241380 C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BAC4 80241384 C6000014 */ lwc1 $f0, 0x14($s0) -/* C5BAC8 80241388 8E050018 */ lw $a1, 0x18($s0) -/* C5BACC 8024138C 46002100 */ add.s $f4, $f4, $f0 -/* C5BAD0 80241390 8E06000C */ lw $a2, 0xc($s0) -/* C5BAD4 80241394 C6200078 */ lwc1 $f0, 0x78($s1) -/* C5BAD8 80241398 46800020 */ cvt.s.w $f0, $f0 -/* C5BADC 8024139C E604001C */ swc1 $f4, 0x1c($s0) -/* C5BAE0 802413A0 3C014059 */ lui $at, 0x4059 -/* C5BAE4 802413A4 44812800 */ mtc1 $at, $f5 -/* C5BAE8 802413A8 44802000 */ mtc1 $zero, $f4 -/* C5BAEC 802413AC 46000021 */ cvt.d.s $f0, $f0 -/* C5BAF0 802413B0 46240003 */ div.d $f0, $f0, $f4 -/* C5BAF4 802413B4 46200520 */ cvt.s.d $f20, $f0 -/* C5BAF8 802413B8 46241083 */ div.d $f2, $f2, $f4 -/* C5BAFC 802413BC 0C00EA95 */ jal npc_move_heading -/* C5BB00 802413C0 462015A0 */ cvt.s.d $f22, $f2 -/* C5BB04 802413C4 C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BB08 802413C8 44801000 */ mtc1 $zero, $f2 -/* C5BB0C 802413CC 44801800 */ mtc1 $zero, $f3 -/* C5BB10 802413D0 46002021 */ cvt.d.s $f0, $f4 -/* C5BB14 802413D4 4620103E */ c.le.d $f2, $f0 -/* C5BB18 802413D8 00000000 */ nop -/* C5BB1C 802413DC 45000030 */ bc1f .L802414A0 -/* C5BB20 802413E0 00000000 */ nop -/* C5BB24 802413E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5BB28 802413E8 46040000 */ add.s $f0, $f0, $f4 -/* C5BB2C 802413EC E600003C */ swc1 $f0, 0x3c($s0) -/* C5BB30 802413F0 8E2200CC */ lw $v0, 0xcc($s1) -/* C5BB34 802413F4 8C420024 */ lw $v0, 0x24($v0) -/* C5BB38 802413F8 AE020028 */ sw $v0, 0x28($s0) -/* C5BB3C 802413FC A2200007 */ sb $zero, 7($s1) -/* C5BB40 80241400 8E020000 */ lw $v0, ($s0) -/* C5BB44 80241404 30420008 */ andi $v0, $v0, 8 -/* C5BB48 80241408 14400011 */ bnez $v0, .L80241450 -/* C5BB4C 8024140C 0000102D */ daddu $v0, $zero, $zero -/* C5BB50 80241410 27A50018 */ addiu $a1, $sp, 0x18 -/* C5BB54 80241414 27A6001C */ addiu $a2, $sp, 0x1c -/* C5BB58 80241418 C6000038 */ lwc1 $f0, 0x38($s0) -/* C5BB5C 8024141C C602003C */ lwc1 $f2, 0x3c($s0) -/* C5BB60 80241420 C6040040 */ lwc1 $f4, 0x40($s0) -/* C5BB64 80241424 3C01447A */ lui $at, 0x447a -/* C5BB68 80241428 44813000 */ mtc1 $at, $f6 -/* C5BB6C 8024142C 27A20024 */ addiu $v0, $sp, 0x24 -/* C5BB70 80241430 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5BB74 80241434 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C5BB78 80241438 E7A40020 */ swc1 $f4, 0x20($sp) -/* C5BB7C 8024143C E7A60024 */ swc1 $f6, 0x24($sp) -/* C5BB80 80241440 AFA20010 */ sw $v0, 0x10($sp) -/* C5BB84 80241444 8E040080 */ lw $a0, 0x80($s0) -/* C5BB88 80241448 0C0372DF */ jal func_800DCB7C -/* C5BB8C 8024144C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241450: -/* C5BB90 80241450 1040000B */ beqz $v0, .L80241480 -/* C5BB94 80241454 00000000 */ nop -/* C5BB98 80241458 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C5BB9C 8024145C 46140080 */ add.s $f2, $f0, $f20 -/* C5BBA0 80241460 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5BBA4 80241464 4600103E */ c.le.s $f2, $f0 -/* C5BBA8 80241468 00000000 */ nop -/* C5BBAC 8024146C 4500008D */ bc1f .L802416A4 -/* C5BBB0 80241470 00000000 */ nop -/* C5BBB4 80241474 E602003C */ swc1 $f2, 0x3c($s0) -/* C5BBB8 80241478 080905A9 */ j .L802416A4 -/* C5BBBC 8024147C AE400070 */ sw $zero, 0x70($s2) -.L80241480: -/* C5BBC0 80241480 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5BBC4 80241484 C6000064 */ lwc1 $f0, 0x64($s0) -/* C5BBC8 80241488 4602003E */ c.le.s $f0, $f2 -/* C5BBCC 8024148C 00000000 */ nop -/* C5BBD0 80241490 45030084 */ bc1tl .L802416A4 -/* C5BBD4 80241494 AE400070 */ sw $zero, 0x70($s2) -/* C5BBD8 80241498 080905A9 */ j .L802416A4 -/* C5BBDC 8024149C 00000000 */ nop -.L802414A0: -/* C5BBE0 802414A0 4622003C */ c.lt.d $f0, $f2 -/* C5BBE4 802414A4 00000000 */ nop -/* C5BBE8 802414A8 4500007E */ bc1f .L802416A4 -/* C5BBEC 802414AC 00000000 */ nop -/* C5BBF0 802414B0 9602008E */ lhu $v0, 0x8e($s0) -/* C5BBF4 802414B4 24420001 */ addiu $v0, $v0, 1 -/* C5BBF8 802414B8 A602008E */ sh $v0, 0x8e($s0) -/* C5BBFC 802414BC 00021400 */ sll $v0, $v0, 0x10 -/* C5BC00 802414C0 8E630020 */ lw $v1, 0x20($s3) -/* C5BC04 802414C4 00021403 */ sra $v0, $v0, 0x10 -/* C5BC08 802414C8 0043102A */ slt $v0, $v0, $v1 -/* C5BC0C 802414CC 14400026 */ bnez $v0, .L80241568 -/* C5BC10 802414D0 00000000 */ nop -/* C5BC14 802414D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5BC18 802414D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5BC1C 802414DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5BC20 802414E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5BC24 802414E4 A600008E */ sh $zero, 0x8e($s0) -/* C5BC28 802414E8 8C460028 */ lw $a2, 0x28($v0) -/* C5BC2C 802414EC 0C00A720 */ jal atan2 -/* C5BC30 802414F0 8C470030 */ lw $a3, 0x30($v0) -/* C5BC34 802414F4 46000506 */ mov.s $f20, $f0 -/* C5BC38 802414F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5BC3C 802414FC 0C00A70A */ jal get_clamped_angle_diff -/* C5BC40 80241500 4600A386 */ mov.s $f14, $f20 -/* C5BC44 80241504 46000086 */ mov.s $f2, $f0 -/* C5BC48 80241508 8E62001C */ lw $v0, 0x1c($s3) -/* C5BC4C 8024150C 46001005 */ abs.s $f0, $f2 -/* C5BC50 80241510 44822000 */ mtc1 $v0, $f4 -/* C5BC54 80241514 00000000 */ nop -/* C5BC58 80241518 46802120 */ cvt.s.w $f4, $f4 -/* C5BC5C 8024151C 4600203C */ c.lt.s $f4, $f0 -/* C5BC60 80241520 00000000 */ nop -/* C5BC64 80241524 4500000D */ bc1f .L8024155C -/* C5BC68 80241528 00000000 */ nop -/* C5BC6C 8024152C 44800000 */ mtc1 $zero, $f0 -/* C5BC70 80241530 C614000C */ lwc1 $f20, 0xc($s0) -/* C5BC74 80241534 4600103C */ c.lt.s $f2, $f0 -/* C5BC78 80241538 00000000 */ nop -/* C5BC7C 8024153C 45000006 */ bc1f .L80241558 -/* C5BC80 80241540 00021023 */ negu $v0, $v0 -/* C5BC84 80241544 44820000 */ mtc1 $v0, $f0 -/* C5BC88 80241548 00000000 */ nop -/* C5BC8C 8024154C 46800020 */ cvt.s.w $f0, $f0 -/* C5BC90 80241550 08090557 */ j .L8024155C -/* C5BC94 80241554 4600A500 */ add.s $f20, $f20, $f0 -.L80241558: -/* C5BC98 80241558 4604A500 */ add.s $f20, $f20, $f4 -.L8024155C: -/* C5BC9C 8024155C 0C00A6C9 */ jal clamp_angle -/* C5BCA0 80241560 4600A306 */ mov.s $f12, $f20 -/* C5BCA4 80241564 E600000C */ swc1 $f0, 0xc($s0) -.L80241568: -/* C5BCA8 80241568 8E020000 */ lw $v0, ($s0) -/* C5BCAC 8024156C 30420008 */ andi $v0, $v0, 8 -/* C5BCB0 80241570 1040000A */ beqz $v0, .L8024159C -/* C5BCB4 80241574 27A50018 */ addiu $a1, $sp, 0x18 -/* C5BCB8 80241578 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5BCBC 8024157C C600001C */ lwc1 $f0, 0x1c($s0) -/* C5BCC0 80241580 46001080 */ add.s $f2, $f2, $f0 -/* C5BCC4 80241584 4616103C */ c.lt.s $f2, $f22 -/* C5BCC8 80241588 00000000 */ nop -/* C5BCCC 8024158C 45020045 */ bc1fl .L802416A4 -/* C5BCD0 80241590 E602003C */ swc1 $f2, 0x3c($s0) -/* C5BCD4 80241594 080905A8 */ j .L802416A0 -/* C5BCD8 80241598 E616003C */ swc1 $f22, 0x3c($s0) -.L8024159C: -/* C5BCDC 8024159C C6000038 */ lwc1 $f0, 0x38($s0) -/* C5BCE0 802415A0 27A6001C */ addiu $a2, $sp, 0x1c -/* C5BCE4 802415A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5BCE8 802415A8 860200A8 */ lh $v0, 0xa8($s0) -/* C5BCEC 802415AC C600001C */ lwc1 $f0, 0x1c($s0) -/* C5BCF0 802415B0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C5BCF4 802415B4 44821000 */ mtc1 $v0, $f2 -/* C5BCF8 802415B8 00000000 */ nop -/* C5BCFC 802415BC 468010A0 */ cvt.s.w $f2, $f2 -/* C5BD00 802415C0 46000005 */ abs.s $f0, $f0 -/* C5BD04 802415C4 46020000 */ add.s $f0, $f0, $f2 -/* C5BD08 802415C8 C6060040 */ lwc1 $f6, 0x40($s0) -/* C5BD0C 802415CC 27A20024 */ addiu $v0, $sp, 0x24 -/* C5BD10 802415D0 46022100 */ add.s $f4, $f4, $f2 -/* C5BD14 802415D4 3C014024 */ lui $at, 0x4024 -/* C5BD18 802415D8 44811800 */ mtc1 $at, $f3 -/* C5BD1C 802415DC 44801000 */ mtc1 $zero, $f2 -/* C5BD20 802415E0 46000021 */ cvt.d.s $f0, $f0 -/* C5BD24 802415E4 46220000 */ add.d $f0, $f0, $f2 -/* C5BD28 802415E8 E7A60020 */ swc1 $f6, 0x20($sp) -/* C5BD2C 802415EC E7A4001C */ swc1 $f4, 0x1c($sp) -/* C5BD30 802415F0 46200020 */ cvt.s.d $f0, $f0 -/* C5BD34 802415F4 E7A00024 */ swc1 $f0, 0x24($sp) -/* C5BD38 802415F8 AFA20010 */ sw $v0, 0x10($sp) -/* C5BD3C 802415FC 8E040080 */ lw $a0, 0x80($s0) -/* C5BD40 80241600 0C0372DF */ jal func_800DCB7C -/* C5BD44 80241604 27A70020 */ addiu $a3, $sp, 0x20 -/* C5BD48 80241608 10400015 */ beqz $v0, .L80241660 -/* C5BD4C 8024160C 00000000 */ nop -/* C5BD50 80241610 860200A8 */ lh $v0, 0xa8($s0) -/* C5BD54 80241614 C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BD58 80241618 44820000 */ mtc1 $v0, $f0 -/* C5BD5C 8024161C 00000000 */ nop -/* C5BD60 80241620 46800020 */ cvt.s.w $f0, $f0 -/* C5BD64 80241624 46002085 */ abs.s $f2, $f4 -/* C5BD68 80241628 46020000 */ add.s $f0, $f0, $f2 -/* C5BD6C 8024162C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C5BD70 80241630 4600103E */ c.le.s $f2, $f0 -/* C5BD74 80241634 00000000 */ nop -/* C5BD78 80241638 45000005 */ bc1f .L80241650 -/* C5BD7C 8024163C 00000000 */ nop -/* C5BD80 80241640 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C5BD84 80241644 AE00001C */ sw $zero, 0x1c($s0) -/* C5BD88 80241648 080905A9 */ j .L802416A4 -/* C5BD8C 8024164C E600003C */ swc1 $f0, 0x3c($s0) -.L80241650: -/* C5BD90 80241650 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5BD94 80241654 46040000 */ add.s $f0, $f0, $f4 -/* C5BD98 80241658 080905A9 */ j .L802416A4 -/* C5BD9C 8024165C E600003C */ swc1 $f0, 0x3c($s0) -.L80241660: -/* C5BDA0 80241660 C606003C */ lwc1 $f6, 0x3c($s0) -/* C5BDA4 80241664 860200A8 */ lh $v0, 0xa8($s0) -/* C5BDA8 80241668 46163081 */ sub.s $f2, $f6, $f22 -/* C5BDAC 8024166C 44820000 */ mtc1 $v0, $f0 -/* C5BDB0 80241670 00000000 */ nop -/* C5BDB4 80241674 46800020 */ cvt.s.w $f0, $f0 -/* C5BDB8 80241678 46001080 */ add.s $f2, $f2, $f0 -/* C5BDBC 8024167C C604001C */ lwc1 $f4, 0x1c($s0) -/* C5BDC0 80241680 46002005 */ abs.s $f0, $f4 -/* C5BDC4 80241684 4602003C */ c.lt.s $f0, $f2 -/* C5BDC8 80241688 00000000 */ nop -/* C5BDCC 8024168C 45020005 */ bc1fl .L802416A4 -/* C5BDD0 80241690 AE00001C */ sw $zero, 0x1c($s0) -/* C5BDD4 80241694 46043000 */ add.s $f0, $f6, $f4 -/* C5BDD8 80241698 080905A9 */ j .L802416A4 -/* C5BDDC 8024169C E600003C */ swc1 $f0, 0x3c($s0) -.L802416A0: -/* C5BDE0 802416A0 AE00001C */ sw $zero, 0x1c($s0) -.L802416A4: -/* C5BDE4 802416A4 8FBF0038 */ lw $ra, 0x38($sp) -/* C5BDE8 802416A8 8FB30034 */ lw $s3, 0x34($sp) -/* C5BDEC 802416AC 8FB20030 */ lw $s2, 0x30($sp) -/* C5BDF0 802416B0 8FB1002C */ lw $s1, 0x2c($sp) -/* C5BDF4 802416B4 8FB00028 */ lw $s0, 0x28($sp) -/* C5BDF8 802416B8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C5BDFC 802416BC D7B40040 */ ldc1 $f20, 0x40($sp) -/* C5BE00 802416C0 03E00008 */ jr $ra -/* C5BE04 802416C4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s deleted file mode 100644 index 47dc683ed7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802416C8_C5BE08.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C8_C5BE08 -/* C5BE08 802416C8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C5BE0C 802416CC AFB00028 */ sw $s0, 0x28($sp) -/* C5BE10 802416D0 00A0802D */ daddu $s0, $a1, $zero -/* C5BE14 802416D4 AFB1002C */ sw $s1, 0x2c($sp) -/* C5BE18 802416D8 00C0882D */ daddu $s1, $a2, $zero -/* C5BE1C 802416DC AFBF0034 */ sw $ra, 0x34($sp) -/* C5BE20 802416E0 AFB20030 */ sw $s2, 0x30($sp) -/* C5BE24 802416E4 AE200070 */ sw $zero, 0x70($s1) -/* C5BE28 802416E8 8C830000 */ lw $v1, ($a0) -/* C5BE2C 802416EC 2402FDFF */ addiu $v0, $zero, -0x201 -/* C5BE30 802416F0 A480008E */ sh $zero, 0x8e($a0) -/* C5BE34 802416F4 00621824 */ and $v1, $v1, $v0 -/* C5BE38 802416F8 34650800 */ ori $a1, $v1, 0x800 -/* C5BE3C 802416FC AC850000 */ sw $a1, ($a0) -/* C5BE40 80241700 8E0200D0 */ lw $v0, 0xd0($s0) -/* C5BE44 80241704 8C420034 */ lw $v0, 0x34($v0) -/* C5BE48 80241708 10400003 */ beqz $v0, .L80241718 -/* C5BE4C 8024170C 00E0902D */ daddu $s2, $a3, $zero -/* C5BE50 80241710 080905C8 */ j .L80241720 -/* C5BE54 80241714 34620808 */ ori $v0, $v1, 0x808 -.L80241718: -/* C5BE58 80241718 2402FFF7 */ addiu $v0, $zero, -9 -/* C5BE5C 8024171C 00A21024 */ and $v0, $a1, $v0 -.L80241720: -/* C5BE60 80241720 AC820000 */ sw $v0, ($a0) -/* C5BE64 80241724 27A20024 */ addiu $v0, $sp, 0x24 -/* C5BE68 80241728 27A50018 */ addiu $a1, $sp, 0x18 -/* C5BE6C 8024172C C4800038 */ lwc1 $f0, 0x38($a0) -/* C5BE70 80241730 C482003C */ lwc1 $f2, 0x3c($a0) -/* C5BE74 80241734 C4840040 */ lwc1 $f4, 0x40($a0) -/* C5BE78 80241738 3C01447A */ lui $at, 0x447a -/* C5BE7C 8024173C 44813000 */ mtc1 $at, $f6 -/* C5BE80 80241740 27A6001C */ addiu $a2, $sp, 0x1c -/* C5BE84 80241744 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5BE88 80241748 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C5BE8C 8024174C E7A40020 */ swc1 $f4, 0x20($sp) -/* C5BE90 80241750 E7A60024 */ swc1 $f6, 0x24($sp) -/* C5BE94 80241754 AFA20010 */ sw $v0, 0x10($sp) -/* C5BE98 80241758 8C840080 */ lw $a0, 0x80($a0) -/* C5BE9C 8024175C 0C0372DF */ jal func_800DCB7C -/* C5BEA0 80241760 27A70020 */ addiu $a3, $sp, 0x20 -/* C5BEA4 80241764 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C5BEA8 80241768 3C014059 */ lui $at, 0x4059 -/* C5BEAC 8024176C 44812800 */ mtc1 $at, $f5 -/* C5BEB0 80241770 44802000 */ mtc1 $zero, $f4 -/* C5BEB4 80241774 460010A1 */ cvt.d.s $f2, $f2 -/* C5BEB8 80241778 46241082 */ mul.d $f2, $f2, $f4 -/* C5BEBC 8024177C 00000000 */ nop -/* C5BEC0 80241780 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C5BEC4 80241784 46000021 */ cvt.d.s $f0, $f0 -/* C5BEC8 80241788 46240002 */ mul.d $f0, $f0, $f4 -/* C5BECC 8024178C 00000000 */ nop -/* C5BED0 80241790 3C013FE0 */ lui $at, 0x3fe0 -/* C5BED4 80241794 44812800 */ mtc1 $at, $f5 -/* C5BED8 80241798 44802000 */ mtc1 $zero, $f4 -/* C5BEDC 8024179C 00000000 */ nop -/* C5BEE0 802417A0 46241080 */ add.d $f2, $f2, $f4 -/* C5BEE4 802417A4 AE000074 */ sw $zero, 0x74($s0) -/* C5BEE8 802417A8 46240000 */ add.d $f0, $f0, $f4 -/* C5BEEC 802417AC AE000090 */ sw $zero, 0x90($s0) -/* C5BEF0 802417B0 4620120D */ trunc.w.d $f8, $f2 -/* C5BEF4 802417B4 E6080078 */ swc1 $f8, 0x78($s0) -/* C5BEF8 802417B8 4620020D */ trunc.w.d $f8, $f0 -/* C5BEFC 802417BC E6080088 */ swc1 $f8, 0x88($s0) -/* C5BF00 802417C0 8E420014 */ lw $v0, 0x14($s2) -/* C5BF04 802417C4 AE220074 */ sw $v0, 0x74($s1) -/* C5BF08 802417C8 8E0200B0 */ lw $v0, 0xb0($s0) -/* C5BF0C 802417CC 34420010 */ ori $v0, $v0, 0x10 -/* C5BF10 802417D0 AE0200B0 */ sw $v0, 0xb0($s0) -/* C5BF14 802417D4 8FBF0034 */ lw $ra, 0x34($sp) -/* C5BF18 802417D8 8FB20030 */ lw $s2, 0x30($sp) -/* C5BF1C 802417DC 8FB1002C */ lw $s1, 0x2c($sp) -/* C5BF20 802417E0 8FB00028 */ lw $s0, 0x28($sp) -/* C5BF24 802417E4 03E00008 */ jr $ra -/* C5BF28 802417E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 92e55a0308..063f6eab13 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -46,7 +46,7 @@ glabel func_802417EC_C5BF2C /* C5BFD0 80241890 02A0202D */ daddu $a0, $s5, $zero /* C5BFD4 80241894 0240282D */ daddu $a1, $s2, $zero /* C5BFD8 80241898 0280302D */ daddu $a2, $s4, $zero -/* C5BFDC 8024189C 0C0905B2 */ jal func_802416C8_C5BE08 +/* C5BFDC 8024189C 0C0905B2 */ jal kzn_02_UnkFunc5 /* C5BFE0 802418A0 0200382D */ daddu $a3, $s0, $zero .L802418A4: /* C5BFE4 802418A4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241920_C5C060 glabel L80241930_C5C070 /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero -/* C5C078 80241938 0C09035E */ jal func_80240D78_C5B4B8 +/* C5C078 80241938 0C09035E */ jal kzn_02_UnkFunc4 /* C5C07C 8024193C 0260302D */ daddu $a2, $s3, $zero /* C5C080 80241940 0809066D */ j .L802419B4 /* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241988_C5C0C8 glabel L802419A0_C5C0E0 /* C5C0E0 802419A0 0280202D */ daddu $a0, $s4, $zero /* C5C0E4 802419A4 0200282D */ daddu $a1, $s0, $zero -/* C5C0E8 802419A8 0C0904CE */ jal func_80241338_C5BA78 +/* C5C0E8 802419A8 0C0904CE */ jal kzn_02_UnkFunc6 /* C5C0EC 802419AC 0260302D */ daddu $a2, $s3, $zero glabel L802419B0_C5C0F0 /* C5C0F0 802419B0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 466b857317..d9ff0590c7 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -46,7 +46,7 @@ glabel func_80241DE4_C5C524 /* C5C5C8 80241E88 02A0202D */ daddu $a0, $s5, $zero /* C5C5CC 80241E8C 0240282D */ daddu $a1, $s2, $zero /* C5C5D0 80241E90 0280302D */ daddu $a2, $s4, $zero -/* C5C5D4 80241E94 0C0905B2 */ jal func_802416C8_C5BE08 +/* C5C5D4 80241E94 0C0905B2 */ jal kzn_02_UnkFunc5 /* C5C5D8 80241E98 0200382D */ daddu $a3, $s0, $zero /* C5C5DC 80241E9C AE800070 */ sw $zero, 0x70($s4) .L80241EA0: @@ -92,7 +92,7 @@ glabel L80241F1C_C5C65C glabel L80241F2C_C5C66C /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero -/* C5C674 80241F34 0C09035E */ jal func_80240D78_C5B4B8 +/* C5C674 80241F34 0C09035E */ jal kzn_02_UnkFunc4 /* C5C678 80241F38 0260302D */ daddu $a2, $s3, $zero /* C5C67C 80241F3C 080907EA */ j .L80241FA8 /* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s deleted file mode 100644 index 42d3c7d141..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB4_C61CC4 -/* C61CC4 80240FB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C61CC8 80240FB8 AFB40028 */ sw $s4, 0x28($sp) -/* C61CCC 80240FBC 0080A02D */ daddu $s4, $a0, $zero -/* C61CD0 80240FC0 AFBF002C */ sw $ra, 0x2c($sp) -/* C61CD4 80240FC4 AFB30024 */ sw $s3, 0x24($sp) -/* C61CD8 80240FC8 AFB20020 */ sw $s2, 0x20($sp) -/* C61CDC 80240FCC AFB1001C */ sw $s1, 0x1c($sp) -/* C61CE0 80240FD0 AFB00018 */ sw $s0, 0x18($sp) -/* C61CE4 80240FD4 8E910148 */ lw $s1, 0x148($s4) -/* C61CE8 80240FD8 86240008 */ lh $a0, 8($s1) -/* C61CEC 80240FDC 0C00EABB */ jal get_npc_unsafe -/* C61CF0 80240FE0 00A0802D */ daddu $s0, $a1, $zero -/* C61CF4 80240FE4 16000005 */ bnez $s0, .L80240FFC -/* C61CF8 80240FE8 0040902D */ daddu $s2, $v0, $zero -/* C61CFC 80240FEC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61D00 80240FF0 30420004 */ andi $v0, $v0, 4 -/* C61D04 80240FF4 10400015 */ beqz $v0, .L8024104C -/* C61D08 80240FF8 00000000 */ nop -.L80240FFC: -/* C61D0C 80240FFC AE800070 */ sw $zero, 0x70($s4) -/* C61D10 80241000 8E420000 */ lw $v0, ($s2) -/* C61D14 80241004 3C031F30 */ lui $v1, 0x1f30 -/* C61D18 80241008 A640008E */ sh $zero, 0x8e($s2) -/* C61D1C 8024100C 34420102 */ ori $v0, $v0, 0x102 -/* C61D20 80241010 AE420000 */ sw $v0, ($s2) -/* C61D24 80241014 8E220000 */ lw $v0, ($s1) -/* C61D28 80241018 3C01C47A */ lui $at, 0xc47a -/* C61D2C 8024101C 44810000 */ mtc1 $at, $f0 -/* C61D30 80241020 00431025 */ or $v0, $v0, $v1 -/* C61D34 80241024 AE220000 */ sw $v0, ($s1) -/* C61D38 80241028 AE400038 */ sw $zero, 0x38($s2) -/* C61D3C 8024102C E640003C */ swc1 $f0, 0x3c($s2) -/* C61D40 80241030 AE400040 */ sw $zero, 0x40($s2) -/* C61D44 80241034 8E2300B0 */ lw $v1, 0xb0($s1) -/* C61D48 80241038 30620004 */ andi $v0, $v1, 4 -/* C61D4C 8024103C 10400003 */ beqz $v0, .L8024104C -/* C61D50 80241040 2402FFFB */ addiu $v0, $zero, -5 -/* C61D54 80241044 00621024 */ and $v0, $v1, $v0 -/* C61D58 80241048 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024104C: -/* C61D5C 8024104C 8E930070 */ lw $s3, 0x70($s4) -/* C61D60 80241050 12600005 */ beqz $s3, .L80241068 -/* C61D64 80241054 24020001 */ addiu $v0, $zero, 1 -/* C61D68 80241058 12620048 */ beq $s3, $v0, .L8024117C -/* C61D6C 8024105C 00000000 */ nop -/* C61D70 80241060 0809047C */ j .L802411F0 -/* C61D74 80241064 00000000 */ nop -.L80241068: -/* C61D78 80241068 86240008 */ lh $a0, 8($s1) -/* C61D7C 8024106C 0C00FB3A */ jal get_enemy -/* C61D80 80241070 2484FFFF */ addiu $a0, $a0, -1 -/* C61D84 80241074 0040802D */ daddu $s0, $v0, $zero -/* C61D88 80241078 0C00EABB */ jal get_npc_unsafe -/* C61D8C 8024107C 86040008 */ lh $a0, 8($s0) -/* C61D90 80241080 24030001 */ addiu $v1, $zero, 1 -/* C61D94 80241084 0040982D */ daddu $s3, $v0, $zero -/* C61D98 80241088 A2230007 */ sb $v1, 7($s1) -/* C61D9C 8024108C 8E03006C */ lw $v1, 0x6c($s0) -/* C61DA0 80241090 24020003 */ addiu $v0, $zero, 3 -/* C61DA4 80241094 14620056 */ bne $v1, $v0, .L802411F0 -/* C61DA8 80241098 00000000 */ nop -/* C61DAC 8024109C 8E2500A8 */ lw $a1, 0xa8($s1) -/* C61DB0 802410A0 10A00003 */ beqz $a1, .L802410B0 -/* C61DB4 802410A4 0260202D */ daddu $a0, $s3, $zero -/* C61DB8 802410A8 0C012530 */ jal func_800494C0 -/* C61DBC 802410AC 0000302D */ daddu $a2, $zero, $zero -.L802410B0: -/* C61DC0 802410B0 27A40010 */ addiu $a0, $sp, 0x10 -/* C61DC4 802410B4 C6280070 */ lwc1 $f8, 0x70($s1) -/* C61DC8 802410B8 46804220 */ cvt.s.w $f8, $f8 -/* C61DCC 802410BC C6620034 */ lwc1 $f2, 0x34($s3) -/* C61DD0 802410C0 3C014387 */ lui $at, 0x4387 -/* C61DD4 802410C4 44810000 */ mtc1 $at, $f0 -/* C61DD8 802410C8 44064000 */ mfc1 $a2, $f8 -/* C61DDC 802410CC 46020001 */ sub.s $f0, $f0, $f2 -/* C61DE0 802410D0 C6660038 */ lwc1 $f6, 0x38($s3) -/* C61DE4 802410D4 C6640040 */ lwc1 $f4, 0x40($s3) -/* C61DE8 802410D8 44070000 */ mfc1 $a3, $f0 -/* C61DEC 802410DC 27A50014 */ addiu $a1, $sp, 0x14 -/* C61DF0 802410E0 E7A60010 */ swc1 $f6, 0x10($sp) -/* C61DF4 802410E4 0C00A7E7 */ jal add_vec2D_polar -/* C61DF8 802410E8 E7A40014 */ swc1 $f4, 0x14($sp) -/* C61DFC 802410EC C7A00010 */ lwc1 $f0, 0x10($sp) -/* C61E00 802410F0 4600020D */ trunc.w.s $f8, $f0 -/* C61E04 802410F4 44024000 */ mfc1 $v0, $f8 -/* C61E08 802410F8 E6400038 */ swc1 $f0, 0x38($s2) -/* C61E0C 802410FC A6220010 */ sh $v0, 0x10($s1) -/* C61E10 80241100 C660003C */ lwc1 $f0, 0x3c($s3) -/* C61E14 80241104 C622006C */ lwc1 $f2, 0x6c($s1) -/* C61E18 80241108 468010A0 */ cvt.s.w $f2, $f2 -/* C61E1C 8024110C 46020000 */ add.s $f0, $f0, $f2 -/* C61E20 80241110 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C61E24 80241114 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C61E28 80241118 E640003C */ swc1 $f0, 0x3c($s2) -/* C61E2C 8024111C C7A20014 */ lwc1 $f2, 0x14($sp) -/* C61E30 80241120 4600020D */ trunc.w.s $f8, $f0 -/* C61E34 80241124 44024000 */ mfc1 $v0, $f8 -/* C61E38 80241128 00000000 */ nop -/* C61E3C 8024112C A6220012 */ sh $v0, 0x12($s1) -/* C61E40 80241130 4600120D */ trunc.w.s $f8, $f2 -/* C61E44 80241134 44024000 */ mfc1 $v0, $f8 -/* C61E48 80241138 E6420040 */ swc1 $f2, 0x40($s2) -/* C61E4C 8024113C A6220014 */ sh $v0, 0x14($s1) -/* C61E50 80241140 8C660028 */ lw $a2, 0x28($v1) -/* C61E54 80241144 8C670030 */ lw $a3, 0x30($v1) -/* C61E58 80241148 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C61E5C 8024114C 0C00A720 */ jal atan2 -/* C61E60 80241150 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C61E64 80241154 3C03E0EF */ lui $v1, 0xe0ef -/* C61E68 80241158 E640000C */ swc1 $f0, 0xc($s2) -/* C61E6C 8024115C 8E220000 */ lw $v0, ($s1) -/* C61E70 80241160 3463FFFF */ ori $v1, $v1, 0xffff -/* C61E74 80241164 00431024 */ and $v0, $v0, $v1 -/* C61E78 80241168 AE220000 */ sw $v0, ($s1) -/* C61E7C 8024116C 24020001 */ addiu $v0, $zero, 1 -/* C61E80 80241170 A640008E */ sh $zero, 0x8e($s2) -/* C61E84 80241174 0809047C */ j .L802411F0 -/* C61E88 80241178 AE820070 */ sw $v0, 0x70($s4) -.L8024117C: -/* C61E8C 8024117C 86240008 */ lh $a0, 8($s1) -/* C61E90 80241180 0C00FB3A */ jal get_enemy -/* C61E94 80241184 2484FFFF */ addiu $a0, $a0, -1 -/* C61E98 80241188 0040802D */ daddu $s0, $v0, $zero -/* C61E9C 8024118C 0C00EABB */ jal get_npc_unsafe -/* C61EA0 80241190 86040008 */ lh $a0, 8($s0) -/* C61EA4 80241194 9642008E */ lhu $v0, 0x8e($s2) -/* C61EA8 80241198 24420001 */ addiu $v0, $v0, 1 -/* C61EAC 8024119C A642008E */ sh $v0, 0x8e($s2) -/* C61EB0 802411A0 00021400 */ sll $v0, $v0, 0x10 -/* C61EB4 802411A4 8E23007C */ lw $v1, 0x7c($s1) -/* C61EB8 802411A8 00021403 */ sra $v0, $v0, 0x10 -/* C61EBC 802411AC 0043102A */ slt $v0, $v0, $v1 -/* C61EC0 802411B0 50400001 */ beql $v0, $zero, .L802411B8 -/* C61EC4 802411B4 A2200007 */ sb $zero, 7($s1) -.L802411B8: -/* C61EC8 802411B8 8E03006C */ lw $v1, 0x6c($s0) -/* C61ECC 802411BC 24020004 */ addiu $v0, $zero, 4 -/* C61ED0 802411C0 1462000B */ bne $v1, $v0, .L802411F0 -/* C61ED4 802411C4 3C021F10 */ lui $v0, 0x1f10 -/* C61ED8 802411C8 8E230000 */ lw $v1, ($s1) -/* C61EDC 802411CC 3C01C47A */ lui $at, 0xc47a -/* C61EE0 802411D0 44810000 */ mtc1 $at, $f0 -/* C61EE4 802411D4 00621825 */ or $v1, $v1, $v0 -/* C61EE8 802411D8 AE230000 */ sw $v1, ($s1) -/* C61EEC 802411DC AE400038 */ sw $zero, 0x38($s2) -/* C61EF0 802411E0 E640003C */ swc1 $f0, 0x3c($s2) -/* C61EF4 802411E4 AE400040 */ sw $zero, 0x40($s2) -/* C61EF8 802411E8 A2330007 */ sb $s3, 7($s1) -/* C61EFC 802411EC AE800070 */ sw $zero, 0x70($s4) -.L802411F0: -/* C61F00 802411F0 8FBF002C */ lw $ra, 0x2c($sp) -/* C61F04 802411F4 8FB40028 */ lw $s4, 0x28($sp) -/* C61F08 802411F8 8FB30024 */ lw $s3, 0x24($sp) -/* C61F0C 802411FC 8FB20020 */ lw $s2, 0x20($sp) -/* C61F10 80241200 8FB1001C */ lw $s1, 0x1c($sp) -/* C61F14 80241204 8FB00018 */ lw $s0, 0x18($sp) -/* C61F18 80241208 0000102D */ daddu $v0, $zero, $zero -/* C61F1C 8024120C 03E00008 */ jr $ra -/* C61F20 80241210 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024032C_C6845C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024032C_C6845C.s deleted file mode 100644 index c7f4c708a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024032C_C6845C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C_C6845C -/* C6845C 8024032C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* C68460 80240330 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* C68464 80240334 8C430000 */ lw $v1, ($v0) -/* C68468 80240338 2404FFBF */ addiu $a0, $zero, -0x41 -/* C6846C 8024033C 00641824 */ and $v1, $v1, $a0 -/* C68470 80240340 AC430000 */ sw $v1, ($v0) -/* C68474 80240344 03E00008 */ jr $ra -/* C68478 80240348 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s deleted file mode 100644 index b84e45672a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240378_C684A8 -/* C684A8 80240378 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C684AC 8024037C AFB00010 */ sw $s0, 0x10($sp) -/* C684B0 80240380 0080802D */ daddu $s0, $a0, $zero -/* C684B4 80240384 AFBF0018 */ sw $ra, 0x18($sp) -/* C684B8 80240388 AFB10014 */ sw $s1, 0x14($sp) -/* C684BC 8024038C 8E11000C */ lw $s1, 0xc($s0) -/* C684C0 80240390 8E250000 */ lw $a1, ($s1) -/* C684C4 80240394 0C0B1EAF */ jal get_variable -/* C684C8 80240398 26310004 */ addiu $s1, $s1, 4 -/* C684CC 8024039C 0200202D */ daddu $a0, $s0, $zero -/* C684D0 802403A0 3C038011 */ lui $v1, %hi(gPlayerData) -/* C684D4 802403A4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* C684D8 802403A8 000210C0 */ sll $v0, $v0, 3 -/* C684DC 802403AC 00431021 */ addu $v0, $v0, $v1 -/* C684E0 802403B0 90460015 */ lbu $a2, 0x15($v0) -/* C684E4 802403B4 8E250000 */ lw $a1, ($s1) -/* C684E8 802403B8 24C60001 */ addiu $a2, $a2, 1 -/* C684EC 802403BC A0460015 */ sb $a2, 0x15($v0) -/* C684F0 802403C0 00063600 */ sll $a2, $a2, 0x18 -/* C684F4 802403C4 0C0B2026 */ jal set_variable -/* C684F8 802403C8 00063603 */ sra $a2, $a2, 0x18 -/* C684FC 802403CC 8FBF0018 */ lw $ra, 0x18($sp) -/* C68500 802403D0 8FB10014 */ lw $s1, 0x14($sp) -/* C68504 802403D4 8FB00010 */ lw $s0, 0x10($sp) -/* C68508 802403D8 24020002 */ addiu $v0, $zero, 2 -/* C6850C 802403DC 03E00008 */ jr $ra -/* C68510 802403E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s deleted file mode 100644 index 48d3590bcf..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240758_C68888 -/* C68888 80240758 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* C6888C 8024075C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* C68890 80240760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68894 80240764 AFBF0010 */ sw $ra, 0x10($sp) -/* C68898 80240768 00021100 */ sll $v0, $v0, 4 -/* C6889C 8024076C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* C688A0 80240770 00822021 */ addu $a0, $a0, $v0 -/* C688A4 80240774 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* C688A8 80240778 0C0496CF */ jal set_message_string -/* C688AC 8024077C 0000282D */ daddu $a1, $zero, $zero -/* C688B0 80240780 8FBF0010 */ lw $ra, 0x10($sp) -/* C688B4 80240784 24020002 */ addiu $v0, $zero, 2 -/* C688B8 80240788 03E00008 */ jr $ra -/* C688BC 8024078C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240790_C688C0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240790_C688C0.s deleted file mode 100644 index 07946a3f76..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240790_C688C0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_C688C0 -/* C688C0 80240790 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C688C4 80240794 AFB1001C */ sw $s1, 0x1c($sp) -/* C688C8 80240798 0080882D */ daddu $s1, $a0, $zero -/* C688CC 8024079C AFBF0020 */ sw $ra, 0x20($sp) -/* C688D0 802407A0 AFB00018 */ sw $s0, 0x18($sp) -/* C688D4 802407A4 8E30000C */ lw $s0, 0xc($s1) -/* C688D8 802407A8 8E050000 */ lw $a1, ($s0) -/* C688DC 802407AC 0C0B1EAF */ jal get_variable -/* C688E0 802407B0 26100004 */ addiu $s0, $s0, 4 -/* C688E4 802407B4 0C04417A */ jal get_entity_by_index -/* C688E8 802407B8 0040202D */ daddu $a0, $v0, $zero -/* C688EC 802407BC 8E100000 */ lw $s0, ($s0) -/* C688F0 802407C0 C444004C */ lwc1 $f4, 0x4c($v0) -/* C688F4 802407C4 3C014148 */ lui $at, 0x4148 -/* C688F8 802407C8 44810000 */ mtc1 $at, $f0 -/* C688FC 802407CC 3C013F33 */ lui $at, 0x3f33 -/* C68900 802407D0 34213333 */ ori $at, $at, 0x3333 -/* C68904 802407D4 44811000 */ mtc1 $at, $f2 -/* C68908 802407D8 AFA00014 */ sw $zero, 0x14($sp) -/* C6890C 802407DC 46002100 */ add.s $f4, $f4, $f0 -/* C68910 802407E0 E7A20010 */ swc1 $f2, 0x10($sp) -/* C68914 802407E4 8C450048 */ lw $a1, 0x48($v0) -/* C68918 802407E8 8C470050 */ lw $a3, 0x50($v0) -/* C6891C 802407EC 44062000 */ mfc1 $a2, $f4 -/* C68920 802407F0 0C01C5D4 */ jal func_80071750 -/* C68924 802407F4 0000202D */ daddu $a0, $zero, $zero -/* C68928 802407F8 0220202D */ daddu $a0, $s1, $zero -/* C6892C 802407FC 0200282D */ daddu $a1, $s0, $zero -/* C68930 80240800 0C0B2026 */ jal set_variable -/* C68934 80240804 0040302D */ daddu $a2, $v0, $zero -/* C68938 80240808 8FBF0020 */ lw $ra, 0x20($sp) -/* C6893C 8024080C 8FB1001C */ lw $s1, 0x1c($sp) -/* C68940 80240810 8FB00018 */ lw $s0, 0x18($sp) -/* C68944 80240814 24020002 */ addiu $v0, $zero, 2 -/* C68948 80240818 03E00008 */ jr $ra -/* C6894C 8024081C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240854_C68984.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240854_C68984.s deleted file mode 100644 index 3f04dde425..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240854_C68984.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854_C68984 -/* C68984 80240854 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C68988 80240858 AFBF0018 */ sw $ra, 0x18($sp) -/* C6898C 8024085C 8C82000C */ lw $v0, 0xc($a0) -/* C68990 80240860 0C0B1EAF */ jal get_variable -/* C68994 80240864 8C450000 */ lw $a1, ($v0) -/* C68998 80240868 0C04417A */ jal get_entity_by_index -/* C6899C 8024086C 0040202D */ daddu $a0, $v0, $zero -/* C689A0 80240870 3C013F80 */ lui $at, 0x3f80 -/* C689A4 80240874 44810000 */ mtc1 $at, $f0 -/* C689A8 80240878 C442004C */ lwc1 $f2, 0x4c($v0) -/* C689AC 8024087C E7A00010 */ swc1 $f0, 0x10($sp) -/* C689B0 80240880 3C014148 */ lui $at, 0x4148 -/* C689B4 80240884 44810000 */ mtc1 $at, $f0 -/* C689B8 80240888 2403004B */ addiu $v1, $zero, 0x4b -/* C689BC 8024088C AFA30014 */ sw $v1, 0x14($sp) -/* C689C0 80240890 46001080 */ add.s $f2, $f2, $f0 -/* C689C4 80240894 8C450048 */ lw $a1, 0x48($v0) -/* C689C8 80240898 8C470050 */ lw $a3, 0x50($v0) -/* C689CC 8024089C 44061000 */ mfc1 $a2, $f2 -/* C689D0 802408A0 0C01C2EC */ jal func_80070BB0 -/* C689D4 802408A4 24040004 */ addiu $a0, $zero, 4 -/* C689D8 802408A8 8FBF0018 */ lw $ra, 0x18($sp) -/* C689DC 802408AC 24020002 */ addiu $v0, $zero, 2 -/* C689E0 802408B0 03E00008 */ jr $ra -/* C689E4 802408B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s deleted file mode 100644 index 327bb840d0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B8_C689E8 -/* C689E8 802408B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C689EC 802408BC AFBF0018 */ sw $ra, 0x18($sp) -/* C689F0 802408C0 0C00EAD2 */ jal get_npc_safe -/* C689F4 802408C4 2404FFFC */ addiu $a0, $zero, -4 -/* C689F8 802408C8 C444003C */ lwc1 $f4, 0x3c($v0) -/* C689FC 802408CC 3C014148 */ lui $at, 0x4148 -/* C68A00 802408D0 44811000 */ mtc1 $at, $f2 -/* C68A04 802408D4 3C013F80 */ lui $at, 0x3f80 -/* C68A08 802408D8 44810000 */ mtc1 $at, $f0 -/* C68A0C 802408DC 2403001E */ addiu $v1, $zero, 0x1e -/* C68A10 802408E0 AFA30014 */ sw $v1, 0x14($sp) -/* C68A14 802408E4 46022100 */ add.s $f4, $f4, $f2 -/* C68A18 802408E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C68A1C 802408EC 8C450038 */ lw $a1, 0x38($v0) -/* C68A20 802408F0 8C470040 */ lw $a3, 0x40($v0) -/* C68A24 802408F4 44062000 */ mfc1 $a2, $f4 -/* C68A28 802408F8 0C01C2EC */ jal func_80070BB0 -/* C68A2C 802408FC 24040009 */ addiu $a0, $zero, 9 -/* C68A30 80240900 8FBF0018 */ lw $ra, 0x18($sp) -/* C68A34 80240904 24020002 */ addiu $v0, $zero, 2 -/* C68A38 80240908 03E00008 */ jr $ra -/* C68A3C 8024090C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s deleted file mode 100644 index a992cf9be6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240E48_C68F78.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E48_C68F78 -/* C68F78 80240E48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C68F7C 80240E4C AFB10014 */ sw $s1, 0x14($sp) -/* C68F80 80240E50 0080882D */ daddu $s1, $a0, $zero -/* C68F84 80240E54 AFB20018 */ sw $s2, 0x18($sp) -/* C68F88 80240E58 AFBF001C */ sw $ra, 0x1c($sp) -/* C68F8C 80240E5C AFB00010 */ sw $s0, 0x10($sp) -/* C68F90 80240E60 8E30000C */ lw $s0, 0xc($s1) -/* C68F94 80240E64 10A00010 */ beqz $a1, .L80240EA8 -/* C68F98 80240E68 0000902D */ daddu $s2, $zero, $zero -/* C68F9C 80240E6C 8E050000 */ lw $a1, ($s0) -/* C68FA0 80240E70 0C0B1EAF */ jal get_variable -/* C68FA4 80240E74 26100004 */ addiu $s0, $s0, 4 -/* C68FA8 80240E78 AE220084 */ sw $v0, 0x84($s1) -/* C68FAC 80240E7C 8E050000 */ lw $a1, ($s0) -/* C68FB0 80240E80 0C0B1EAF */ jal get_variable -/* C68FB4 80240E84 0220202D */ daddu $a0, $s1, $zero -/* C68FB8 80240E88 0240202D */ daddu $a0, $s2, $zero -/* C68FBC 80240E8C 240500D0 */ addiu $a1, $zero, 0xd0 -/* C68FC0 80240E90 00A0302D */ daddu $a2, $a1, $zero -/* C68FC4 80240E94 00A0382D */ daddu $a3, $a1, $zero -/* C68FC8 80240E98 AE220088 */ sw $v0, 0x88($s1) -/* C68FCC 80240E9C AE200070 */ sw $zero, 0x70($s1) -/* C68FD0 80240EA0 0C04DF84 */ jal set_transition_stencil_color -/* C68FD4 80240EA4 AE200074 */ sw $zero, 0x74($s1) -.L80240EA8: -/* C68FD8 80240EA8 8E230070 */ lw $v1, 0x70($s1) -/* C68FDC 80240EAC 24040001 */ addiu $a0, $zero, 1 -/* C68FE0 80240EB0 10640019 */ beq $v1, $a0, .L80240F18 -/* C68FE4 80240EB4 28620002 */ slti $v0, $v1, 2 -/* C68FE8 80240EB8 10400005 */ beqz $v0, .L80240ED0 -/* C68FEC 80240EBC 24020002 */ addiu $v0, $zero, 2 -/* C68FF0 80240EC0 10600007 */ beqz $v1, .L80240EE0 -/* C68FF4 80240EC4 240500FF */ addiu $a1, $zero, 0xff -/* C68FF8 80240EC8 080903D6 */ j .L80240F58 -/* C68FFC 80240ECC 00000000 */ nop -.L80240ED0: -/* C69000 80240ED0 10620019 */ beq $v1, $v0, .L80240F38 -/* C69004 80240ED4 00000000 */ nop -/* C69008 80240ED8 080903D6 */ j .L80240F58 -/* C6900C 80240EDC 00000000 */ nop -.L80240EE0: -/* C69010 80240EE0 8E220074 */ lw $v0, 0x74($s1) -/* C69014 80240EE4 14450004 */ bne $v0, $a1, .L80240EF8 -/* C69018 80240EE8 00000000 */ nop -/* C6901C 80240EEC AE240070 */ sw $a0, 0x70($s1) -/* C69020 80240EF0 AE200078 */ sw $zero, 0x78($s1) -/* C69024 80240EF4 8E220074 */ lw $v0, 0x74($s1) -.L80240EF8: -/* C69028 80240EF8 8E230084 */ lw $v1, 0x84($s1) -/* C6902C 80240EFC 00431021 */ addu $v0, $v0, $v1 -/* C69030 80240F00 AE220074 */ sw $v0, 0x74($s1) -/* C69034 80240F04 28420100 */ slti $v0, $v0, 0x100 -/* C69038 80240F08 50400013 */ beql $v0, $zero, .L80240F58 -/* C6903C 80240F0C AE250074 */ sw $a1, 0x74($s1) -/* C69040 80240F10 080903D6 */ j .L80240F58 -/* C69044 80240F14 00000000 */ nop -.L80240F18: -/* C69048 80240F18 8E220078 */ lw $v0, 0x78($s1) -/* C6904C 80240F1C 24420001 */ addiu $v0, $v0, 1 -/* C69050 80240F20 AE220078 */ sw $v0, 0x78($s1) -/* C69054 80240F24 28420002 */ slti $v0, $v0, 2 -/* C69058 80240F28 1440000B */ bnez $v0, .L80240F58 -/* C6905C 80240F2C 24020002 */ addiu $v0, $zero, 2 -/* C69060 80240F30 080903D6 */ j .L80240F58 -/* C69064 80240F34 AE220070 */ sw $v0, 0x70($s1) -.L80240F38: -/* C69068 80240F38 8E230074 */ lw $v1, 0x74($s1) -/* C6906C 80240F3C 50600001 */ beql $v1, $zero, .L80240F44 -/* C69070 80240F40 24120001 */ addiu $s2, $zero, 1 -.L80240F44: -/* C69074 80240F44 8E220088 */ lw $v0, 0x88($s1) -/* C69078 80240F48 00621023 */ subu $v0, $v1, $v0 -/* C6907C 80240F4C 04410002 */ bgez $v0, .L80240F58 -/* C69080 80240F50 AE220074 */ sw $v0, 0x74($s1) -/* C69084 80240F54 AE200074 */ sw $zero, 0x74($s1) -.L80240F58: -/* C69088 80240F58 C6200074 */ lwc1 $f0, 0x74($s1) -/* C6908C 80240F5C 46800020 */ cvt.s.w $f0, $f0 -/* C69090 80240F60 44050000 */ mfc1 $a1, $f0 -/* C69094 80240F64 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* C69098 80240F68 24040001 */ addiu $a0, $zero, 1 -/* C6909C 80240F6C 0240102D */ daddu $v0, $s2, $zero -/* C690A0 80240F70 8FBF001C */ lw $ra, 0x1c($sp) -/* C690A4 80240F74 8FB20018 */ lw $s2, 0x18($sp) -/* C690A8 80240F78 8FB10014 */ lw $s1, 0x14($sp) -/* C690AC 80240F7C 8FB00010 */ lw $s0, 0x10($sp) -/* C690B0 80240F80 03E00008 */ jr $ra -/* C690B4 80240F84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s deleted file mode 100644 index 67e9faec9d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B8_C6F3E8 -/* C6F3E8 802410B8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C6F3EC 802410BC AFB3004C */ sw $s3, 0x4c($sp) -/* C6F3F0 802410C0 0080982D */ daddu $s3, $a0, $zero -/* C6F3F4 802410C4 AFBF0054 */ sw $ra, 0x54($sp) -/* C6F3F8 802410C8 AFB40050 */ sw $s4, 0x50($sp) -/* C6F3FC 802410CC AFB20048 */ sw $s2, 0x48($sp) -/* C6F400 802410D0 AFB10044 */ sw $s1, 0x44($sp) -/* C6F404 802410D4 AFB00040 */ sw $s0, 0x40($sp) -/* C6F408 802410D8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C6F40C 802410DC F7B80068 */ sdc1 $f24, 0x68($sp) -/* C6F410 802410E0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C6F414 802410E4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C6F418 802410E8 8E710148 */ lw $s1, 0x148($s3) -/* C6F41C 802410EC 00A0902D */ daddu $s2, $a1, $zero -/* C6F420 802410F0 86240008 */ lh $a0, 8($s1) -/* C6F424 802410F4 0C00EABB */ jal get_npc_unsafe -/* C6F428 802410F8 00C0A02D */ daddu $s4, $a2, $zero -/* C6F42C 802410FC 0040802D */ daddu $s0, $v0, $zero -/* C6F430 80241100 C6200078 */ lwc1 $f0, 0x78($s1) -/* C6F434 80241104 46800020 */ cvt.s.w $f0, $f0 -/* C6F438 80241108 46000021 */ cvt.d.s $f0, $f0 -/* C6F43C 8024110C 3C014059 */ lui $at, 0x4059 -/* C6F440 80241110 44811800 */ mtc1 $at, $f3 -/* C6F444 80241114 44801000 */ mtc1 $zero, $f2 -/* C6F448 80241118 8602008E */ lh $v0, 0x8e($s0) -/* C6F44C 8024111C 9603008E */ lhu $v1, 0x8e($s0) -/* C6F450 80241120 46220003 */ div.d $f0, $f0, $f2 -/* C6F454 80241124 46200620 */ cvt.s.d $f24, $f0 -/* C6F458 80241128 C6200088 */ lwc1 $f0, 0x88($s1) -/* C6F45C 8024112C 46800020 */ cvt.s.w $f0, $f0 -/* C6F460 80241130 46000021 */ cvt.d.s $f0, $f0 -/* C6F464 80241134 46220003 */ div.d $f0, $f0, $f2 -/* C6F468 80241138 46200020 */ cvt.s.d $f0, $f0 -/* C6F46C 8024113C 18400003 */ blez $v0, .L8024114C -/* C6F470 80241140 4600C680 */ add.s $f26, $f24, $f0 -/* C6F474 80241144 2462FFFF */ addiu $v0, $v1, -1 -/* C6F478 80241148 A602008E */ sh $v0, 0x8e($s0) -.L8024114C: -/* C6F47C 8024114C 8E220070 */ lw $v0, 0x70($s1) -/* C6F480 80241150 18400034 */ blez $v0, .L80241224 -/* C6F484 80241154 00000000 */ nop -/* C6F488 80241158 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C6F48C 8024115C 46806320 */ cvt.s.w $f12, $f12 -/* C6F490 80241160 44820000 */ mtc1 $v0, $f0 -/* C6F494 80241164 00000000 */ nop -/* C6F498 80241168 46800020 */ cvt.s.w $f0, $f0 -/* C6F49C 8024116C 46000021 */ cvt.d.s $f0, $f0 -/* C6F4A0 80241170 46220003 */ div.d $f0, $f0, $f2 -/* C6F4A4 80241174 0C00A8BB */ jal sin_deg -/* C6F4A8 80241178 462005A0 */ cvt.s.d $f22, $f0 -/* C6F4AC 8024117C 8E020000 */ lw $v0, ($s0) -/* C6F4B0 80241180 30420008 */ andi $v0, $v0, 8 -/* C6F4B4 80241184 10400003 */ beqz $v0, .L80241194 -/* C6F4B8 80241188 46000506 */ mov.s $f20, $f0 -/* C6F4BC 8024118C 08090475 */ j .L802411D4 -/* C6F4C0 80241190 0000102D */ daddu $v0, $zero, $zero -.L80241194: -/* C6F4C4 80241194 27A50028 */ addiu $a1, $sp, 0x28 -/* C6F4C8 80241198 27A6002C */ addiu $a2, $sp, 0x2c -/* C6F4CC 8024119C C6000038 */ lwc1 $f0, 0x38($s0) -/* C6F4D0 802411A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6F4D4 802411A4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C6F4D8 802411A8 3C01447A */ lui $at, 0x447a -/* C6F4DC 802411AC 44813000 */ mtc1 $at, $f6 -/* C6F4E0 802411B0 27A20034 */ addiu $v0, $sp, 0x34 -/* C6F4E4 802411B4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6F4E8 802411B8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C6F4EC 802411BC E7A40030 */ swc1 $f4, 0x30($sp) -/* C6F4F0 802411C0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C6F4F4 802411C4 AFA20010 */ sw $v0, 0x10($sp) -/* C6F4F8 802411C8 8E040080 */ lw $a0, 0x80($s0) -/* C6F4FC 802411CC 0C0372DF */ jal func_800DCB7C -/* C6F500 802411D0 27A70030 */ addiu $a3, $sp, 0x30 -.L802411D4: -/* C6F504 802411D4 10400007 */ beqz $v0, .L802411F4 -/* C6F508 802411D8 00000000 */ nop -/* C6F50C 802411DC 4616A082 */ mul.s $f2, $f20, $f22 -/* C6F510 802411E0 00000000 */ nop -/* C6F514 802411E4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C6F518 802411E8 46180000 */ add.s $f0, $f0, $f24 -/* C6F51C 802411EC 08090480 */ j .L80241200 -/* C6F520 802411F0 46020000 */ add.s $f0, $f0, $f2 -.L802411F4: -/* C6F524 802411F4 4616A002 */ mul.s $f0, $f20, $f22 -/* C6F528 802411F8 00000000 */ nop -/* C6F52C 802411FC 4600D000 */ add.s $f0, $f26, $f0 -.L80241200: -/* C6F530 80241200 E600003C */ swc1 $f0, 0x3c($s0) -/* C6F534 80241204 8E220074 */ lw $v0, 0x74($s1) -/* C6F538 80241208 2442000A */ addiu $v0, $v0, 0xa -/* C6F53C 8024120C 44826000 */ mtc1 $v0, $f12 -/* C6F540 80241210 00000000 */ nop -/* C6F544 80241214 0C00A6C9 */ jal clamp_angle -/* C6F548 80241218 46806320 */ cvt.s.w $f12, $f12 -/* C6F54C 8024121C 4600020D */ trunc.w.s $f8, $f0 -/* C6F550 80241220 E6280074 */ swc1 $f8, 0x74($s1) -.L80241224: -/* C6F554 80241224 8E220090 */ lw $v0, 0x90($s1) -/* C6F558 80241228 1C400040 */ bgtz $v0, .L8024132C -/* C6F55C 8024122C 2442FFFF */ addiu $v0, $v0, -1 -/* C6F560 80241230 860200A8 */ lh $v0, 0xa8($s0) -/* C6F564 80241234 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6F568 80241238 44821000 */ mtc1 $v0, $f2 -/* C6F56C 8024123C 00000000 */ nop -/* C6F570 80241240 468010A0 */ cvt.s.w $f2, $f2 -/* C6F574 80241244 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F578 80241248 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F57C 8024124C 46020000 */ add.s $f0, $f0, $f2 -/* C6F580 80241250 3C014024 */ lui $at, 0x4024 -/* C6F584 80241254 44812800 */ mtc1 $at, $f5 -/* C6F588 80241258 44802000 */ mtc1 $zero, $f4 -/* C6F58C 8024125C C442002C */ lwc1 $f2, 0x2c($v0) -/* C6F590 80241260 46000021 */ cvt.d.s $f0, $f0 -/* C6F594 80241264 46240000 */ add.d $f0, $f0, $f4 -/* C6F598 80241268 460010A1 */ cvt.d.s $f2, $f2 -/* C6F59C 8024126C 4620103C */ c.lt.d $f2, $f0 -/* C6F5A0 80241270 00000000 */ nop -/* C6F5A4 80241274 4500002E */ bc1f .L80241330 -/* C6F5A8 80241278 0280202D */ daddu $a0, $s4, $zero -/* C6F5AC 8024127C 24020001 */ addiu $v0, $zero, 1 -/* C6F5B0 80241280 AFA20010 */ sw $v0, 0x10($sp) -/* C6F5B4 80241284 8E460024 */ lw $a2, 0x24($s2) -/* C6F5B8 80241288 8E470028 */ lw $a3, 0x28($s2) -/* C6F5BC 8024128C 0C01242D */ jal func_800490B4 -/* C6F5C0 80241290 0220282D */ daddu $a1, $s1, $zero -/* C6F5C4 80241294 10400026 */ beqz $v0, .L80241330 -/* C6F5C8 80241298 0000202D */ daddu $a0, $zero, $zero -/* C6F5CC 8024129C 0200282D */ daddu $a1, $s0, $zero -/* C6F5D0 802412A0 0000302D */ daddu $a2, $zero, $zero -/* C6F5D4 802412A4 2412000C */ addiu $s2, $zero, 0xc -/* C6F5D8 802412A8 860300A8 */ lh $v1, 0xa8($s0) -/* C6F5DC 802412AC 3C013F80 */ lui $at, 0x3f80 -/* C6F5E0 802412B0 44810000 */ mtc1 $at, $f0 -/* C6F5E4 802412B4 3C014000 */ lui $at, 0x4000 -/* C6F5E8 802412B8 44811000 */ mtc1 $at, $f2 -/* C6F5EC 802412BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C6F5F0 802412C0 44812000 */ mtc1 $at, $f4 -/* C6F5F4 802412C4 44834000 */ mtc1 $v1, $f8 -/* C6F5F8 802412C8 00000000 */ nop -/* C6F5FC 802412CC 46804220 */ cvt.s.w $f8, $f8 -/* C6F600 802412D0 44074000 */ mfc1 $a3, $f8 -/* C6F604 802412D4 27A20038 */ addiu $v0, $sp, 0x38 -/* C6F608 802412D8 AFB2001C */ sw $s2, 0x1c($sp) -/* C6F60C 802412DC AFA20020 */ sw $v0, 0x20($sp) -/* C6F610 802412E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6F614 802412E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C6F618 802412E8 0C01BFA4 */ jal fx_emote -/* C6F61C 802412EC E7A40018 */ swc1 $f4, 0x18($sp) -/* C6F620 802412F0 0200202D */ daddu $a0, $s0, $zero -/* C6F624 802412F4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C6F628 802412F8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C6F62C 802412FC 3C060020 */ lui $a2, 0x20 -/* C6F630 80241300 0C012530 */ jal func_800494C0 -/* C6F634 80241304 E4800064 */ swc1 $f0, 0x64($a0) -/* C6F638 80241308 8E220018 */ lw $v0, 0x18($s1) -/* C6F63C 8024130C 9442002A */ lhu $v0, 0x2a($v0) -/* C6F640 80241310 30420001 */ andi $v0, $v0, 1 -/* C6F644 80241314 10400003 */ beqz $v0, .L80241324 -/* C6F648 80241318 2402000A */ addiu $v0, $zero, 0xa -/* C6F64C 8024131C 080904F3 */ j .L802413CC -/* C6F650 80241320 AE620070 */ sw $v0, 0x70($s3) -.L80241324: -/* C6F654 80241324 080904F3 */ j .L802413CC -/* C6F658 80241328 AE720070 */ sw $s2, 0x70($s3) -.L8024132C: -/* C6F65C 8024132C AE220090 */ sw $v0, 0x90($s1) -.L80241330: -/* C6F660 80241330 8602008C */ lh $v0, 0x8c($s0) -/* C6F664 80241334 14400025 */ bnez $v0, .L802413CC -/* C6F668 80241338 00000000 */ nop -/* C6F66C 8024133C 8602008E */ lh $v0, 0x8e($s0) -/* C6F670 80241340 1C400022 */ bgtz $v0, .L802413CC -/* C6F674 80241344 00000000 */ nop -/* C6F678 80241348 8E620074 */ lw $v0, 0x74($s3) -/* C6F67C 8024134C 2442FFFF */ addiu $v0, $v0, -1 -/* C6F680 80241350 1840001D */ blez $v0, .L802413C8 -/* C6F684 80241354 AE620074 */ sw $v0, 0x74($s3) -/* C6F688 80241358 8E220018 */ lw $v0, 0x18($s1) -/* C6F68C 8024135C 9442002A */ lhu $v0, 0x2a($v0) -/* C6F690 80241360 30420010 */ andi $v0, $v0, 0x10 -/* C6F694 80241364 14400007 */ bnez $v0, .L80241384 -/* C6F698 80241368 00000000 */ nop -/* C6F69C 8024136C C600000C */ lwc1 $f0, 0xc($s0) -/* C6F6A0 80241370 3C014334 */ lui $at, 0x4334 -/* C6F6A4 80241374 44816000 */ mtc1 $at, $f12 -/* C6F6A8 80241378 0C00A6C9 */ jal clamp_angle -/* C6F6AC 8024137C 460C0300 */ add.s $f12, $f0, $f12 -/* C6F6B0 80241380 E600000C */ swc1 $f0, 0xc($s0) -.L80241384: -/* C6F6B4 80241384 0C00A67F */ jal rand_int -/* C6F6B8 80241388 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C6F6BC 8024138C 3C032E8B */ lui $v1, 0x2e8b -/* C6F6C0 80241390 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C6F6C4 80241394 00430018 */ mult $v0, $v1 -/* C6F6C8 80241398 00021FC3 */ sra $v1, $v0, 0x1f -/* C6F6CC 8024139C 00004010 */ mfhi $t0 -/* C6F6D0 802413A0 00082043 */ sra $a0, $t0, 1 -/* C6F6D4 802413A4 00832023 */ subu $a0, $a0, $v1 -/* C6F6D8 802413A8 00041840 */ sll $v1, $a0, 1 -/* C6F6DC 802413AC 00641821 */ addu $v1, $v1, $a0 -/* C6F6E0 802413B0 00031880 */ sll $v1, $v1, 2 -/* C6F6E4 802413B4 00641823 */ subu $v1, $v1, $a0 -/* C6F6E8 802413B8 00431023 */ subu $v0, $v0, $v1 -/* C6F6EC 802413BC 24420005 */ addiu $v0, $v0, 5 -/* C6F6F0 802413C0 080904F3 */ j .L802413CC -/* C6F6F4 802413C4 A602008E */ sh $v0, 0x8e($s0) -.L802413C8: -/* C6F6F8 802413C8 AE600070 */ sw $zero, 0x70($s3) -.L802413CC: -/* C6F6FC 802413CC 8FBF0054 */ lw $ra, 0x54($sp) -/* C6F700 802413D0 8FB40050 */ lw $s4, 0x50($sp) -/* C6F704 802413D4 8FB3004C */ lw $s3, 0x4c($sp) -/* C6F708 802413D8 8FB20048 */ lw $s2, 0x48($sp) -/* C6F70C 802413DC 8FB10044 */ lw $s1, 0x44($sp) -/* C6F710 802413E0 8FB00040 */ lw $s0, 0x40($sp) -/* C6F714 802413E4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C6F718 802413E8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C6F71C 802413EC D7B60060 */ ldc1 $f22, 0x60($sp) -/* C6F720 802413F0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C6F724 802413F4 03E00008 */ jr $ra -/* C6F728 802413F8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s deleted file mode 100644 index 778c51c864..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241678_C6F9A8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241678_C6F9A8 -/* C6F9A8 80241678 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C6F9AC 8024167C AFB20030 */ sw $s2, 0x30($sp) -/* C6F9B0 80241680 0080902D */ daddu $s2, $a0, $zero -/* C6F9B4 80241684 AFBF0038 */ sw $ra, 0x38($sp) -/* C6F9B8 80241688 AFB30034 */ sw $s3, 0x34($sp) -/* C6F9BC 8024168C AFB1002C */ sw $s1, 0x2c($sp) -/* C6F9C0 80241690 AFB00028 */ sw $s0, 0x28($sp) -/* C6F9C4 80241694 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C6F9C8 80241698 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C6F9CC 8024169C 8E510148 */ lw $s1, 0x148($s2) -/* C6F9D0 802416A0 86240008 */ lh $a0, 8($s1) -/* C6F9D4 802416A4 0C00EABB */ jal get_npc_unsafe -/* C6F9D8 802416A8 00A0982D */ daddu $s3, $a1, $zero -/* C6F9DC 802416AC 0040802D */ daddu $s0, $v0, $zero -/* C6F9E0 802416B0 0200202D */ daddu $a0, $s0, $zero -/* C6F9E4 802416B4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C6F9E8 802416B8 468010A0 */ cvt.s.w $f2, $f2 -/* C6F9EC 802416BC 460010A1 */ cvt.d.s $f2, $f2 -/* C6F9F0 802416C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C6F9F4 802416C4 C6000014 */ lwc1 $f0, 0x14($s0) -/* C6F9F8 802416C8 8E050018 */ lw $a1, 0x18($s0) -/* C6F9FC 802416CC 46002100 */ add.s $f4, $f4, $f0 -/* C6FA00 802416D0 8E06000C */ lw $a2, 0xc($s0) -/* C6FA04 802416D4 C6200078 */ lwc1 $f0, 0x78($s1) -/* C6FA08 802416D8 46800020 */ cvt.s.w $f0, $f0 -/* C6FA0C 802416DC E604001C */ swc1 $f4, 0x1c($s0) -/* C6FA10 802416E0 3C014059 */ lui $at, 0x4059 -/* C6FA14 802416E4 44812800 */ mtc1 $at, $f5 -/* C6FA18 802416E8 44802000 */ mtc1 $zero, $f4 -/* C6FA1C 802416EC 46000021 */ cvt.d.s $f0, $f0 -/* C6FA20 802416F0 46240003 */ div.d $f0, $f0, $f4 -/* C6FA24 802416F4 46200520 */ cvt.s.d $f20, $f0 -/* C6FA28 802416F8 46241083 */ div.d $f2, $f2, $f4 -/* C6FA2C 802416FC 0C00EA95 */ jal npc_move_heading -/* C6FA30 80241700 462015A0 */ cvt.s.d $f22, $f2 -/* C6FA34 80241704 C604001C */ lwc1 $f4, 0x1c($s0) -/* C6FA38 80241708 44801000 */ mtc1 $zero, $f2 -/* C6FA3C 8024170C 44801800 */ mtc1 $zero, $f3 -/* C6FA40 80241710 46002021 */ cvt.d.s $f0, $f4 -/* C6FA44 80241714 4620103E */ c.le.d $f2, $f0 -/* C6FA48 80241718 00000000 */ nop -/* C6FA4C 8024171C 45000030 */ bc1f .L802417E0 -/* C6FA50 80241720 00000000 */ nop -/* C6FA54 80241724 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6FA58 80241728 46040000 */ add.s $f0, $f0, $f4 -/* C6FA5C 8024172C E600003C */ swc1 $f0, 0x3c($s0) -/* C6FA60 80241730 8E2200CC */ lw $v0, 0xcc($s1) -/* C6FA64 80241734 8C420024 */ lw $v0, 0x24($v0) -/* C6FA68 80241738 AE020028 */ sw $v0, 0x28($s0) -/* C6FA6C 8024173C A2200007 */ sb $zero, 7($s1) -/* C6FA70 80241740 8E020000 */ lw $v0, ($s0) -/* C6FA74 80241744 30420008 */ andi $v0, $v0, 8 -/* C6FA78 80241748 14400011 */ bnez $v0, .L80241790 -/* C6FA7C 8024174C 0000102D */ daddu $v0, $zero, $zero -/* C6FA80 80241750 27A50018 */ addiu $a1, $sp, 0x18 -/* C6FA84 80241754 27A6001C */ addiu $a2, $sp, 0x1c -/* C6FA88 80241758 C6000038 */ lwc1 $f0, 0x38($s0) -/* C6FA8C 8024175C C602003C */ lwc1 $f2, 0x3c($s0) -/* C6FA90 80241760 C6040040 */ lwc1 $f4, 0x40($s0) -/* C6FA94 80241764 3C01447A */ lui $at, 0x447a -/* C6FA98 80241768 44813000 */ mtc1 $at, $f6 -/* C6FA9C 8024176C 27A20024 */ addiu $v0, $sp, 0x24 -/* C6FAA0 80241770 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6FAA4 80241774 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C6FAA8 80241778 E7A40020 */ swc1 $f4, 0x20($sp) -/* C6FAAC 8024177C E7A60024 */ swc1 $f6, 0x24($sp) -/* C6FAB0 80241780 AFA20010 */ sw $v0, 0x10($sp) -/* C6FAB4 80241784 8E040080 */ lw $a0, 0x80($s0) -/* C6FAB8 80241788 0C0372DF */ jal func_800DCB7C -/* C6FABC 8024178C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241790: -/* C6FAC0 80241790 1040000B */ beqz $v0, .L802417C0 -/* C6FAC4 80241794 00000000 */ nop -/* C6FAC8 80241798 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C6FACC 8024179C 46140080 */ add.s $f2, $f0, $f20 -/* C6FAD0 802417A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6FAD4 802417A4 4600103E */ c.le.s $f2, $f0 -/* C6FAD8 802417A8 00000000 */ nop -/* C6FADC 802417AC 4500008D */ bc1f .L802419E4 -/* C6FAE0 802417B0 00000000 */ nop -/* C6FAE4 802417B4 E602003C */ swc1 $f2, 0x3c($s0) -/* C6FAE8 802417B8 08090679 */ j .L802419E4 -/* C6FAEC 802417BC AE400070 */ sw $zero, 0x70($s2) -.L802417C0: -/* C6FAF0 802417C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6FAF4 802417C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* C6FAF8 802417C8 4602003E */ c.le.s $f0, $f2 -/* C6FAFC 802417CC 00000000 */ nop -/* C6FB00 802417D0 45030084 */ bc1tl .L802419E4 -/* C6FB04 802417D4 AE400070 */ sw $zero, 0x70($s2) -/* C6FB08 802417D8 08090679 */ j .L802419E4 -/* C6FB0C 802417DC 00000000 */ nop -.L802417E0: -/* C6FB10 802417E0 4622003C */ c.lt.d $f0, $f2 -/* C6FB14 802417E4 00000000 */ nop -/* C6FB18 802417E8 4500007E */ bc1f .L802419E4 -/* C6FB1C 802417EC 00000000 */ nop -/* C6FB20 802417F0 9602008E */ lhu $v0, 0x8e($s0) -/* C6FB24 802417F4 24420001 */ addiu $v0, $v0, 1 -/* C6FB28 802417F8 A602008E */ sh $v0, 0x8e($s0) -/* C6FB2C 802417FC 00021400 */ sll $v0, $v0, 0x10 -/* C6FB30 80241800 8E630020 */ lw $v1, 0x20($s3) -/* C6FB34 80241804 00021403 */ sra $v0, $v0, 0x10 -/* C6FB38 80241808 0043102A */ slt $v0, $v0, $v1 -/* C6FB3C 8024180C 14400026 */ bnez $v0, .L802418A8 -/* C6FB40 80241810 00000000 */ nop -/* C6FB44 80241814 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6FB48 80241818 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6FB4C 8024181C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6FB50 80241820 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6FB54 80241824 A600008E */ sh $zero, 0x8e($s0) -/* C6FB58 80241828 8C460028 */ lw $a2, 0x28($v0) -/* C6FB5C 8024182C 0C00A720 */ jal atan2 -/* C6FB60 80241830 8C470030 */ lw $a3, 0x30($v0) -/* C6FB64 80241834 46000506 */ mov.s $f20, $f0 -/* C6FB68 80241838 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6FB6C 8024183C 0C00A70A */ jal get_clamped_angle_diff -/* C6FB70 80241840 4600A386 */ mov.s $f14, $f20 -/* C6FB74 80241844 46000086 */ mov.s $f2, $f0 -/* C6FB78 80241848 8E62001C */ lw $v0, 0x1c($s3) -/* C6FB7C 8024184C 46001005 */ abs.s $f0, $f2 -/* C6FB80 80241850 44822000 */ mtc1 $v0, $f4 -/* C6FB84 80241854 00000000 */ nop -/* C6FB88 80241858 46802120 */ cvt.s.w $f4, $f4 -/* C6FB8C 8024185C 4600203C */ c.lt.s $f4, $f0 -/* C6FB90 80241860 00000000 */ nop -/* C6FB94 80241864 4500000D */ bc1f .L8024189C -/* C6FB98 80241868 00000000 */ nop -/* C6FB9C 8024186C 44800000 */ mtc1 $zero, $f0 -/* C6FBA0 80241870 C614000C */ lwc1 $f20, 0xc($s0) -/* C6FBA4 80241874 4600103C */ c.lt.s $f2, $f0 -/* C6FBA8 80241878 00000000 */ nop -/* C6FBAC 8024187C 45000006 */ bc1f .L80241898 -/* C6FBB0 80241880 00021023 */ negu $v0, $v0 -/* C6FBB4 80241884 44820000 */ mtc1 $v0, $f0 -/* C6FBB8 80241888 00000000 */ nop -/* C6FBBC 8024188C 46800020 */ cvt.s.w $f0, $f0 -/* C6FBC0 80241890 08090627 */ j .L8024189C -/* C6FBC4 80241894 4600A500 */ add.s $f20, $f20, $f0 -.L80241898: -/* C6FBC8 80241898 4604A500 */ add.s $f20, $f20, $f4 -.L8024189C: -/* C6FBCC 8024189C 0C00A6C9 */ jal clamp_angle -/* C6FBD0 802418A0 4600A306 */ mov.s $f12, $f20 -/* C6FBD4 802418A4 E600000C */ swc1 $f0, 0xc($s0) -.L802418A8: -/* C6FBD8 802418A8 8E020000 */ lw $v0, ($s0) -/* C6FBDC 802418AC 30420008 */ andi $v0, $v0, 8 -/* C6FBE0 802418B0 1040000A */ beqz $v0, .L802418DC -/* C6FBE4 802418B4 27A50018 */ addiu $a1, $sp, 0x18 -/* C6FBE8 802418B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6FBEC 802418BC C600001C */ lwc1 $f0, 0x1c($s0) -/* C6FBF0 802418C0 46001080 */ add.s $f2, $f2, $f0 -/* C6FBF4 802418C4 4616103C */ c.lt.s $f2, $f22 -/* C6FBF8 802418C8 00000000 */ nop -/* C6FBFC 802418CC 45020045 */ bc1fl .L802419E4 -/* C6FC00 802418D0 E602003C */ swc1 $f2, 0x3c($s0) -/* C6FC04 802418D4 08090678 */ j .L802419E0 -/* C6FC08 802418D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802418DC: -/* C6FC0C 802418DC C6000038 */ lwc1 $f0, 0x38($s0) -/* C6FC10 802418E0 27A6001C */ addiu $a2, $sp, 0x1c -/* C6FC14 802418E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6FC18 802418E8 860200A8 */ lh $v0, 0xa8($s0) -/* C6FC1C 802418EC C600001C */ lwc1 $f0, 0x1c($s0) -/* C6FC20 802418F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C6FC24 802418F4 44821000 */ mtc1 $v0, $f2 -/* C6FC28 802418F8 00000000 */ nop -/* C6FC2C 802418FC 468010A0 */ cvt.s.w $f2, $f2 -/* C6FC30 80241900 46000005 */ abs.s $f0, $f0 -/* C6FC34 80241904 46020000 */ add.s $f0, $f0, $f2 -/* C6FC38 80241908 C6060040 */ lwc1 $f6, 0x40($s0) -/* C6FC3C 8024190C 27A20024 */ addiu $v0, $sp, 0x24 -/* C6FC40 80241910 46022100 */ add.s $f4, $f4, $f2 -/* C6FC44 80241914 3C014024 */ lui $at, 0x4024 -/* C6FC48 80241918 44811800 */ mtc1 $at, $f3 -/* C6FC4C 8024191C 44801000 */ mtc1 $zero, $f2 -/* C6FC50 80241920 46000021 */ cvt.d.s $f0, $f0 -/* C6FC54 80241924 46220000 */ add.d $f0, $f0, $f2 -/* C6FC58 80241928 E7A60020 */ swc1 $f6, 0x20($sp) -/* C6FC5C 8024192C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C6FC60 80241930 46200020 */ cvt.s.d $f0, $f0 -/* C6FC64 80241934 E7A00024 */ swc1 $f0, 0x24($sp) -/* C6FC68 80241938 AFA20010 */ sw $v0, 0x10($sp) -/* C6FC6C 8024193C 8E040080 */ lw $a0, 0x80($s0) -/* C6FC70 80241940 0C0372DF */ jal func_800DCB7C -/* C6FC74 80241944 27A70020 */ addiu $a3, $sp, 0x20 -/* C6FC78 80241948 10400015 */ beqz $v0, .L802419A0 -/* C6FC7C 8024194C 00000000 */ nop -/* C6FC80 80241950 860200A8 */ lh $v0, 0xa8($s0) -/* C6FC84 80241954 C604001C */ lwc1 $f4, 0x1c($s0) -/* C6FC88 80241958 44820000 */ mtc1 $v0, $f0 -/* C6FC8C 8024195C 00000000 */ nop -/* C6FC90 80241960 46800020 */ cvt.s.w $f0, $f0 -/* C6FC94 80241964 46002085 */ abs.s $f2, $f4 -/* C6FC98 80241968 46020000 */ add.s $f0, $f0, $f2 -/* C6FC9C 8024196C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C6FCA0 80241970 4600103E */ c.le.s $f2, $f0 -/* C6FCA4 80241974 00000000 */ nop -/* C6FCA8 80241978 45000005 */ bc1f .L80241990 -/* C6FCAC 8024197C 00000000 */ nop -/* C6FCB0 80241980 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C6FCB4 80241984 AE00001C */ sw $zero, 0x1c($s0) -/* C6FCB8 80241988 08090679 */ j .L802419E4 -/* C6FCBC 8024198C E600003C */ swc1 $f0, 0x3c($s0) -.L80241990: -/* C6FCC0 80241990 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6FCC4 80241994 46040000 */ add.s $f0, $f0, $f4 -/* C6FCC8 80241998 08090679 */ j .L802419E4 -/* C6FCCC 8024199C E600003C */ swc1 $f0, 0x3c($s0) -.L802419A0: -/* C6FCD0 802419A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C6FCD4 802419A4 860200A8 */ lh $v0, 0xa8($s0) -/* C6FCD8 802419A8 46163081 */ sub.s $f2, $f6, $f22 -/* C6FCDC 802419AC 44820000 */ mtc1 $v0, $f0 -/* C6FCE0 802419B0 00000000 */ nop -/* C6FCE4 802419B4 46800020 */ cvt.s.w $f0, $f0 -/* C6FCE8 802419B8 46001080 */ add.s $f2, $f2, $f0 -/* C6FCEC 802419BC C604001C */ lwc1 $f4, 0x1c($s0) -/* C6FCF0 802419C0 46002005 */ abs.s $f0, $f4 -/* C6FCF4 802419C4 4602003C */ c.lt.s $f0, $f2 -/* C6FCF8 802419C8 00000000 */ nop -/* C6FCFC 802419CC 45020005 */ bc1fl .L802419E4 -/* C6FD00 802419D0 AE00001C */ sw $zero, 0x1c($s0) -/* C6FD04 802419D4 46043000 */ add.s $f0, $f6, $f4 -/* C6FD08 802419D8 08090679 */ j .L802419E4 -/* C6FD0C 802419DC E600003C */ swc1 $f0, 0x3c($s0) -.L802419E0: -/* C6FD10 802419E0 AE00001C */ sw $zero, 0x1c($s0) -.L802419E4: -/* C6FD14 802419E4 8FBF0038 */ lw $ra, 0x38($sp) -/* C6FD18 802419E8 8FB30034 */ lw $s3, 0x34($sp) -/* C6FD1C 802419EC 8FB20030 */ lw $s2, 0x30($sp) -/* C6FD20 802419F0 8FB1002C */ lw $s1, 0x2c($sp) -/* C6FD24 802419F4 8FB00028 */ lw $s0, 0x28($sp) -/* C6FD28 802419F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C6FD2C 802419FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* C6FD30 80241A00 03E00008 */ jr $ra -/* C6FD34 80241A04 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s deleted file mode 100644 index 2a285b7bad..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241A08_C6FD38.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A08_C6FD38 -/* C6FD38 80241A08 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C6FD3C 80241A0C AFB00028 */ sw $s0, 0x28($sp) -/* C6FD40 80241A10 00A0802D */ daddu $s0, $a1, $zero -/* C6FD44 80241A14 AFB1002C */ sw $s1, 0x2c($sp) -/* C6FD48 80241A18 00C0882D */ daddu $s1, $a2, $zero -/* C6FD4C 80241A1C AFBF0034 */ sw $ra, 0x34($sp) -/* C6FD50 80241A20 AFB20030 */ sw $s2, 0x30($sp) -/* C6FD54 80241A24 AE200070 */ sw $zero, 0x70($s1) -/* C6FD58 80241A28 8C830000 */ lw $v1, ($a0) -/* C6FD5C 80241A2C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C6FD60 80241A30 A480008E */ sh $zero, 0x8e($a0) -/* C6FD64 80241A34 00621824 */ and $v1, $v1, $v0 -/* C6FD68 80241A38 34650800 */ ori $a1, $v1, 0x800 -/* C6FD6C 80241A3C AC850000 */ sw $a1, ($a0) -/* C6FD70 80241A40 8E0200D0 */ lw $v0, 0xd0($s0) -/* C6FD74 80241A44 8C420034 */ lw $v0, 0x34($v0) -/* C6FD78 80241A48 10400003 */ beqz $v0, .L80241A58 -/* C6FD7C 80241A4C 00E0902D */ daddu $s2, $a3, $zero -/* C6FD80 80241A50 08090698 */ j .L80241A60 -/* C6FD84 80241A54 34620808 */ ori $v0, $v1, 0x808 -.L80241A58: -/* C6FD88 80241A58 2402FFF7 */ addiu $v0, $zero, -9 -/* C6FD8C 80241A5C 00A21024 */ and $v0, $a1, $v0 -.L80241A60: -/* C6FD90 80241A60 AC820000 */ sw $v0, ($a0) -/* C6FD94 80241A64 27A20024 */ addiu $v0, $sp, 0x24 -/* C6FD98 80241A68 27A50018 */ addiu $a1, $sp, 0x18 -/* C6FD9C 80241A6C C4800038 */ lwc1 $f0, 0x38($a0) -/* C6FDA0 80241A70 C482003C */ lwc1 $f2, 0x3c($a0) -/* C6FDA4 80241A74 C4840040 */ lwc1 $f4, 0x40($a0) -/* C6FDA8 80241A78 3C01447A */ lui $at, 0x447a -/* C6FDAC 80241A7C 44813000 */ mtc1 $at, $f6 -/* C6FDB0 80241A80 27A6001C */ addiu $a2, $sp, 0x1c -/* C6FDB4 80241A84 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6FDB8 80241A88 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C6FDBC 80241A8C E7A40020 */ swc1 $f4, 0x20($sp) -/* C6FDC0 80241A90 E7A60024 */ swc1 $f6, 0x24($sp) -/* C6FDC4 80241A94 AFA20010 */ sw $v0, 0x10($sp) -/* C6FDC8 80241A98 8C840080 */ lw $a0, 0x80($a0) -/* C6FDCC 80241A9C 0C0372DF */ jal func_800DCB7C -/* C6FDD0 80241AA0 27A70020 */ addiu $a3, $sp, 0x20 -/* C6FDD4 80241AA4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C6FDD8 80241AA8 3C014059 */ lui $at, 0x4059 -/* C6FDDC 80241AAC 44812800 */ mtc1 $at, $f5 -/* C6FDE0 80241AB0 44802000 */ mtc1 $zero, $f4 -/* C6FDE4 80241AB4 460010A1 */ cvt.d.s $f2, $f2 -/* C6FDE8 80241AB8 46241082 */ mul.d $f2, $f2, $f4 -/* C6FDEC 80241ABC 00000000 */ nop -/* C6FDF0 80241AC0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C6FDF4 80241AC4 46000021 */ cvt.d.s $f0, $f0 -/* C6FDF8 80241AC8 46240002 */ mul.d $f0, $f0, $f4 -/* C6FDFC 80241ACC 00000000 */ nop -/* C6FE00 80241AD0 3C013FE0 */ lui $at, 0x3fe0 -/* C6FE04 80241AD4 44812800 */ mtc1 $at, $f5 -/* C6FE08 80241AD8 44802000 */ mtc1 $zero, $f4 -/* C6FE0C 80241ADC 00000000 */ nop -/* C6FE10 80241AE0 46241080 */ add.d $f2, $f2, $f4 -/* C6FE14 80241AE4 AE000074 */ sw $zero, 0x74($s0) -/* C6FE18 80241AE8 46240000 */ add.d $f0, $f0, $f4 -/* C6FE1C 80241AEC AE000090 */ sw $zero, 0x90($s0) -/* C6FE20 80241AF0 4620120D */ trunc.w.d $f8, $f2 -/* C6FE24 80241AF4 E6080078 */ swc1 $f8, 0x78($s0) -/* C6FE28 80241AF8 4620020D */ trunc.w.d $f8, $f0 -/* C6FE2C 80241AFC E6080088 */ swc1 $f8, 0x88($s0) -/* C6FE30 80241B00 8E420014 */ lw $v0, 0x14($s2) -/* C6FE34 80241B04 AE220074 */ sw $v0, 0x74($s1) -/* C6FE38 80241B08 8E0200B0 */ lw $v0, 0xb0($s0) -/* C6FE3C 80241B0C 34420010 */ ori $v0, $v0, 0x10 -/* C6FE40 80241B10 AE0200B0 */ sw $v0, 0xb0($s0) -/* C6FE44 80241B14 8FBF0034 */ lw $ra, 0x34($sp) -/* C6FE48 80241B18 8FB20030 */ lw $s2, 0x30($sp) -/* C6FE4C 80241B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* C6FE50 80241B20 8FB00028 */ lw $s0, 0x28($sp) -/* C6FE54 80241B24 03E00008 */ jr $ra -/* C6FE58 80241B28 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index e62b53cd6e..ea9edb7d4a 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -46,7 +46,7 @@ glabel func_80241B2C_C6FE5C /* C6FF00 80241BD0 02A0202D */ daddu $a0, $s5, $zero /* C6FF04 80241BD4 0240282D */ daddu $a1, $s2, $zero /* C6FF08 80241BD8 0280302D */ daddu $a2, $s4, $zero -/* C6FF0C 80241BDC 0C090682 */ jal func_80241A08_C6FD38 +/* C6FF0C 80241BDC 0C090682 */ jal kzn_07_UnkFunc5 /* C6FF10 80241BE0 0200382D */ daddu $a3, $s0, $zero .L80241BE4: /* C6FF14 80241BE4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241C60_C6FF90 glabel L80241C70_C6FFA0 /* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero /* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero -/* C6FFA8 80241C78 0C09042E */ jal func_802410B8_C6F3E8 +/* C6FFA8 80241C78 0C09042E */ jal kzn_07_UnkFunc4 /* C6FFAC 80241C7C 0260302D */ daddu $a2, $s3, $zero /* C6FFB0 80241C80 0809073D */ j .L80241CF4 /* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241CC8_C6FFF8 glabel L80241CE0_C70010 /* C70010 80241CE0 0280202D */ daddu $a0, $s4, $zero /* C70014 80241CE4 0200282D */ daddu $a1, $s0, $zero -/* C70018 80241CE8 0C09059E */ jal func_80241678_C6F9A8 +/* C70018 80241CE8 0C09059E */ jal kzn_07_UnkFunc6 /* C7001C 80241CEC 0260302D */ daddu $a2, $s3, $zero glabel L80241CF0_C70020 /* C70020 80241CF0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index 9ebe8b0fcc..50d87fe088 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -46,7 +46,7 @@ glabel func_80242124_C70454 /* C704F8 802421C8 02A0202D */ daddu $a0, $s5, $zero /* C704FC 802421CC 0240282D */ daddu $a1, $s2, $zero /* C70500 802421D0 0280302D */ daddu $a2, $s4, $zero -/* C70504 802421D4 0C090682 */ jal func_80241A08_C6FD38 +/* C70504 802421D4 0C090682 */ jal kzn_07_UnkFunc5 /* C70508 802421D8 0200382D */ daddu $a3, $s0, $zero /* C7050C 802421DC AE800070 */ sw $zero, 0x70($s4) .L802421E0: @@ -92,7 +92,7 @@ glabel L8024225C_C7058C glabel L8024226C_C7059C /* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero /* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero -/* C705A4 80242274 0C09042E */ jal func_802410B8_C6F3E8 +/* C705A4 80242274 0C09042E */ jal kzn_07_UnkFunc4 /* C705A8 80242278 0260302D */ daddu $a2, $s3, $zero /* C705AC 8024227C 080908BA */ j .L802422E8 /* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s deleted file mode 100644 index 4bec60bdd0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802412E8_C72768.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E8_C72768 -/* C72768 802412E8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C7276C 802412EC AFB3004C */ sw $s3, 0x4c($sp) -/* C72770 802412F0 0080982D */ daddu $s3, $a0, $zero -/* C72774 802412F4 AFBF0054 */ sw $ra, 0x54($sp) -/* C72778 802412F8 AFB40050 */ sw $s4, 0x50($sp) -/* C7277C 802412FC AFB20048 */ sw $s2, 0x48($sp) -/* C72780 80241300 AFB10044 */ sw $s1, 0x44($sp) -/* C72784 80241304 AFB00040 */ sw $s0, 0x40($sp) -/* C72788 80241308 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C7278C 8024130C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C72790 80241310 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C72794 80241314 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C72798 80241318 8E710148 */ lw $s1, 0x148($s3) -/* C7279C 8024131C 00A0902D */ daddu $s2, $a1, $zero -/* C727A0 80241320 86240008 */ lh $a0, 8($s1) -/* C727A4 80241324 0C00EABB */ jal get_npc_unsafe -/* C727A8 80241328 00C0A02D */ daddu $s4, $a2, $zero -/* C727AC 8024132C 0040802D */ daddu $s0, $v0, $zero -/* C727B0 80241330 C6200078 */ lwc1 $f0, 0x78($s1) -/* C727B4 80241334 46800020 */ cvt.s.w $f0, $f0 -/* C727B8 80241338 46000021 */ cvt.d.s $f0, $f0 -/* C727BC 8024133C 3C014059 */ lui $at, 0x4059 -/* C727C0 80241340 44811800 */ mtc1 $at, $f3 -/* C727C4 80241344 44801000 */ mtc1 $zero, $f2 -/* C727C8 80241348 8602008E */ lh $v0, 0x8e($s0) -/* C727CC 8024134C 9603008E */ lhu $v1, 0x8e($s0) -/* C727D0 80241350 46220003 */ div.d $f0, $f0, $f2 -/* C727D4 80241354 46200620 */ cvt.s.d $f24, $f0 -/* C727D8 80241358 C6200088 */ lwc1 $f0, 0x88($s1) -/* C727DC 8024135C 46800020 */ cvt.s.w $f0, $f0 -/* C727E0 80241360 46000021 */ cvt.d.s $f0, $f0 -/* C727E4 80241364 46220003 */ div.d $f0, $f0, $f2 -/* C727E8 80241368 46200020 */ cvt.s.d $f0, $f0 -/* C727EC 8024136C 18400003 */ blez $v0, .L8024137C -/* C727F0 80241370 4600C680 */ add.s $f26, $f24, $f0 -/* C727F4 80241374 2462FFFF */ addiu $v0, $v1, -1 -/* C727F8 80241378 A602008E */ sh $v0, 0x8e($s0) -.L8024137C: -/* C727FC 8024137C 8E220070 */ lw $v0, 0x70($s1) -/* C72800 80241380 18400034 */ blez $v0, .L80241454 -/* C72804 80241384 00000000 */ nop -/* C72808 80241388 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C7280C 8024138C 46806320 */ cvt.s.w $f12, $f12 -/* C72810 80241390 44820000 */ mtc1 $v0, $f0 -/* C72814 80241394 00000000 */ nop -/* C72818 80241398 46800020 */ cvt.s.w $f0, $f0 -/* C7281C 8024139C 46000021 */ cvt.d.s $f0, $f0 -/* C72820 802413A0 46220003 */ div.d $f0, $f0, $f2 -/* C72824 802413A4 0C00A8BB */ jal sin_deg -/* C72828 802413A8 462005A0 */ cvt.s.d $f22, $f0 -/* C7282C 802413AC 8E020000 */ lw $v0, ($s0) -/* C72830 802413B0 30420008 */ andi $v0, $v0, 8 -/* C72834 802413B4 10400003 */ beqz $v0, .L802413C4 -/* C72838 802413B8 46000506 */ mov.s $f20, $f0 -/* C7283C 802413BC 08090501 */ j .L80241404 -/* C72840 802413C0 0000102D */ daddu $v0, $zero, $zero -.L802413C4: -/* C72844 802413C4 27A50028 */ addiu $a1, $sp, 0x28 -/* C72848 802413C8 27A6002C */ addiu $a2, $sp, 0x2c -/* C7284C 802413CC C6000038 */ lwc1 $f0, 0x38($s0) -/* C72850 802413D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72854 802413D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C72858 802413D8 3C01447A */ lui $at, 0x447a -/* C7285C 802413DC 44813000 */ mtc1 $at, $f6 -/* C72860 802413E0 27A20034 */ addiu $v0, $sp, 0x34 -/* C72864 802413E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C72868 802413E8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C7286C 802413EC E7A40030 */ swc1 $f4, 0x30($sp) -/* C72870 802413F0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C72874 802413F4 AFA20010 */ sw $v0, 0x10($sp) -/* C72878 802413F8 8E040080 */ lw $a0, 0x80($s0) -/* C7287C 802413FC 0C0372DF */ jal func_800DCB7C -/* C72880 80241400 27A70030 */ addiu $a3, $sp, 0x30 -.L80241404: -/* C72884 80241404 10400007 */ beqz $v0, .L80241424 -/* C72888 80241408 00000000 */ nop -/* C7288C 8024140C 4616A082 */ mul.s $f2, $f20, $f22 -/* C72890 80241410 00000000 */ nop -/* C72894 80241414 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C72898 80241418 46180000 */ add.s $f0, $f0, $f24 -/* C7289C 8024141C 0809050C */ j .L80241430 -/* C728A0 80241420 46020000 */ add.s $f0, $f0, $f2 -.L80241424: -/* C728A4 80241424 4616A002 */ mul.s $f0, $f20, $f22 -/* C728A8 80241428 00000000 */ nop -/* C728AC 8024142C 4600D000 */ add.s $f0, $f26, $f0 -.L80241430: -/* C728B0 80241430 E600003C */ swc1 $f0, 0x3c($s0) -/* C728B4 80241434 8E220074 */ lw $v0, 0x74($s1) -/* C728B8 80241438 2442000A */ addiu $v0, $v0, 0xa -/* C728BC 8024143C 44826000 */ mtc1 $v0, $f12 -/* C728C0 80241440 00000000 */ nop -/* C728C4 80241444 0C00A6C9 */ jal clamp_angle -/* C728C8 80241448 46806320 */ cvt.s.w $f12, $f12 -/* C728CC 8024144C 4600020D */ trunc.w.s $f8, $f0 -/* C728D0 80241450 E6280074 */ swc1 $f8, 0x74($s1) -.L80241454: -/* C728D4 80241454 8E220090 */ lw $v0, 0x90($s1) -/* C728D8 80241458 1C400040 */ bgtz $v0, .L8024155C -/* C728DC 8024145C 2442FFFF */ addiu $v0, $v0, -1 -/* C728E0 80241460 860200A8 */ lh $v0, 0xa8($s0) -/* C728E4 80241464 C600003C */ lwc1 $f0, 0x3c($s0) -/* C728E8 80241468 44821000 */ mtc1 $v0, $f2 -/* C728EC 8024146C 00000000 */ nop -/* C728F0 80241470 468010A0 */ cvt.s.w $f2, $f2 -/* C728F4 80241474 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C728F8 80241478 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C728FC 8024147C 46020000 */ add.s $f0, $f0, $f2 -/* C72900 80241480 3C014024 */ lui $at, 0x4024 -/* C72904 80241484 44812800 */ mtc1 $at, $f5 -/* C72908 80241488 44802000 */ mtc1 $zero, $f4 -/* C7290C 8024148C C442002C */ lwc1 $f2, 0x2c($v0) -/* C72910 80241490 46000021 */ cvt.d.s $f0, $f0 -/* C72914 80241494 46240000 */ add.d $f0, $f0, $f4 -/* C72918 80241498 460010A1 */ cvt.d.s $f2, $f2 -/* C7291C 8024149C 4620103C */ c.lt.d $f2, $f0 -/* C72920 802414A0 00000000 */ nop -/* C72924 802414A4 4500002E */ bc1f .L80241560 -/* C72928 802414A8 0280202D */ daddu $a0, $s4, $zero -/* C7292C 802414AC 24020001 */ addiu $v0, $zero, 1 -/* C72930 802414B0 AFA20010 */ sw $v0, 0x10($sp) -/* C72934 802414B4 8E460024 */ lw $a2, 0x24($s2) -/* C72938 802414B8 8E470028 */ lw $a3, 0x28($s2) -/* C7293C 802414BC 0C01242D */ jal func_800490B4 -/* C72940 802414C0 0220282D */ daddu $a1, $s1, $zero -/* C72944 802414C4 10400026 */ beqz $v0, .L80241560 -/* C72948 802414C8 0000202D */ daddu $a0, $zero, $zero -/* C7294C 802414CC 0200282D */ daddu $a1, $s0, $zero -/* C72950 802414D0 0000302D */ daddu $a2, $zero, $zero -/* C72954 802414D4 2412000C */ addiu $s2, $zero, 0xc -/* C72958 802414D8 860300A8 */ lh $v1, 0xa8($s0) -/* C7295C 802414DC 3C013F80 */ lui $at, 0x3f80 -/* C72960 802414E0 44810000 */ mtc1 $at, $f0 -/* C72964 802414E4 3C014000 */ lui $at, 0x4000 -/* C72968 802414E8 44811000 */ mtc1 $at, $f2 -/* C7296C 802414EC 3C01C1A0 */ lui $at, 0xc1a0 -/* C72970 802414F0 44812000 */ mtc1 $at, $f4 -/* C72974 802414F4 44834000 */ mtc1 $v1, $f8 -/* C72978 802414F8 00000000 */ nop -/* C7297C 802414FC 46804220 */ cvt.s.w $f8, $f8 -/* C72980 80241500 44074000 */ mfc1 $a3, $f8 -/* C72984 80241504 27A20038 */ addiu $v0, $sp, 0x38 -/* C72988 80241508 AFB2001C */ sw $s2, 0x1c($sp) -/* C7298C 8024150C AFA20020 */ sw $v0, 0x20($sp) -/* C72990 80241510 E7A00010 */ swc1 $f0, 0x10($sp) -/* C72994 80241514 E7A20014 */ swc1 $f2, 0x14($sp) -/* C72998 80241518 0C01BFA4 */ jal fx_emote -/* C7299C 8024151C E7A40018 */ swc1 $f4, 0x18($sp) -/* C729A0 80241520 0200202D */ daddu $a0, $s0, $zero -/* C729A4 80241524 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C729A8 80241528 C480003C */ lwc1 $f0, 0x3c($a0) -/* C729AC 8024152C 3C060020 */ lui $a2, 0x20 -/* C729B0 80241530 0C012530 */ jal func_800494C0 -/* C729B4 80241534 E4800064 */ swc1 $f0, 0x64($a0) -/* C729B8 80241538 8E220018 */ lw $v0, 0x18($s1) -/* C729BC 8024153C 9442002A */ lhu $v0, 0x2a($v0) -/* C729C0 80241540 30420001 */ andi $v0, $v0, 1 -/* C729C4 80241544 10400003 */ beqz $v0, .L80241554 -/* C729C8 80241548 2402000A */ addiu $v0, $zero, 0xa -/* C729CC 8024154C 0809057F */ j .L802415FC -/* C729D0 80241550 AE620070 */ sw $v0, 0x70($s3) -.L80241554: -/* C729D4 80241554 0809057F */ j .L802415FC -/* C729D8 80241558 AE720070 */ sw $s2, 0x70($s3) -.L8024155C: -/* C729DC 8024155C AE220090 */ sw $v0, 0x90($s1) -.L80241560: -/* C729E0 80241560 8602008C */ lh $v0, 0x8c($s0) -/* C729E4 80241564 14400025 */ bnez $v0, .L802415FC -/* C729E8 80241568 00000000 */ nop -/* C729EC 8024156C 8602008E */ lh $v0, 0x8e($s0) -/* C729F0 80241570 1C400022 */ bgtz $v0, .L802415FC -/* C729F4 80241574 00000000 */ nop -/* C729F8 80241578 8E620074 */ lw $v0, 0x74($s3) -/* C729FC 8024157C 2442FFFF */ addiu $v0, $v0, -1 -/* C72A00 80241580 1840001D */ blez $v0, .L802415F8 -/* C72A04 80241584 AE620074 */ sw $v0, 0x74($s3) -/* C72A08 80241588 8E220018 */ lw $v0, 0x18($s1) -/* C72A0C 8024158C 9442002A */ lhu $v0, 0x2a($v0) -/* C72A10 80241590 30420010 */ andi $v0, $v0, 0x10 -/* C72A14 80241594 14400007 */ bnez $v0, .L802415B4 -/* C72A18 80241598 00000000 */ nop -/* C72A1C 8024159C C600000C */ lwc1 $f0, 0xc($s0) -/* C72A20 802415A0 3C014334 */ lui $at, 0x4334 -/* C72A24 802415A4 44816000 */ mtc1 $at, $f12 -/* C72A28 802415A8 0C00A6C9 */ jal clamp_angle -/* C72A2C 802415AC 460C0300 */ add.s $f12, $f0, $f12 -/* C72A30 802415B0 E600000C */ swc1 $f0, 0xc($s0) -.L802415B4: -/* C72A34 802415B4 0C00A67F */ jal rand_int -/* C72A38 802415B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C72A3C 802415BC 3C032E8B */ lui $v1, 0x2e8b -/* C72A40 802415C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C72A44 802415C4 00430018 */ mult $v0, $v1 -/* C72A48 802415C8 00021FC3 */ sra $v1, $v0, 0x1f -/* C72A4C 802415CC 00004010 */ mfhi $t0 -/* C72A50 802415D0 00082043 */ sra $a0, $t0, 1 -/* C72A54 802415D4 00832023 */ subu $a0, $a0, $v1 -/* C72A58 802415D8 00041840 */ sll $v1, $a0, 1 -/* C72A5C 802415DC 00641821 */ addu $v1, $v1, $a0 -/* C72A60 802415E0 00031880 */ sll $v1, $v1, 2 -/* C72A64 802415E4 00641823 */ subu $v1, $v1, $a0 -/* C72A68 802415E8 00431023 */ subu $v0, $v0, $v1 -/* C72A6C 802415EC 24420005 */ addiu $v0, $v0, 5 -/* C72A70 802415F0 0809057F */ j .L802415FC -/* C72A74 802415F4 A602008E */ sh $v0, 0x8e($s0) -.L802415F8: -/* C72A78 802415F8 AE600070 */ sw $zero, 0x70($s3) -.L802415FC: -/* C72A7C 802415FC 8FBF0054 */ lw $ra, 0x54($sp) -/* C72A80 80241600 8FB40050 */ lw $s4, 0x50($sp) -/* C72A84 80241604 8FB3004C */ lw $s3, 0x4c($sp) -/* C72A88 80241608 8FB20048 */ lw $s2, 0x48($sp) -/* C72A8C 8024160C 8FB10044 */ lw $s1, 0x44($sp) -/* C72A90 80241610 8FB00040 */ lw $s0, 0x40($sp) -/* C72A94 80241614 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C72A98 80241618 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C72A9C 8024161C D7B60060 */ ldc1 $f22, 0x60($sp) -/* C72AA0 80241620 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C72AA4 80241624 03E00008 */ jr $ra -/* C72AA8 80241628 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s deleted file mode 100644 index ff3f06e2d5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802418A8_C72D28.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A8_C72D28 -/* C72D28 802418A8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C72D2C 802418AC AFB20030 */ sw $s2, 0x30($sp) -/* C72D30 802418B0 0080902D */ daddu $s2, $a0, $zero -/* C72D34 802418B4 AFBF0038 */ sw $ra, 0x38($sp) -/* C72D38 802418B8 AFB30034 */ sw $s3, 0x34($sp) -/* C72D3C 802418BC AFB1002C */ sw $s1, 0x2c($sp) -/* C72D40 802418C0 AFB00028 */ sw $s0, 0x28($sp) -/* C72D44 802418C4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C72D48 802418C8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C72D4C 802418CC 8E510148 */ lw $s1, 0x148($s2) -/* C72D50 802418D0 86240008 */ lh $a0, 8($s1) -/* C72D54 802418D4 0C00EABB */ jal get_npc_unsafe -/* C72D58 802418D8 00A0982D */ daddu $s3, $a1, $zero -/* C72D5C 802418DC 0040802D */ daddu $s0, $v0, $zero -/* C72D60 802418E0 0200202D */ daddu $a0, $s0, $zero -/* C72D64 802418E4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C72D68 802418E8 468010A0 */ cvt.s.w $f2, $f2 -/* C72D6C 802418EC 460010A1 */ cvt.d.s $f2, $f2 -/* C72D70 802418F0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C72D74 802418F4 C6000014 */ lwc1 $f0, 0x14($s0) -/* C72D78 802418F8 8E050018 */ lw $a1, 0x18($s0) -/* C72D7C 802418FC 46002100 */ add.s $f4, $f4, $f0 -/* C72D80 80241900 8E06000C */ lw $a2, 0xc($s0) -/* C72D84 80241904 C6200078 */ lwc1 $f0, 0x78($s1) -/* C72D88 80241908 46800020 */ cvt.s.w $f0, $f0 -/* C72D8C 8024190C E604001C */ swc1 $f4, 0x1c($s0) -/* C72D90 80241910 3C014059 */ lui $at, 0x4059 -/* C72D94 80241914 44812800 */ mtc1 $at, $f5 -/* C72D98 80241918 44802000 */ mtc1 $zero, $f4 -/* C72D9C 8024191C 46000021 */ cvt.d.s $f0, $f0 -/* C72DA0 80241920 46240003 */ div.d $f0, $f0, $f4 -/* C72DA4 80241924 46200520 */ cvt.s.d $f20, $f0 -/* C72DA8 80241928 46241083 */ div.d $f2, $f2, $f4 -/* C72DAC 8024192C 0C00EA95 */ jal npc_move_heading -/* C72DB0 80241930 462015A0 */ cvt.s.d $f22, $f2 -/* C72DB4 80241934 C604001C */ lwc1 $f4, 0x1c($s0) -/* C72DB8 80241938 44801000 */ mtc1 $zero, $f2 -/* C72DBC 8024193C 44801800 */ mtc1 $zero, $f3 -/* C72DC0 80241940 46002021 */ cvt.d.s $f0, $f4 -/* C72DC4 80241944 4620103E */ c.le.d $f2, $f0 -/* C72DC8 80241948 00000000 */ nop -/* C72DCC 8024194C 45000030 */ bc1f .L80241A10 -/* C72DD0 80241950 00000000 */ nop -/* C72DD4 80241954 C600003C */ lwc1 $f0, 0x3c($s0) -/* C72DD8 80241958 46040000 */ add.s $f0, $f0, $f4 -/* C72DDC 8024195C E600003C */ swc1 $f0, 0x3c($s0) -/* C72DE0 80241960 8E2200CC */ lw $v0, 0xcc($s1) -/* C72DE4 80241964 8C420024 */ lw $v0, 0x24($v0) -/* C72DE8 80241968 AE020028 */ sw $v0, 0x28($s0) -/* C72DEC 8024196C A2200007 */ sb $zero, 7($s1) -/* C72DF0 80241970 8E020000 */ lw $v0, ($s0) -/* C72DF4 80241974 30420008 */ andi $v0, $v0, 8 -/* C72DF8 80241978 14400011 */ bnez $v0, .L802419C0 -/* C72DFC 8024197C 0000102D */ daddu $v0, $zero, $zero -/* C72E00 80241980 27A50018 */ addiu $a1, $sp, 0x18 -/* C72E04 80241984 27A6001C */ addiu $a2, $sp, 0x1c -/* C72E08 80241988 C6000038 */ lwc1 $f0, 0x38($s0) -/* C72E0C 8024198C C602003C */ lwc1 $f2, 0x3c($s0) -/* C72E10 80241990 C6040040 */ lwc1 $f4, 0x40($s0) -/* C72E14 80241994 3C01447A */ lui $at, 0x447a -/* C72E18 80241998 44813000 */ mtc1 $at, $f6 -/* C72E1C 8024199C 27A20024 */ addiu $v0, $sp, 0x24 -/* C72E20 802419A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C72E24 802419A4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C72E28 802419A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* C72E2C 802419AC E7A60024 */ swc1 $f6, 0x24($sp) -/* C72E30 802419B0 AFA20010 */ sw $v0, 0x10($sp) -/* C72E34 802419B4 8E040080 */ lw $a0, 0x80($s0) -/* C72E38 802419B8 0C0372DF */ jal func_800DCB7C -/* C72E3C 802419BC 27A70020 */ addiu $a3, $sp, 0x20 -.L802419C0: -/* C72E40 802419C0 1040000B */ beqz $v0, .L802419F0 -/* C72E44 802419C4 00000000 */ nop -/* C72E48 802419C8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C72E4C 802419CC 46140080 */ add.s $f2, $f0, $f20 -/* C72E50 802419D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C72E54 802419D4 4600103E */ c.le.s $f2, $f0 -/* C72E58 802419D8 00000000 */ nop -/* C72E5C 802419DC 4500008D */ bc1f .L80241C14 -/* C72E60 802419E0 00000000 */ nop -/* C72E64 802419E4 E602003C */ swc1 $f2, 0x3c($s0) -/* C72E68 802419E8 08090705 */ j .L80241C14 -/* C72E6C 802419EC AE400070 */ sw $zero, 0x70($s2) -.L802419F0: -/* C72E70 802419F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72E74 802419F4 C6000064 */ lwc1 $f0, 0x64($s0) -/* C72E78 802419F8 4602003E */ c.le.s $f0, $f2 -/* C72E7C 802419FC 00000000 */ nop -/* C72E80 80241A00 45030084 */ bc1tl .L80241C14 -/* C72E84 80241A04 AE400070 */ sw $zero, 0x70($s2) -/* C72E88 80241A08 08090705 */ j .L80241C14 -/* C72E8C 80241A0C 00000000 */ nop -.L80241A10: -/* C72E90 80241A10 4622003C */ c.lt.d $f0, $f2 -/* C72E94 80241A14 00000000 */ nop -/* C72E98 80241A18 4500007E */ bc1f .L80241C14 -/* C72E9C 80241A1C 00000000 */ nop -/* C72EA0 80241A20 9602008E */ lhu $v0, 0x8e($s0) -/* C72EA4 80241A24 24420001 */ addiu $v0, $v0, 1 -/* C72EA8 80241A28 A602008E */ sh $v0, 0x8e($s0) -/* C72EAC 80241A2C 00021400 */ sll $v0, $v0, 0x10 -/* C72EB0 80241A30 8E630020 */ lw $v1, 0x20($s3) -/* C72EB4 80241A34 00021403 */ sra $v0, $v0, 0x10 -/* C72EB8 80241A38 0043102A */ slt $v0, $v0, $v1 -/* C72EBC 80241A3C 14400026 */ bnez $v0, .L80241AD8 -/* C72EC0 80241A40 00000000 */ nop -/* C72EC4 80241A44 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C72EC8 80241A48 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C72ECC 80241A4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C72ED0 80241A50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C72ED4 80241A54 A600008E */ sh $zero, 0x8e($s0) -/* C72ED8 80241A58 8C460028 */ lw $a2, 0x28($v0) -/* C72EDC 80241A5C 0C00A720 */ jal atan2 -/* C72EE0 80241A60 8C470030 */ lw $a3, 0x30($v0) -/* C72EE4 80241A64 46000506 */ mov.s $f20, $f0 -/* C72EE8 80241A68 C60C000C */ lwc1 $f12, 0xc($s0) -/* C72EEC 80241A6C 0C00A70A */ jal get_clamped_angle_diff -/* C72EF0 80241A70 4600A386 */ mov.s $f14, $f20 -/* C72EF4 80241A74 46000086 */ mov.s $f2, $f0 -/* C72EF8 80241A78 8E62001C */ lw $v0, 0x1c($s3) -/* C72EFC 80241A7C 46001005 */ abs.s $f0, $f2 -/* C72F00 80241A80 44822000 */ mtc1 $v0, $f4 -/* C72F04 80241A84 00000000 */ nop -/* C72F08 80241A88 46802120 */ cvt.s.w $f4, $f4 -/* C72F0C 80241A8C 4600203C */ c.lt.s $f4, $f0 -/* C72F10 80241A90 00000000 */ nop -/* C72F14 80241A94 4500000D */ bc1f .L80241ACC -/* C72F18 80241A98 00000000 */ nop -/* C72F1C 80241A9C 44800000 */ mtc1 $zero, $f0 -/* C72F20 80241AA0 C614000C */ lwc1 $f20, 0xc($s0) -/* C72F24 80241AA4 4600103C */ c.lt.s $f2, $f0 -/* C72F28 80241AA8 00000000 */ nop -/* C72F2C 80241AAC 45000006 */ bc1f .L80241AC8 -/* C72F30 80241AB0 00021023 */ negu $v0, $v0 -/* C72F34 80241AB4 44820000 */ mtc1 $v0, $f0 -/* C72F38 80241AB8 00000000 */ nop -/* C72F3C 80241ABC 46800020 */ cvt.s.w $f0, $f0 -/* C72F40 80241AC0 080906B3 */ j .L80241ACC -/* C72F44 80241AC4 4600A500 */ add.s $f20, $f20, $f0 -.L80241AC8: -/* C72F48 80241AC8 4604A500 */ add.s $f20, $f20, $f4 -.L80241ACC: -/* C72F4C 80241ACC 0C00A6C9 */ jal clamp_angle -/* C72F50 80241AD0 4600A306 */ mov.s $f12, $f20 -/* C72F54 80241AD4 E600000C */ swc1 $f0, 0xc($s0) -.L80241AD8: -/* C72F58 80241AD8 8E020000 */ lw $v0, ($s0) -/* C72F5C 80241ADC 30420008 */ andi $v0, $v0, 8 -/* C72F60 80241AE0 1040000A */ beqz $v0, .L80241B0C -/* C72F64 80241AE4 27A50018 */ addiu $a1, $sp, 0x18 -/* C72F68 80241AE8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C72F6C 80241AEC C600001C */ lwc1 $f0, 0x1c($s0) -/* C72F70 80241AF0 46001080 */ add.s $f2, $f2, $f0 -/* C72F74 80241AF4 4616103C */ c.lt.s $f2, $f22 -/* C72F78 80241AF8 00000000 */ nop -/* C72F7C 80241AFC 45020045 */ bc1fl .L80241C14 -/* C72F80 80241B00 E602003C */ swc1 $f2, 0x3c($s0) -/* C72F84 80241B04 08090704 */ j .L80241C10 -/* C72F88 80241B08 E616003C */ swc1 $f22, 0x3c($s0) -.L80241B0C: -/* C72F8C 80241B0C C6000038 */ lwc1 $f0, 0x38($s0) -/* C72F90 80241B10 27A6001C */ addiu $a2, $sp, 0x1c -/* C72F94 80241B14 E7A00018 */ swc1 $f0, 0x18($sp) -/* C72F98 80241B18 860200A8 */ lh $v0, 0xa8($s0) -/* C72F9C 80241B1C C600001C */ lwc1 $f0, 0x1c($s0) -/* C72FA0 80241B20 C604003C */ lwc1 $f4, 0x3c($s0) -/* C72FA4 80241B24 44821000 */ mtc1 $v0, $f2 -/* C72FA8 80241B28 00000000 */ nop -/* C72FAC 80241B2C 468010A0 */ cvt.s.w $f2, $f2 -/* C72FB0 80241B30 46000005 */ abs.s $f0, $f0 -/* C72FB4 80241B34 46020000 */ add.s $f0, $f0, $f2 -/* C72FB8 80241B38 C6060040 */ lwc1 $f6, 0x40($s0) -/* C72FBC 80241B3C 27A20024 */ addiu $v0, $sp, 0x24 -/* C72FC0 80241B40 46022100 */ add.s $f4, $f4, $f2 -/* C72FC4 80241B44 3C014024 */ lui $at, 0x4024 -/* C72FC8 80241B48 44811800 */ mtc1 $at, $f3 -/* C72FCC 80241B4C 44801000 */ mtc1 $zero, $f2 -/* C72FD0 80241B50 46000021 */ cvt.d.s $f0, $f0 -/* C72FD4 80241B54 46220000 */ add.d $f0, $f0, $f2 -/* C72FD8 80241B58 E7A60020 */ swc1 $f6, 0x20($sp) -/* C72FDC 80241B5C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C72FE0 80241B60 46200020 */ cvt.s.d $f0, $f0 -/* C72FE4 80241B64 E7A00024 */ swc1 $f0, 0x24($sp) -/* C72FE8 80241B68 AFA20010 */ sw $v0, 0x10($sp) -/* C72FEC 80241B6C 8E040080 */ lw $a0, 0x80($s0) -/* C72FF0 80241B70 0C0372DF */ jal func_800DCB7C -/* C72FF4 80241B74 27A70020 */ addiu $a3, $sp, 0x20 -/* C72FF8 80241B78 10400015 */ beqz $v0, .L80241BD0 -/* C72FFC 80241B7C 00000000 */ nop -/* C73000 80241B80 860200A8 */ lh $v0, 0xa8($s0) -/* C73004 80241B84 C604001C */ lwc1 $f4, 0x1c($s0) -/* C73008 80241B88 44820000 */ mtc1 $v0, $f0 -/* C7300C 80241B8C 00000000 */ nop -/* C73010 80241B90 46800020 */ cvt.s.w $f0, $f0 -/* C73014 80241B94 46002085 */ abs.s $f2, $f4 -/* C73018 80241B98 46020000 */ add.s $f0, $f0, $f2 -/* C7301C 80241B9C C7A20024 */ lwc1 $f2, 0x24($sp) -/* C73020 80241BA0 4600103E */ c.le.s $f2, $f0 -/* C73024 80241BA4 00000000 */ nop -/* C73028 80241BA8 45000005 */ bc1f .L80241BC0 -/* C7302C 80241BAC 00000000 */ nop -/* C73030 80241BB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C73034 80241BB4 AE00001C */ sw $zero, 0x1c($s0) -/* C73038 80241BB8 08090705 */ j .L80241C14 -/* C7303C 80241BBC E600003C */ swc1 $f0, 0x3c($s0) -.L80241BC0: -/* C73040 80241BC0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C73044 80241BC4 46040000 */ add.s $f0, $f0, $f4 -/* C73048 80241BC8 08090705 */ j .L80241C14 -/* C7304C 80241BCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241BD0: -/* C73050 80241BD0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C73054 80241BD4 860200A8 */ lh $v0, 0xa8($s0) -/* C73058 80241BD8 46163081 */ sub.s $f2, $f6, $f22 -/* C7305C 80241BDC 44820000 */ mtc1 $v0, $f0 -/* C73060 80241BE0 00000000 */ nop -/* C73064 80241BE4 46800020 */ cvt.s.w $f0, $f0 -/* C73068 80241BE8 46001080 */ add.s $f2, $f2, $f0 -/* C7306C 80241BEC C604001C */ lwc1 $f4, 0x1c($s0) -/* C73070 80241BF0 46002005 */ abs.s $f0, $f4 -/* C73074 80241BF4 4602003C */ c.lt.s $f0, $f2 -/* C73078 80241BF8 00000000 */ nop -/* C7307C 80241BFC 45020005 */ bc1fl .L80241C14 -/* C73080 80241C00 AE00001C */ sw $zero, 0x1c($s0) -/* C73084 80241C04 46043000 */ add.s $f0, $f6, $f4 -/* C73088 80241C08 08090705 */ j .L80241C14 -/* C7308C 80241C0C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C10: -/* C73090 80241C10 AE00001C */ sw $zero, 0x1c($s0) -.L80241C14: -/* C73094 80241C14 8FBF0038 */ lw $ra, 0x38($sp) -/* C73098 80241C18 8FB30034 */ lw $s3, 0x34($sp) -/* C7309C 80241C1C 8FB20030 */ lw $s2, 0x30($sp) -/* C730A0 80241C20 8FB1002C */ lw $s1, 0x2c($sp) -/* C730A4 80241C24 8FB00028 */ lw $s0, 0x28($sp) -/* C730A8 80241C28 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C730AC 80241C2C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C730B0 80241C30 03E00008 */ jr $ra -/* C730B4 80241C34 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s deleted file mode 100644 index dac6202b0c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C38_C730B8 -/* C730B8 80241C38 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C730BC 80241C3C AFB00028 */ sw $s0, 0x28($sp) -/* C730C0 80241C40 00A0802D */ daddu $s0, $a1, $zero -/* C730C4 80241C44 AFB1002C */ sw $s1, 0x2c($sp) -/* C730C8 80241C48 00C0882D */ daddu $s1, $a2, $zero -/* C730CC 80241C4C AFBF0034 */ sw $ra, 0x34($sp) -/* C730D0 80241C50 AFB20030 */ sw $s2, 0x30($sp) -/* C730D4 80241C54 AE200070 */ sw $zero, 0x70($s1) -/* C730D8 80241C58 8C830000 */ lw $v1, ($a0) -/* C730DC 80241C5C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C730E0 80241C60 A480008E */ sh $zero, 0x8e($a0) -/* C730E4 80241C64 00621824 */ and $v1, $v1, $v0 -/* C730E8 80241C68 34650800 */ ori $a1, $v1, 0x800 -/* C730EC 80241C6C AC850000 */ sw $a1, ($a0) -/* C730F0 80241C70 8E0200D0 */ lw $v0, 0xd0($s0) -/* C730F4 80241C74 8C420034 */ lw $v0, 0x34($v0) -/* C730F8 80241C78 10400003 */ beqz $v0, .L80241C88 -/* C730FC 80241C7C 00E0902D */ daddu $s2, $a3, $zero -/* C73100 80241C80 08090724 */ j .L80241C90 -/* C73104 80241C84 34620808 */ ori $v0, $v1, 0x808 -.L80241C88: -/* C73108 80241C88 2402FFF7 */ addiu $v0, $zero, -9 -/* C7310C 80241C8C 00A21024 */ and $v0, $a1, $v0 -.L80241C90: -/* C73110 80241C90 AC820000 */ sw $v0, ($a0) -/* C73114 80241C94 27A20024 */ addiu $v0, $sp, 0x24 -/* C73118 80241C98 27A50018 */ addiu $a1, $sp, 0x18 -/* C7311C 80241C9C C4800038 */ lwc1 $f0, 0x38($a0) -/* C73120 80241CA0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C73124 80241CA4 C4840040 */ lwc1 $f4, 0x40($a0) -/* C73128 80241CA8 3C01447A */ lui $at, 0x447a -/* C7312C 80241CAC 44813000 */ mtc1 $at, $f6 -/* C73130 80241CB0 27A6001C */ addiu $a2, $sp, 0x1c -/* C73134 80241CB4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C73138 80241CB8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C7313C 80241CBC E7A40020 */ swc1 $f4, 0x20($sp) -/* C73140 80241CC0 E7A60024 */ swc1 $f6, 0x24($sp) -/* C73144 80241CC4 AFA20010 */ sw $v0, 0x10($sp) -/* C73148 80241CC8 8C840080 */ lw $a0, 0x80($a0) -/* C7314C 80241CCC 0C0372DF */ jal func_800DCB7C -/* C73150 80241CD0 27A70020 */ addiu $a3, $sp, 0x20 -/* C73154 80241CD4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C73158 80241CD8 3C014059 */ lui $at, 0x4059 -/* C7315C 80241CDC 44812800 */ mtc1 $at, $f5 -/* C73160 80241CE0 44802000 */ mtc1 $zero, $f4 -/* C73164 80241CE4 460010A1 */ cvt.d.s $f2, $f2 -/* C73168 80241CE8 46241082 */ mul.d $f2, $f2, $f4 -/* C7316C 80241CEC 00000000 */ nop -/* C73170 80241CF0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C73174 80241CF4 46000021 */ cvt.d.s $f0, $f0 -/* C73178 80241CF8 46240002 */ mul.d $f0, $f0, $f4 -/* C7317C 80241CFC 00000000 */ nop -/* C73180 80241D00 3C013FE0 */ lui $at, 0x3fe0 -/* C73184 80241D04 44812800 */ mtc1 $at, $f5 -/* C73188 80241D08 44802000 */ mtc1 $zero, $f4 -/* C7318C 80241D0C 00000000 */ nop -/* C73190 80241D10 46241080 */ add.d $f2, $f2, $f4 -/* C73194 80241D14 AE000074 */ sw $zero, 0x74($s0) -/* C73198 80241D18 46240000 */ add.d $f0, $f0, $f4 -/* C7319C 80241D1C AE000090 */ sw $zero, 0x90($s0) -/* C731A0 80241D20 4620120D */ trunc.w.d $f8, $f2 -/* C731A4 80241D24 E6080078 */ swc1 $f8, 0x78($s0) -/* C731A8 80241D28 4620020D */ trunc.w.d $f8, $f0 -/* C731AC 80241D2C E6080088 */ swc1 $f8, 0x88($s0) -/* C731B0 80241D30 8E420014 */ lw $v0, 0x14($s2) -/* C731B4 80241D34 AE220074 */ sw $v0, 0x74($s1) -/* C731B8 80241D38 8E0200B0 */ lw $v0, 0xb0($s0) -/* C731BC 80241D3C 34420010 */ ori $v0, $v0, 0x10 -/* C731C0 80241D40 AE0200B0 */ sw $v0, 0xb0($s0) -/* C731C4 80241D44 8FBF0034 */ lw $ra, 0x34($sp) -/* C731C8 80241D48 8FB20030 */ lw $s2, 0x30($sp) -/* C731CC 80241D4C 8FB1002C */ lw $s1, 0x2c($sp) -/* C731D0 80241D50 8FB00028 */ lw $s0, 0x28($sp) -/* C731D4 80241D54 03E00008 */ jr $ra -/* C731D8 80241D58 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 3531ecd545..4254e2a602 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -46,7 +46,7 @@ glabel func_80241D5C_C731DC /* C73280 80241E00 02A0202D */ daddu $a0, $s5, $zero /* C73284 80241E04 0240282D */ daddu $a1, $s2, $zero /* C73288 80241E08 0280302D */ daddu $a2, $s4, $zero -/* C7328C 80241E0C 0C09070E */ jal func_80241C38_C730B8 +/* C7328C 80241E0C 0C09070E */ jal kzn_08_UnkFunc5 /* C73290 80241E10 0200382D */ daddu $a3, $s0, $zero .L80241E14: /* C73294 80241E14 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241E90_C73310 glabel L80241EA0_C73320 /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero -/* C73328 80241EA8 0C0904BA */ jal func_802412E8_C72768 +/* C73328 80241EA8 0C0904BA */ jal kzn_08_UnkFunc4 /* C7332C 80241EAC 0260302D */ daddu $a2, $s3, $zero /* C73330 80241EB0 080907C9 */ j .L80241F24 /* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241EF8_C73378 glabel L80241F10_C73390 /* C73390 80241F10 0280202D */ daddu $a0, $s4, $zero /* C73394 80241F14 0200282D */ daddu $a1, $s0, $zero -/* C73398 80241F18 0C09062A */ jal func_802418A8_C72D28 +/* C73398 80241F18 0C09062A */ jal kzn_08_UnkFunc6 /* C7339C 80241F1C 0260302D */ daddu $a2, $s3, $zero glabel L80241F20_C733A0 /* C733A0 80241F20 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index 3cc640c052..59d1bd8f40 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -46,7 +46,7 @@ glabel func_80242354_C737D4 /* C73878 802423F8 02A0202D */ daddu $a0, $s5, $zero /* C7387C 802423FC 0240282D */ daddu $a1, $s2, $zero /* C73880 80242400 0280302D */ daddu $a2, $s4, $zero -/* C73884 80242404 0C09070E */ jal func_80241C38_C730B8 +/* C73884 80242404 0C09070E */ jal kzn_08_UnkFunc5 /* C73888 80242408 0200382D */ daddu $a3, $s0, $zero /* C7388C 8024240C AE800070 */ sw $zero, 0x70($s4) .L80242410: @@ -92,7 +92,7 @@ glabel L8024248C_C7390C glabel L8024249C_C7391C /* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero /* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero -/* C73924 802424A4 0C0904BA */ jal func_802412E8_C72768 +/* C73924 802424A4 0C0904BA */ jal kzn_08_UnkFunc4 /* C73928 802424A8 0260302D */ daddu $a2, $s3, $zero /* C7392C 802424AC 08090946 */ j .L80242518 /* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s deleted file mode 100644 index b602ad41d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428F8_C73D78 -/* C73D78 802428F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C73D7C 802428FC AFB40028 */ sw $s4, 0x28($sp) -/* C73D80 80242900 0080A02D */ daddu $s4, $a0, $zero -/* C73D84 80242904 AFBF002C */ sw $ra, 0x2c($sp) -/* C73D88 80242908 AFB30024 */ sw $s3, 0x24($sp) -/* C73D8C 8024290C AFB20020 */ sw $s2, 0x20($sp) -/* C73D90 80242910 AFB1001C */ sw $s1, 0x1c($sp) -/* C73D94 80242914 AFB00018 */ sw $s0, 0x18($sp) -/* C73D98 80242918 8E910148 */ lw $s1, 0x148($s4) -/* C73D9C 8024291C 86240008 */ lh $a0, 8($s1) -/* C73DA0 80242920 0C00EABB */ jal get_npc_unsafe -/* C73DA4 80242924 00A0802D */ daddu $s0, $a1, $zero -/* C73DA8 80242928 16000005 */ bnez $s0, .L80242940 -/* C73DAC 8024292C 0040902D */ daddu $s2, $v0, $zero -/* C73DB0 80242930 8E2200B0 */ lw $v0, 0xb0($s1) -/* C73DB4 80242934 30420004 */ andi $v0, $v0, 4 -/* C73DB8 80242938 10400015 */ beqz $v0, .L80242990 -/* C73DBC 8024293C 00000000 */ nop -.L80242940: -/* C73DC0 80242940 AE800070 */ sw $zero, 0x70($s4) -/* C73DC4 80242944 8E420000 */ lw $v0, ($s2) -/* C73DC8 80242948 3C031F30 */ lui $v1, 0x1f30 -/* C73DCC 8024294C A640008E */ sh $zero, 0x8e($s2) -/* C73DD0 80242950 34420102 */ ori $v0, $v0, 0x102 -/* C73DD4 80242954 AE420000 */ sw $v0, ($s2) -/* C73DD8 80242958 8E220000 */ lw $v0, ($s1) -/* C73DDC 8024295C 3C01C47A */ lui $at, 0xc47a -/* C73DE0 80242960 44810000 */ mtc1 $at, $f0 -/* C73DE4 80242964 00431025 */ or $v0, $v0, $v1 -/* C73DE8 80242968 AE220000 */ sw $v0, ($s1) -/* C73DEC 8024296C AE400038 */ sw $zero, 0x38($s2) -/* C73DF0 80242970 E640003C */ swc1 $f0, 0x3c($s2) -/* C73DF4 80242974 AE400040 */ sw $zero, 0x40($s2) -/* C73DF8 80242978 8E2300B0 */ lw $v1, 0xb0($s1) -/* C73DFC 8024297C 30620004 */ andi $v0, $v1, 4 -/* C73E00 80242980 10400003 */ beqz $v0, .L80242990 -/* C73E04 80242984 2402FFFB */ addiu $v0, $zero, -5 -/* C73E08 80242988 00621024 */ and $v0, $v1, $v0 -/* C73E0C 8024298C AE2200B0 */ sw $v0, 0xb0($s1) -.L80242990: -/* C73E10 80242990 8E930070 */ lw $s3, 0x70($s4) -/* C73E14 80242994 12600005 */ beqz $s3, .L802429AC -/* C73E18 80242998 24020001 */ addiu $v0, $zero, 1 -/* C73E1C 8024299C 12620048 */ beq $s3, $v0, .L80242AC0 -/* C73E20 802429A0 00000000 */ nop -/* C73E24 802429A4 08090ACD */ j .L80242B34 -/* C73E28 802429A8 00000000 */ nop -.L802429AC: -/* C73E2C 802429AC 86240008 */ lh $a0, 8($s1) -/* C73E30 802429B0 0C00FB3A */ jal get_enemy -/* C73E34 802429B4 2484FFFF */ addiu $a0, $a0, -1 -/* C73E38 802429B8 0040802D */ daddu $s0, $v0, $zero -/* C73E3C 802429BC 0C00EABB */ jal get_npc_unsafe -/* C73E40 802429C0 86040008 */ lh $a0, 8($s0) -/* C73E44 802429C4 24030001 */ addiu $v1, $zero, 1 -/* C73E48 802429C8 0040982D */ daddu $s3, $v0, $zero -/* C73E4C 802429CC A2230007 */ sb $v1, 7($s1) -/* C73E50 802429D0 8E03006C */ lw $v1, 0x6c($s0) -/* C73E54 802429D4 24020003 */ addiu $v0, $zero, 3 -/* C73E58 802429D8 14620056 */ bne $v1, $v0, .L80242B34 -/* C73E5C 802429DC 00000000 */ nop -/* C73E60 802429E0 8E2500A8 */ lw $a1, 0xa8($s1) -/* C73E64 802429E4 10A00003 */ beqz $a1, .L802429F4 -/* C73E68 802429E8 0260202D */ daddu $a0, $s3, $zero -/* C73E6C 802429EC 0C012530 */ jal func_800494C0 -/* C73E70 802429F0 0000302D */ daddu $a2, $zero, $zero -.L802429F4: -/* C73E74 802429F4 27A40010 */ addiu $a0, $sp, 0x10 -/* C73E78 802429F8 C6280070 */ lwc1 $f8, 0x70($s1) -/* C73E7C 802429FC 46804220 */ cvt.s.w $f8, $f8 -/* C73E80 80242A00 C6620034 */ lwc1 $f2, 0x34($s3) -/* C73E84 80242A04 3C014387 */ lui $at, 0x4387 -/* C73E88 80242A08 44810000 */ mtc1 $at, $f0 -/* C73E8C 80242A0C 44064000 */ mfc1 $a2, $f8 -/* C73E90 80242A10 46020001 */ sub.s $f0, $f0, $f2 -/* C73E94 80242A14 C6660038 */ lwc1 $f6, 0x38($s3) -/* C73E98 80242A18 C6640040 */ lwc1 $f4, 0x40($s3) -/* C73E9C 80242A1C 44070000 */ mfc1 $a3, $f0 -/* C73EA0 80242A20 27A50014 */ addiu $a1, $sp, 0x14 -/* C73EA4 80242A24 E7A60010 */ swc1 $f6, 0x10($sp) -/* C73EA8 80242A28 0C00A7E7 */ jal add_vec2D_polar -/* C73EAC 80242A2C E7A40014 */ swc1 $f4, 0x14($sp) -/* C73EB0 80242A30 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C73EB4 80242A34 4600020D */ trunc.w.s $f8, $f0 -/* C73EB8 80242A38 44024000 */ mfc1 $v0, $f8 -/* C73EBC 80242A3C E6400038 */ swc1 $f0, 0x38($s2) -/* C73EC0 80242A40 A6220010 */ sh $v0, 0x10($s1) -/* C73EC4 80242A44 C660003C */ lwc1 $f0, 0x3c($s3) -/* C73EC8 80242A48 C622006C */ lwc1 $f2, 0x6c($s1) -/* C73ECC 80242A4C 468010A0 */ cvt.s.w $f2, $f2 -/* C73ED0 80242A50 46020000 */ add.s $f0, $f0, $f2 -/* C73ED4 80242A54 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C73ED8 80242A58 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C73EDC 80242A5C E640003C */ swc1 $f0, 0x3c($s2) -/* C73EE0 80242A60 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C73EE4 80242A64 4600020D */ trunc.w.s $f8, $f0 -/* C73EE8 80242A68 44024000 */ mfc1 $v0, $f8 -/* C73EEC 80242A6C 00000000 */ nop -/* C73EF0 80242A70 A6220012 */ sh $v0, 0x12($s1) -/* C73EF4 80242A74 4600120D */ trunc.w.s $f8, $f2 -/* C73EF8 80242A78 44024000 */ mfc1 $v0, $f8 -/* C73EFC 80242A7C E6420040 */ swc1 $f2, 0x40($s2) -/* C73F00 80242A80 A6220014 */ sh $v0, 0x14($s1) -/* C73F04 80242A84 8C660028 */ lw $a2, 0x28($v1) -/* C73F08 80242A88 8C670030 */ lw $a3, 0x30($v1) -/* C73F0C 80242A8C C64C0038 */ lwc1 $f12, 0x38($s2) -/* C73F10 80242A90 0C00A720 */ jal atan2 -/* C73F14 80242A94 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C73F18 80242A98 3C03E0EF */ lui $v1, 0xe0ef -/* C73F1C 80242A9C E640000C */ swc1 $f0, 0xc($s2) -/* C73F20 80242AA0 8E220000 */ lw $v0, ($s1) -/* C73F24 80242AA4 3463FFFF */ ori $v1, $v1, 0xffff -/* C73F28 80242AA8 00431024 */ and $v0, $v0, $v1 -/* C73F2C 80242AAC AE220000 */ sw $v0, ($s1) -/* C73F30 80242AB0 24020001 */ addiu $v0, $zero, 1 -/* C73F34 80242AB4 A640008E */ sh $zero, 0x8e($s2) -/* C73F38 80242AB8 08090ACD */ j .L80242B34 -/* C73F3C 80242ABC AE820070 */ sw $v0, 0x70($s4) -.L80242AC0: -/* C73F40 80242AC0 86240008 */ lh $a0, 8($s1) -/* C73F44 80242AC4 0C00FB3A */ jal get_enemy -/* C73F48 80242AC8 2484FFFF */ addiu $a0, $a0, -1 -/* C73F4C 80242ACC 0040802D */ daddu $s0, $v0, $zero -/* C73F50 80242AD0 0C00EABB */ jal get_npc_unsafe -/* C73F54 80242AD4 86040008 */ lh $a0, 8($s0) -/* C73F58 80242AD8 9642008E */ lhu $v0, 0x8e($s2) -/* C73F5C 80242ADC 24420001 */ addiu $v0, $v0, 1 -/* C73F60 80242AE0 A642008E */ sh $v0, 0x8e($s2) -/* C73F64 80242AE4 00021400 */ sll $v0, $v0, 0x10 -/* C73F68 80242AE8 8E23007C */ lw $v1, 0x7c($s1) -/* C73F6C 80242AEC 00021403 */ sra $v0, $v0, 0x10 -/* C73F70 80242AF0 0043102A */ slt $v0, $v0, $v1 -/* C73F74 80242AF4 50400001 */ beql $v0, $zero, .L80242AFC -/* C73F78 80242AF8 A2200007 */ sb $zero, 7($s1) -.L80242AFC: -/* C73F7C 80242AFC 8E03006C */ lw $v1, 0x6c($s0) -/* C73F80 80242B00 24020004 */ addiu $v0, $zero, 4 -/* C73F84 80242B04 1462000B */ bne $v1, $v0, .L80242B34 -/* C73F88 80242B08 3C021F10 */ lui $v0, 0x1f10 -/* C73F8C 80242B0C 8E230000 */ lw $v1, ($s1) -/* C73F90 80242B10 3C01C47A */ lui $at, 0xc47a -/* C73F94 80242B14 44810000 */ mtc1 $at, $f0 -/* C73F98 80242B18 00621825 */ or $v1, $v1, $v0 -/* C73F9C 80242B1C AE230000 */ sw $v1, ($s1) -/* C73FA0 80242B20 AE400038 */ sw $zero, 0x38($s2) -/* C73FA4 80242B24 E640003C */ swc1 $f0, 0x3c($s2) -/* C73FA8 80242B28 AE400040 */ sw $zero, 0x40($s2) -/* C73FAC 80242B2C A2330007 */ sb $s3, 7($s1) -/* C73FB0 80242B30 AE800070 */ sw $zero, 0x70($s4) -.L80242B34: -/* C73FB4 80242B34 8FBF002C */ lw $ra, 0x2c($sp) -/* C73FB8 80242B38 8FB40028 */ lw $s4, 0x28($sp) -/* C73FBC 80242B3C 8FB30024 */ lw $s3, 0x24($sp) -/* C73FC0 80242B40 8FB20020 */ lw $s2, 0x20($sp) -/* C73FC4 80242B44 8FB1001C */ lw $s1, 0x1c($sp) -/* C73FC8 80242B48 8FB00018 */ lw $s0, 0x18($sp) -/* C73FCC 80242B4C 0000102D */ daddu $v0, $zero, $zero -/* C73FD0 80242B50 03E00008 */ jr $ra -/* C73FD4 80242B54 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024001C_C76CFC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024001C_C76CFC.s deleted file mode 100644 index 0a5822d438..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024001C_C76CFC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_C76CFC -/* C76CFC 8024001C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* C76D00 80240020 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* C76D04 80240024 8C430000 */ lw $v1, ($v0) -/* C76D08 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* C76D0C 8024002C 00641824 */ and $v1, $v1, $a0 -/* C76D10 80240030 AC430000 */ sw $v1, ($v0) -/* C76D14 80240034 03E00008 */ jr $ra -/* C76D18 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240068_C76D48.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240068_C76D48.s deleted file mode 100644 index 6f3a968b30..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240068_C76D48.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_C76D48 -/* C76D48 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C76D4C 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* C76D50 80240070 0080802D */ daddu $s0, $a0, $zero -/* C76D54 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* C76D58 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* C76D5C 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* C76D60 80240080 8E250000 */ lw $a1, ($s1) -/* C76D64 80240084 0C0B1EAF */ jal get_variable -/* C76D68 80240088 26310004 */ addiu $s1, $s1, 4 -/* C76D6C 8024008C 0200202D */ daddu $a0, $s0, $zero -/* C76D70 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* C76D74 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* C76D78 80240098 000210C0 */ sll $v0, $v0, 3 -/* C76D7C 8024009C 00431021 */ addu $v0, $v0, $v1 -/* C76D80 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* C76D84 802400A4 8E250000 */ lw $a1, ($s1) -/* C76D88 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* C76D8C 802400AC A0460015 */ sb $a2, 0x15($v0) -/* C76D90 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* C76D94 802400B4 0C0B2026 */ jal set_variable -/* C76D98 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* C76D9C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* C76DA0 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* C76DA4 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* C76DA8 802400C8 24020002 */ addiu $v0, $zero, 2 -/* C76DAC 802400CC 03E00008 */ jr $ra -/* C76DB0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s deleted file mode 100644 index 1cdae6f2a5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_C77128 -/* C77128 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* C7712C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* C77130 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C77134 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* C77138 80240458 00021100 */ sll $v0, $v0, 4 -/* C7713C 8024045C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* C77140 80240460 00822021 */ addu $a0, $a0, $v0 -/* C77144 80240464 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* C77148 80240468 0C0496CF */ jal set_message_string -/* C7714C 8024046C 0000282D */ daddu $a1, $zero, $zero -/* C77150 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* C77154 80240474 24020002 */ addiu $v0, $zero, 2 -/* C77158 80240478 03E00008 */ jr $ra -/* C7715C 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240480_C77160.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240480_C77160.s deleted file mode 100644 index 0a98b6bcd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240480_C77160.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_C77160 -/* C77160 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C77164 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* C77168 80240488 0080882D */ daddu $s1, $a0, $zero -/* C7716C 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* C77170 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* C77174 80240494 8E30000C */ lw $s0, 0xc($s1) -/* C77178 80240498 8E050000 */ lw $a1, ($s0) -/* C7717C 8024049C 0C0B1EAF */ jal get_variable -/* C77180 802404A0 26100004 */ addiu $s0, $s0, 4 -/* C77184 802404A4 0C04417A */ jal get_entity_by_index -/* C77188 802404A8 0040202D */ daddu $a0, $v0, $zero -/* C7718C 802404AC 8E100000 */ lw $s0, ($s0) -/* C77190 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* C77194 802404B4 3C014148 */ lui $at, 0x4148 -/* C77198 802404B8 44810000 */ mtc1 $at, $f0 -/* C7719C 802404BC 3C013F33 */ lui $at, 0x3f33 -/* C771A0 802404C0 34213333 */ ori $at, $at, 0x3333 -/* C771A4 802404C4 44811000 */ mtc1 $at, $f2 -/* C771A8 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* C771AC 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* C771B0 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* C771B4 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* C771B8 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* C771BC 802404DC 44062000 */ mfc1 $a2, $f4 -/* C771C0 802404E0 0C01C5D4 */ jal func_80071750 -/* C771C4 802404E4 0000202D */ daddu $a0, $zero, $zero -/* C771C8 802404E8 0220202D */ daddu $a0, $s1, $zero -/* C771CC 802404EC 0200282D */ daddu $a1, $s0, $zero -/* C771D0 802404F0 0C0B2026 */ jal set_variable -/* C771D4 802404F4 0040302D */ daddu $a2, $v0, $zero -/* C771D8 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* C771DC 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* C771E0 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* C771E4 80240504 24020002 */ addiu $v0, $zero, 2 -/* C771E8 80240508 03E00008 */ jr $ra -/* C771EC 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240544_C77224.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240544_C77224.s deleted file mode 100644 index c509f5c05f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240544_C77224.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_C77224 -/* C77224 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77228 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* C7722C 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* C77230 80240550 0C0B1EAF */ jal get_variable -/* C77234 80240554 8C450000 */ lw $a1, ($v0) -/* C77238 80240558 0C04417A */ jal get_entity_by_index -/* C7723C 8024055C 0040202D */ daddu $a0, $v0, $zero -/* C77240 80240560 3C013F80 */ lui $at, 0x3f80 -/* C77244 80240564 44810000 */ mtc1 $at, $f0 -/* C77248 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* C7724C 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* C77250 80240570 3C014148 */ lui $at, 0x4148 -/* C77254 80240574 44810000 */ mtc1 $at, $f0 -/* C77258 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* C7725C 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* C77260 80240580 46001080 */ add.s $f2, $f2, $f0 -/* C77264 80240584 8C450048 */ lw $a1, 0x48($v0) -/* C77268 80240588 8C470050 */ lw $a3, 0x50($v0) -/* C7726C 8024058C 44061000 */ mfc1 $a2, $f2 -/* C77270 80240590 0C01C2EC */ jal func_80070BB0 -/* C77274 80240594 24040004 */ addiu $a0, $zero, 4 -/* C77278 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* C7727C 8024059C 24020002 */ addiu $v0, $zero, 2 -/* C77280 802405A0 03E00008 */ jr $ra -/* C77284 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802405A8_C77288.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802405A8_C77288.s deleted file mode 100644 index a02c191e5d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802405A8_C77288.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_C77288 -/* C77288 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7728C 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* C77290 802405B0 0C00EAD2 */ jal get_npc_safe -/* C77294 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* C77298 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* C7729C 802405BC 3C014148 */ lui $at, 0x4148 -/* C772A0 802405C0 44811000 */ mtc1 $at, $f2 -/* C772A4 802405C4 3C013F80 */ lui $at, 0x3f80 -/* C772A8 802405C8 44810000 */ mtc1 $at, $f0 -/* C772AC 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* C772B0 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* C772B4 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* C772B8 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C772BC 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* C772C0 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* C772C4 802405E4 44062000 */ mfc1 $a2, $f4 -/* C772C8 802405E8 0C01C2EC */ jal func_80070BB0 -/* C772CC 802405EC 24040009 */ addiu $a0, $zero, 9 -/* C772D0 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* C772D4 802405F4 24020002 */ addiu $v0, $zero, 2 -/* C772D8 802405F8 03E00008 */ jr $ra -/* C772DC 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s deleted file mode 100644 index 9a1899e88e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240B38_C77818.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_C77818 -/* C77818 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7781C 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* C77820 80240B40 0080882D */ daddu $s1, $a0, $zero -/* C77824 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* C77828 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* C7782C 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* C77830 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* C77834 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* C77838 80240B58 0000902D */ daddu $s2, $zero, $zero -/* C7783C 80240B5C 8E050000 */ lw $a1, ($s0) -/* C77840 80240B60 0C0B1EAF */ jal get_variable -/* C77844 80240B64 26100004 */ addiu $s0, $s0, 4 -/* C77848 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* C7784C 80240B6C 8E050000 */ lw $a1, ($s0) -/* C77850 80240B70 0C0B1EAF */ jal get_variable -/* C77854 80240B74 0220202D */ daddu $a0, $s1, $zero -/* C77858 80240B78 0240202D */ daddu $a0, $s2, $zero -/* C7785C 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* C77860 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* C77864 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* C77868 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* C7786C 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* C77870 80240B90 0C04DF84 */ jal set_transition_stencil_color -/* C77874 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* C77878 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* C7787C 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* C77880 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* C77884 80240BA4 28620002 */ slti $v0, $v1, 2 -/* C77888 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* C7788C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* C77890 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* C77894 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* C77898 80240BB8 08090312 */ j .L80240C48 -/* C7789C 80240BBC 00000000 */ nop -.L80240BC0: -/* C778A0 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* C778A4 80240BC4 00000000 */ nop -/* C778A8 80240BC8 08090312 */ j .L80240C48 -/* C778AC 80240BCC 00000000 */ nop -.L80240BD0: -/* C778B0 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* C778B4 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* C778B8 80240BD8 00000000 */ nop -/* C778BC 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* C778C0 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* C778C4 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* C778C8 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* C778CC 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* C778D0 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* C778D4 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* C778D8 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* C778DC 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* C778E0 80240C00 08090312 */ j .L80240C48 -/* C778E4 80240C04 00000000 */ nop -.L80240C08: -/* C778E8 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* C778EC 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* C778F0 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* C778F4 80240C14 28420002 */ slti $v0, $v0, 2 -/* C778F8 80240C18 1440000B */ bnez $v0, .L80240C48 -/* C778FC 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* C77900 80240C20 08090312 */ j .L80240C48 -/* C77904 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* C77908 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* C7790C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* C77910 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* C77914 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* C77918 80240C38 00621023 */ subu $v0, $v1, $v0 -/* C7791C 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* C77920 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* C77924 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* C77928 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* C7792C 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* C77930 80240C50 44050000 */ mfc1 $a1, $f0 -/* C77934 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* C77938 80240C58 24040001 */ addiu $a0, $zero, 1 -/* C7793C 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* C77940 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* C77944 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* C77948 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* C7794C 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* C77950 80240C70 03E00008 */ jr $ra -/* C77954 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s deleted file mode 100644 index b807c7201a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413DC_C780BC -/* C780BC 802413DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C780C0 802413E0 AFB40028 */ sw $s4, 0x28($sp) -/* C780C4 802413E4 0080A02D */ daddu $s4, $a0, $zero -/* C780C8 802413E8 AFBF002C */ sw $ra, 0x2c($sp) -/* C780CC 802413EC AFB30024 */ sw $s3, 0x24($sp) -/* C780D0 802413F0 AFB20020 */ sw $s2, 0x20($sp) -/* C780D4 802413F4 AFB1001C */ sw $s1, 0x1c($sp) -/* C780D8 802413F8 AFB00018 */ sw $s0, 0x18($sp) -/* C780DC 802413FC 8E910148 */ lw $s1, 0x148($s4) -/* C780E0 80241400 86240008 */ lh $a0, 8($s1) -/* C780E4 80241404 0C00EABB */ jal get_npc_unsafe -/* C780E8 80241408 00A0802D */ daddu $s0, $a1, $zero -/* C780EC 8024140C 16000005 */ bnez $s0, .L80241424 -/* C780F0 80241410 0040902D */ daddu $s2, $v0, $zero -/* C780F4 80241414 8E2200B0 */ lw $v0, 0xb0($s1) -/* C780F8 80241418 30420004 */ andi $v0, $v0, 4 -/* C780FC 8024141C 10400015 */ beqz $v0, .L80241474 -/* C78100 80241420 00000000 */ nop -.L80241424: -/* C78104 80241424 AE800070 */ sw $zero, 0x70($s4) -/* C78108 80241428 8E420000 */ lw $v0, ($s2) -/* C7810C 8024142C 3C031F30 */ lui $v1, 0x1f30 -/* C78110 80241430 A640008E */ sh $zero, 0x8e($s2) -/* C78114 80241434 34420102 */ ori $v0, $v0, 0x102 -/* C78118 80241438 AE420000 */ sw $v0, ($s2) -/* C7811C 8024143C 8E220000 */ lw $v0, ($s1) -/* C78120 80241440 3C01C47A */ lui $at, 0xc47a -/* C78124 80241444 44810000 */ mtc1 $at, $f0 -/* C78128 80241448 00431025 */ or $v0, $v0, $v1 -/* C7812C 8024144C AE220000 */ sw $v0, ($s1) -/* C78130 80241450 AE400038 */ sw $zero, 0x38($s2) -/* C78134 80241454 E640003C */ swc1 $f0, 0x3c($s2) -/* C78138 80241458 AE400040 */ sw $zero, 0x40($s2) -/* C7813C 8024145C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C78140 80241460 30620004 */ andi $v0, $v1, 4 -/* C78144 80241464 10400003 */ beqz $v0, .L80241474 -/* C78148 80241468 2402FFFB */ addiu $v0, $zero, -5 -/* C7814C 8024146C 00621024 */ and $v0, $v1, $v0 -/* C78150 80241470 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241474: -/* C78154 80241474 8E930070 */ lw $s3, 0x70($s4) -/* C78158 80241478 12600005 */ beqz $s3, .L80241490 -/* C7815C 8024147C 24020001 */ addiu $v0, $zero, 1 -/* C78160 80241480 12620048 */ beq $s3, $v0, .L802415A4 -/* C78164 80241484 00000000 */ nop -/* C78168 80241488 08090586 */ j .L80241618 -/* C7816C 8024148C 00000000 */ nop -.L80241490: -/* C78170 80241490 86240008 */ lh $a0, 8($s1) -/* C78174 80241494 0C00FB3A */ jal get_enemy -/* C78178 80241498 2484FFFF */ addiu $a0, $a0, -1 -/* C7817C 8024149C 0040802D */ daddu $s0, $v0, $zero -/* C78180 802414A0 0C00EABB */ jal get_npc_unsafe -/* C78184 802414A4 86040008 */ lh $a0, 8($s0) -/* C78188 802414A8 24030001 */ addiu $v1, $zero, 1 -/* C7818C 802414AC 0040982D */ daddu $s3, $v0, $zero -/* C78190 802414B0 A2230007 */ sb $v1, 7($s1) -/* C78194 802414B4 8E03006C */ lw $v1, 0x6c($s0) -/* C78198 802414B8 24020003 */ addiu $v0, $zero, 3 -/* C7819C 802414BC 14620056 */ bne $v1, $v0, .L80241618 -/* C781A0 802414C0 00000000 */ nop -/* C781A4 802414C4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C781A8 802414C8 10A00003 */ beqz $a1, .L802414D8 -/* C781AC 802414CC 0260202D */ daddu $a0, $s3, $zero -/* C781B0 802414D0 0C012530 */ jal func_800494C0 -/* C781B4 802414D4 0000302D */ daddu $a2, $zero, $zero -.L802414D8: -/* C781B8 802414D8 27A40010 */ addiu $a0, $sp, 0x10 -/* C781BC 802414DC C6280070 */ lwc1 $f8, 0x70($s1) -/* C781C0 802414E0 46804220 */ cvt.s.w $f8, $f8 -/* C781C4 802414E4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C781C8 802414E8 3C014387 */ lui $at, 0x4387 -/* C781CC 802414EC 44810000 */ mtc1 $at, $f0 -/* C781D0 802414F0 44064000 */ mfc1 $a2, $f8 -/* C781D4 802414F4 46020001 */ sub.s $f0, $f0, $f2 -/* C781D8 802414F8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C781DC 802414FC C6640040 */ lwc1 $f4, 0x40($s3) -/* C781E0 80241500 44070000 */ mfc1 $a3, $f0 -/* C781E4 80241504 27A50014 */ addiu $a1, $sp, 0x14 -/* C781E8 80241508 E7A60010 */ swc1 $f6, 0x10($sp) -/* C781EC 8024150C 0C00A7E7 */ jal add_vec2D_polar -/* C781F0 80241510 E7A40014 */ swc1 $f4, 0x14($sp) -/* C781F4 80241514 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C781F8 80241518 4600020D */ trunc.w.s $f8, $f0 -/* C781FC 8024151C 44024000 */ mfc1 $v0, $f8 -/* C78200 80241520 E6400038 */ swc1 $f0, 0x38($s2) -/* C78204 80241524 A6220010 */ sh $v0, 0x10($s1) -/* C78208 80241528 C660003C */ lwc1 $f0, 0x3c($s3) -/* C7820C 8024152C C622006C */ lwc1 $f2, 0x6c($s1) -/* C78210 80241530 468010A0 */ cvt.s.w $f2, $f2 -/* C78214 80241534 46020000 */ add.s $f0, $f0, $f2 -/* C78218 80241538 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C7821C 8024153C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C78220 80241540 E640003C */ swc1 $f0, 0x3c($s2) -/* C78224 80241544 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C78228 80241548 4600020D */ trunc.w.s $f8, $f0 -/* C7822C 8024154C 44024000 */ mfc1 $v0, $f8 -/* C78230 80241550 00000000 */ nop -/* C78234 80241554 A6220012 */ sh $v0, 0x12($s1) -/* C78238 80241558 4600120D */ trunc.w.s $f8, $f2 -/* C7823C 8024155C 44024000 */ mfc1 $v0, $f8 -/* C78240 80241560 E6420040 */ swc1 $f2, 0x40($s2) -/* C78244 80241564 A6220014 */ sh $v0, 0x14($s1) -/* C78248 80241568 8C660028 */ lw $a2, 0x28($v1) -/* C7824C 8024156C 8C670030 */ lw $a3, 0x30($v1) -/* C78250 80241570 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C78254 80241574 0C00A720 */ jal atan2 -/* C78258 80241578 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C7825C 8024157C 3C03E0EF */ lui $v1, 0xe0ef -/* C78260 80241580 E640000C */ swc1 $f0, 0xc($s2) -/* C78264 80241584 8E220000 */ lw $v0, ($s1) -/* C78268 80241588 3463FFFF */ ori $v1, $v1, 0xffff -/* C7826C 8024158C 00431024 */ and $v0, $v0, $v1 -/* C78270 80241590 AE220000 */ sw $v0, ($s1) -/* C78274 80241594 24020001 */ addiu $v0, $zero, 1 -/* C78278 80241598 A640008E */ sh $zero, 0x8e($s2) -/* C7827C 8024159C 08090586 */ j .L80241618 -/* C78280 802415A0 AE820070 */ sw $v0, 0x70($s4) -.L802415A4: -/* C78284 802415A4 86240008 */ lh $a0, 8($s1) -/* C78288 802415A8 0C00FB3A */ jal get_enemy -/* C7828C 802415AC 2484FFFF */ addiu $a0, $a0, -1 -/* C78290 802415B0 0040802D */ daddu $s0, $v0, $zero -/* C78294 802415B4 0C00EABB */ jal get_npc_unsafe -/* C78298 802415B8 86040008 */ lh $a0, 8($s0) -/* C7829C 802415BC 9642008E */ lhu $v0, 0x8e($s2) -/* C782A0 802415C0 24420001 */ addiu $v0, $v0, 1 -/* C782A4 802415C4 A642008E */ sh $v0, 0x8e($s2) -/* C782A8 802415C8 00021400 */ sll $v0, $v0, 0x10 -/* C782AC 802415CC 8E23007C */ lw $v1, 0x7c($s1) -/* C782B0 802415D0 00021403 */ sra $v0, $v0, 0x10 -/* C782B4 802415D4 0043102A */ slt $v0, $v0, $v1 -/* C782B8 802415D8 50400001 */ beql $v0, $zero, .L802415E0 -/* C782BC 802415DC A2200007 */ sb $zero, 7($s1) -.L802415E0: -/* C782C0 802415E0 8E03006C */ lw $v1, 0x6c($s0) -/* C782C4 802415E4 24020004 */ addiu $v0, $zero, 4 -/* C782C8 802415E8 1462000B */ bne $v1, $v0, .L80241618 -/* C782CC 802415EC 3C021F10 */ lui $v0, 0x1f10 -/* C782D0 802415F0 8E230000 */ lw $v1, ($s1) -/* C782D4 802415F4 3C01C47A */ lui $at, 0xc47a -/* C782D8 802415F8 44810000 */ mtc1 $at, $f0 -/* C782DC 802415FC 00621825 */ or $v1, $v1, $v0 -/* C782E0 80241600 AE230000 */ sw $v1, ($s1) -/* C782E4 80241604 AE400038 */ sw $zero, 0x38($s2) -/* C782E8 80241608 E640003C */ swc1 $f0, 0x3c($s2) -/* C782EC 8024160C AE400040 */ sw $zero, 0x40($s2) -/* C782F0 80241610 A2330007 */ sb $s3, 7($s1) -/* C782F4 80241614 AE800070 */ sw $zero, 0x70($s4) -.L80241618: -/* C782F8 80241618 8FBF002C */ lw $ra, 0x2c($sp) -/* C782FC 8024161C 8FB40028 */ lw $s4, 0x28($sp) -/* C78300 80241620 8FB30024 */ lw $s3, 0x24($sp) -/* C78304 80241624 8FB20020 */ lw $s2, 0x20($sp) -/* C78308 80241628 8FB1001C */ lw $s1, 0x1c($sp) -/* C7830C 8024162C 8FB00018 */ lw $s0, 0x18($sp) -/* C78310 80241630 0000102D */ daddu $v0, $zero, $zero -/* C78314 80241634 03E00008 */ jr $ra -/* C78318 80241638 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s deleted file mode 100644 index 308464a4a1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240CF8_C80E98.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF8_C80E98 -/* C80E98 80240CF8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C80E9C 80240CFC AFB3004C */ sw $s3, 0x4c($sp) -/* C80EA0 80240D00 0080982D */ daddu $s3, $a0, $zero -/* C80EA4 80240D04 AFBF0054 */ sw $ra, 0x54($sp) -/* C80EA8 80240D08 AFB40050 */ sw $s4, 0x50($sp) -/* C80EAC 80240D0C AFB20048 */ sw $s2, 0x48($sp) -/* C80EB0 80240D10 AFB10044 */ sw $s1, 0x44($sp) -/* C80EB4 80240D14 AFB00040 */ sw $s0, 0x40($sp) -/* C80EB8 80240D18 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C80EBC 80240D1C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C80EC0 80240D20 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C80EC4 80240D24 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C80EC8 80240D28 8E710148 */ lw $s1, 0x148($s3) -/* C80ECC 80240D2C 00A0902D */ daddu $s2, $a1, $zero -/* C80ED0 80240D30 86240008 */ lh $a0, 8($s1) -/* C80ED4 80240D34 0C00EABB */ jal get_npc_unsafe -/* C80ED8 80240D38 00C0A02D */ daddu $s4, $a2, $zero -/* C80EDC 80240D3C 0040802D */ daddu $s0, $v0, $zero -/* C80EE0 80240D40 C6200078 */ lwc1 $f0, 0x78($s1) -/* C80EE4 80240D44 46800020 */ cvt.s.w $f0, $f0 -/* C80EE8 80240D48 46000021 */ cvt.d.s $f0, $f0 -/* C80EEC 80240D4C 3C014059 */ lui $at, 0x4059 -/* C80EF0 80240D50 44811800 */ mtc1 $at, $f3 -/* C80EF4 80240D54 44801000 */ mtc1 $zero, $f2 -/* C80EF8 80240D58 8602008E */ lh $v0, 0x8e($s0) -/* C80EFC 80240D5C 9603008E */ lhu $v1, 0x8e($s0) -/* C80F00 80240D60 46220003 */ div.d $f0, $f0, $f2 -/* C80F04 80240D64 46200620 */ cvt.s.d $f24, $f0 -/* C80F08 80240D68 C6200088 */ lwc1 $f0, 0x88($s1) -/* C80F0C 80240D6C 46800020 */ cvt.s.w $f0, $f0 -/* C80F10 80240D70 46000021 */ cvt.d.s $f0, $f0 -/* C80F14 80240D74 46220003 */ div.d $f0, $f0, $f2 -/* C80F18 80240D78 46200020 */ cvt.s.d $f0, $f0 -/* C80F1C 80240D7C 18400003 */ blez $v0, .L80240D8C -/* C80F20 80240D80 4600C680 */ add.s $f26, $f24, $f0 -/* C80F24 80240D84 2462FFFF */ addiu $v0, $v1, -1 -/* C80F28 80240D88 A602008E */ sh $v0, 0x8e($s0) -.L80240D8C: -/* C80F2C 80240D8C 8E220070 */ lw $v0, 0x70($s1) -/* C80F30 80240D90 18400034 */ blez $v0, .L80240E64 -/* C80F34 80240D94 00000000 */ nop -/* C80F38 80240D98 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C80F3C 80240D9C 46806320 */ cvt.s.w $f12, $f12 -/* C80F40 80240DA0 44820000 */ mtc1 $v0, $f0 -/* C80F44 80240DA4 00000000 */ nop -/* C80F48 80240DA8 46800020 */ cvt.s.w $f0, $f0 -/* C80F4C 80240DAC 46000021 */ cvt.d.s $f0, $f0 -/* C80F50 80240DB0 46220003 */ div.d $f0, $f0, $f2 -/* C80F54 80240DB4 0C00A8BB */ jal sin_deg -/* C80F58 80240DB8 462005A0 */ cvt.s.d $f22, $f0 -/* C80F5C 80240DBC 8E020000 */ lw $v0, ($s0) -/* C80F60 80240DC0 30420008 */ andi $v0, $v0, 8 -/* C80F64 80240DC4 10400003 */ beqz $v0, .L80240DD4 -/* C80F68 80240DC8 46000506 */ mov.s $f20, $f0 -/* C80F6C 80240DCC 08090385 */ j .L80240E14 -/* C80F70 80240DD0 0000102D */ daddu $v0, $zero, $zero -.L80240DD4: -/* C80F74 80240DD4 27A50028 */ addiu $a1, $sp, 0x28 -/* C80F78 80240DD8 27A6002C */ addiu $a2, $sp, 0x2c -/* C80F7C 80240DDC C6000038 */ lwc1 $f0, 0x38($s0) -/* C80F80 80240DE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C80F84 80240DE4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C80F88 80240DE8 3C01447A */ lui $at, 0x447a -/* C80F8C 80240DEC 44813000 */ mtc1 $at, $f6 -/* C80F90 80240DF0 27A20034 */ addiu $v0, $sp, 0x34 -/* C80F94 80240DF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C80F98 80240DF8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C80F9C 80240DFC E7A40030 */ swc1 $f4, 0x30($sp) -/* C80FA0 80240E00 E7A60034 */ swc1 $f6, 0x34($sp) -/* C80FA4 80240E04 AFA20010 */ sw $v0, 0x10($sp) -/* C80FA8 80240E08 8E040080 */ lw $a0, 0x80($s0) -/* C80FAC 80240E0C 0C0372DF */ jal func_800DCB7C -/* C80FB0 80240E10 27A70030 */ addiu $a3, $sp, 0x30 -.L80240E14: -/* C80FB4 80240E14 10400007 */ beqz $v0, .L80240E34 -/* C80FB8 80240E18 00000000 */ nop -/* C80FBC 80240E1C 4616A082 */ mul.s $f2, $f20, $f22 -/* C80FC0 80240E20 00000000 */ nop -/* C80FC4 80240E24 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C80FC8 80240E28 46180000 */ add.s $f0, $f0, $f24 -/* C80FCC 80240E2C 08090390 */ j .L80240E40 -/* C80FD0 80240E30 46020000 */ add.s $f0, $f0, $f2 -.L80240E34: -/* C80FD4 80240E34 4616A002 */ mul.s $f0, $f20, $f22 -/* C80FD8 80240E38 00000000 */ nop -/* C80FDC 80240E3C 4600D000 */ add.s $f0, $f26, $f0 -.L80240E40: -/* C80FE0 80240E40 E600003C */ swc1 $f0, 0x3c($s0) -/* C80FE4 80240E44 8E220074 */ lw $v0, 0x74($s1) -/* C80FE8 80240E48 2442000A */ addiu $v0, $v0, 0xa -/* C80FEC 80240E4C 44826000 */ mtc1 $v0, $f12 -/* C80FF0 80240E50 00000000 */ nop -/* C80FF4 80240E54 0C00A6C9 */ jal clamp_angle -/* C80FF8 80240E58 46806320 */ cvt.s.w $f12, $f12 -/* C80FFC 80240E5C 4600020D */ trunc.w.s $f8, $f0 -/* C81000 80240E60 E6280074 */ swc1 $f8, 0x74($s1) -.L80240E64: -/* C81004 80240E64 8E220090 */ lw $v0, 0x90($s1) -/* C81008 80240E68 1C400040 */ bgtz $v0, .L80240F6C -/* C8100C 80240E6C 2442FFFF */ addiu $v0, $v0, -1 -/* C81010 80240E70 860200A8 */ lh $v0, 0xa8($s0) -/* C81014 80240E74 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81018 80240E78 44821000 */ mtc1 $v0, $f2 -/* C8101C 80240E7C 00000000 */ nop -/* C81020 80240E80 468010A0 */ cvt.s.w $f2, $f2 -/* C81024 80240E84 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81028 80240E88 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8102C 80240E8C 46020000 */ add.s $f0, $f0, $f2 -/* C81030 80240E90 3C014024 */ lui $at, 0x4024 -/* C81034 80240E94 44812800 */ mtc1 $at, $f5 -/* C81038 80240E98 44802000 */ mtc1 $zero, $f4 -/* C8103C 80240E9C C442002C */ lwc1 $f2, 0x2c($v0) -/* C81040 80240EA0 46000021 */ cvt.d.s $f0, $f0 -/* C81044 80240EA4 46240000 */ add.d $f0, $f0, $f4 -/* C81048 80240EA8 460010A1 */ cvt.d.s $f2, $f2 -/* C8104C 80240EAC 4620103C */ c.lt.d $f2, $f0 -/* C81050 80240EB0 00000000 */ nop -/* C81054 80240EB4 4500002E */ bc1f .L80240F70 -/* C81058 80240EB8 0280202D */ daddu $a0, $s4, $zero -/* C8105C 80240EBC 24020001 */ addiu $v0, $zero, 1 -/* C81060 80240EC0 AFA20010 */ sw $v0, 0x10($sp) -/* C81064 80240EC4 8E460024 */ lw $a2, 0x24($s2) -/* C81068 80240EC8 8E470028 */ lw $a3, 0x28($s2) -/* C8106C 80240ECC 0C01242D */ jal func_800490B4 -/* C81070 80240ED0 0220282D */ daddu $a1, $s1, $zero -/* C81074 80240ED4 10400026 */ beqz $v0, .L80240F70 -/* C81078 80240ED8 0000202D */ daddu $a0, $zero, $zero -/* C8107C 80240EDC 0200282D */ daddu $a1, $s0, $zero -/* C81080 80240EE0 0000302D */ daddu $a2, $zero, $zero -/* C81084 80240EE4 2412000C */ addiu $s2, $zero, 0xc -/* C81088 80240EE8 860300A8 */ lh $v1, 0xa8($s0) -/* C8108C 80240EEC 3C013F80 */ lui $at, 0x3f80 -/* C81090 80240EF0 44810000 */ mtc1 $at, $f0 -/* C81094 80240EF4 3C014000 */ lui $at, 0x4000 -/* C81098 80240EF8 44811000 */ mtc1 $at, $f2 -/* C8109C 80240EFC 3C01C1A0 */ lui $at, 0xc1a0 -/* C810A0 80240F00 44812000 */ mtc1 $at, $f4 -/* C810A4 80240F04 44834000 */ mtc1 $v1, $f8 -/* C810A8 80240F08 00000000 */ nop -/* C810AC 80240F0C 46804220 */ cvt.s.w $f8, $f8 -/* C810B0 80240F10 44074000 */ mfc1 $a3, $f8 -/* C810B4 80240F14 27A20038 */ addiu $v0, $sp, 0x38 -/* C810B8 80240F18 AFB2001C */ sw $s2, 0x1c($sp) -/* C810BC 80240F1C AFA20020 */ sw $v0, 0x20($sp) -/* C810C0 80240F20 E7A00010 */ swc1 $f0, 0x10($sp) -/* C810C4 80240F24 E7A20014 */ swc1 $f2, 0x14($sp) -/* C810C8 80240F28 0C01BFA4 */ jal fx_emote -/* C810CC 80240F2C E7A40018 */ swc1 $f4, 0x18($sp) -/* C810D0 80240F30 0200202D */ daddu $a0, $s0, $zero -/* C810D4 80240F34 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C810D8 80240F38 C480003C */ lwc1 $f0, 0x3c($a0) -/* C810DC 80240F3C 3C060020 */ lui $a2, 0x20 -/* C810E0 80240F40 0C012530 */ jal func_800494C0 -/* C810E4 80240F44 E4800064 */ swc1 $f0, 0x64($a0) -/* C810E8 80240F48 8E220018 */ lw $v0, 0x18($s1) -/* C810EC 80240F4C 9442002A */ lhu $v0, 0x2a($v0) -/* C810F0 80240F50 30420001 */ andi $v0, $v0, 1 -/* C810F4 80240F54 10400003 */ beqz $v0, .L80240F64 -/* C810F8 80240F58 2402000A */ addiu $v0, $zero, 0xa -/* C810FC 80240F5C 08090403 */ j .L8024100C -/* C81100 80240F60 AE620070 */ sw $v0, 0x70($s3) -.L80240F64: -/* C81104 80240F64 08090403 */ j .L8024100C -/* C81108 80240F68 AE720070 */ sw $s2, 0x70($s3) -.L80240F6C: -/* C8110C 80240F6C AE220090 */ sw $v0, 0x90($s1) -.L80240F70: -/* C81110 80240F70 8602008C */ lh $v0, 0x8c($s0) -/* C81114 80240F74 14400025 */ bnez $v0, .L8024100C -/* C81118 80240F78 00000000 */ nop -/* C8111C 80240F7C 8602008E */ lh $v0, 0x8e($s0) -/* C81120 80240F80 1C400022 */ bgtz $v0, .L8024100C -/* C81124 80240F84 00000000 */ nop -/* C81128 80240F88 8E620074 */ lw $v0, 0x74($s3) -/* C8112C 80240F8C 2442FFFF */ addiu $v0, $v0, -1 -/* C81130 80240F90 1840001D */ blez $v0, .L80241008 -/* C81134 80240F94 AE620074 */ sw $v0, 0x74($s3) -/* C81138 80240F98 8E220018 */ lw $v0, 0x18($s1) -/* C8113C 80240F9C 9442002A */ lhu $v0, 0x2a($v0) -/* C81140 80240FA0 30420010 */ andi $v0, $v0, 0x10 -/* C81144 80240FA4 14400007 */ bnez $v0, .L80240FC4 -/* C81148 80240FA8 00000000 */ nop -/* C8114C 80240FAC C600000C */ lwc1 $f0, 0xc($s0) -/* C81150 80240FB0 3C014334 */ lui $at, 0x4334 -/* C81154 80240FB4 44816000 */ mtc1 $at, $f12 -/* C81158 80240FB8 0C00A6C9 */ jal clamp_angle -/* C8115C 80240FBC 460C0300 */ add.s $f12, $f0, $f12 -/* C81160 80240FC0 E600000C */ swc1 $f0, 0xc($s0) -.L80240FC4: -/* C81164 80240FC4 0C00A67F */ jal rand_int -/* C81168 80240FC8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C8116C 80240FCC 3C032E8B */ lui $v1, 0x2e8b -/* C81170 80240FD0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C81174 80240FD4 00430018 */ mult $v0, $v1 -/* C81178 80240FD8 00021FC3 */ sra $v1, $v0, 0x1f -/* C8117C 80240FDC 00004010 */ mfhi $t0 -/* C81180 80240FE0 00082043 */ sra $a0, $t0, 1 -/* C81184 80240FE4 00832023 */ subu $a0, $a0, $v1 -/* C81188 80240FE8 00041840 */ sll $v1, $a0, 1 -/* C8118C 80240FEC 00641821 */ addu $v1, $v1, $a0 -/* C81190 80240FF0 00031880 */ sll $v1, $v1, 2 -/* C81194 80240FF4 00641823 */ subu $v1, $v1, $a0 -/* C81198 80240FF8 00431023 */ subu $v0, $v0, $v1 -/* C8119C 80240FFC 24420005 */ addiu $v0, $v0, 5 -/* C811A0 80241000 08090403 */ j .L8024100C -/* C811A4 80241004 A602008E */ sh $v0, 0x8e($s0) -.L80241008: -/* C811A8 80241008 AE600070 */ sw $zero, 0x70($s3) -.L8024100C: -/* C811AC 8024100C 8FBF0054 */ lw $ra, 0x54($sp) -/* C811B0 80241010 8FB40050 */ lw $s4, 0x50($sp) -/* C811B4 80241014 8FB3004C */ lw $s3, 0x4c($sp) -/* C811B8 80241018 8FB20048 */ lw $s2, 0x48($sp) -/* C811BC 8024101C 8FB10044 */ lw $s1, 0x44($sp) -/* C811C0 80241020 8FB00040 */ lw $s0, 0x40($sp) -/* C811C4 80241024 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C811C8 80241028 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C811CC 8024102C D7B60060 */ ldc1 $f22, 0x60($sp) -/* C811D0 80241030 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C811D4 80241034 03E00008 */ jr $ra -/* C811D8 80241038 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s deleted file mode 100644 index 0c7cfb7566..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B8_C81458 -/* C81458 802412B8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C8145C 802412BC AFB20030 */ sw $s2, 0x30($sp) -/* C81460 802412C0 0080902D */ daddu $s2, $a0, $zero -/* C81464 802412C4 AFBF0038 */ sw $ra, 0x38($sp) -/* C81468 802412C8 AFB30034 */ sw $s3, 0x34($sp) -/* C8146C 802412CC AFB1002C */ sw $s1, 0x2c($sp) -/* C81470 802412D0 AFB00028 */ sw $s0, 0x28($sp) -/* C81474 802412D4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C81478 802412D8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C8147C 802412DC 8E510148 */ lw $s1, 0x148($s2) -/* C81480 802412E0 86240008 */ lh $a0, 8($s1) -/* C81484 802412E4 0C00EABB */ jal get_npc_unsafe -/* C81488 802412E8 00A0982D */ daddu $s3, $a1, $zero -/* C8148C 802412EC 0040802D */ daddu $s0, $v0, $zero -/* C81490 802412F0 0200202D */ daddu $a0, $s0, $zero -/* C81494 802412F4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C81498 802412F8 468010A0 */ cvt.s.w $f2, $f2 -/* C8149C 802412FC 460010A1 */ cvt.d.s $f2, $f2 -/* C814A0 80241300 C604001C */ lwc1 $f4, 0x1c($s0) -/* C814A4 80241304 C6000014 */ lwc1 $f0, 0x14($s0) -/* C814A8 80241308 8E050018 */ lw $a1, 0x18($s0) -/* C814AC 8024130C 46002100 */ add.s $f4, $f4, $f0 -/* C814B0 80241310 8E06000C */ lw $a2, 0xc($s0) -/* C814B4 80241314 C6200078 */ lwc1 $f0, 0x78($s1) -/* C814B8 80241318 46800020 */ cvt.s.w $f0, $f0 -/* C814BC 8024131C E604001C */ swc1 $f4, 0x1c($s0) -/* C814C0 80241320 3C014059 */ lui $at, 0x4059 -/* C814C4 80241324 44812800 */ mtc1 $at, $f5 -/* C814C8 80241328 44802000 */ mtc1 $zero, $f4 -/* C814CC 8024132C 46000021 */ cvt.d.s $f0, $f0 -/* C814D0 80241330 46240003 */ div.d $f0, $f0, $f4 -/* C814D4 80241334 46200520 */ cvt.s.d $f20, $f0 -/* C814D8 80241338 46241083 */ div.d $f2, $f2, $f4 -/* C814DC 8024133C 0C00EA95 */ jal npc_move_heading -/* C814E0 80241340 462015A0 */ cvt.s.d $f22, $f2 -/* C814E4 80241344 C604001C */ lwc1 $f4, 0x1c($s0) -/* C814E8 80241348 44801000 */ mtc1 $zero, $f2 -/* C814EC 8024134C 44801800 */ mtc1 $zero, $f3 -/* C814F0 80241350 46002021 */ cvt.d.s $f0, $f4 -/* C814F4 80241354 4620103E */ c.le.d $f2, $f0 -/* C814F8 80241358 00000000 */ nop -/* C814FC 8024135C 45000030 */ bc1f .L80241420 -/* C81500 80241360 00000000 */ nop -/* C81504 80241364 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81508 80241368 46040000 */ add.s $f0, $f0, $f4 -/* C8150C 8024136C E600003C */ swc1 $f0, 0x3c($s0) -/* C81510 80241370 8E2200CC */ lw $v0, 0xcc($s1) -/* C81514 80241374 8C420024 */ lw $v0, 0x24($v0) -/* C81518 80241378 AE020028 */ sw $v0, 0x28($s0) -/* C8151C 8024137C A2200007 */ sb $zero, 7($s1) -/* C81520 80241380 8E020000 */ lw $v0, ($s0) -/* C81524 80241384 30420008 */ andi $v0, $v0, 8 -/* C81528 80241388 14400011 */ bnez $v0, .L802413D0 -/* C8152C 8024138C 0000102D */ daddu $v0, $zero, $zero -/* C81530 80241390 27A50018 */ addiu $a1, $sp, 0x18 -/* C81534 80241394 27A6001C */ addiu $a2, $sp, 0x1c -/* C81538 80241398 C6000038 */ lwc1 $f0, 0x38($s0) -/* C8153C 8024139C C602003C */ lwc1 $f2, 0x3c($s0) -/* C81540 802413A0 C6040040 */ lwc1 $f4, 0x40($s0) -/* C81544 802413A4 3C01447A */ lui $at, 0x447a -/* C81548 802413A8 44813000 */ mtc1 $at, $f6 -/* C8154C 802413AC 27A20024 */ addiu $v0, $sp, 0x24 -/* C81550 802413B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C81554 802413B4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C81558 802413B8 E7A40020 */ swc1 $f4, 0x20($sp) -/* C8155C 802413BC E7A60024 */ swc1 $f6, 0x24($sp) -/* C81560 802413C0 AFA20010 */ sw $v0, 0x10($sp) -/* C81564 802413C4 8E040080 */ lw $a0, 0x80($s0) -/* C81568 802413C8 0C0372DF */ jal func_800DCB7C -/* C8156C 802413CC 27A70020 */ addiu $a3, $sp, 0x20 -.L802413D0: -/* C81570 802413D0 1040000B */ beqz $v0, .L80241400 -/* C81574 802413D4 00000000 */ nop -/* C81578 802413D8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C8157C 802413DC 46140080 */ add.s $f2, $f0, $f20 -/* C81580 802413E0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81584 802413E4 4600103E */ c.le.s $f2, $f0 -/* C81588 802413E8 00000000 */ nop -/* C8158C 802413EC 4500008D */ bc1f .L80241624 -/* C81590 802413F0 00000000 */ nop -/* C81594 802413F4 E602003C */ swc1 $f2, 0x3c($s0) -/* C81598 802413F8 08090589 */ j .L80241624 -/* C8159C 802413FC AE400070 */ sw $zero, 0x70($s2) -.L80241400: -/* C815A0 80241400 C602003C */ lwc1 $f2, 0x3c($s0) -/* C815A4 80241404 C6000064 */ lwc1 $f0, 0x64($s0) -/* C815A8 80241408 4602003E */ c.le.s $f0, $f2 -/* C815AC 8024140C 00000000 */ nop -/* C815B0 80241410 45030084 */ bc1tl .L80241624 -/* C815B4 80241414 AE400070 */ sw $zero, 0x70($s2) -/* C815B8 80241418 08090589 */ j .L80241624 -/* C815BC 8024141C 00000000 */ nop -.L80241420: -/* C815C0 80241420 4622003C */ c.lt.d $f0, $f2 -/* C815C4 80241424 00000000 */ nop -/* C815C8 80241428 4500007E */ bc1f .L80241624 -/* C815CC 8024142C 00000000 */ nop -/* C815D0 80241430 9602008E */ lhu $v0, 0x8e($s0) -/* C815D4 80241434 24420001 */ addiu $v0, $v0, 1 -/* C815D8 80241438 A602008E */ sh $v0, 0x8e($s0) -/* C815DC 8024143C 00021400 */ sll $v0, $v0, 0x10 -/* C815E0 80241440 8E630020 */ lw $v1, 0x20($s3) -/* C815E4 80241444 00021403 */ sra $v0, $v0, 0x10 -/* C815E8 80241448 0043102A */ slt $v0, $v0, $v1 -/* C815EC 8024144C 14400026 */ bnez $v0, .L802414E8 -/* C815F0 80241450 00000000 */ nop -/* C815F4 80241454 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C815F8 80241458 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C815FC 8024145C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81600 80241460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C81604 80241464 A600008E */ sh $zero, 0x8e($s0) -/* C81608 80241468 8C460028 */ lw $a2, 0x28($v0) -/* C8160C 8024146C 0C00A720 */ jal atan2 -/* C81610 80241470 8C470030 */ lw $a3, 0x30($v0) -/* C81614 80241474 46000506 */ mov.s $f20, $f0 -/* C81618 80241478 C60C000C */ lwc1 $f12, 0xc($s0) -/* C8161C 8024147C 0C00A70A */ jal get_clamped_angle_diff -/* C81620 80241480 4600A386 */ mov.s $f14, $f20 -/* C81624 80241484 46000086 */ mov.s $f2, $f0 -/* C81628 80241488 8E62001C */ lw $v0, 0x1c($s3) -/* C8162C 8024148C 46001005 */ abs.s $f0, $f2 -/* C81630 80241490 44822000 */ mtc1 $v0, $f4 -/* C81634 80241494 00000000 */ nop -/* C81638 80241498 46802120 */ cvt.s.w $f4, $f4 -/* C8163C 8024149C 4600203C */ c.lt.s $f4, $f0 -/* C81640 802414A0 00000000 */ nop -/* C81644 802414A4 4500000D */ bc1f .L802414DC -/* C81648 802414A8 00000000 */ nop -/* C8164C 802414AC 44800000 */ mtc1 $zero, $f0 -/* C81650 802414B0 C614000C */ lwc1 $f20, 0xc($s0) -/* C81654 802414B4 4600103C */ c.lt.s $f2, $f0 -/* C81658 802414B8 00000000 */ nop -/* C8165C 802414BC 45000006 */ bc1f .L802414D8 -/* C81660 802414C0 00021023 */ negu $v0, $v0 -/* C81664 802414C4 44820000 */ mtc1 $v0, $f0 -/* C81668 802414C8 00000000 */ nop -/* C8166C 802414CC 46800020 */ cvt.s.w $f0, $f0 -/* C81670 802414D0 08090537 */ j .L802414DC -/* C81674 802414D4 4600A500 */ add.s $f20, $f20, $f0 -.L802414D8: -/* C81678 802414D8 4604A500 */ add.s $f20, $f20, $f4 -.L802414DC: -/* C8167C 802414DC 0C00A6C9 */ jal clamp_angle -/* C81680 802414E0 4600A306 */ mov.s $f12, $f20 -/* C81684 802414E4 E600000C */ swc1 $f0, 0xc($s0) -.L802414E8: -/* C81688 802414E8 8E020000 */ lw $v0, ($s0) -/* C8168C 802414EC 30420008 */ andi $v0, $v0, 8 -/* C81690 802414F0 1040000A */ beqz $v0, .L8024151C -/* C81694 802414F4 27A50018 */ addiu $a1, $sp, 0x18 -/* C81698 802414F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C8169C 802414FC C600001C */ lwc1 $f0, 0x1c($s0) -/* C816A0 80241500 46001080 */ add.s $f2, $f2, $f0 -/* C816A4 80241504 4616103C */ c.lt.s $f2, $f22 -/* C816A8 80241508 00000000 */ nop -/* C816AC 8024150C 45020045 */ bc1fl .L80241624 -/* C816B0 80241510 E602003C */ swc1 $f2, 0x3c($s0) -/* C816B4 80241514 08090588 */ j .L80241620 -/* C816B8 80241518 E616003C */ swc1 $f22, 0x3c($s0) -.L8024151C: -/* C816BC 8024151C C6000038 */ lwc1 $f0, 0x38($s0) -/* C816C0 80241520 27A6001C */ addiu $a2, $sp, 0x1c -/* C816C4 80241524 E7A00018 */ swc1 $f0, 0x18($sp) -/* C816C8 80241528 860200A8 */ lh $v0, 0xa8($s0) -/* C816CC 8024152C C600001C */ lwc1 $f0, 0x1c($s0) -/* C816D0 80241530 C604003C */ lwc1 $f4, 0x3c($s0) -/* C816D4 80241534 44821000 */ mtc1 $v0, $f2 -/* C816D8 80241538 00000000 */ nop -/* C816DC 8024153C 468010A0 */ cvt.s.w $f2, $f2 -/* C816E0 80241540 46000005 */ abs.s $f0, $f0 -/* C816E4 80241544 46020000 */ add.s $f0, $f0, $f2 -/* C816E8 80241548 C6060040 */ lwc1 $f6, 0x40($s0) -/* C816EC 8024154C 27A20024 */ addiu $v0, $sp, 0x24 -/* C816F0 80241550 46022100 */ add.s $f4, $f4, $f2 -/* C816F4 80241554 3C014024 */ lui $at, 0x4024 -/* C816F8 80241558 44811800 */ mtc1 $at, $f3 -/* C816FC 8024155C 44801000 */ mtc1 $zero, $f2 -/* C81700 80241560 46000021 */ cvt.d.s $f0, $f0 -/* C81704 80241564 46220000 */ add.d $f0, $f0, $f2 -/* C81708 80241568 E7A60020 */ swc1 $f6, 0x20($sp) -/* C8170C 8024156C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C81710 80241570 46200020 */ cvt.s.d $f0, $f0 -/* C81714 80241574 E7A00024 */ swc1 $f0, 0x24($sp) -/* C81718 80241578 AFA20010 */ sw $v0, 0x10($sp) -/* C8171C 8024157C 8E040080 */ lw $a0, 0x80($s0) -/* C81720 80241580 0C0372DF */ jal func_800DCB7C -/* C81724 80241584 27A70020 */ addiu $a3, $sp, 0x20 -/* C81728 80241588 10400015 */ beqz $v0, .L802415E0 -/* C8172C 8024158C 00000000 */ nop -/* C81730 80241590 860200A8 */ lh $v0, 0xa8($s0) -/* C81734 80241594 C604001C */ lwc1 $f4, 0x1c($s0) -/* C81738 80241598 44820000 */ mtc1 $v0, $f0 -/* C8173C 8024159C 00000000 */ nop -/* C81740 802415A0 46800020 */ cvt.s.w $f0, $f0 -/* C81744 802415A4 46002085 */ abs.s $f2, $f4 -/* C81748 802415A8 46020000 */ add.s $f0, $f0, $f2 -/* C8174C 802415AC C7A20024 */ lwc1 $f2, 0x24($sp) -/* C81750 802415B0 4600103E */ c.le.s $f2, $f0 -/* C81754 802415B4 00000000 */ nop -/* C81758 802415B8 45000005 */ bc1f .L802415D0 -/* C8175C 802415BC 00000000 */ nop -/* C81760 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C81764 802415C4 AE00001C */ sw $zero, 0x1c($s0) -/* C81768 802415C8 08090589 */ j .L80241624 -/* C8176C 802415CC E600003C */ swc1 $f0, 0x3c($s0) -.L802415D0: -/* C81770 802415D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81774 802415D4 46040000 */ add.s $f0, $f0, $f4 -/* C81778 802415D8 08090589 */ j .L80241624 -/* C8177C 802415DC E600003C */ swc1 $f0, 0x3c($s0) -.L802415E0: -/* C81780 802415E0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C81784 802415E4 860200A8 */ lh $v0, 0xa8($s0) -/* C81788 802415E8 46163081 */ sub.s $f2, $f6, $f22 -/* C8178C 802415EC 44820000 */ mtc1 $v0, $f0 -/* C81790 802415F0 00000000 */ nop -/* C81794 802415F4 46800020 */ cvt.s.w $f0, $f0 -/* C81798 802415F8 46001080 */ add.s $f2, $f2, $f0 -/* C8179C 802415FC C604001C */ lwc1 $f4, 0x1c($s0) -/* C817A0 80241600 46002005 */ abs.s $f0, $f4 -/* C817A4 80241604 4602003C */ c.lt.s $f0, $f2 -/* C817A8 80241608 00000000 */ nop -/* C817AC 8024160C 45020005 */ bc1fl .L80241624 -/* C817B0 80241610 AE00001C */ sw $zero, 0x1c($s0) -/* C817B4 80241614 46043000 */ add.s $f0, $f6, $f4 -/* C817B8 80241618 08090589 */ j .L80241624 -/* C817BC 8024161C E600003C */ swc1 $f0, 0x3c($s0) -.L80241620: -/* C817C0 80241620 AE00001C */ sw $zero, 0x1c($s0) -.L80241624: -/* C817C4 80241624 8FBF0038 */ lw $ra, 0x38($sp) -/* C817C8 80241628 8FB30034 */ lw $s3, 0x34($sp) -/* C817CC 8024162C 8FB20030 */ lw $s2, 0x30($sp) -/* C817D0 80241630 8FB1002C */ lw $s1, 0x2c($sp) -/* C817D4 80241634 8FB00028 */ lw $s0, 0x28($sp) -/* C817D8 80241638 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C817DC 8024163C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C817E0 80241640 03E00008 */ jr $ra -/* C817E4 80241644 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s deleted file mode 100644 index 294ad2f79b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241648_C817E8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241648_C817E8 -/* C817E8 80241648 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C817EC 8024164C AFB00028 */ sw $s0, 0x28($sp) -/* C817F0 80241650 00A0802D */ daddu $s0, $a1, $zero -/* C817F4 80241654 AFB1002C */ sw $s1, 0x2c($sp) -/* C817F8 80241658 00C0882D */ daddu $s1, $a2, $zero -/* C817FC 8024165C AFBF0034 */ sw $ra, 0x34($sp) -/* C81800 80241660 AFB20030 */ sw $s2, 0x30($sp) -/* C81804 80241664 AE200070 */ sw $zero, 0x70($s1) -/* C81808 80241668 8C830000 */ lw $v1, ($a0) -/* C8180C 8024166C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C81810 80241670 A480008E */ sh $zero, 0x8e($a0) -/* C81814 80241674 00621824 */ and $v1, $v1, $v0 -/* C81818 80241678 34650800 */ ori $a1, $v1, 0x800 -/* C8181C 8024167C AC850000 */ sw $a1, ($a0) -/* C81820 80241680 8E0200D0 */ lw $v0, 0xd0($s0) -/* C81824 80241684 8C420034 */ lw $v0, 0x34($v0) -/* C81828 80241688 10400003 */ beqz $v0, .L80241698 -/* C8182C 8024168C 00E0902D */ daddu $s2, $a3, $zero -/* C81830 80241690 080905A8 */ j .L802416A0 -/* C81834 80241694 34620808 */ ori $v0, $v1, 0x808 -.L80241698: -/* C81838 80241698 2402FFF7 */ addiu $v0, $zero, -9 -/* C8183C 8024169C 00A21024 */ and $v0, $a1, $v0 -.L802416A0: -/* C81840 802416A0 AC820000 */ sw $v0, ($a0) -/* C81844 802416A4 27A20024 */ addiu $v0, $sp, 0x24 -/* C81848 802416A8 27A50018 */ addiu $a1, $sp, 0x18 -/* C8184C 802416AC C4800038 */ lwc1 $f0, 0x38($a0) -/* C81850 802416B0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C81854 802416B4 C4840040 */ lwc1 $f4, 0x40($a0) -/* C81858 802416B8 3C01447A */ lui $at, 0x447a -/* C8185C 802416BC 44813000 */ mtc1 $at, $f6 -/* C81860 802416C0 27A6001C */ addiu $a2, $sp, 0x1c -/* C81864 802416C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C81868 802416C8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C8186C 802416CC E7A40020 */ swc1 $f4, 0x20($sp) -/* C81870 802416D0 E7A60024 */ swc1 $f6, 0x24($sp) -/* C81874 802416D4 AFA20010 */ sw $v0, 0x10($sp) -/* C81878 802416D8 8C840080 */ lw $a0, 0x80($a0) -/* C8187C 802416DC 0C0372DF */ jal func_800DCB7C -/* C81880 802416E0 27A70020 */ addiu $a3, $sp, 0x20 -/* C81884 802416E4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C81888 802416E8 3C014059 */ lui $at, 0x4059 -/* C8188C 802416EC 44812800 */ mtc1 $at, $f5 -/* C81890 802416F0 44802000 */ mtc1 $zero, $f4 -/* C81894 802416F4 460010A1 */ cvt.d.s $f2, $f2 -/* C81898 802416F8 46241082 */ mul.d $f2, $f2, $f4 -/* C8189C 802416FC 00000000 */ nop -/* C818A0 80241700 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C818A4 80241704 46000021 */ cvt.d.s $f0, $f0 -/* C818A8 80241708 46240002 */ mul.d $f0, $f0, $f4 -/* C818AC 8024170C 00000000 */ nop -/* C818B0 80241710 3C013FE0 */ lui $at, 0x3fe0 -/* C818B4 80241714 44812800 */ mtc1 $at, $f5 -/* C818B8 80241718 44802000 */ mtc1 $zero, $f4 -/* C818BC 8024171C 00000000 */ nop -/* C818C0 80241720 46241080 */ add.d $f2, $f2, $f4 -/* C818C4 80241724 AE000074 */ sw $zero, 0x74($s0) -/* C818C8 80241728 46240000 */ add.d $f0, $f0, $f4 -/* C818CC 8024172C AE000090 */ sw $zero, 0x90($s0) -/* C818D0 80241730 4620120D */ trunc.w.d $f8, $f2 -/* C818D4 80241734 E6080078 */ swc1 $f8, 0x78($s0) -/* C818D8 80241738 4620020D */ trunc.w.d $f8, $f0 -/* C818DC 8024173C E6080088 */ swc1 $f8, 0x88($s0) -/* C818E0 80241740 8E420014 */ lw $v0, 0x14($s2) -/* C818E4 80241744 AE220074 */ sw $v0, 0x74($s1) -/* C818E8 80241748 8E0200B0 */ lw $v0, 0xb0($s0) -/* C818EC 8024174C 34420010 */ ori $v0, $v0, 0x10 -/* C818F0 80241750 AE0200B0 */ sw $v0, 0xb0($s0) -/* C818F4 80241754 8FBF0034 */ lw $ra, 0x34($sp) -/* C818F8 80241758 8FB20030 */ lw $s2, 0x30($sp) -/* C818FC 8024175C 8FB1002C */ lw $s1, 0x2c($sp) -/* C81900 80241760 8FB00028 */ lw $s0, 0x28($sp) -/* C81904 80241764 03E00008 */ jr $ra -/* C81908 80241768 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 7761812956..02110954f0 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -46,7 +46,7 @@ glabel func_8024176C_C8190C /* C819B0 80241810 02A0202D */ daddu $a0, $s5, $zero /* C819B4 80241814 0240282D */ daddu $a1, $s2, $zero /* C819B8 80241818 0280302D */ daddu $a2, $s4, $zero -/* C819BC 8024181C 0C090592 */ jal func_80241648_C817E8 +/* C819BC 8024181C 0C090592 */ jal kzn_11_UnkFunc5 /* C819C0 80241820 0200382D */ daddu $a3, $s0, $zero .L80241824: /* C819C4 80241824 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L802418A0_C81A40 glabel L802418B0_C81A50 /* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero /* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero -/* C81A58 802418B8 0C09033E */ jal func_80240CF8_C80E98 +/* C81A58 802418B8 0C09033E */ jal kzn_11_UnkFunc4 /* C81A5C 802418BC 0260302D */ daddu $a2, $s3, $zero /* C81A60 802418C0 0809064D */ j .L80241934 /* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241908_C81AA8 glabel L80241920_C81AC0 /* C81AC0 80241920 0280202D */ daddu $a0, $s4, $zero /* C81AC4 80241924 0200282D */ daddu $a1, $s0, $zero -/* C81AC8 80241928 0C0904AE */ jal func_802412B8_C81458 +/* C81AC8 80241928 0C0904AE */ jal kzn_11_UnkFunc6 /* C81ACC 8024192C 0260302D */ daddu $a2, $s3, $zero glabel L80241930_C81AD0 /* C81AD0 80241930 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index 52ab44681c..0b9c2768c6 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -46,7 +46,7 @@ glabel func_80241D64_C81F04 /* C81FA8 80241E08 02A0202D */ daddu $a0, $s5, $zero /* C81FAC 80241E0C 0240282D */ daddu $a1, $s2, $zero /* C81FB0 80241E10 0280302D */ daddu $a2, $s4, $zero -/* C81FB4 80241E14 0C090592 */ jal func_80241648_C817E8 +/* C81FB4 80241E14 0C090592 */ jal kzn_11_UnkFunc5 /* C81FB8 80241E18 0200382D */ daddu $a3, $s0, $zero /* C81FBC 80241E1C AE800070 */ sw $zero, 0x70($s4) .L80241E20: @@ -92,7 +92,7 @@ glabel L80241E9C_C8203C glabel L80241EAC_C8204C /* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero -/* C82054 80241EB4 0C09033E */ jal func_80240CF8_C80E98 +/* C82054 80241EB4 0C09033E */ jal kzn_11_UnkFunc4 /* C82058 80241EB8 0260302D */ daddu $a2, $s3, $zero /* C8205C 80241EBC 080907CA */ j .L80241F28 /* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s deleted file mode 100644 index b4a54f8209..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802406CC_C8617C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC_C8617C -/* C8617C 802406CC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C86180 802406D0 AFB40028 */ sw $s4, 0x28($sp) -/* C86184 802406D4 0080A02D */ daddu $s4, $a0, $zero -/* C86188 802406D8 AFBF002C */ sw $ra, 0x2c($sp) -/* C8618C 802406DC AFB30024 */ sw $s3, 0x24($sp) -/* C86190 802406E0 AFB20020 */ sw $s2, 0x20($sp) -/* C86194 802406E4 AFB1001C */ sw $s1, 0x1c($sp) -/* C86198 802406E8 AFB00018 */ sw $s0, 0x18($sp) -/* C8619C 802406EC 8E910148 */ lw $s1, 0x148($s4) -/* C861A0 802406F0 86240008 */ lh $a0, 8($s1) -/* C861A4 802406F4 0C00EABB */ jal get_npc_unsafe -/* C861A8 802406F8 00A0802D */ daddu $s0, $a1, $zero -/* C861AC 802406FC 16000005 */ bnez $s0, .L80240714 -/* C861B0 80240700 0040902D */ daddu $s2, $v0, $zero -/* C861B4 80240704 8E2200B0 */ lw $v0, 0xb0($s1) -/* C861B8 80240708 30420004 */ andi $v0, $v0, 4 -/* C861BC 8024070C 10400015 */ beqz $v0, .L80240764 -/* C861C0 80240710 00000000 */ nop -.L80240714: -/* C861C4 80240714 AE800070 */ sw $zero, 0x70($s4) -/* C861C8 80240718 8E420000 */ lw $v0, ($s2) -/* C861CC 8024071C 3C031F30 */ lui $v1, 0x1f30 -/* C861D0 80240720 A640008E */ sh $zero, 0x8e($s2) -/* C861D4 80240724 34420102 */ ori $v0, $v0, 0x102 -/* C861D8 80240728 AE420000 */ sw $v0, ($s2) -/* C861DC 8024072C 8E220000 */ lw $v0, ($s1) -/* C861E0 80240730 3C01C47A */ lui $at, 0xc47a -/* C861E4 80240734 44810000 */ mtc1 $at, $f0 -/* C861E8 80240738 00431025 */ or $v0, $v0, $v1 -/* C861EC 8024073C AE220000 */ sw $v0, ($s1) -/* C861F0 80240740 AE400038 */ sw $zero, 0x38($s2) -/* C861F4 80240744 E640003C */ swc1 $f0, 0x3c($s2) -/* C861F8 80240748 AE400040 */ sw $zero, 0x40($s2) -/* C861FC 8024074C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C86200 80240750 30620004 */ andi $v0, $v1, 4 -/* C86204 80240754 10400003 */ beqz $v0, .L80240764 -/* C86208 80240758 2402FFFB */ addiu $v0, $zero, -5 -/* C8620C 8024075C 00621024 */ and $v0, $v1, $v0 -/* C86210 80240760 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240764: -/* C86214 80240764 8E930070 */ lw $s3, 0x70($s4) -/* C86218 80240768 12600005 */ beqz $s3, .L80240780 -/* C8621C 8024076C 24020001 */ addiu $v0, $zero, 1 -/* C86220 80240770 12620048 */ beq $s3, $v0, .L80240894 -/* C86224 80240774 00000000 */ nop -/* C86228 80240778 08090242 */ j .L80240908 -/* C8622C 8024077C 00000000 */ nop -.L80240780: -/* C86230 80240780 86240008 */ lh $a0, 8($s1) -/* C86234 80240784 0C00FB3A */ jal get_enemy -/* C86238 80240788 2484FFFF */ addiu $a0, $a0, -1 -/* C8623C 8024078C 0040802D */ daddu $s0, $v0, $zero -/* C86240 80240790 0C00EABB */ jal get_npc_unsafe -/* C86244 80240794 86040008 */ lh $a0, 8($s0) -/* C86248 80240798 24030001 */ addiu $v1, $zero, 1 -/* C8624C 8024079C 0040982D */ daddu $s3, $v0, $zero -/* C86250 802407A0 A2230007 */ sb $v1, 7($s1) -/* C86254 802407A4 8E03006C */ lw $v1, 0x6c($s0) -/* C86258 802407A8 24020003 */ addiu $v0, $zero, 3 -/* C8625C 802407AC 14620056 */ bne $v1, $v0, .L80240908 -/* C86260 802407B0 00000000 */ nop -/* C86264 802407B4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C86268 802407B8 10A00003 */ beqz $a1, .L802407C8 -/* C8626C 802407BC 0260202D */ daddu $a0, $s3, $zero -/* C86270 802407C0 0C012530 */ jal func_800494C0 -/* C86274 802407C4 0000302D */ daddu $a2, $zero, $zero -.L802407C8: -/* C86278 802407C8 27A40010 */ addiu $a0, $sp, 0x10 -/* C8627C 802407CC C6280070 */ lwc1 $f8, 0x70($s1) -/* C86280 802407D0 46804220 */ cvt.s.w $f8, $f8 -/* C86284 802407D4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C86288 802407D8 3C014387 */ lui $at, 0x4387 -/* C8628C 802407DC 44810000 */ mtc1 $at, $f0 -/* C86290 802407E0 44064000 */ mfc1 $a2, $f8 -/* C86294 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* C86298 802407E8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C8629C 802407EC C6640040 */ lwc1 $f4, 0x40($s3) -/* C862A0 802407F0 44070000 */ mfc1 $a3, $f0 -/* C862A4 802407F4 27A50014 */ addiu $a1, $sp, 0x14 -/* C862A8 802407F8 E7A60010 */ swc1 $f6, 0x10($sp) -/* C862AC 802407FC 0C00A7E7 */ jal add_vec2D_polar -/* C862B0 80240800 E7A40014 */ swc1 $f4, 0x14($sp) -/* C862B4 80240804 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C862B8 80240808 4600020D */ trunc.w.s $f8, $f0 -/* C862BC 8024080C 44024000 */ mfc1 $v0, $f8 -/* C862C0 80240810 E6400038 */ swc1 $f0, 0x38($s2) -/* C862C4 80240814 A6220010 */ sh $v0, 0x10($s1) -/* C862C8 80240818 C660003C */ lwc1 $f0, 0x3c($s3) -/* C862CC 8024081C C622006C */ lwc1 $f2, 0x6c($s1) -/* C862D0 80240820 468010A0 */ cvt.s.w $f2, $f2 -/* C862D4 80240824 46020000 */ add.s $f0, $f0, $f2 -/* C862D8 80240828 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C862DC 8024082C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C862E0 80240830 E640003C */ swc1 $f0, 0x3c($s2) -/* C862E4 80240834 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C862E8 80240838 4600020D */ trunc.w.s $f8, $f0 -/* C862EC 8024083C 44024000 */ mfc1 $v0, $f8 -/* C862F0 80240840 00000000 */ nop -/* C862F4 80240844 A6220012 */ sh $v0, 0x12($s1) -/* C862F8 80240848 4600120D */ trunc.w.s $f8, $f2 -/* C862FC 8024084C 44024000 */ mfc1 $v0, $f8 -/* C86300 80240850 E6420040 */ swc1 $f2, 0x40($s2) -/* C86304 80240854 A6220014 */ sh $v0, 0x14($s1) -/* C86308 80240858 8C660028 */ lw $a2, 0x28($v1) -/* C8630C 8024085C 8C670030 */ lw $a3, 0x30($v1) -/* C86310 80240860 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C86314 80240864 0C00A720 */ jal atan2 -/* C86318 80240868 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C8631C 8024086C 3C03E0EF */ lui $v1, 0xe0ef -/* C86320 80240870 E640000C */ swc1 $f0, 0xc($s2) -/* C86324 80240874 8E220000 */ lw $v0, ($s1) -/* C86328 80240878 3463FFFF */ ori $v1, $v1, 0xffff -/* C8632C 8024087C 00431024 */ and $v0, $v0, $v1 -/* C86330 80240880 AE220000 */ sw $v0, ($s1) -/* C86334 80240884 24020001 */ addiu $v0, $zero, 1 -/* C86338 80240888 A640008E */ sh $zero, 0x8e($s2) -/* C8633C 8024088C 08090242 */ j .L80240908 -/* C86340 80240890 AE820070 */ sw $v0, 0x70($s4) -.L80240894: -/* C86344 80240894 86240008 */ lh $a0, 8($s1) -/* C86348 80240898 0C00FB3A */ jal get_enemy -/* C8634C 8024089C 2484FFFF */ addiu $a0, $a0, -1 -/* C86350 802408A0 0040802D */ daddu $s0, $v0, $zero -/* C86354 802408A4 0C00EABB */ jal get_npc_unsafe -/* C86358 802408A8 86040008 */ lh $a0, 8($s0) -/* C8635C 802408AC 9642008E */ lhu $v0, 0x8e($s2) -/* C86360 802408B0 24420001 */ addiu $v0, $v0, 1 -/* C86364 802408B4 A642008E */ sh $v0, 0x8e($s2) -/* C86368 802408B8 00021400 */ sll $v0, $v0, 0x10 -/* C8636C 802408BC 8E23007C */ lw $v1, 0x7c($s1) -/* C86370 802408C0 00021403 */ sra $v0, $v0, 0x10 -/* C86374 802408C4 0043102A */ slt $v0, $v0, $v1 -/* C86378 802408C8 50400001 */ beql $v0, $zero, .L802408D0 -/* C8637C 802408CC A2200007 */ sb $zero, 7($s1) -.L802408D0: -/* C86380 802408D0 8E03006C */ lw $v1, 0x6c($s0) -/* C86384 802408D4 24020004 */ addiu $v0, $zero, 4 -/* C86388 802408D8 1462000B */ bne $v1, $v0, .L80240908 -/* C8638C 802408DC 3C021F10 */ lui $v0, 0x1f10 -/* C86390 802408E0 8E230000 */ lw $v1, ($s1) -/* C86394 802408E4 3C01C47A */ lui $at, 0xc47a -/* C86398 802408E8 44810000 */ mtc1 $at, $f0 -/* C8639C 802408EC 00621825 */ or $v1, $v1, $v0 -/* C863A0 802408F0 AE230000 */ sw $v1, ($s1) -/* C863A4 802408F4 AE400038 */ sw $zero, 0x38($s2) -/* C863A8 802408F8 E640003C */ swc1 $f0, 0x3c($s2) -/* C863AC 802408FC AE400040 */ sw $zero, 0x40($s2) -/* C863B0 80240900 A2330007 */ sb $s3, 7($s1) -/* C863B4 80240904 AE800070 */ sw $zero, 0x70($s4) -.L80240908: -/* C863B8 80240908 8FBF002C */ lw $ra, 0x2c($sp) -/* C863BC 8024090C 8FB40028 */ lw $s4, 0x28($sp) -/* C863C0 80240910 8FB30024 */ lw $s3, 0x24($sp) -/* C863C4 80240914 8FB20020 */ lw $s2, 0x20($sp) -/* C863C8 80240918 8FB1001C */ lw $s1, 0x1c($sp) -/* C863CC 8024091C 8FB00018 */ lw $s0, 0x18($sp) -/* C863D0 80240920 0000102D */ daddu $v0, $zero, $zero -/* C863D4 80240924 03E00008 */ jr $ra -/* C863D8 80240928 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s deleted file mode 100644 index 348f8be597..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426C8_7ED3D8 -/* 7ED3D8 802426C8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 7ED3DC 802426CC AFB20038 */ sw $s2, 0x38($sp) -/* 7ED3E0 802426D0 0080902D */ daddu $s2, $a0, $zero -/* 7ED3E4 802426D4 AFBF0044 */ sw $ra, 0x44($sp) -/* 7ED3E8 802426D8 AFB40040 */ sw $s4, 0x40($sp) -/* 7ED3EC 802426DC AFB3003C */ sw $s3, 0x3c($sp) -/* 7ED3F0 802426E0 AFB10034 */ sw $s1, 0x34($sp) -/* 7ED3F4 802426E4 AFB00030 */ sw $s0, 0x30($sp) -/* 7ED3F8 802426E8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 7ED3FC 802426EC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 7ED400 802426F0 8E510148 */ lw $s1, 0x148($s2) -/* 7ED404 802426F4 00A0982D */ daddu $s3, $a1, $zero -/* 7ED408 802426F8 86240008 */ lh $a0, 8($s1) -/* 7ED40C 802426FC 0C00EABB */ jal get_npc_unsafe -/* 7ED410 80242700 00C0A02D */ daddu $s4, $a2, $zero -/* 7ED414 80242704 8E630014 */ lw $v1, 0x14($s3) -/* 7ED418 80242708 04600030 */ bltz $v1, .L802427CC -/* 7ED41C 8024270C 0040802D */ daddu $s0, $v0, $zero -/* 7ED420 80242710 8E420074 */ lw $v0, 0x74($s2) -/* 7ED424 80242714 1C40002C */ bgtz $v0, .L802427C8 -/* 7ED428 80242718 2442FFFF */ addiu $v0, $v0, -1 -/* 7ED42C 8024271C 0280202D */ daddu $a0, $s4, $zero -/* 7ED430 80242720 AE430074 */ sw $v1, 0x74($s2) -/* 7ED434 80242724 AFA00010 */ sw $zero, 0x10($sp) -/* 7ED438 80242728 8E66000C */ lw $a2, 0xc($s3) -/* 7ED43C 8024272C 8E670010 */ lw $a3, 0x10($s3) -/* 7ED440 80242730 0C01242D */ jal func_800490B4 -/* 7ED444 80242734 0220282D */ daddu $a1, $s1, $zero -/* 7ED448 80242738 10400021 */ beqz $v0, .L802427C0 -/* 7ED44C 8024273C 0000202D */ daddu $a0, $zero, $zero -/* 7ED450 80242740 0200282D */ daddu $a1, $s0, $zero -/* 7ED454 80242744 0000302D */ daddu $a2, $zero, $zero -/* 7ED458 80242748 860300A8 */ lh $v1, 0xa8($s0) -/* 7ED45C 8024274C 3C013F80 */ lui $at, 0x3f80 -/* 7ED460 80242750 44810000 */ mtc1 $at, $f0 -/* 7ED464 80242754 3C014000 */ lui $at, 0x4000 -/* 7ED468 80242758 44811000 */ mtc1 $at, $f2 -/* 7ED46C 8024275C 3C01C1A0 */ lui $at, 0xc1a0 -/* 7ED470 80242760 44812000 */ mtc1 $at, $f4 -/* 7ED474 80242764 2402000F */ addiu $v0, $zero, 0xf -/* 7ED478 80242768 AFA2001C */ sw $v0, 0x1c($sp) -/* 7ED47C 8024276C 44833000 */ mtc1 $v1, $f6 -/* 7ED480 80242770 00000000 */ nop -/* 7ED484 80242774 468031A0 */ cvt.s.w $f6, $f6 -/* 7ED488 80242778 44073000 */ mfc1 $a3, $f6 -/* 7ED48C 8024277C 27A20028 */ addiu $v0, $sp, 0x28 -/* 7ED490 80242780 AFA20020 */ sw $v0, 0x20($sp) -/* 7ED494 80242784 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7ED498 80242788 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7ED49C 8024278C 0C01BFA4 */ jal fx_emote -/* 7ED4A0 80242790 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7ED4A4 80242794 0200202D */ daddu $a0, $s0, $zero -/* 7ED4A8 80242798 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 7ED4AC 8024279C 0C012530 */ jal func_800494C0 -/* 7ED4B0 802427A0 3C060020 */ lui $a2, 0x20 -/* 7ED4B4 802427A4 8E220018 */ lw $v0, 0x18($s1) -/* 7ED4B8 802427A8 9442002A */ lhu $v0, 0x2a($v0) -/* 7ED4BC 802427AC 30420001 */ andi $v0, $v0, 1 -/* 7ED4C0 802427B0 14400064 */ bnez $v0, .L80242944 -/* 7ED4C4 802427B4 2402000A */ addiu $v0, $zero, 0xa -/* 7ED4C8 802427B8 08090A51 */ j .L80242944 -/* 7ED4CC 802427BC 2402000C */ addiu $v0, $zero, 0xc -.L802427C0: -/* 7ED4D0 802427C0 8E420074 */ lw $v0, 0x74($s2) -/* 7ED4D4 802427C4 2442FFFF */ addiu $v0, $v0, -1 -.L802427C8: -/* 7ED4D8 802427C8 AE420074 */ sw $v0, 0x74($s2) -.L802427CC: -/* 7ED4DC 802427CC 8602008C */ lh $v0, 0x8c($s0) -/* 7ED4E0 802427D0 1440005D */ bnez $v0, .L80242948 -/* 7ED4E4 802427D4 00000000 */ nop -/* 7ED4E8 802427D8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 7ED4EC 802427DC 3C014010 */ lui $at, 0x4010 -/* 7ED4F0 802427E0 44811800 */ mtc1 $at, $f3 -/* 7ED4F4 802427E4 44801000 */ mtc1 $zero, $f2 -/* 7ED4F8 802427E8 46000021 */ cvt.d.s $f0, $f0 -/* 7ED4FC 802427EC 4622003C */ c.lt.d $f0, $f2 -/* 7ED500 802427F0 00000000 */ nop -/* 7ED504 802427F4 45000003 */ bc1f .L80242804 -/* 7ED508 802427F8 0200202D */ daddu $a0, $s0, $zero -/* 7ED50C 802427FC 08090A02 */ j .L80242808 -/* 7ED510 80242800 0000282D */ daddu $a1, $zero, $zero -.L80242804: -/* 7ED514 80242804 24050001 */ addiu $a1, $zero, 1 -.L80242808: -/* 7ED518 80242808 0C00F598 */ jal func_8003D660 -/* 7ED51C 8024280C 00000000 */ nop -/* 7ED520 80242810 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 7ED524 80242814 8E430078 */ lw $v1, 0x78($s2) -/* 7ED528 80242818 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 7ED52C 8024281C 00031040 */ sll $v0, $v1, 1 -/* 7ED530 80242820 00431021 */ addu $v0, $v0, $v1 -/* 7ED534 80242824 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7ED538 80242828 00021080 */ sll $v0, $v0, 2 -/* 7ED53C 8024282C 00431021 */ addu $v0, $v0, $v1 -/* 7ED540 80242830 C4560004 */ lwc1 $f22, 4($v0) -/* 7ED544 80242834 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7ED548 80242838 C454000C */ lwc1 $f20, 0xc($v0) -/* 7ED54C 8024283C 4680A520 */ cvt.s.w $f20, $f20 -/* 7ED550 80242840 4406B000 */ mfc1 $a2, $f22 -/* 7ED554 80242844 4407A000 */ mfc1 $a3, $f20 -/* 7ED558 80242848 0C00A720 */ jal atan2 -/* 7ED55C 8024284C 00000000 */ nop -/* 7ED560 80242850 8E050018 */ lw $a1, 0x18($s0) -/* 7ED564 80242854 44060000 */ mfc1 $a2, $f0 -/* 7ED568 80242858 0200202D */ daddu $a0, $s0, $zero -/* 7ED56C 8024285C 0C00EA95 */ jal npc_move_heading -/* 7ED570 80242860 AE06000C */ sw $a2, 0xc($s0) -/* 7ED574 80242864 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 7ED578 80242868 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 7ED57C 8024286C 4406B000 */ mfc1 $a2, $f22 -/* 7ED580 80242870 4407A000 */ mfc1 $a3, $f20 -/* 7ED584 80242874 0C00A7B5 */ jal dist2D -/* 7ED588 80242878 00000000 */ nop -/* 7ED58C 8024287C C6020018 */ lwc1 $f2, 0x18($s0) -/* 7ED590 80242880 4602003E */ c.le.s $f0, $f2 -/* 7ED594 80242884 00000000 */ nop -/* 7ED598 80242888 4500002F */ bc1f .L80242948 -/* 7ED59C 8024288C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 7ED5A0 80242890 24020002 */ addiu $v0, $zero, 2 -/* 7ED5A4 80242894 0C00A67F */ jal rand_int -/* 7ED5A8 80242898 AE420070 */ sw $v0, 0x70($s2) -/* 7ED5AC 8024289C 3C035555 */ lui $v1, 0x5555 -/* 7ED5B0 802428A0 34635556 */ ori $v1, $v1, 0x5556 -/* 7ED5B4 802428A4 00430018 */ mult $v0, $v1 -/* 7ED5B8 802428A8 000227C3 */ sra $a0, $v0, 0x1f -/* 7ED5BC 802428AC 00004010 */ mfhi $t0 -/* 7ED5C0 802428B0 01042023 */ subu $a0, $t0, $a0 -/* 7ED5C4 802428B4 00041840 */ sll $v1, $a0, 1 -/* 7ED5C8 802428B8 00641821 */ addu $v1, $v1, $a0 -/* 7ED5CC 802428BC 00431023 */ subu $v0, $v0, $v1 -/* 7ED5D0 802428C0 24430002 */ addiu $v1, $v0, 2 -/* 7ED5D4 802428C4 AE430074 */ sw $v1, 0x74($s2) -/* 7ED5D8 802428C8 8E62002C */ lw $v0, 0x2c($s3) -/* 7ED5DC 802428CC 18400009 */ blez $v0, .L802428F4 -/* 7ED5E0 802428D0 24020004 */ addiu $v0, $zero, 4 -/* 7ED5E4 802428D4 8E620004 */ lw $v0, 4($s3) -/* 7ED5E8 802428D8 18400006 */ blez $v0, .L802428F4 -/* 7ED5EC 802428DC 24020004 */ addiu $v0, $zero, 4 -/* 7ED5F0 802428E0 8E620008 */ lw $v0, 8($s3) -/* 7ED5F4 802428E4 18400003 */ blez $v0, .L802428F4 -/* 7ED5F8 802428E8 24020004 */ addiu $v0, $zero, 4 -/* 7ED5FC 802428EC 14600002 */ bnez $v1, .L802428F8 -/* 7ED600 802428F0 00000000 */ nop -.L802428F4: -/* 7ED604 802428F4 AE420070 */ sw $v0, 0x70($s2) -.L802428F8: -/* 7ED608 802428F8 0C00A67F */ jal rand_int -/* 7ED60C 802428FC 24042710 */ addiu $a0, $zero, 0x2710 -/* 7ED610 80242900 3C0351EB */ lui $v1, 0x51eb -/* 7ED614 80242904 3463851F */ ori $v1, $v1, 0x851f -/* 7ED618 80242908 00430018 */ mult $v0, $v1 -/* 7ED61C 8024290C 00021FC3 */ sra $v1, $v0, 0x1f -/* 7ED620 80242910 00004010 */ mfhi $t0 -/* 7ED624 80242914 00082143 */ sra $a0, $t0, 5 -/* 7ED628 80242918 00832023 */ subu $a0, $a0, $v1 -/* 7ED62C 8024291C 00041840 */ sll $v1, $a0, 1 -/* 7ED630 80242920 00641821 */ addu $v1, $v1, $a0 -/* 7ED634 80242924 000318C0 */ sll $v1, $v1, 3 -/* 7ED638 80242928 00641821 */ addu $v1, $v1, $a0 -/* 7ED63C 8024292C 00031880 */ sll $v1, $v1, 2 -/* 7ED640 80242930 8E640004 */ lw $a0, 4($s3) -/* 7ED644 80242934 00431023 */ subu $v0, $v0, $v1 -/* 7ED648 80242938 0044102A */ slt $v0, $v0, $a0 -/* 7ED64C 8024293C 10400002 */ beqz $v0, .L80242948 -/* 7ED650 80242940 24020004 */ addiu $v0, $zero, 4 -.L80242944: -/* 7ED654 80242944 AE420070 */ sw $v0, 0x70($s2) -.L80242948: -/* 7ED658 80242948 8FBF0044 */ lw $ra, 0x44($sp) -/* 7ED65C 8024294C 8FB40040 */ lw $s4, 0x40($sp) -/* 7ED660 80242950 8FB3003C */ lw $s3, 0x3c($sp) -/* 7ED664 80242954 8FB20038 */ lw $s2, 0x38($sp) -/* 7ED668 80242958 8FB10034 */ lw $s1, 0x34($sp) -/* 7ED66C 8024295C 8FB00030 */ lw $s0, 0x30($sp) -/* 7ED670 80242960 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 7ED674 80242964 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 7ED678 80242968 03E00008 */ jr $ra -/* 7ED67C 8024296C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s deleted file mode 100644 index 199f5ef360..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A30_7ED740 -/* 7ED740 80242A30 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7ED744 80242A34 AFB40040 */ sw $s4, 0x40($sp) -/* 7ED748 80242A38 0080A02D */ daddu $s4, $a0, $zero -/* 7ED74C 80242A3C AFBF0044 */ sw $ra, 0x44($sp) -/* 7ED750 80242A40 AFB3003C */ sw $s3, 0x3c($sp) -/* 7ED754 80242A44 AFB20038 */ sw $s2, 0x38($sp) -/* 7ED758 80242A48 AFB10034 */ sw $s1, 0x34($sp) -/* 7ED75C 80242A4C AFB00030 */ sw $s0, 0x30($sp) -/* 7ED760 80242A50 8E910148 */ lw $s1, 0x148($s4) -/* 7ED764 80242A54 00A0902D */ daddu $s2, $a1, $zero -/* 7ED768 80242A58 86240008 */ lh $a0, 8($s1) -/* 7ED76C 80242A5C 0C00EABB */ jal get_npc_unsafe -/* 7ED770 80242A60 00C0982D */ daddu $s3, $a2, $zero -/* 7ED774 80242A64 8E430014 */ lw $v1, 0x14($s2) -/* 7ED778 80242A68 04600031 */ bltz $v1, .L80242B30 -/* 7ED77C 80242A6C 0040802D */ daddu $s0, $v0, $zero -/* 7ED780 80242A70 0260202D */ daddu $a0, $s3, $zero -/* 7ED784 80242A74 AFA00010 */ sw $zero, 0x10($sp) -/* 7ED788 80242A78 8E460024 */ lw $a2, 0x24($s2) -/* 7ED78C 80242A7C 8E470028 */ lw $a3, 0x28($s2) -/* 7ED790 80242A80 0C01242D */ jal func_800490B4 -/* 7ED794 80242A84 0220282D */ daddu $a1, $s1, $zero -/* 7ED798 80242A88 10400029 */ beqz $v0, .L80242B30 -/* 7ED79C 80242A8C 0000202D */ daddu $a0, $zero, $zero -/* 7ED7A0 80242A90 0200282D */ daddu $a1, $s0, $zero -/* 7ED7A4 80242A94 0000302D */ daddu $a2, $zero, $zero -/* 7ED7A8 80242A98 860300A8 */ lh $v1, 0xa8($s0) -/* 7ED7AC 80242A9C 3C013F80 */ lui $at, 0x3f80 -/* 7ED7B0 80242AA0 44810000 */ mtc1 $at, $f0 -/* 7ED7B4 80242AA4 3C014000 */ lui $at, 0x4000 -/* 7ED7B8 80242AA8 44811000 */ mtc1 $at, $f2 -/* 7ED7BC 80242AAC 3C01C1A0 */ lui $at, 0xc1a0 -/* 7ED7C0 80242AB0 44812000 */ mtc1 $at, $f4 -/* 7ED7C4 80242AB4 2402000F */ addiu $v0, $zero, 0xf -/* 7ED7C8 80242AB8 AFA2001C */ sw $v0, 0x1c($sp) -/* 7ED7CC 80242ABC 44833000 */ mtc1 $v1, $f6 -/* 7ED7D0 80242AC0 00000000 */ nop -/* 7ED7D4 80242AC4 468031A0 */ cvt.s.w $f6, $f6 -/* 7ED7D8 80242AC8 44073000 */ mfc1 $a3, $f6 -/* 7ED7DC 80242ACC 27A20028 */ addiu $v0, $sp, 0x28 -/* 7ED7E0 80242AD0 AFA20020 */ sw $v0, 0x20($sp) -/* 7ED7E4 80242AD4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7ED7E8 80242AD8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7ED7EC 80242ADC 0C01BFA4 */ jal fx_emote -/* 7ED7F0 80242AE0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7ED7F4 80242AE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7ED7F8 80242AE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7ED7FC 80242AEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 7ED800 80242AF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 7ED804 80242AF4 8C460028 */ lw $a2, 0x28($v0) -/* 7ED808 80242AF8 0C00A720 */ jal atan2 -/* 7ED80C 80242AFC 8C470030 */ lw $a3, 0x30($v0) -/* 7ED810 80242B00 0200202D */ daddu $a0, $s0, $zero -/* 7ED814 80242B04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 7ED818 80242B08 3C060020 */ lui $a2, 0x20 -/* 7ED81C 80242B0C 0C012530 */ jal func_800494C0 -/* 7ED820 80242B10 E480000C */ swc1 $f0, 0xc($a0) -/* 7ED824 80242B14 8E220018 */ lw $v0, 0x18($s1) -/* 7ED828 80242B18 9442002A */ lhu $v0, 0x2a($v0) -/* 7ED82C 80242B1C 30420001 */ andi $v0, $v0, 1 -/* 7ED830 80242B20 14400029 */ bnez $v0, .L80242BC8 -/* 7ED834 80242B24 2402000A */ addiu $v0, $zero, 0xa -/* 7ED838 80242B28 08090AF2 */ j .L80242BC8 -/* 7ED83C 80242B2C 2402000C */ addiu $v0, $zero, 0xc -.L80242B30: -/* 7ED840 80242B30 8602008C */ lh $v0, 0x8c($s0) -/* 7ED844 80242B34 14400025 */ bnez $v0, .L80242BCC -/* 7ED848 80242B38 00000000 */ nop -/* 7ED84C 80242B3C 9602008E */ lhu $v0, 0x8e($s0) -/* 7ED850 80242B40 2442FFFF */ addiu $v0, $v0, -1 -/* 7ED854 80242B44 A602008E */ sh $v0, 0x8e($s0) -/* 7ED858 80242B48 00021400 */ sll $v0, $v0, 0x10 -/* 7ED85C 80242B4C 1440001F */ bnez $v0, .L80242BCC -/* 7ED860 80242B50 00000000 */ nop -/* 7ED864 80242B54 8E820074 */ lw $v0, 0x74($s4) -/* 7ED868 80242B58 2442FFFF */ addiu $v0, $v0, -1 -/* 7ED86C 80242B5C 10400019 */ beqz $v0, .L80242BC4 -/* 7ED870 80242B60 AE820074 */ sw $v0, 0x74($s4) -/* 7ED874 80242B64 8E220018 */ lw $v0, 0x18($s1) -/* 7ED878 80242B68 9442002A */ lhu $v0, 0x2a($v0) -/* 7ED87C 80242B6C 30420010 */ andi $v0, $v0, 0x10 -/* 7ED880 80242B70 14400007 */ bnez $v0, .L80242B90 -/* 7ED884 80242B74 00000000 */ nop -/* 7ED888 80242B78 C600000C */ lwc1 $f0, 0xc($s0) -/* 7ED88C 80242B7C 3C014334 */ lui $at, 0x4334 -/* 7ED890 80242B80 44816000 */ mtc1 $at, $f12 -/* 7ED894 80242B84 0C00A6C9 */ jal clamp_angle -/* 7ED898 80242B88 460C0300 */ add.s $f12, $f0, $f12 -/* 7ED89C 80242B8C E600000C */ swc1 $f0, 0xc($s0) -.L80242B90: -/* 7ED8A0 80242B90 8E440008 */ lw $a0, 8($s2) -/* 7ED8A4 80242B94 000417C2 */ srl $v0, $a0, 0x1f -/* 7ED8A8 80242B98 00822021 */ addu $a0, $a0, $v0 -/* 7ED8AC 80242B9C 00042043 */ sra $a0, $a0, 1 -/* 7ED8B0 80242BA0 0C00A67F */ jal rand_int -/* 7ED8B4 80242BA4 24840001 */ addiu $a0, $a0, 1 -/* 7ED8B8 80242BA8 8E430008 */ lw $v1, 8($s2) -/* 7ED8BC 80242BAC 000327C2 */ srl $a0, $v1, 0x1f -/* 7ED8C0 80242BB0 00641821 */ addu $v1, $v1, $a0 -/* 7ED8C4 80242BB4 00031843 */ sra $v1, $v1, 1 -/* 7ED8C8 80242BB8 00621821 */ addu $v1, $v1, $v0 -/* 7ED8CC 80242BBC 08090AF3 */ j .L80242BCC -/* 7ED8D0 80242BC0 A603008E */ sh $v1, 0x8e($s0) -.L80242BC4: -/* 7ED8D4 80242BC4 24020004 */ addiu $v0, $zero, 4 -.L80242BC8: -/* 7ED8D8 80242BC8 AE820070 */ sw $v0, 0x70($s4) -.L80242BCC: -/* 7ED8DC 80242BCC 8FBF0044 */ lw $ra, 0x44($sp) -/* 7ED8E0 80242BD0 8FB40040 */ lw $s4, 0x40($sp) -/* 7ED8E4 80242BD4 8FB3003C */ lw $s3, 0x3c($sp) -/* 7ED8E8 80242BD8 8FB20038 */ lw $s2, 0x38($sp) -/* 7ED8EC 80242BDC 8FB10034 */ lw $s1, 0x34($sp) -/* 7ED8F0 80242BE0 8FB00030 */ lw $s0, 0x30($sp) -/* 7ED8F4 80242BE4 03E00008 */ jr $ra -/* 7ED8F8 80242BE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s deleted file mode 100644 index 00dd9969ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EBC_7EDBCC -/* 7EDBCC 80242EBC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EDBD0 80242EC0 AFB3003C */ sw $s3, 0x3c($sp) -/* 7EDBD4 80242EC4 0080982D */ daddu $s3, $a0, $zero -/* 7EDBD8 80242EC8 AFBF0040 */ sw $ra, 0x40($sp) -/* 7EDBDC 80242ECC AFB20038 */ sw $s2, 0x38($sp) -/* 7EDBE0 80242ED0 AFB10034 */ sw $s1, 0x34($sp) -/* 7EDBE4 80242ED4 AFB00030 */ sw $s0, 0x30($sp) -/* 7EDBE8 80242ED8 8E720148 */ lw $s2, 0x148($s3) -/* 7EDBEC 80242EDC 00A0882D */ daddu $s1, $a1, $zero -/* 7EDBF0 80242EE0 86440008 */ lh $a0, 8($s2) -/* 7EDBF4 80242EE4 0C00EABB */ jal get_npc_unsafe -/* 7EDBF8 80242EE8 00C0802D */ daddu $s0, $a2, $zero -/* 7EDBFC 80242EEC 0200202D */ daddu $a0, $s0, $zero -/* 7EDC00 80242EF0 0240282D */ daddu $a1, $s2, $zero -/* 7EDC04 80242EF4 24030001 */ addiu $v1, $zero, 1 -/* 7EDC08 80242EF8 AFA30010 */ sw $v1, 0x10($sp) -/* 7EDC0C 80242EFC 8E260024 */ lw $a2, 0x24($s1) -/* 7EDC10 80242F00 8E270028 */ lw $a3, 0x28($s1) -/* 7EDC14 80242F04 0C01242D */ jal func_800490B4 -/* 7EDC18 80242F08 0040802D */ daddu $s0, $v0, $zero -/* 7EDC1C 80242F0C 1440001E */ bnez $v0, .L80242F88 -/* 7EDC20 80242F10 0200202D */ daddu $a0, $s0, $zero -/* 7EDC24 80242F14 24040002 */ addiu $a0, $zero, 2 -/* 7EDC28 80242F18 0200282D */ daddu $a1, $s0, $zero -/* 7EDC2C 80242F1C 0000302D */ daddu $a2, $zero, $zero -/* 7EDC30 80242F20 860300A8 */ lh $v1, 0xa8($s0) -/* 7EDC34 80242F24 3C013F80 */ lui $at, 0x3f80 -/* 7EDC38 80242F28 44810000 */ mtc1 $at, $f0 -/* 7EDC3C 80242F2C 3C014000 */ lui $at, 0x4000 -/* 7EDC40 80242F30 44811000 */ mtc1 $at, $f2 -/* 7EDC44 80242F34 3C01C1A0 */ lui $at, 0xc1a0 -/* 7EDC48 80242F38 44812000 */ mtc1 $at, $f4 -/* 7EDC4C 80242F3C 2402000F */ addiu $v0, $zero, 0xf -/* 7EDC50 80242F40 AFA2001C */ sw $v0, 0x1c($sp) -/* 7EDC54 80242F44 44833000 */ mtc1 $v1, $f6 -/* 7EDC58 80242F48 00000000 */ nop -/* 7EDC5C 80242F4C 468031A0 */ cvt.s.w $f6, $f6 -/* 7EDC60 80242F50 44073000 */ mfc1 $a3, $f6 -/* 7EDC64 80242F54 27A20028 */ addiu $v0, $sp, 0x28 -/* 7EDC68 80242F58 AFA20020 */ sw $v0, 0x20($sp) -/* 7EDC6C 80242F5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EDC70 80242F60 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7EDC74 80242F64 0C01BFA4 */ jal fx_emote -/* 7EDC78 80242F68 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7EDC7C 80242F6C 8E4200CC */ lw $v0, 0xcc($s2) -/* 7EDC80 80242F70 8C430000 */ lw $v1, ($v0) -/* 7EDC84 80242F74 24020019 */ addiu $v0, $zero, 0x19 -/* 7EDC88 80242F78 A602008E */ sh $v0, 0x8e($s0) -/* 7EDC8C 80242F7C 2402000E */ addiu $v0, $zero, 0xe -/* 7EDC90 80242F80 08090BEF */ j .L80242FBC -/* 7EDC94 80242F84 AE030028 */ sw $v1, 0x28($s0) -.L80242F88: -/* 7EDC98 80242F88 0C00F598 */ jal func_8003D660 -/* 7EDC9C 80242F8C 24050001 */ addiu $a1, $zero, 1 -/* 7EDCA0 80242F90 8E050018 */ lw $a1, 0x18($s0) -/* 7EDCA4 80242F94 8E06000C */ lw $a2, 0xc($s0) -/* 7EDCA8 80242F98 0C00EA95 */ jal npc_move_heading -/* 7EDCAC 80242F9C 0200202D */ daddu $a0, $s0, $zero -/* 7EDCB0 80242FA0 8602008E */ lh $v0, 0x8e($s0) -/* 7EDCB4 80242FA4 9603008E */ lhu $v1, 0x8e($s0) -/* 7EDCB8 80242FA8 18400003 */ blez $v0, .L80242FB8 -/* 7EDCBC 80242FAC 2462FFFF */ addiu $v0, $v1, -1 -/* 7EDCC0 80242FB0 08090BF0 */ j .L80242FC0 -/* 7EDCC4 80242FB4 A602008E */ sh $v0, 0x8e($s0) -.L80242FB8: -/* 7EDCC8 80242FB8 2402000C */ addiu $v0, $zero, 0xc -.L80242FBC: -/* 7EDCCC 80242FBC AE620070 */ sw $v0, 0x70($s3) -.L80242FC0: -/* 7EDCD0 80242FC0 8FBF0040 */ lw $ra, 0x40($sp) -/* 7EDCD4 80242FC4 8FB3003C */ lw $s3, 0x3c($sp) -/* 7EDCD8 80242FC8 8FB20038 */ lw $s2, 0x38($sp) -/* 7EDCDC 80242FCC 8FB10034 */ lw $s1, 0x34($sp) -/* 7EDCE0 80242FD0 8FB00030 */ lw $s0, 0x30($sp) -/* 7EDCE4 80242FD4 03E00008 */ jr $ra -/* 7EDCE8 80242FD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s deleted file mode 100644 index dd29d4dbf8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243044_7EDD54 -/* 7EDD54 80243044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EDD58 80243048 AFB10014 */ sw $s1, 0x14($sp) -/* 7EDD5C 8024304C 0080882D */ daddu $s1, $a0, $zero -/* 7EDD60 80243050 AFBF001C */ sw $ra, 0x1c($sp) -/* 7EDD64 80243054 AFB20018 */ sw $s2, 0x18($sp) -/* 7EDD68 80243058 AFB00010 */ sw $s0, 0x10($sp) -/* 7EDD6C 8024305C 8E300148 */ lw $s0, 0x148($s1) -/* 7EDD70 80243060 86040008 */ lh $a0, 8($s0) -/* 7EDD74 80243064 0C00EABB */ jal get_npc_unsafe -/* 7EDD78 80243068 00A0902D */ daddu $s2, $a1, $zero -/* 7EDD7C 8024306C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 7EDD80 80243070 8E240078 */ lw $a0, 0x78($s1) -/* 7EDD84 80243074 8C630000 */ lw $v1, ($v1) -/* 7EDD88 80243078 0083182A */ slt $v1, $a0, $v1 -/* 7EDD8C 8024307C 10600013 */ beqz $v1, .L802430CC -/* 7EDD90 80243080 0040302D */ daddu $a2, $v0, $zero -/* 7EDD94 80243084 00041040 */ sll $v0, $a0, 1 -/* 7EDD98 80243088 00441021 */ addu $v0, $v0, $a0 -/* 7EDD9C 8024308C 00022880 */ sll $a1, $v0, 2 -.L80243090: -/* 7EDDA0 80243090 8E0300D0 */ lw $v1, 0xd0($s0) -/* 7EDDA4 80243094 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 7EDDA8 80243098 00A31021 */ addu $v0, $a1, $v1 -/* 7EDDAC 8024309C C4400008 */ lwc1 $f0, 8($v0) -/* 7EDDB0 802430A0 46800020 */ cvt.s.w $f0, $f0 -/* 7EDDB4 802430A4 4602003E */ c.le.s $f0, $f2 -/* 7EDDB8 802430A8 00000000 */ nop -/* 7EDDBC 802430AC 45020003 */ bc1fl .L802430BC -/* 7EDDC0 802430B0 24840001 */ addiu $a0, $a0, 1 -/* 7EDDC4 802430B4 08090C33 */ j .L802430CC -/* 7EDDC8 802430B8 AE240078 */ sw $a0, 0x78($s1) -.L802430BC: -/* 7EDDCC 802430BC 8C620000 */ lw $v0, ($v1) -/* 7EDDD0 802430C0 0082102A */ slt $v0, $a0, $v0 -/* 7EDDD4 802430C4 1440FFF2 */ bnez $v0, .L80243090 -/* 7EDDD8 802430C8 24A5000C */ addiu $a1, $a1, 0xc -.L802430CC: -/* 7EDDDC 802430CC C6400000 */ lwc1 $f0, ($s2) -/* 7EDDE0 802430D0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 7EDDE4 802430D4 8E0200CC */ lw $v0, 0xcc($s0) -/* 7EDDE8 802430D8 8C420004 */ lw $v0, 4($v0) -/* 7EDDEC 802430DC ACC20028 */ sw $v0, 0x28($a2) -/* 7EDDF0 802430E0 24020001 */ addiu $v0, $zero, 1 -/* 7EDDF4 802430E4 AE200074 */ sw $zero, 0x74($s1) -/* 7EDDF8 802430E8 AE220070 */ sw $v0, 0x70($s1) -/* 7EDDFC 802430EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EDE00 802430F0 8FB20018 */ lw $s2, 0x18($sp) -/* 7EDE04 802430F4 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDE08 802430F8 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDE0C 802430FC 03E00008 */ jr $ra -/* 7EDE10 80243100 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 58f226c603..df6dc91494 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -137,7 +137,7 @@ glabel L802432E8_7EDFF8 glabel L802432F8_7EE008 /* 7EE008 802432F8 0280202D */ daddu $a0, $s4, $zero /* 7EE00C 802432FC 0260282D */ daddu $a1, $s3, $zero -/* 7EE010 80243300 0C0909B2 */ jal func_802426C8_7ED3D8 +/* 7EE010 80243300 0C0909B2 */ jal mac_00_UnkFunc13 /* 7EE014 80243304 02A0302D */ daddu $a2, $s5, $zero /* 7EE018 80243308 08090CF6 */ j L802433D8_7EE0E8 /* 7EE01C 8024330C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80243310_7EE020 glabel L80243320_7EE030 /* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero -/* 7EE038 80243328 0C090A8C */ jal func_80242A30_7ED740 +/* 7EE038 80243328 0C090A8C */ jal mac_00_UnkFunc14 /* 7EE03C 8024332C 02A0302D */ daddu $a2, $s5, $zero /* 7EE040 80243330 08090CF6 */ j L802433D8_7EE0E8 /* 7EE044 80243334 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80243378_7EE088 glabel L80243388_7EE098 /* 7EE098 80243388 0280202D */ daddu $a0, $s4, $zero /* 7EE09C 8024338C 0260282D */ daddu $a1, $s3, $zero -/* 7EE0A0 80243390 0C090BAF */ jal func_80242EBC_7EDBCC +/* 7EE0A0 80243390 0C090BAF */ jal mac_00_UnkFunc15 /* 7EE0A4 80243394 02A0302D */ daddu $a2, $s5, $zero /* 7EE0A8 80243398 08090CF6 */ j L802433D8_7EE0E8 /* 7EE0AC 8024339C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L802433A0_7EE0B0 glabel L802433B8_7EE0C8 /* 7EE0C8 802433B8 0280202D */ daddu $a0, $s4, $zero /* 7EE0CC 802433BC 0260282D */ daddu $a1, $s3, $zero -/* 7EE0D0 802433C0 0C090C11 */ jal func_80243044_7EDD54 +/* 7EE0D0 802433C0 0C090C11 */ jal mac_00_UnkFunc16 /* 7EE0D4 802433C4 02A0302D */ daddu $a2, $s5, $zero /* 7EE0D8 802433C8 08090CF6 */ j L802433D8_7EE0E8 /* 7EE0DC 802433CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s deleted file mode 100644 index 665b0f342b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8_801A58 -/* 801A58 802411D8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 801A5C 802411DC AFB20038 */ sw $s2, 0x38($sp) -/* 801A60 802411E0 0080902D */ daddu $s2, $a0, $zero -/* 801A64 802411E4 AFBF0044 */ sw $ra, 0x44($sp) -/* 801A68 802411E8 AFB40040 */ sw $s4, 0x40($sp) -/* 801A6C 802411EC AFB3003C */ sw $s3, 0x3c($sp) -/* 801A70 802411F0 AFB10034 */ sw $s1, 0x34($sp) -/* 801A74 802411F4 AFB00030 */ sw $s0, 0x30($sp) -/* 801A78 802411F8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 801A7C 802411FC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 801A80 80241200 8E510148 */ lw $s1, 0x148($s2) -/* 801A84 80241204 00A0982D */ daddu $s3, $a1, $zero -/* 801A88 80241208 86240008 */ lh $a0, 8($s1) -/* 801A8C 8024120C 0C00EABB */ jal get_npc_unsafe -/* 801A90 80241210 00C0A02D */ daddu $s4, $a2, $zero -/* 801A94 80241214 8E630014 */ lw $v1, 0x14($s3) -/* 801A98 80241218 04600030 */ bltz $v1, .L802412DC -/* 801A9C 8024121C 0040802D */ daddu $s0, $v0, $zero -/* 801AA0 80241220 8E420074 */ lw $v0, 0x74($s2) -/* 801AA4 80241224 1C40002C */ bgtz $v0, .L802412D8 -/* 801AA8 80241228 2442FFFF */ addiu $v0, $v0, -1 -/* 801AAC 8024122C 0280202D */ daddu $a0, $s4, $zero -/* 801AB0 80241230 AE430074 */ sw $v1, 0x74($s2) -/* 801AB4 80241234 AFA00010 */ sw $zero, 0x10($sp) -/* 801AB8 80241238 8E66000C */ lw $a2, 0xc($s3) -/* 801ABC 8024123C 8E670010 */ lw $a3, 0x10($s3) -/* 801AC0 80241240 0C01242D */ jal func_800490B4 -/* 801AC4 80241244 0220282D */ daddu $a1, $s1, $zero -/* 801AC8 80241248 10400021 */ beqz $v0, .L802412D0 -/* 801ACC 8024124C 0000202D */ daddu $a0, $zero, $zero -/* 801AD0 80241250 0200282D */ daddu $a1, $s0, $zero -/* 801AD4 80241254 0000302D */ daddu $a2, $zero, $zero -/* 801AD8 80241258 860300A8 */ lh $v1, 0xa8($s0) -/* 801ADC 8024125C 3C013F80 */ lui $at, 0x3f80 -/* 801AE0 80241260 44810000 */ mtc1 $at, $f0 -/* 801AE4 80241264 3C014000 */ lui $at, 0x4000 -/* 801AE8 80241268 44811000 */ mtc1 $at, $f2 -/* 801AEC 8024126C 3C01C1A0 */ lui $at, 0xc1a0 -/* 801AF0 80241270 44812000 */ mtc1 $at, $f4 -/* 801AF4 80241274 2402000F */ addiu $v0, $zero, 0xf -/* 801AF8 80241278 AFA2001C */ sw $v0, 0x1c($sp) -/* 801AFC 8024127C 44833000 */ mtc1 $v1, $f6 -/* 801B00 80241280 00000000 */ nop -/* 801B04 80241284 468031A0 */ cvt.s.w $f6, $f6 -/* 801B08 80241288 44073000 */ mfc1 $a3, $f6 -/* 801B0C 8024128C 27A20028 */ addiu $v0, $sp, 0x28 -/* 801B10 80241290 AFA20020 */ sw $v0, 0x20($sp) -/* 801B14 80241294 E7A00010 */ swc1 $f0, 0x10($sp) -/* 801B18 80241298 E7A20014 */ swc1 $f2, 0x14($sp) -/* 801B1C 8024129C 0C01BFA4 */ jal fx_emote -/* 801B20 802412A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 801B24 802412A4 0200202D */ daddu $a0, $s0, $zero -/* 801B28 802412A8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 801B2C 802412AC 0C012530 */ jal func_800494C0 -/* 801B30 802412B0 3C060020 */ lui $a2, 0x20 -/* 801B34 802412B4 8E220018 */ lw $v0, 0x18($s1) -/* 801B38 802412B8 9442002A */ lhu $v0, 0x2a($v0) -/* 801B3C 802412BC 30420001 */ andi $v0, $v0, 1 -/* 801B40 802412C0 14400064 */ bnez $v0, .L80241454 -/* 801B44 802412C4 2402000A */ addiu $v0, $zero, 0xa -/* 801B48 802412C8 08090515 */ j .L80241454 -/* 801B4C 802412CC 2402000C */ addiu $v0, $zero, 0xc -.L802412D0: -/* 801B50 802412D0 8E420074 */ lw $v0, 0x74($s2) -/* 801B54 802412D4 2442FFFF */ addiu $v0, $v0, -1 -.L802412D8: -/* 801B58 802412D8 AE420074 */ sw $v0, 0x74($s2) -.L802412DC: -/* 801B5C 802412DC 8602008C */ lh $v0, 0x8c($s0) -/* 801B60 802412E0 1440005D */ bnez $v0, .L80241458 -/* 801B64 802412E4 00000000 */ nop -/* 801B68 802412E8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 801B6C 802412EC 3C014010 */ lui $at, 0x4010 -/* 801B70 802412F0 44811800 */ mtc1 $at, $f3 -/* 801B74 802412F4 44801000 */ mtc1 $zero, $f2 -/* 801B78 802412F8 46000021 */ cvt.d.s $f0, $f0 -/* 801B7C 802412FC 4622003C */ c.lt.d $f0, $f2 -/* 801B80 80241300 00000000 */ nop -/* 801B84 80241304 45000003 */ bc1f .L80241314 -/* 801B88 80241308 0200202D */ daddu $a0, $s0, $zero -/* 801B8C 8024130C 080904C6 */ j .L80241318 -/* 801B90 80241310 0000282D */ daddu $a1, $zero, $zero -.L80241314: -/* 801B94 80241314 24050001 */ addiu $a1, $zero, 1 -.L80241318: -/* 801B98 80241318 0C00F598 */ jal func_8003D660 -/* 801B9C 8024131C 00000000 */ nop -/* 801BA0 80241320 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 801BA4 80241324 8E430078 */ lw $v1, 0x78($s2) -/* 801BA8 80241328 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 801BAC 8024132C 00031040 */ sll $v0, $v1, 1 -/* 801BB0 80241330 00431021 */ addu $v0, $v0, $v1 -/* 801BB4 80241334 8E2300D0 */ lw $v1, 0xd0($s1) -/* 801BB8 80241338 00021080 */ sll $v0, $v0, 2 -/* 801BBC 8024133C 00431021 */ addu $v0, $v0, $v1 -/* 801BC0 80241340 C4560004 */ lwc1 $f22, 4($v0) -/* 801BC4 80241344 4680B5A0 */ cvt.s.w $f22, $f22 -/* 801BC8 80241348 C454000C */ lwc1 $f20, 0xc($v0) -/* 801BCC 8024134C 4680A520 */ cvt.s.w $f20, $f20 -/* 801BD0 80241350 4406B000 */ mfc1 $a2, $f22 -/* 801BD4 80241354 4407A000 */ mfc1 $a3, $f20 -/* 801BD8 80241358 0C00A720 */ jal atan2 -/* 801BDC 8024135C 00000000 */ nop -/* 801BE0 80241360 8E050018 */ lw $a1, 0x18($s0) -/* 801BE4 80241364 44060000 */ mfc1 $a2, $f0 -/* 801BE8 80241368 0200202D */ daddu $a0, $s0, $zero -/* 801BEC 8024136C 0C00EA95 */ jal npc_move_heading -/* 801BF0 80241370 AE06000C */ sw $a2, 0xc($s0) -/* 801BF4 80241374 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 801BF8 80241378 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 801BFC 8024137C 4406B000 */ mfc1 $a2, $f22 -/* 801C00 80241380 4407A000 */ mfc1 $a3, $f20 -/* 801C04 80241384 0C00A7B5 */ jal dist2D -/* 801C08 80241388 00000000 */ nop -/* 801C0C 8024138C C6020018 */ lwc1 $f2, 0x18($s0) -/* 801C10 80241390 4602003E */ c.le.s $f0, $f2 -/* 801C14 80241394 00000000 */ nop -/* 801C18 80241398 4500002F */ bc1f .L80241458 -/* 801C1C 8024139C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 801C20 802413A0 24020002 */ addiu $v0, $zero, 2 -/* 801C24 802413A4 0C00A67F */ jal rand_int -/* 801C28 802413A8 AE420070 */ sw $v0, 0x70($s2) -/* 801C2C 802413AC 3C035555 */ lui $v1, 0x5555 -/* 801C30 802413B0 34635556 */ ori $v1, $v1, 0x5556 -/* 801C34 802413B4 00430018 */ mult $v0, $v1 -/* 801C38 802413B8 000227C3 */ sra $a0, $v0, 0x1f -/* 801C3C 802413BC 00004010 */ mfhi $t0 -/* 801C40 802413C0 01042023 */ subu $a0, $t0, $a0 -/* 801C44 802413C4 00041840 */ sll $v1, $a0, 1 -/* 801C48 802413C8 00641821 */ addu $v1, $v1, $a0 -/* 801C4C 802413CC 00431023 */ subu $v0, $v0, $v1 -/* 801C50 802413D0 24430002 */ addiu $v1, $v0, 2 -/* 801C54 802413D4 AE430074 */ sw $v1, 0x74($s2) -/* 801C58 802413D8 8E62002C */ lw $v0, 0x2c($s3) -/* 801C5C 802413DC 18400009 */ blez $v0, .L80241404 -/* 801C60 802413E0 24020004 */ addiu $v0, $zero, 4 -/* 801C64 802413E4 8E620004 */ lw $v0, 4($s3) -/* 801C68 802413E8 18400006 */ blez $v0, .L80241404 -/* 801C6C 802413EC 24020004 */ addiu $v0, $zero, 4 -/* 801C70 802413F0 8E620008 */ lw $v0, 8($s3) -/* 801C74 802413F4 18400003 */ blez $v0, .L80241404 -/* 801C78 802413F8 24020004 */ addiu $v0, $zero, 4 -/* 801C7C 802413FC 14600002 */ bnez $v1, .L80241408 -/* 801C80 80241400 00000000 */ nop -.L80241404: -/* 801C84 80241404 AE420070 */ sw $v0, 0x70($s2) -.L80241408: -/* 801C88 80241408 0C00A67F */ jal rand_int -/* 801C8C 8024140C 24042710 */ addiu $a0, $zero, 0x2710 -/* 801C90 80241410 3C0351EB */ lui $v1, 0x51eb -/* 801C94 80241414 3463851F */ ori $v1, $v1, 0x851f -/* 801C98 80241418 00430018 */ mult $v0, $v1 -/* 801C9C 8024141C 00021FC3 */ sra $v1, $v0, 0x1f -/* 801CA0 80241420 00004010 */ mfhi $t0 -/* 801CA4 80241424 00082143 */ sra $a0, $t0, 5 -/* 801CA8 80241428 00832023 */ subu $a0, $a0, $v1 -/* 801CAC 8024142C 00041840 */ sll $v1, $a0, 1 -/* 801CB0 80241430 00641821 */ addu $v1, $v1, $a0 -/* 801CB4 80241434 000318C0 */ sll $v1, $v1, 3 -/* 801CB8 80241438 00641821 */ addu $v1, $v1, $a0 -/* 801CBC 8024143C 00031880 */ sll $v1, $v1, 2 -/* 801CC0 80241440 8E640004 */ lw $a0, 4($s3) -/* 801CC4 80241444 00431023 */ subu $v0, $v0, $v1 -/* 801CC8 80241448 0044102A */ slt $v0, $v0, $a0 -/* 801CCC 8024144C 10400002 */ beqz $v0, .L80241458 -/* 801CD0 80241450 24020004 */ addiu $v0, $zero, 4 -.L80241454: -/* 801CD4 80241454 AE420070 */ sw $v0, 0x70($s2) -.L80241458: -/* 801CD8 80241458 8FBF0044 */ lw $ra, 0x44($sp) -/* 801CDC 8024145C 8FB40040 */ lw $s4, 0x40($sp) -/* 801CE0 80241460 8FB3003C */ lw $s3, 0x3c($sp) -/* 801CE4 80241464 8FB20038 */ lw $s2, 0x38($sp) -/* 801CE8 80241468 8FB10034 */ lw $s1, 0x34($sp) -/* 801CEC 8024146C 8FB00030 */ lw $s0, 0x30($sp) -/* 801CF0 80241470 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 801CF4 80241474 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 801CF8 80241478 03E00008 */ jr $ra -/* 801CFC 8024147C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s deleted file mode 100644 index c5272e0a05..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241540_801DC0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241540_801DC0 -/* 801DC0 80241540 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 801DC4 80241544 AFB40040 */ sw $s4, 0x40($sp) -/* 801DC8 80241548 0080A02D */ daddu $s4, $a0, $zero -/* 801DCC 8024154C AFBF0044 */ sw $ra, 0x44($sp) -/* 801DD0 80241550 AFB3003C */ sw $s3, 0x3c($sp) -/* 801DD4 80241554 AFB20038 */ sw $s2, 0x38($sp) -/* 801DD8 80241558 AFB10034 */ sw $s1, 0x34($sp) -/* 801DDC 8024155C AFB00030 */ sw $s0, 0x30($sp) -/* 801DE0 80241560 8E910148 */ lw $s1, 0x148($s4) -/* 801DE4 80241564 00A0902D */ daddu $s2, $a1, $zero -/* 801DE8 80241568 86240008 */ lh $a0, 8($s1) -/* 801DEC 8024156C 0C00EABB */ jal get_npc_unsafe -/* 801DF0 80241570 00C0982D */ daddu $s3, $a2, $zero -/* 801DF4 80241574 8E430014 */ lw $v1, 0x14($s2) -/* 801DF8 80241578 04600031 */ bltz $v1, .L80241640 -/* 801DFC 8024157C 0040802D */ daddu $s0, $v0, $zero -/* 801E00 80241580 0260202D */ daddu $a0, $s3, $zero -/* 801E04 80241584 AFA00010 */ sw $zero, 0x10($sp) -/* 801E08 80241588 8E460024 */ lw $a2, 0x24($s2) -/* 801E0C 8024158C 8E470028 */ lw $a3, 0x28($s2) -/* 801E10 80241590 0C01242D */ jal func_800490B4 -/* 801E14 80241594 0220282D */ daddu $a1, $s1, $zero -/* 801E18 80241598 10400029 */ beqz $v0, .L80241640 -/* 801E1C 8024159C 0000202D */ daddu $a0, $zero, $zero -/* 801E20 802415A0 0200282D */ daddu $a1, $s0, $zero -/* 801E24 802415A4 0000302D */ daddu $a2, $zero, $zero -/* 801E28 802415A8 860300A8 */ lh $v1, 0xa8($s0) -/* 801E2C 802415AC 3C013F80 */ lui $at, 0x3f80 -/* 801E30 802415B0 44810000 */ mtc1 $at, $f0 -/* 801E34 802415B4 3C014000 */ lui $at, 0x4000 -/* 801E38 802415B8 44811000 */ mtc1 $at, $f2 -/* 801E3C 802415BC 3C01C1A0 */ lui $at, 0xc1a0 -/* 801E40 802415C0 44812000 */ mtc1 $at, $f4 -/* 801E44 802415C4 2402000F */ addiu $v0, $zero, 0xf -/* 801E48 802415C8 AFA2001C */ sw $v0, 0x1c($sp) -/* 801E4C 802415CC 44833000 */ mtc1 $v1, $f6 -/* 801E50 802415D0 00000000 */ nop -/* 801E54 802415D4 468031A0 */ cvt.s.w $f6, $f6 -/* 801E58 802415D8 44073000 */ mfc1 $a3, $f6 -/* 801E5C 802415DC 27A20028 */ addiu $v0, $sp, 0x28 -/* 801E60 802415E0 AFA20020 */ sw $v0, 0x20($sp) -/* 801E64 802415E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 801E68 802415E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 801E6C 802415EC 0C01BFA4 */ jal fx_emote -/* 801E70 802415F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 801E74 802415F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 801E78 802415F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 801E7C 802415FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 801E80 80241600 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 801E84 80241604 8C460028 */ lw $a2, 0x28($v0) -/* 801E88 80241608 0C00A720 */ jal atan2 -/* 801E8C 8024160C 8C470030 */ lw $a3, 0x30($v0) -/* 801E90 80241610 0200202D */ daddu $a0, $s0, $zero -/* 801E94 80241614 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 801E98 80241618 3C060020 */ lui $a2, 0x20 -/* 801E9C 8024161C 0C012530 */ jal func_800494C0 -/* 801EA0 80241620 E480000C */ swc1 $f0, 0xc($a0) -/* 801EA4 80241624 8E220018 */ lw $v0, 0x18($s1) -/* 801EA8 80241628 9442002A */ lhu $v0, 0x2a($v0) -/* 801EAC 8024162C 30420001 */ andi $v0, $v0, 1 -/* 801EB0 80241630 14400029 */ bnez $v0, .L802416D8 -/* 801EB4 80241634 2402000A */ addiu $v0, $zero, 0xa -/* 801EB8 80241638 080905B6 */ j .L802416D8 -/* 801EBC 8024163C 2402000C */ addiu $v0, $zero, 0xc -.L80241640: -/* 801EC0 80241640 8602008C */ lh $v0, 0x8c($s0) -/* 801EC4 80241644 14400025 */ bnez $v0, .L802416DC -/* 801EC8 80241648 00000000 */ nop -/* 801ECC 8024164C 9602008E */ lhu $v0, 0x8e($s0) -/* 801ED0 80241650 2442FFFF */ addiu $v0, $v0, -1 -/* 801ED4 80241654 A602008E */ sh $v0, 0x8e($s0) -/* 801ED8 80241658 00021400 */ sll $v0, $v0, 0x10 -/* 801EDC 8024165C 1440001F */ bnez $v0, .L802416DC -/* 801EE0 80241660 00000000 */ nop -/* 801EE4 80241664 8E820074 */ lw $v0, 0x74($s4) -/* 801EE8 80241668 2442FFFF */ addiu $v0, $v0, -1 -/* 801EEC 8024166C 10400019 */ beqz $v0, .L802416D4 -/* 801EF0 80241670 AE820074 */ sw $v0, 0x74($s4) -/* 801EF4 80241674 8E220018 */ lw $v0, 0x18($s1) -/* 801EF8 80241678 9442002A */ lhu $v0, 0x2a($v0) -/* 801EFC 8024167C 30420010 */ andi $v0, $v0, 0x10 -/* 801F00 80241680 14400007 */ bnez $v0, .L802416A0 -/* 801F04 80241684 00000000 */ nop -/* 801F08 80241688 C600000C */ lwc1 $f0, 0xc($s0) -/* 801F0C 8024168C 3C014334 */ lui $at, 0x4334 -/* 801F10 80241690 44816000 */ mtc1 $at, $f12 -/* 801F14 80241694 0C00A6C9 */ jal clamp_angle -/* 801F18 80241698 460C0300 */ add.s $f12, $f0, $f12 -/* 801F1C 8024169C E600000C */ swc1 $f0, 0xc($s0) -.L802416A0: -/* 801F20 802416A0 8E440008 */ lw $a0, 8($s2) -/* 801F24 802416A4 000417C2 */ srl $v0, $a0, 0x1f -/* 801F28 802416A8 00822021 */ addu $a0, $a0, $v0 -/* 801F2C 802416AC 00042043 */ sra $a0, $a0, 1 -/* 801F30 802416B0 0C00A67F */ jal rand_int -/* 801F34 802416B4 24840001 */ addiu $a0, $a0, 1 -/* 801F38 802416B8 8E430008 */ lw $v1, 8($s2) -/* 801F3C 802416BC 000327C2 */ srl $a0, $v1, 0x1f -/* 801F40 802416C0 00641821 */ addu $v1, $v1, $a0 -/* 801F44 802416C4 00031843 */ sra $v1, $v1, 1 -/* 801F48 802416C8 00621821 */ addu $v1, $v1, $v0 -/* 801F4C 802416CC 080905B7 */ j .L802416DC -/* 801F50 802416D0 A603008E */ sh $v1, 0x8e($s0) -.L802416D4: -/* 801F54 802416D4 24020004 */ addiu $v0, $zero, 4 -.L802416D8: -/* 801F58 802416D8 AE820070 */ sw $v0, 0x70($s4) -.L802416DC: -/* 801F5C 802416DC 8FBF0044 */ lw $ra, 0x44($sp) -/* 801F60 802416E0 8FB40040 */ lw $s4, 0x40($sp) -/* 801F64 802416E4 8FB3003C */ lw $s3, 0x3c($sp) -/* 801F68 802416E8 8FB20038 */ lw $s2, 0x38($sp) -/* 801F6C 802416EC 8FB10034 */ lw $s1, 0x34($sp) -/* 801F70 802416F0 8FB00030 */ lw $s0, 0x30($sp) -/* 801F74 802416F4 03E00008 */ jr $ra -/* 801F78 802416F8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s deleted file mode 100644 index 703ab504da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419CC_80224C -/* 80224C 802419CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 802250 802419D0 AFB3003C */ sw $s3, 0x3c($sp) -/* 802254 802419D4 0080982D */ daddu $s3, $a0, $zero -/* 802258 802419D8 AFBF0040 */ sw $ra, 0x40($sp) -/* 80225C 802419DC AFB20038 */ sw $s2, 0x38($sp) -/* 802260 802419E0 AFB10034 */ sw $s1, 0x34($sp) -/* 802264 802419E4 AFB00030 */ sw $s0, 0x30($sp) -/* 802268 802419E8 8E720148 */ lw $s2, 0x148($s3) -/* 80226C 802419EC 00A0882D */ daddu $s1, $a1, $zero -/* 802270 802419F0 86440008 */ lh $a0, 8($s2) -/* 802274 802419F4 0C00EABB */ jal get_npc_unsafe -/* 802278 802419F8 00C0802D */ daddu $s0, $a2, $zero -/* 80227C 802419FC 0200202D */ daddu $a0, $s0, $zero -/* 802280 80241A00 0240282D */ daddu $a1, $s2, $zero -/* 802284 80241A04 24030001 */ addiu $v1, $zero, 1 -/* 802288 80241A08 AFA30010 */ sw $v1, 0x10($sp) -/* 80228C 80241A0C 8E260024 */ lw $a2, 0x24($s1) -/* 802290 80241A10 8E270028 */ lw $a3, 0x28($s1) -/* 802294 80241A14 0C01242D */ jal func_800490B4 -/* 802298 80241A18 0040802D */ daddu $s0, $v0, $zero -/* 80229C 80241A1C 1440001E */ bnez $v0, .L80241A98 -/* 8022A0 80241A20 0200202D */ daddu $a0, $s0, $zero -/* 8022A4 80241A24 24040002 */ addiu $a0, $zero, 2 -/* 8022A8 80241A28 0200282D */ daddu $a1, $s0, $zero -/* 8022AC 80241A2C 0000302D */ daddu $a2, $zero, $zero -/* 8022B0 80241A30 860300A8 */ lh $v1, 0xa8($s0) -/* 8022B4 80241A34 3C013F80 */ lui $at, 0x3f80 -/* 8022B8 80241A38 44810000 */ mtc1 $at, $f0 -/* 8022BC 80241A3C 3C014000 */ lui $at, 0x4000 -/* 8022C0 80241A40 44811000 */ mtc1 $at, $f2 -/* 8022C4 80241A44 3C01C1A0 */ lui $at, 0xc1a0 -/* 8022C8 80241A48 44812000 */ mtc1 $at, $f4 -/* 8022CC 80241A4C 2402000F */ addiu $v0, $zero, 0xf -/* 8022D0 80241A50 AFA2001C */ sw $v0, 0x1c($sp) -/* 8022D4 80241A54 44833000 */ mtc1 $v1, $f6 -/* 8022D8 80241A58 00000000 */ nop -/* 8022DC 80241A5C 468031A0 */ cvt.s.w $f6, $f6 -/* 8022E0 80241A60 44073000 */ mfc1 $a3, $f6 -/* 8022E4 80241A64 27A20028 */ addiu $v0, $sp, 0x28 -/* 8022E8 80241A68 AFA20020 */ sw $v0, 0x20($sp) -/* 8022EC 80241A6C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8022F0 80241A70 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8022F4 80241A74 0C01BFA4 */ jal fx_emote -/* 8022F8 80241A78 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8022FC 80241A7C 8E4200CC */ lw $v0, 0xcc($s2) -/* 802300 80241A80 8C430000 */ lw $v1, ($v0) -/* 802304 80241A84 24020019 */ addiu $v0, $zero, 0x19 -/* 802308 80241A88 A602008E */ sh $v0, 0x8e($s0) -/* 80230C 80241A8C 2402000E */ addiu $v0, $zero, 0xe -/* 802310 80241A90 080906B3 */ j .L80241ACC -/* 802314 80241A94 AE030028 */ sw $v1, 0x28($s0) -.L80241A98: -/* 802318 80241A98 0C00F598 */ jal func_8003D660 -/* 80231C 80241A9C 24050001 */ addiu $a1, $zero, 1 -/* 802320 80241AA0 8E050018 */ lw $a1, 0x18($s0) -/* 802324 80241AA4 8E06000C */ lw $a2, 0xc($s0) -/* 802328 80241AA8 0C00EA95 */ jal npc_move_heading -/* 80232C 80241AAC 0200202D */ daddu $a0, $s0, $zero -/* 802330 80241AB0 8602008E */ lh $v0, 0x8e($s0) -/* 802334 80241AB4 9603008E */ lhu $v1, 0x8e($s0) -/* 802338 80241AB8 18400003 */ blez $v0, .L80241AC8 -/* 80233C 80241ABC 2462FFFF */ addiu $v0, $v1, -1 -/* 802340 80241AC0 080906B4 */ j .L80241AD0 -/* 802344 80241AC4 A602008E */ sh $v0, 0x8e($s0) -.L80241AC8: -/* 802348 80241AC8 2402000C */ addiu $v0, $zero, 0xc -.L80241ACC: -/* 80234C 80241ACC AE620070 */ sw $v0, 0x70($s3) -.L80241AD0: -/* 802350 80241AD0 8FBF0040 */ lw $ra, 0x40($sp) -/* 802354 80241AD4 8FB3003C */ lw $s3, 0x3c($sp) -/* 802358 80241AD8 8FB20038 */ lw $s2, 0x38($sp) -/* 80235C 80241ADC 8FB10034 */ lw $s1, 0x34($sp) -/* 802360 80241AE0 8FB00030 */ lw $s0, 0x30($sp) -/* 802364 80241AE4 03E00008 */ jr $ra -/* 802368 80241AE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s deleted file mode 100644 index bea435239b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B54_8023D4 -/* 8023D4 80241B54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8023D8 80241B58 AFB10014 */ sw $s1, 0x14($sp) -/* 8023DC 80241B5C 0080882D */ daddu $s1, $a0, $zero -/* 8023E0 80241B60 AFBF001C */ sw $ra, 0x1c($sp) -/* 8023E4 80241B64 AFB20018 */ sw $s2, 0x18($sp) -/* 8023E8 80241B68 AFB00010 */ sw $s0, 0x10($sp) -/* 8023EC 80241B6C 8E300148 */ lw $s0, 0x148($s1) -/* 8023F0 80241B70 86040008 */ lh $a0, 8($s0) -/* 8023F4 80241B74 0C00EABB */ jal get_npc_unsafe -/* 8023F8 80241B78 00A0902D */ daddu $s2, $a1, $zero -/* 8023FC 80241B7C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 802400 80241B80 8E240078 */ lw $a0, 0x78($s1) -/* 802404 80241B84 8C630000 */ lw $v1, ($v1) -/* 802408 80241B88 0083182A */ slt $v1, $a0, $v1 -/* 80240C 80241B8C 10600013 */ beqz $v1, .L80241BDC -/* 802410 80241B90 0040302D */ daddu $a2, $v0, $zero -/* 802414 80241B94 00041040 */ sll $v0, $a0, 1 -/* 802418 80241B98 00441021 */ addu $v0, $v0, $a0 -/* 80241C 80241B9C 00022880 */ sll $a1, $v0, 2 -.L80241BA0: -/* 802420 80241BA0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 802424 80241BA4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 802428 80241BA8 00A31021 */ addu $v0, $a1, $v1 -/* 80242C 80241BAC C4400008 */ lwc1 $f0, 8($v0) -/* 802430 80241BB0 46800020 */ cvt.s.w $f0, $f0 -/* 802434 80241BB4 4602003E */ c.le.s $f0, $f2 -/* 802438 80241BB8 00000000 */ nop -/* 80243C 80241BBC 45020003 */ bc1fl .L80241BCC -/* 802440 80241BC0 24840001 */ addiu $a0, $a0, 1 -/* 802444 80241BC4 080906F7 */ j .L80241BDC -/* 802448 80241BC8 AE240078 */ sw $a0, 0x78($s1) -.L80241BCC: -/* 80244C 80241BCC 8C620000 */ lw $v0, ($v1) -/* 802450 80241BD0 0082102A */ slt $v0, $a0, $v0 -/* 802454 80241BD4 1440FFF2 */ bnez $v0, .L80241BA0 -/* 802458 80241BD8 24A5000C */ addiu $a1, $a1, 0xc -.L80241BDC: -/* 80245C 80241BDC C6400000 */ lwc1 $f0, ($s2) -/* 802460 80241BE0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 802464 80241BE4 8E0200CC */ lw $v0, 0xcc($s0) -/* 802468 80241BE8 8C420004 */ lw $v0, 4($v0) -/* 80246C 80241BEC ACC20028 */ sw $v0, 0x28($a2) -/* 802470 80241BF0 24020001 */ addiu $v0, $zero, 1 -/* 802474 80241BF4 AE200074 */ sw $zero, 0x74($s1) -/* 802478 80241BF8 AE220070 */ sw $v0, 0x70($s1) -/* 80247C 80241BFC 8FBF001C */ lw $ra, 0x1c($sp) -/* 802480 80241C00 8FB20018 */ lw $s2, 0x18($sp) -/* 802484 80241C04 8FB10014 */ lw $s1, 0x14($sp) -/* 802488 80241C08 8FB00010 */ lw $s0, 0x10($sp) -/* 80248C 80241C0C 03E00008 */ jr $ra -/* 802490 80241C10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index ba77eee5b9..7712b39a9a 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -137,7 +137,7 @@ glabel L80241DF8_802678 glabel L80241E08_802688 /* 802688 80241E08 0280202D */ daddu $a0, $s4, $zero /* 80268C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 802690 80241E10 0C090476 */ jal func_802411D8_801A58 +/* 802690 80241E10 0C090476 */ jal mac_01_UnkFunc13 /* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 802698 80241E18 080907BA */ j L80241EE8_802768 /* 80269C 80241E1C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241E20_8026A0 glabel L80241E30_8026B0 /* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero -/* 8026B8 80241E38 0C090550 */ jal func_80241540_801DC0 +/* 8026B8 80241E38 0C090550 */ jal mac_01_UnkFunc14 /* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero /* 8026C0 80241E40 080907BA */ j L80241EE8_802768 /* 8026C4 80241E44 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241E88_802708 glabel L80241E98_802718 /* 802718 80241E98 0280202D */ daddu $a0, $s4, $zero /* 80271C 80241E9C 0260282D */ daddu $a1, $s3, $zero -/* 802720 80241EA0 0C090673 */ jal func_802419CC_80224C +/* 802720 80241EA0 0C090673 */ jal mac_01_UnkFunc15 /* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero /* 802728 80241EA8 080907BA */ j L80241EE8_802768 /* 80272C 80241EAC 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241EB0_802730 glabel L80241EC8_802748 /* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero /* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero -/* 802750 80241ED0 0C0906D5 */ jal func_80241B54_8023D4 +/* 802750 80241ED0 0C0906D5 */ jal mac_01_UnkFunc16 /* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero /* 802758 80241ED8 080907BA */ j L80241EE8_802768 /* 80275C 80241EDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s deleted file mode 100644 index da65a398a6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802456A8_805F28 -/* 805F28 802456A8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 805F2C 802456AC AFB20038 */ sw $s2, 0x38($sp) -/* 805F30 802456B0 0080902D */ daddu $s2, $a0, $zero -/* 805F34 802456B4 AFBF0044 */ sw $ra, 0x44($sp) -/* 805F38 802456B8 AFB40040 */ sw $s4, 0x40($sp) -/* 805F3C 802456BC AFB3003C */ sw $s3, 0x3c($sp) -/* 805F40 802456C0 AFB10034 */ sw $s1, 0x34($sp) -/* 805F44 802456C4 AFB00030 */ sw $s0, 0x30($sp) -/* 805F48 802456C8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 805F4C 802456CC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 805F50 802456D0 8E510148 */ lw $s1, 0x148($s2) -/* 805F54 802456D4 00A0982D */ daddu $s3, $a1, $zero -/* 805F58 802456D8 86240008 */ lh $a0, 8($s1) -/* 805F5C 802456DC 0C00EABB */ jal get_npc_unsafe -/* 805F60 802456E0 00C0A02D */ daddu $s4, $a2, $zero -/* 805F64 802456E4 8E630014 */ lw $v1, 0x14($s3) -/* 805F68 802456E8 04600030 */ bltz $v1, .L802457AC -/* 805F6C 802456EC 0040802D */ daddu $s0, $v0, $zero -/* 805F70 802456F0 8E420074 */ lw $v0, 0x74($s2) -/* 805F74 802456F4 1C40002C */ bgtz $v0, .L802457A8 -/* 805F78 802456F8 2442FFFF */ addiu $v0, $v0, -1 -/* 805F7C 802456FC 0280202D */ daddu $a0, $s4, $zero -/* 805F80 80245700 AE430074 */ sw $v1, 0x74($s2) -/* 805F84 80245704 AFA00010 */ sw $zero, 0x10($sp) -/* 805F88 80245708 8E66000C */ lw $a2, 0xc($s3) -/* 805F8C 8024570C 8E670010 */ lw $a3, 0x10($s3) -/* 805F90 80245710 0C01242D */ jal func_800490B4 -/* 805F94 80245714 0220282D */ daddu $a1, $s1, $zero -/* 805F98 80245718 10400021 */ beqz $v0, .L802457A0 -/* 805F9C 8024571C 0000202D */ daddu $a0, $zero, $zero -/* 805FA0 80245720 0200282D */ daddu $a1, $s0, $zero -/* 805FA4 80245724 0000302D */ daddu $a2, $zero, $zero -/* 805FA8 80245728 860300A8 */ lh $v1, 0xa8($s0) -/* 805FAC 8024572C 3C013F80 */ lui $at, 0x3f80 -/* 805FB0 80245730 44810000 */ mtc1 $at, $f0 -/* 805FB4 80245734 3C014000 */ lui $at, 0x4000 -/* 805FB8 80245738 44811000 */ mtc1 $at, $f2 -/* 805FBC 8024573C 3C01C1A0 */ lui $at, 0xc1a0 -/* 805FC0 80245740 44812000 */ mtc1 $at, $f4 -/* 805FC4 80245744 2402000F */ addiu $v0, $zero, 0xf -/* 805FC8 80245748 AFA2001C */ sw $v0, 0x1c($sp) -/* 805FCC 8024574C 44833000 */ mtc1 $v1, $f6 -/* 805FD0 80245750 00000000 */ nop -/* 805FD4 80245754 468031A0 */ cvt.s.w $f6, $f6 -/* 805FD8 80245758 44073000 */ mfc1 $a3, $f6 -/* 805FDC 8024575C 27A20028 */ addiu $v0, $sp, 0x28 -/* 805FE0 80245760 AFA20020 */ sw $v0, 0x20($sp) -/* 805FE4 80245764 E7A00010 */ swc1 $f0, 0x10($sp) -/* 805FE8 80245768 E7A20014 */ swc1 $f2, 0x14($sp) -/* 805FEC 8024576C 0C01BFA4 */ jal fx_emote -/* 805FF0 80245770 E7A40018 */ swc1 $f4, 0x18($sp) -/* 805FF4 80245774 0200202D */ daddu $a0, $s0, $zero -/* 805FF8 80245778 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 805FFC 8024577C 0C012530 */ jal func_800494C0 -/* 806000 80245780 3C060020 */ lui $a2, 0x20 -/* 806004 80245784 8E220018 */ lw $v0, 0x18($s1) -/* 806008 80245788 9442002A */ lhu $v0, 0x2a($v0) -/* 80600C 8024578C 30420001 */ andi $v0, $v0, 1 -/* 806010 80245790 14400064 */ bnez $v0, .L80245924 -/* 806014 80245794 2402000A */ addiu $v0, $zero, 0xa -/* 806018 80245798 08091649 */ j .L80245924 -/* 80601C 8024579C 2402000C */ addiu $v0, $zero, 0xc -.L802457A0: -/* 806020 802457A0 8E420074 */ lw $v0, 0x74($s2) -/* 806024 802457A4 2442FFFF */ addiu $v0, $v0, -1 -.L802457A8: -/* 806028 802457A8 AE420074 */ sw $v0, 0x74($s2) -.L802457AC: -/* 80602C 802457AC 8602008C */ lh $v0, 0x8c($s0) -/* 806030 802457B0 1440005D */ bnez $v0, .L80245928 -/* 806034 802457B4 00000000 */ nop -/* 806038 802457B8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 80603C 802457BC 3C014010 */ lui $at, 0x4010 -/* 806040 802457C0 44811800 */ mtc1 $at, $f3 -/* 806044 802457C4 44801000 */ mtc1 $zero, $f2 -/* 806048 802457C8 46000021 */ cvt.d.s $f0, $f0 -/* 80604C 802457CC 4622003C */ c.lt.d $f0, $f2 -/* 806050 802457D0 00000000 */ nop -/* 806054 802457D4 45000003 */ bc1f .L802457E4 -/* 806058 802457D8 0200202D */ daddu $a0, $s0, $zero -/* 80605C 802457DC 080915FA */ j .L802457E8 -/* 806060 802457E0 0000282D */ daddu $a1, $zero, $zero -.L802457E4: -/* 806064 802457E4 24050001 */ addiu $a1, $zero, 1 -.L802457E8: -/* 806068 802457E8 0C00F598 */ jal func_8003D660 -/* 80606C 802457EC 00000000 */ nop -/* 806070 802457F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 806074 802457F4 8E430078 */ lw $v1, 0x78($s2) -/* 806078 802457F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 80607C 802457FC 00031040 */ sll $v0, $v1, 1 -/* 806080 80245800 00431021 */ addu $v0, $v0, $v1 -/* 806084 80245804 8E2300D0 */ lw $v1, 0xd0($s1) -/* 806088 80245808 00021080 */ sll $v0, $v0, 2 -/* 80608C 8024580C 00431021 */ addu $v0, $v0, $v1 -/* 806090 80245810 C4560004 */ lwc1 $f22, 4($v0) -/* 806094 80245814 4680B5A0 */ cvt.s.w $f22, $f22 -/* 806098 80245818 C454000C */ lwc1 $f20, 0xc($v0) -/* 80609C 8024581C 4680A520 */ cvt.s.w $f20, $f20 -/* 8060A0 80245820 4406B000 */ mfc1 $a2, $f22 -/* 8060A4 80245824 4407A000 */ mfc1 $a3, $f20 -/* 8060A8 80245828 0C00A720 */ jal atan2 -/* 8060AC 8024582C 00000000 */ nop -/* 8060B0 80245830 8E050018 */ lw $a1, 0x18($s0) -/* 8060B4 80245834 44060000 */ mfc1 $a2, $f0 -/* 8060B8 80245838 0200202D */ daddu $a0, $s0, $zero -/* 8060BC 8024583C 0C00EA95 */ jal npc_move_heading -/* 8060C0 80245840 AE06000C */ sw $a2, 0xc($s0) -/* 8060C4 80245844 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8060C8 80245848 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8060CC 8024584C 4406B000 */ mfc1 $a2, $f22 -/* 8060D0 80245850 4407A000 */ mfc1 $a3, $f20 -/* 8060D4 80245854 0C00A7B5 */ jal dist2D -/* 8060D8 80245858 00000000 */ nop -/* 8060DC 8024585C C6020018 */ lwc1 $f2, 0x18($s0) -/* 8060E0 80245860 4602003E */ c.le.s $f0, $f2 -/* 8060E4 80245864 00000000 */ nop -/* 8060E8 80245868 4500002F */ bc1f .L80245928 -/* 8060EC 8024586C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8060F0 80245870 24020002 */ addiu $v0, $zero, 2 -/* 8060F4 80245874 0C00A67F */ jal rand_int -/* 8060F8 80245878 AE420070 */ sw $v0, 0x70($s2) -/* 8060FC 8024587C 3C035555 */ lui $v1, 0x5555 -/* 806100 80245880 34635556 */ ori $v1, $v1, 0x5556 -/* 806104 80245884 00430018 */ mult $v0, $v1 -/* 806108 80245888 000227C3 */ sra $a0, $v0, 0x1f -/* 80610C 8024588C 00004010 */ mfhi $t0 -/* 806110 80245890 01042023 */ subu $a0, $t0, $a0 -/* 806114 80245894 00041840 */ sll $v1, $a0, 1 -/* 806118 80245898 00641821 */ addu $v1, $v1, $a0 -/* 80611C 8024589C 00431023 */ subu $v0, $v0, $v1 -/* 806120 802458A0 24430002 */ addiu $v1, $v0, 2 -/* 806124 802458A4 AE430074 */ sw $v1, 0x74($s2) -/* 806128 802458A8 8E62002C */ lw $v0, 0x2c($s3) -/* 80612C 802458AC 18400009 */ blez $v0, .L802458D4 -/* 806130 802458B0 24020004 */ addiu $v0, $zero, 4 -/* 806134 802458B4 8E620004 */ lw $v0, 4($s3) -/* 806138 802458B8 18400006 */ blez $v0, .L802458D4 -/* 80613C 802458BC 24020004 */ addiu $v0, $zero, 4 -/* 806140 802458C0 8E620008 */ lw $v0, 8($s3) -/* 806144 802458C4 18400003 */ blez $v0, .L802458D4 -/* 806148 802458C8 24020004 */ addiu $v0, $zero, 4 -/* 80614C 802458CC 14600002 */ bnez $v1, .L802458D8 -/* 806150 802458D0 00000000 */ nop -.L802458D4: -/* 806154 802458D4 AE420070 */ sw $v0, 0x70($s2) -.L802458D8: -/* 806158 802458D8 0C00A67F */ jal rand_int -/* 80615C 802458DC 24042710 */ addiu $a0, $zero, 0x2710 -/* 806160 802458E0 3C0351EB */ lui $v1, 0x51eb -/* 806164 802458E4 3463851F */ ori $v1, $v1, 0x851f -/* 806168 802458E8 00430018 */ mult $v0, $v1 -/* 80616C 802458EC 00021FC3 */ sra $v1, $v0, 0x1f -/* 806170 802458F0 00004010 */ mfhi $t0 -/* 806174 802458F4 00082143 */ sra $a0, $t0, 5 -/* 806178 802458F8 00832023 */ subu $a0, $a0, $v1 -/* 80617C 802458FC 00041840 */ sll $v1, $a0, 1 -/* 806180 80245900 00641821 */ addu $v1, $v1, $a0 -/* 806184 80245904 000318C0 */ sll $v1, $v1, 3 -/* 806188 80245908 00641821 */ addu $v1, $v1, $a0 -/* 80618C 8024590C 00031880 */ sll $v1, $v1, 2 -/* 806190 80245910 8E640004 */ lw $a0, 4($s3) -/* 806194 80245914 00431023 */ subu $v0, $v0, $v1 -/* 806198 80245918 0044102A */ slt $v0, $v0, $a0 -/* 80619C 8024591C 10400002 */ beqz $v0, .L80245928 -/* 8061A0 80245920 24020004 */ addiu $v0, $zero, 4 -.L80245924: -/* 8061A4 80245924 AE420070 */ sw $v0, 0x70($s2) -.L80245928: -/* 8061A8 80245928 8FBF0044 */ lw $ra, 0x44($sp) -/* 8061AC 8024592C 8FB40040 */ lw $s4, 0x40($sp) -/* 8061B0 80245930 8FB3003C */ lw $s3, 0x3c($sp) -/* 8061B4 80245934 8FB20038 */ lw $s2, 0x38($sp) -/* 8061B8 80245938 8FB10034 */ lw $s1, 0x34($sp) -/* 8061BC 8024593C 8FB00030 */ lw $s0, 0x30($sp) -/* 8061C0 80245940 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 8061C4 80245944 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 8061C8 80245948 03E00008 */ jr $ra -/* 8061CC 8024594C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s deleted file mode 100644 index 186b423e5c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245A10_806290 -/* 806290 80245A10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 806294 80245A14 AFB40040 */ sw $s4, 0x40($sp) -/* 806298 80245A18 0080A02D */ daddu $s4, $a0, $zero -/* 80629C 80245A1C AFBF0044 */ sw $ra, 0x44($sp) -/* 8062A0 80245A20 AFB3003C */ sw $s3, 0x3c($sp) -/* 8062A4 80245A24 AFB20038 */ sw $s2, 0x38($sp) -/* 8062A8 80245A28 AFB10034 */ sw $s1, 0x34($sp) -/* 8062AC 80245A2C AFB00030 */ sw $s0, 0x30($sp) -/* 8062B0 80245A30 8E910148 */ lw $s1, 0x148($s4) -/* 8062B4 80245A34 00A0902D */ daddu $s2, $a1, $zero -/* 8062B8 80245A38 86240008 */ lh $a0, 8($s1) -/* 8062BC 80245A3C 0C00EABB */ jal get_npc_unsafe -/* 8062C0 80245A40 00C0982D */ daddu $s3, $a2, $zero -/* 8062C4 80245A44 8E430014 */ lw $v1, 0x14($s2) -/* 8062C8 80245A48 04600031 */ bltz $v1, .L80245B10 -/* 8062CC 80245A4C 0040802D */ daddu $s0, $v0, $zero -/* 8062D0 80245A50 0260202D */ daddu $a0, $s3, $zero -/* 8062D4 80245A54 AFA00010 */ sw $zero, 0x10($sp) -/* 8062D8 80245A58 8E460024 */ lw $a2, 0x24($s2) -/* 8062DC 80245A5C 8E470028 */ lw $a3, 0x28($s2) -/* 8062E0 80245A60 0C01242D */ jal func_800490B4 -/* 8062E4 80245A64 0220282D */ daddu $a1, $s1, $zero -/* 8062E8 80245A68 10400029 */ beqz $v0, .L80245B10 -/* 8062EC 80245A6C 0000202D */ daddu $a0, $zero, $zero -/* 8062F0 80245A70 0200282D */ daddu $a1, $s0, $zero -/* 8062F4 80245A74 0000302D */ daddu $a2, $zero, $zero -/* 8062F8 80245A78 860300A8 */ lh $v1, 0xa8($s0) -/* 8062FC 80245A7C 3C013F80 */ lui $at, 0x3f80 -/* 806300 80245A80 44810000 */ mtc1 $at, $f0 -/* 806304 80245A84 3C014000 */ lui $at, 0x4000 -/* 806308 80245A88 44811000 */ mtc1 $at, $f2 -/* 80630C 80245A8C 3C01C1A0 */ lui $at, 0xc1a0 -/* 806310 80245A90 44812000 */ mtc1 $at, $f4 -/* 806314 80245A94 2402000F */ addiu $v0, $zero, 0xf -/* 806318 80245A98 AFA2001C */ sw $v0, 0x1c($sp) -/* 80631C 80245A9C 44833000 */ mtc1 $v1, $f6 -/* 806320 80245AA0 00000000 */ nop -/* 806324 80245AA4 468031A0 */ cvt.s.w $f6, $f6 -/* 806328 80245AA8 44073000 */ mfc1 $a3, $f6 -/* 80632C 80245AAC 27A20028 */ addiu $v0, $sp, 0x28 -/* 806330 80245AB0 AFA20020 */ sw $v0, 0x20($sp) -/* 806334 80245AB4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 806338 80245AB8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 80633C 80245ABC 0C01BFA4 */ jal fx_emote -/* 806340 80245AC0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 806344 80245AC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 806348 80245AC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 80634C 80245ACC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 806350 80245AD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 806354 80245AD4 8C460028 */ lw $a2, 0x28($v0) -/* 806358 80245AD8 0C00A720 */ jal atan2 -/* 80635C 80245ADC 8C470030 */ lw $a3, 0x30($v0) -/* 806360 80245AE0 0200202D */ daddu $a0, $s0, $zero -/* 806364 80245AE4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 806368 80245AE8 3C060020 */ lui $a2, 0x20 -/* 80636C 80245AEC 0C012530 */ jal func_800494C0 -/* 806370 80245AF0 E480000C */ swc1 $f0, 0xc($a0) -/* 806374 80245AF4 8E220018 */ lw $v0, 0x18($s1) -/* 806378 80245AF8 9442002A */ lhu $v0, 0x2a($v0) -/* 80637C 80245AFC 30420001 */ andi $v0, $v0, 1 -/* 806380 80245B00 14400029 */ bnez $v0, .L80245BA8 -/* 806384 80245B04 2402000A */ addiu $v0, $zero, 0xa -/* 806388 80245B08 080916EA */ j .L80245BA8 -/* 80638C 80245B0C 2402000C */ addiu $v0, $zero, 0xc -.L80245B10: -/* 806390 80245B10 8602008C */ lh $v0, 0x8c($s0) -/* 806394 80245B14 14400025 */ bnez $v0, .L80245BAC -/* 806398 80245B18 00000000 */ nop -/* 80639C 80245B1C 9602008E */ lhu $v0, 0x8e($s0) -/* 8063A0 80245B20 2442FFFF */ addiu $v0, $v0, -1 -/* 8063A4 80245B24 A602008E */ sh $v0, 0x8e($s0) -/* 8063A8 80245B28 00021400 */ sll $v0, $v0, 0x10 -/* 8063AC 80245B2C 1440001F */ bnez $v0, .L80245BAC -/* 8063B0 80245B30 00000000 */ nop -/* 8063B4 80245B34 8E820074 */ lw $v0, 0x74($s4) -/* 8063B8 80245B38 2442FFFF */ addiu $v0, $v0, -1 -/* 8063BC 80245B3C 10400019 */ beqz $v0, .L80245BA4 -/* 8063C0 80245B40 AE820074 */ sw $v0, 0x74($s4) -/* 8063C4 80245B44 8E220018 */ lw $v0, 0x18($s1) -/* 8063C8 80245B48 9442002A */ lhu $v0, 0x2a($v0) -/* 8063CC 80245B4C 30420010 */ andi $v0, $v0, 0x10 -/* 8063D0 80245B50 14400007 */ bnez $v0, .L80245B70 -/* 8063D4 80245B54 00000000 */ nop -/* 8063D8 80245B58 C600000C */ lwc1 $f0, 0xc($s0) -/* 8063DC 80245B5C 3C014334 */ lui $at, 0x4334 -/* 8063E0 80245B60 44816000 */ mtc1 $at, $f12 -/* 8063E4 80245B64 0C00A6C9 */ jal clamp_angle -/* 8063E8 80245B68 460C0300 */ add.s $f12, $f0, $f12 -/* 8063EC 80245B6C E600000C */ swc1 $f0, 0xc($s0) -.L80245B70: -/* 8063F0 80245B70 8E440008 */ lw $a0, 8($s2) -/* 8063F4 80245B74 000417C2 */ srl $v0, $a0, 0x1f -/* 8063F8 80245B78 00822021 */ addu $a0, $a0, $v0 -/* 8063FC 80245B7C 00042043 */ sra $a0, $a0, 1 -/* 806400 80245B80 0C00A67F */ jal rand_int -/* 806404 80245B84 24840001 */ addiu $a0, $a0, 1 -/* 806408 80245B88 8E430008 */ lw $v1, 8($s2) -/* 80640C 80245B8C 000327C2 */ srl $a0, $v1, 0x1f -/* 806410 80245B90 00641821 */ addu $v1, $v1, $a0 -/* 806414 80245B94 00031843 */ sra $v1, $v1, 1 -/* 806418 80245B98 00621821 */ addu $v1, $v1, $v0 -/* 80641C 80245B9C 080916EB */ j .L80245BAC -/* 806420 80245BA0 A603008E */ sh $v1, 0x8e($s0) -.L80245BA4: -/* 806424 80245BA4 24020004 */ addiu $v0, $zero, 4 -.L80245BA8: -/* 806428 80245BA8 AE820070 */ sw $v0, 0x70($s4) -.L80245BAC: -/* 80642C 80245BAC 8FBF0044 */ lw $ra, 0x44($sp) -/* 806430 80245BB0 8FB40040 */ lw $s4, 0x40($sp) -/* 806434 80245BB4 8FB3003C */ lw $s3, 0x3c($sp) -/* 806438 80245BB8 8FB20038 */ lw $s2, 0x38($sp) -/* 80643C 80245BBC 8FB10034 */ lw $s1, 0x34($sp) -/* 806440 80245BC0 8FB00030 */ lw $s0, 0x30($sp) -/* 806444 80245BC4 03E00008 */ jr $ra -/* 806448 80245BC8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s deleted file mode 100644 index 8939da1fa2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245E9C_80671C -/* 80671C 80245E9C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 806720 80245EA0 AFB3003C */ sw $s3, 0x3c($sp) -/* 806724 80245EA4 0080982D */ daddu $s3, $a0, $zero -/* 806728 80245EA8 AFBF0040 */ sw $ra, 0x40($sp) -/* 80672C 80245EAC AFB20038 */ sw $s2, 0x38($sp) -/* 806730 80245EB0 AFB10034 */ sw $s1, 0x34($sp) -/* 806734 80245EB4 AFB00030 */ sw $s0, 0x30($sp) -/* 806738 80245EB8 8E720148 */ lw $s2, 0x148($s3) -/* 80673C 80245EBC 00A0882D */ daddu $s1, $a1, $zero -/* 806740 80245EC0 86440008 */ lh $a0, 8($s2) -/* 806744 80245EC4 0C00EABB */ jal get_npc_unsafe -/* 806748 80245EC8 00C0802D */ daddu $s0, $a2, $zero -/* 80674C 80245ECC 0200202D */ daddu $a0, $s0, $zero -/* 806750 80245ED0 0240282D */ daddu $a1, $s2, $zero -/* 806754 80245ED4 24030001 */ addiu $v1, $zero, 1 -/* 806758 80245ED8 AFA30010 */ sw $v1, 0x10($sp) -/* 80675C 80245EDC 8E260024 */ lw $a2, 0x24($s1) -/* 806760 80245EE0 8E270028 */ lw $a3, 0x28($s1) -/* 806764 80245EE4 0C01242D */ jal func_800490B4 -/* 806768 80245EE8 0040802D */ daddu $s0, $v0, $zero -/* 80676C 80245EEC 1440001E */ bnez $v0, .L80245F68 -/* 806770 80245EF0 0200202D */ daddu $a0, $s0, $zero -/* 806774 80245EF4 24040002 */ addiu $a0, $zero, 2 -/* 806778 80245EF8 0200282D */ daddu $a1, $s0, $zero -/* 80677C 80245EFC 0000302D */ daddu $a2, $zero, $zero -/* 806780 80245F00 860300A8 */ lh $v1, 0xa8($s0) -/* 806784 80245F04 3C013F80 */ lui $at, 0x3f80 -/* 806788 80245F08 44810000 */ mtc1 $at, $f0 -/* 80678C 80245F0C 3C014000 */ lui $at, 0x4000 -/* 806790 80245F10 44811000 */ mtc1 $at, $f2 -/* 806794 80245F14 3C01C1A0 */ lui $at, 0xc1a0 -/* 806798 80245F18 44812000 */ mtc1 $at, $f4 -/* 80679C 80245F1C 2402000F */ addiu $v0, $zero, 0xf -/* 8067A0 80245F20 AFA2001C */ sw $v0, 0x1c($sp) -/* 8067A4 80245F24 44833000 */ mtc1 $v1, $f6 -/* 8067A8 80245F28 00000000 */ nop -/* 8067AC 80245F2C 468031A0 */ cvt.s.w $f6, $f6 -/* 8067B0 80245F30 44073000 */ mfc1 $a3, $f6 -/* 8067B4 80245F34 27A20028 */ addiu $v0, $sp, 0x28 -/* 8067B8 80245F38 AFA20020 */ sw $v0, 0x20($sp) -/* 8067BC 80245F3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8067C0 80245F40 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8067C4 80245F44 0C01BFA4 */ jal fx_emote -/* 8067C8 80245F48 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8067CC 80245F4C 8E4200CC */ lw $v0, 0xcc($s2) -/* 8067D0 80245F50 8C430000 */ lw $v1, ($v0) -/* 8067D4 80245F54 24020019 */ addiu $v0, $zero, 0x19 -/* 8067D8 80245F58 A602008E */ sh $v0, 0x8e($s0) -/* 8067DC 80245F5C 2402000E */ addiu $v0, $zero, 0xe -/* 8067E0 80245F60 080917E7 */ j .L80245F9C -/* 8067E4 80245F64 AE030028 */ sw $v1, 0x28($s0) -.L80245F68: -/* 8067E8 80245F68 0C00F598 */ jal func_8003D660 -/* 8067EC 80245F6C 24050001 */ addiu $a1, $zero, 1 -/* 8067F0 80245F70 8E050018 */ lw $a1, 0x18($s0) -/* 8067F4 80245F74 8E06000C */ lw $a2, 0xc($s0) -/* 8067F8 80245F78 0C00EA95 */ jal npc_move_heading -/* 8067FC 80245F7C 0200202D */ daddu $a0, $s0, $zero -/* 806800 80245F80 8602008E */ lh $v0, 0x8e($s0) -/* 806804 80245F84 9603008E */ lhu $v1, 0x8e($s0) -/* 806808 80245F88 18400003 */ blez $v0, .L80245F98 -/* 80680C 80245F8C 2462FFFF */ addiu $v0, $v1, -1 -/* 806810 80245F90 080917E8 */ j .L80245FA0 -/* 806814 80245F94 A602008E */ sh $v0, 0x8e($s0) -.L80245F98: -/* 806818 80245F98 2402000C */ addiu $v0, $zero, 0xc -.L80245F9C: -/* 80681C 80245F9C AE620070 */ sw $v0, 0x70($s3) -.L80245FA0: -/* 806820 80245FA0 8FBF0040 */ lw $ra, 0x40($sp) -/* 806824 80245FA4 8FB3003C */ lw $s3, 0x3c($sp) -/* 806828 80245FA8 8FB20038 */ lw $s2, 0x38($sp) -/* 80682C 80245FAC 8FB10034 */ lw $s1, 0x34($sp) -/* 806830 80245FB0 8FB00030 */ lw $s0, 0x30($sp) -/* 806834 80245FB4 03E00008 */ jr $ra -/* 806838 80245FB8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s deleted file mode 100644 index ff693c8838..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80246024_8068A4 -/* 8068A4 80246024 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8068A8 80246028 AFB10014 */ sw $s1, 0x14($sp) -/* 8068AC 8024602C 0080882D */ daddu $s1, $a0, $zero -/* 8068B0 80246030 AFBF001C */ sw $ra, 0x1c($sp) -/* 8068B4 80246034 AFB20018 */ sw $s2, 0x18($sp) -/* 8068B8 80246038 AFB00010 */ sw $s0, 0x10($sp) -/* 8068BC 8024603C 8E300148 */ lw $s0, 0x148($s1) -/* 8068C0 80246040 86040008 */ lh $a0, 8($s0) -/* 8068C4 80246044 0C00EABB */ jal get_npc_unsafe -/* 8068C8 80246048 00A0902D */ daddu $s2, $a1, $zero -/* 8068CC 8024604C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 8068D0 80246050 8E240078 */ lw $a0, 0x78($s1) -/* 8068D4 80246054 8C630000 */ lw $v1, ($v1) -/* 8068D8 80246058 0083182A */ slt $v1, $a0, $v1 -/* 8068DC 8024605C 10600013 */ beqz $v1, .L802460AC -/* 8068E0 80246060 0040302D */ daddu $a2, $v0, $zero -/* 8068E4 80246064 00041040 */ sll $v0, $a0, 1 -/* 8068E8 80246068 00441021 */ addu $v0, $v0, $a0 -/* 8068EC 8024606C 00022880 */ sll $a1, $v0, 2 -.L80246070: -/* 8068F0 80246070 8E0300D0 */ lw $v1, 0xd0($s0) -/* 8068F4 80246074 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 8068F8 80246078 00A31021 */ addu $v0, $a1, $v1 -/* 8068FC 8024607C C4400008 */ lwc1 $f0, 8($v0) -/* 806900 80246080 46800020 */ cvt.s.w $f0, $f0 -/* 806904 80246084 4602003E */ c.le.s $f0, $f2 -/* 806908 80246088 00000000 */ nop -/* 80690C 8024608C 45020003 */ bc1fl .L8024609C -/* 806910 80246090 24840001 */ addiu $a0, $a0, 1 -/* 806914 80246094 0809182B */ j .L802460AC -/* 806918 80246098 AE240078 */ sw $a0, 0x78($s1) -.L8024609C: -/* 80691C 8024609C 8C620000 */ lw $v0, ($v1) -/* 806920 802460A0 0082102A */ slt $v0, $a0, $v0 -/* 806924 802460A4 1440FFF2 */ bnez $v0, .L80246070 -/* 806928 802460A8 24A5000C */ addiu $a1, $a1, 0xc -.L802460AC: -/* 80692C 802460AC C6400000 */ lwc1 $f0, ($s2) -/* 806930 802460B0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 806934 802460B4 8E0200CC */ lw $v0, 0xcc($s0) -/* 806938 802460B8 8C420004 */ lw $v0, 4($v0) -/* 80693C 802460BC ACC20028 */ sw $v0, 0x28($a2) -/* 806940 802460C0 24020001 */ addiu $v0, $zero, 1 -/* 806944 802460C4 AE200074 */ sw $zero, 0x74($s1) -/* 806948 802460C8 AE220070 */ sw $v0, 0x70($s1) -/* 80694C 802460CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 806950 802460D0 8FB20018 */ lw $s2, 0x18($sp) -/* 806954 802460D4 8FB10014 */ lw $s1, 0x14($sp) -/* 806958 802460D8 8FB00010 */ lw $s0, 0x10($sp) -/* 80695C 802460DC 03E00008 */ jr $ra -/* 806960 802460E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index 3b2033ad8f..d739e685b4 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -137,7 +137,7 @@ glabel L802462C8_806B48 glabel L802462D8_806B58 /* 806B58 802462D8 0280202D */ daddu $a0, $s4, $zero /* 806B5C 802462DC 0260282D */ daddu $a1, $s3, $zero -/* 806B60 802462E0 0C0915AA */ jal func_802456A8_805F28 +/* 806B60 802462E0 0C0915AA */ jal mac_01_UnkFunc13_copy /* 806B64 802462E4 02A0302D */ daddu $a2, $s5, $zero /* 806B68 802462E8 080918EE */ j L802463B8_806C38 /* 806B6C 802462EC 00000000 */ nop @@ -149,7 +149,7 @@ glabel L802462F0_806B70 glabel L80246300_806B80 /* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero -/* 806B88 80246308 0C091684 */ jal func_80245A10_806290 +/* 806B88 80246308 0C091684 */ jal mac_01_UnkFunc14_copy /* 806B8C 8024630C 02A0302D */ daddu $a2, $s5, $zero /* 806B90 80246310 080918EE */ j L802463B8_806C38 /* 806B94 80246314 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80246358_806BD8 glabel L80246368_806BE8 /* 806BE8 80246368 0280202D */ daddu $a0, $s4, $zero /* 806BEC 8024636C 0260282D */ daddu $a1, $s3, $zero -/* 806BF0 80246370 0C0917A7 */ jal func_80245E9C_80671C +/* 806BF0 80246370 0C0917A7 */ jal mac_01_UnkFunc15_copy /* 806BF4 80246374 02A0302D */ daddu $a2, $s5, $zero /* 806BF8 80246378 080918EE */ j L802463B8_806C38 /* 806BFC 8024637C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80246380_806C00 glabel L80246398_806C18 /* 806C18 80246398 0280202D */ daddu $a0, $s4, $zero /* 806C1C 8024639C 0260282D */ daddu $a1, $s3, $zero -/* 806C20 802463A0 0C091809 */ jal func_80246024_8068A4 +/* 806C20 802463A0 0C091809 */ jal mac_01_UnkFunc16_copy /* 806C24 802463A4 02A0302D */ daddu $a2, $s5, $zero /* 806C28 802463A8 080918EE */ j L802463B8_806C38 /* 806C2C 802463AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s deleted file mode 100644 index c38b57b642..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A88_823D48 -/* 823D48 80240A88 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 823D4C 80240A8C AFB20038 */ sw $s2, 0x38($sp) -/* 823D50 80240A90 0080902D */ daddu $s2, $a0, $zero -/* 823D54 80240A94 AFBF0044 */ sw $ra, 0x44($sp) -/* 823D58 80240A98 AFB40040 */ sw $s4, 0x40($sp) -/* 823D5C 80240A9C AFB3003C */ sw $s3, 0x3c($sp) -/* 823D60 80240AA0 AFB10034 */ sw $s1, 0x34($sp) -/* 823D64 80240AA4 AFB00030 */ sw $s0, 0x30($sp) -/* 823D68 80240AA8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 823D6C 80240AAC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 823D70 80240AB0 8E510148 */ lw $s1, 0x148($s2) -/* 823D74 80240AB4 00A0982D */ daddu $s3, $a1, $zero -/* 823D78 80240AB8 86240008 */ lh $a0, 8($s1) -/* 823D7C 80240ABC 0C00EABB */ jal get_npc_unsafe -/* 823D80 80240AC0 00C0A02D */ daddu $s4, $a2, $zero -/* 823D84 80240AC4 8E630014 */ lw $v1, 0x14($s3) -/* 823D88 80240AC8 04600030 */ bltz $v1, .L80240B8C -/* 823D8C 80240ACC 0040802D */ daddu $s0, $v0, $zero -/* 823D90 80240AD0 8E420074 */ lw $v0, 0x74($s2) -/* 823D94 80240AD4 1C40002C */ bgtz $v0, .L80240B88 -/* 823D98 80240AD8 2442FFFF */ addiu $v0, $v0, -1 -/* 823D9C 80240ADC 0280202D */ daddu $a0, $s4, $zero -/* 823DA0 80240AE0 AE430074 */ sw $v1, 0x74($s2) -/* 823DA4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) -/* 823DA8 80240AE8 8E66000C */ lw $a2, 0xc($s3) -/* 823DAC 80240AEC 8E670010 */ lw $a3, 0x10($s3) -/* 823DB0 80240AF0 0C01242D */ jal func_800490B4 -/* 823DB4 80240AF4 0220282D */ daddu $a1, $s1, $zero -/* 823DB8 80240AF8 10400021 */ beqz $v0, .L80240B80 -/* 823DBC 80240AFC 0000202D */ daddu $a0, $zero, $zero -/* 823DC0 80240B00 0200282D */ daddu $a1, $s0, $zero -/* 823DC4 80240B04 0000302D */ daddu $a2, $zero, $zero -/* 823DC8 80240B08 860300A8 */ lh $v1, 0xa8($s0) -/* 823DCC 80240B0C 3C013F80 */ lui $at, 0x3f80 -/* 823DD0 80240B10 44810000 */ mtc1 $at, $f0 -/* 823DD4 80240B14 3C014000 */ lui $at, 0x4000 -/* 823DD8 80240B18 44811000 */ mtc1 $at, $f2 -/* 823DDC 80240B1C 3C01C1A0 */ lui $at, 0xc1a0 -/* 823DE0 80240B20 44812000 */ mtc1 $at, $f4 -/* 823DE4 80240B24 2402000F */ addiu $v0, $zero, 0xf -/* 823DE8 80240B28 AFA2001C */ sw $v0, 0x1c($sp) -/* 823DEC 80240B2C 44833000 */ mtc1 $v1, $f6 -/* 823DF0 80240B30 00000000 */ nop -/* 823DF4 80240B34 468031A0 */ cvt.s.w $f6, $f6 -/* 823DF8 80240B38 44073000 */ mfc1 $a3, $f6 -/* 823DFC 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 -/* 823E00 80240B40 AFA20020 */ sw $v0, 0x20($sp) -/* 823E04 80240B44 E7A00010 */ swc1 $f0, 0x10($sp) -/* 823E08 80240B48 E7A20014 */ swc1 $f2, 0x14($sp) -/* 823E0C 80240B4C 0C01BFA4 */ jal fx_emote -/* 823E10 80240B50 E7A40018 */ swc1 $f4, 0x18($sp) -/* 823E14 80240B54 0200202D */ daddu $a0, $s0, $zero -/* 823E18 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 823E1C 80240B5C 0C012530 */ jal func_800494C0 -/* 823E20 80240B60 3C060020 */ lui $a2, 0x20 -/* 823E24 80240B64 8E220018 */ lw $v0, 0x18($s1) -/* 823E28 80240B68 9442002A */ lhu $v0, 0x2a($v0) -/* 823E2C 80240B6C 30420001 */ andi $v0, $v0, 1 -/* 823E30 80240B70 14400064 */ bnez $v0, .L80240D04 -/* 823E34 80240B74 2402000A */ addiu $v0, $zero, 0xa -/* 823E38 80240B78 08090341 */ j .L80240D04 -/* 823E3C 80240B7C 2402000C */ addiu $v0, $zero, 0xc -.L80240B80: -/* 823E40 80240B80 8E420074 */ lw $v0, 0x74($s2) -/* 823E44 80240B84 2442FFFF */ addiu $v0, $v0, -1 -.L80240B88: -/* 823E48 80240B88 AE420074 */ sw $v0, 0x74($s2) -.L80240B8C: -/* 823E4C 80240B8C 8602008C */ lh $v0, 0x8c($s0) -/* 823E50 80240B90 1440005D */ bnez $v0, .L80240D08 -/* 823E54 80240B94 00000000 */ nop -/* 823E58 80240B98 C6000018 */ lwc1 $f0, 0x18($s0) -/* 823E5C 80240B9C 3C014010 */ lui $at, 0x4010 -/* 823E60 80240BA0 44811800 */ mtc1 $at, $f3 -/* 823E64 80240BA4 44801000 */ mtc1 $zero, $f2 -/* 823E68 80240BA8 46000021 */ cvt.d.s $f0, $f0 -/* 823E6C 80240BAC 4622003C */ c.lt.d $f0, $f2 -/* 823E70 80240BB0 00000000 */ nop -/* 823E74 80240BB4 45000003 */ bc1f .L80240BC4 -/* 823E78 80240BB8 0200202D */ daddu $a0, $s0, $zero -/* 823E7C 80240BBC 080902F2 */ j .L80240BC8 -/* 823E80 80240BC0 0000282D */ daddu $a1, $zero, $zero -.L80240BC4: -/* 823E84 80240BC4 24050001 */ addiu $a1, $zero, 1 -.L80240BC8: -/* 823E88 80240BC8 0C00F598 */ jal func_8003D660 -/* 823E8C 80240BCC 00000000 */ nop -/* 823E90 80240BD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 823E94 80240BD4 8E430078 */ lw $v1, 0x78($s2) -/* 823E98 80240BD8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 823E9C 80240BDC 00031040 */ sll $v0, $v1, 1 -/* 823EA0 80240BE0 00431021 */ addu $v0, $v0, $v1 -/* 823EA4 80240BE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 823EA8 80240BE8 00021080 */ sll $v0, $v0, 2 -/* 823EAC 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* 823EB0 80240BF0 C4560004 */ lwc1 $f22, 4($v0) -/* 823EB4 80240BF4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 823EB8 80240BF8 C454000C */ lwc1 $f20, 0xc($v0) -/* 823EBC 80240BFC 4680A520 */ cvt.s.w $f20, $f20 -/* 823EC0 80240C00 4406B000 */ mfc1 $a2, $f22 -/* 823EC4 80240C04 4407A000 */ mfc1 $a3, $f20 -/* 823EC8 80240C08 0C00A720 */ jal atan2 -/* 823ECC 80240C0C 00000000 */ nop -/* 823ED0 80240C10 8E050018 */ lw $a1, 0x18($s0) -/* 823ED4 80240C14 44060000 */ mfc1 $a2, $f0 -/* 823ED8 80240C18 0200202D */ daddu $a0, $s0, $zero -/* 823EDC 80240C1C 0C00EA95 */ jal npc_move_heading -/* 823EE0 80240C20 AE06000C */ sw $a2, 0xc($s0) -/* 823EE4 80240C24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 823EE8 80240C28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 823EEC 80240C2C 4406B000 */ mfc1 $a2, $f22 -/* 823EF0 80240C30 4407A000 */ mfc1 $a3, $f20 -/* 823EF4 80240C34 0C00A7B5 */ jal dist2D -/* 823EF8 80240C38 00000000 */ nop -/* 823EFC 80240C3C C6020018 */ lwc1 $f2, 0x18($s0) -/* 823F00 80240C40 4602003E */ c.le.s $f0, $f2 -/* 823F04 80240C44 00000000 */ nop -/* 823F08 80240C48 4500002F */ bc1f .L80240D08 -/* 823F0C 80240C4C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 823F10 80240C50 24020002 */ addiu $v0, $zero, 2 -/* 823F14 80240C54 0C00A67F */ jal rand_int -/* 823F18 80240C58 AE420070 */ sw $v0, 0x70($s2) -/* 823F1C 80240C5C 3C035555 */ lui $v1, 0x5555 -/* 823F20 80240C60 34635556 */ ori $v1, $v1, 0x5556 -/* 823F24 80240C64 00430018 */ mult $v0, $v1 -/* 823F28 80240C68 000227C3 */ sra $a0, $v0, 0x1f -/* 823F2C 80240C6C 00004010 */ mfhi $t0 -/* 823F30 80240C70 01042023 */ subu $a0, $t0, $a0 -/* 823F34 80240C74 00041840 */ sll $v1, $a0, 1 -/* 823F38 80240C78 00641821 */ addu $v1, $v1, $a0 -/* 823F3C 80240C7C 00431023 */ subu $v0, $v0, $v1 -/* 823F40 80240C80 24430002 */ addiu $v1, $v0, 2 -/* 823F44 80240C84 AE430074 */ sw $v1, 0x74($s2) -/* 823F48 80240C88 8E62002C */ lw $v0, 0x2c($s3) -/* 823F4C 80240C8C 18400009 */ blez $v0, .L80240CB4 -/* 823F50 80240C90 24020004 */ addiu $v0, $zero, 4 -/* 823F54 80240C94 8E620004 */ lw $v0, 4($s3) -/* 823F58 80240C98 18400006 */ blez $v0, .L80240CB4 -/* 823F5C 80240C9C 24020004 */ addiu $v0, $zero, 4 -/* 823F60 80240CA0 8E620008 */ lw $v0, 8($s3) -/* 823F64 80240CA4 18400003 */ blez $v0, .L80240CB4 -/* 823F68 80240CA8 24020004 */ addiu $v0, $zero, 4 -/* 823F6C 80240CAC 14600002 */ bnez $v1, .L80240CB8 -/* 823F70 80240CB0 00000000 */ nop -.L80240CB4: -/* 823F74 80240CB4 AE420070 */ sw $v0, 0x70($s2) -.L80240CB8: -/* 823F78 80240CB8 0C00A67F */ jal rand_int -/* 823F7C 80240CBC 24042710 */ addiu $a0, $zero, 0x2710 -/* 823F80 80240CC0 3C0351EB */ lui $v1, 0x51eb -/* 823F84 80240CC4 3463851F */ ori $v1, $v1, 0x851f -/* 823F88 80240CC8 00430018 */ mult $v0, $v1 -/* 823F8C 80240CCC 00021FC3 */ sra $v1, $v0, 0x1f -/* 823F90 80240CD0 00004010 */ mfhi $t0 -/* 823F94 80240CD4 00082143 */ sra $a0, $t0, 5 -/* 823F98 80240CD8 00832023 */ subu $a0, $a0, $v1 -/* 823F9C 80240CDC 00041840 */ sll $v1, $a0, 1 -/* 823FA0 80240CE0 00641821 */ addu $v1, $v1, $a0 -/* 823FA4 80240CE4 000318C0 */ sll $v1, $v1, 3 -/* 823FA8 80240CE8 00641821 */ addu $v1, $v1, $a0 -/* 823FAC 80240CEC 00031880 */ sll $v1, $v1, 2 -/* 823FB0 80240CF0 8E640004 */ lw $a0, 4($s3) -/* 823FB4 80240CF4 00431023 */ subu $v0, $v0, $v1 -/* 823FB8 80240CF8 0044102A */ slt $v0, $v0, $a0 -/* 823FBC 80240CFC 10400002 */ beqz $v0, .L80240D08 -/* 823FC0 80240D00 24020004 */ addiu $v0, $zero, 4 -.L80240D04: -/* 823FC4 80240D04 AE420070 */ sw $v0, 0x70($s2) -.L80240D08: -/* 823FC8 80240D08 8FBF0044 */ lw $ra, 0x44($sp) -/* 823FCC 80240D0C 8FB40040 */ lw $s4, 0x40($sp) -/* 823FD0 80240D10 8FB3003C */ lw $s3, 0x3c($sp) -/* 823FD4 80240D14 8FB20038 */ lw $s2, 0x38($sp) -/* 823FD8 80240D18 8FB10034 */ lw $s1, 0x34($sp) -/* 823FDC 80240D1C 8FB00030 */ lw $s0, 0x30($sp) -/* 823FE0 80240D20 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 823FE4 80240D24 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 823FE8 80240D28 03E00008 */ jr $ra -/* 823FEC 80240D2C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s deleted file mode 100644 index 5675eb7dc4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF0_8240B0 -/* 8240B0 80240DF0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8240B4 80240DF4 AFB40040 */ sw $s4, 0x40($sp) -/* 8240B8 80240DF8 0080A02D */ daddu $s4, $a0, $zero -/* 8240BC 80240DFC AFBF0044 */ sw $ra, 0x44($sp) -/* 8240C0 80240E00 AFB3003C */ sw $s3, 0x3c($sp) -/* 8240C4 80240E04 AFB20038 */ sw $s2, 0x38($sp) -/* 8240C8 80240E08 AFB10034 */ sw $s1, 0x34($sp) -/* 8240CC 80240E0C AFB00030 */ sw $s0, 0x30($sp) -/* 8240D0 80240E10 8E910148 */ lw $s1, 0x148($s4) -/* 8240D4 80240E14 00A0902D */ daddu $s2, $a1, $zero -/* 8240D8 80240E18 86240008 */ lh $a0, 8($s1) -/* 8240DC 80240E1C 0C00EABB */ jal get_npc_unsafe -/* 8240E0 80240E20 00C0982D */ daddu $s3, $a2, $zero -/* 8240E4 80240E24 8E430014 */ lw $v1, 0x14($s2) -/* 8240E8 80240E28 04600031 */ bltz $v1, .L80240EF0 -/* 8240EC 80240E2C 0040802D */ daddu $s0, $v0, $zero -/* 8240F0 80240E30 0260202D */ daddu $a0, $s3, $zero -/* 8240F4 80240E34 AFA00010 */ sw $zero, 0x10($sp) -/* 8240F8 80240E38 8E460024 */ lw $a2, 0x24($s2) -/* 8240FC 80240E3C 8E470028 */ lw $a3, 0x28($s2) -/* 824100 80240E40 0C01242D */ jal func_800490B4 -/* 824104 80240E44 0220282D */ daddu $a1, $s1, $zero -/* 824108 80240E48 10400029 */ beqz $v0, .L80240EF0 -/* 82410C 80240E4C 0000202D */ daddu $a0, $zero, $zero -/* 824110 80240E50 0200282D */ daddu $a1, $s0, $zero -/* 824114 80240E54 0000302D */ daddu $a2, $zero, $zero -/* 824118 80240E58 860300A8 */ lh $v1, 0xa8($s0) -/* 82411C 80240E5C 3C013F80 */ lui $at, 0x3f80 -/* 824120 80240E60 44810000 */ mtc1 $at, $f0 -/* 824124 80240E64 3C014000 */ lui $at, 0x4000 -/* 824128 80240E68 44811000 */ mtc1 $at, $f2 -/* 82412C 80240E6C 3C01C1A0 */ lui $at, 0xc1a0 -/* 824130 80240E70 44812000 */ mtc1 $at, $f4 -/* 824134 80240E74 2402000F */ addiu $v0, $zero, 0xf -/* 824138 80240E78 AFA2001C */ sw $v0, 0x1c($sp) -/* 82413C 80240E7C 44833000 */ mtc1 $v1, $f6 -/* 824140 80240E80 00000000 */ nop -/* 824144 80240E84 468031A0 */ cvt.s.w $f6, $f6 -/* 824148 80240E88 44073000 */ mfc1 $a3, $f6 -/* 82414C 80240E8C 27A20028 */ addiu $v0, $sp, 0x28 -/* 824150 80240E90 AFA20020 */ sw $v0, 0x20($sp) -/* 824154 80240E94 E7A00010 */ swc1 $f0, 0x10($sp) -/* 824158 80240E98 E7A20014 */ swc1 $f2, 0x14($sp) -/* 82415C 80240E9C 0C01BFA4 */ jal fx_emote -/* 824160 80240EA0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 824164 80240EA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 824168 80240EA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 82416C 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 824170 80240EB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 824174 80240EB4 8C460028 */ lw $a2, 0x28($v0) -/* 824178 80240EB8 0C00A720 */ jal atan2 -/* 82417C 80240EBC 8C470030 */ lw $a3, 0x30($v0) -/* 824180 80240EC0 0200202D */ daddu $a0, $s0, $zero -/* 824184 80240EC4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 824188 80240EC8 3C060020 */ lui $a2, 0x20 -/* 82418C 80240ECC 0C012530 */ jal func_800494C0 -/* 824190 80240ED0 E480000C */ swc1 $f0, 0xc($a0) -/* 824194 80240ED4 8E220018 */ lw $v0, 0x18($s1) -/* 824198 80240ED8 9442002A */ lhu $v0, 0x2a($v0) -/* 82419C 80240EDC 30420001 */ andi $v0, $v0, 1 -/* 8241A0 80240EE0 14400029 */ bnez $v0, .L80240F88 -/* 8241A4 80240EE4 2402000A */ addiu $v0, $zero, 0xa -/* 8241A8 80240EE8 080903E2 */ j .L80240F88 -/* 8241AC 80240EEC 2402000C */ addiu $v0, $zero, 0xc -.L80240EF0: -/* 8241B0 80240EF0 8602008C */ lh $v0, 0x8c($s0) -/* 8241B4 80240EF4 14400025 */ bnez $v0, .L80240F8C -/* 8241B8 80240EF8 00000000 */ nop -/* 8241BC 80240EFC 9602008E */ lhu $v0, 0x8e($s0) -/* 8241C0 80240F00 2442FFFF */ addiu $v0, $v0, -1 -/* 8241C4 80240F04 A602008E */ sh $v0, 0x8e($s0) -/* 8241C8 80240F08 00021400 */ sll $v0, $v0, 0x10 -/* 8241CC 80240F0C 1440001F */ bnez $v0, .L80240F8C -/* 8241D0 80240F10 00000000 */ nop -/* 8241D4 80240F14 8E820074 */ lw $v0, 0x74($s4) -/* 8241D8 80240F18 2442FFFF */ addiu $v0, $v0, -1 -/* 8241DC 80240F1C 10400019 */ beqz $v0, .L80240F84 -/* 8241E0 80240F20 AE820074 */ sw $v0, 0x74($s4) -/* 8241E4 80240F24 8E220018 */ lw $v0, 0x18($s1) -/* 8241E8 80240F28 9442002A */ lhu $v0, 0x2a($v0) -/* 8241EC 80240F2C 30420010 */ andi $v0, $v0, 0x10 -/* 8241F0 80240F30 14400007 */ bnez $v0, .L80240F50 -/* 8241F4 80240F34 00000000 */ nop -/* 8241F8 80240F38 C600000C */ lwc1 $f0, 0xc($s0) -/* 8241FC 80240F3C 3C014334 */ lui $at, 0x4334 -/* 824200 80240F40 44816000 */ mtc1 $at, $f12 -/* 824204 80240F44 0C00A6C9 */ jal clamp_angle -/* 824208 80240F48 460C0300 */ add.s $f12, $f0, $f12 -/* 82420C 80240F4C E600000C */ swc1 $f0, 0xc($s0) -.L80240F50: -/* 824210 80240F50 8E440008 */ lw $a0, 8($s2) -/* 824214 80240F54 000417C2 */ srl $v0, $a0, 0x1f -/* 824218 80240F58 00822021 */ addu $a0, $a0, $v0 -/* 82421C 80240F5C 00042043 */ sra $a0, $a0, 1 -/* 824220 80240F60 0C00A67F */ jal rand_int -/* 824224 80240F64 24840001 */ addiu $a0, $a0, 1 -/* 824228 80240F68 8E430008 */ lw $v1, 8($s2) -/* 82422C 80240F6C 000327C2 */ srl $a0, $v1, 0x1f -/* 824230 80240F70 00641821 */ addu $v1, $v1, $a0 -/* 824234 80240F74 00031843 */ sra $v1, $v1, 1 -/* 824238 80240F78 00621821 */ addu $v1, $v1, $v0 -/* 82423C 80240F7C 080903E3 */ j .L80240F8C -/* 824240 80240F80 A603008E */ sh $v1, 0x8e($s0) -.L80240F84: -/* 824244 80240F84 24020004 */ addiu $v0, $zero, 4 -.L80240F88: -/* 824248 80240F88 AE820070 */ sw $v0, 0x70($s4) -.L80240F8C: -/* 82424C 80240F8C 8FBF0044 */ lw $ra, 0x44($sp) -/* 824250 80240F90 8FB40040 */ lw $s4, 0x40($sp) -/* 824254 80240F94 8FB3003C */ lw $s3, 0x3c($sp) -/* 824258 80240F98 8FB20038 */ lw $s2, 0x38($sp) -/* 82425C 80240F9C 8FB10034 */ lw $s1, 0x34($sp) -/* 824260 80240FA0 8FB00030 */ lw $s0, 0x30($sp) -/* 824264 80240FA4 03E00008 */ jr $ra -/* 824268 80240FA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s deleted file mode 100644 index 7c327cc557..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024127C_82453C -/* 82453C 8024127C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 824540 80241280 AFB3003C */ sw $s3, 0x3c($sp) -/* 824544 80241284 0080982D */ daddu $s3, $a0, $zero -/* 824548 80241288 AFBF0040 */ sw $ra, 0x40($sp) -/* 82454C 8024128C AFB20038 */ sw $s2, 0x38($sp) -/* 824550 80241290 AFB10034 */ sw $s1, 0x34($sp) -/* 824554 80241294 AFB00030 */ sw $s0, 0x30($sp) -/* 824558 80241298 8E720148 */ lw $s2, 0x148($s3) -/* 82455C 8024129C 00A0882D */ daddu $s1, $a1, $zero -/* 824560 802412A0 86440008 */ lh $a0, 8($s2) -/* 824564 802412A4 0C00EABB */ jal get_npc_unsafe -/* 824568 802412A8 00C0802D */ daddu $s0, $a2, $zero -/* 82456C 802412AC 0200202D */ daddu $a0, $s0, $zero -/* 824570 802412B0 0240282D */ daddu $a1, $s2, $zero -/* 824574 802412B4 24030001 */ addiu $v1, $zero, 1 -/* 824578 802412B8 AFA30010 */ sw $v1, 0x10($sp) -/* 82457C 802412BC 8E260024 */ lw $a2, 0x24($s1) -/* 824580 802412C0 8E270028 */ lw $a3, 0x28($s1) -/* 824584 802412C4 0C01242D */ jal func_800490B4 -/* 824588 802412C8 0040802D */ daddu $s0, $v0, $zero -/* 82458C 802412CC 1440001E */ bnez $v0, .L80241348 -/* 824590 802412D0 0200202D */ daddu $a0, $s0, $zero -/* 824594 802412D4 24040002 */ addiu $a0, $zero, 2 -/* 824598 802412D8 0200282D */ daddu $a1, $s0, $zero -/* 82459C 802412DC 0000302D */ daddu $a2, $zero, $zero -/* 8245A0 802412E0 860300A8 */ lh $v1, 0xa8($s0) -/* 8245A4 802412E4 3C013F80 */ lui $at, 0x3f80 -/* 8245A8 802412E8 44810000 */ mtc1 $at, $f0 -/* 8245AC 802412EC 3C014000 */ lui $at, 0x4000 -/* 8245B0 802412F0 44811000 */ mtc1 $at, $f2 -/* 8245B4 802412F4 3C01C1A0 */ lui $at, 0xc1a0 -/* 8245B8 802412F8 44812000 */ mtc1 $at, $f4 -/* 8245BC 802412FC 2402000F */ addiu $v0, $zero, 0xf -/* 8245C0 80241300 AFA2001C */ sw $v0, 0x1c($sp) -/* 8245C4 80241304 44833000 */ mtc1 $v1, $f6 -/* 8245C8 80241308 00000000 */ nop -/* 8245CC 8024130C 468031A0 */ cvt.s.w $f6, $f6 -/* 8245D0 80241310 44073000 */ mfc1 $a3, $f6 -/* 8245D4 80241314 27A20028 */ addiu $v0, $sp, 0x28 -/* 8245D8 80241318 AFA20020 */ sw $v0, 0x20($sp) -/* 8245DC 8024131C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8245E0 80241320 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8245E4 80241324 0C01BFA4 */ jal fx_emote -/* 8245E8 80241328 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8245EC 8024132C 8E4200CC */ lw $v0, 0xcc($s2) -/* 8245F0 80241330 8C430000 */ lw $v1, ($v0) -/* 8245F4 80241334 24020019 */ addiu $v0, $zero, 0x19 -/* 8245F8 80241338 A602008E */ sh $v0, 0x8e($s0) -/* 8245FC 8024133C 2402000E */ addiu $v0, $zero, 0xe -/* 824600 80241340 080904DF */ j .L8024137C -/* 824604 80241344 AE030028 */ sw $v1, 0x28($s0) -.L80241348: -/* 824608 80241348 0C00F598 */ jal func_8003D660 -/* 82460C 8024134C 24050001 */ addiu $a1, $zero, 1 -/* 824610 80241350 8E050018 */ lw $a1, 0x18($s0) -/* 824614 80241354 8E06000C */ lw $a2, 0xc($s0) -/* 824618 80241358 0C00EA95 */ jal npc_move_heading -/* 82461C 8024135C 0200202D */ daddu $a0, $s0, $zero -/* 824620 80241360 8602008E */ lh $v0, 0x8e($s0) -/* 824624 80241364 9603008E */ lhu $v1, 0x8e($s0) -/* 824628 80241368 18400003 */ blez $v0, .L80241378 -/* 82462C 8024136C 2462FFFF */ addiu $v0, $v1, -1 -/* 824630 80241370 080904E0 */ j .L80241380 -/* 824634 80241374 A602008E */ sh $v0, 0x8e($s0) -.L80241378: -/* 824638 80241378 2402000C */ addiu $v0, $zero, 0xc -.L8024137C: -/* 82463C 8024137C AE620070 */ sw $v0, 0x70($s3) -.L80241380: -/* 824640 80241380 8FBF0040 */ lw $ra, 0x40($sp) -/* 824644 80241384 8FB3003C */ lw $s3, 0x3c($sp) -/* 824648 80241388 8FB20038 */ lw $s2, 0x38($sp) -/* 82464C 8024138C 8FB10034 */ lw $s1, 0x34($sp) -/* 824650 80241390 8FB00030 */ lw $s0, 0x30($sp) -/* 824654 80241394 03E00008 */ jr $ra -/* 824658 80241398 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s deleted file mode 100644 index 8c2168be25..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241404_8246C4 -/* 8246C4 80241404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8246C8 80241408 AFB10014 */ sw $s1, 0x14($sp) -/* 8246CC 8024140C 0080882D */ daddu $s1, $a0, $zero -/* 8246D0 80241410 AFBF001C */ sw $ra, 0x1c($sp) -/* 8246D4 80241414 AFB20018 */ sw $s2, 0x18($sp) -/* 8246D8 80241418 AFB00010 */ sw $s0, 0x10($sp) -/* 8246DC 8024141C 8E300148 */ lw $s0, 0x148($s1) -/* 8246E0 80241420 86040008 */ lh $a0, 8($s0) -/* 8246E4 80241424 0C00EABB */ jal get_npc_unsafe -/* 8246E8 80241428 00A0902D */ daddu $s2, $a1, $zero -/* 8246EC 8024142C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 8246F0 80241430 8E240078 */ lw $a0, 0x78($s1) -/* 8246F4 80241434 8C630000 */ lw $v1, ($v1) -/* 8246F8 80241438 0083182A */ slt $v1, $a0, $v1 -/* 8246FC 8024143C 10600013 */ beqz $v1, .L8024148C -/* 824700 80241440 0040302D */ daddu $a2, $v0, $zero -/* 824704 80241444 00041040 */ sll $v0, $a0, 1 -/* 824708 80241448 00441021 */ addu $v0, $v0, $a0 -/* 82470C 8024144C 00022880 */ sll $a1, $v0, 2 -.L80241450: -/* 824710 80241450 8E0300D0 */ lw $v1, 0xd0($s0) -/* 824714 80241454 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 824718 80241458 00A31021 */ addu $v0, $a1, $v1 -/* 82471C 8024145C C4400008 */ lwc1 $f0, 8($v0) -/* 824720 80241460 46800020 */ cvt.s.w $f0, $f0 -/* 824724 80241464 4602003E */ c.le.s $f0, $f2 -/* 824728 80241468 00000000 */ nop -/* 82472C 8024146C 45020003 */ bc1fl .L8024147C -/* 824730 80241470 24840001 */ addiu $a0, $a0, 1 -/* 824734 80241474 08090523 */ j .L8024148C -/* 824738 80241478 AE240078 */ sw $a0, 0x78($s1) -.L8024147C: -/* 82473C 8024147C 8C620000 */ lw $v0, ($v1) -/* 824740 80241480 0082102A */ slt $v0, $a0, $v0 -/* 824744 80241484 1440FFF2 */ bnez $v0, .L80241450 -/* 824748 80241488 24A5000C */ addiu $a1, $a1, 0xc -.L8024148C: -/* 82474C 8024148C C6400000 */ lwc1 $f0, ($s2) -/* 824750 80241490 E4C00018 */ swc1 $f0, 0x18($a2) -/* 824754 80241494 8E0200CC */ lw $v0, 0xcc($s0) -/* 824758 80241498 8C420004 */ lw $v0, 4($v0) -/* 82475C 8024149C ACC20028 */ sw $v0, 0x28($a2) -/* 824760 802414A0 24020001 */ addiu $v0, $zero, 1 -/* 824764 802414A4 AE200074 */ sw $zero, 0x74($s1) -/* 824768 802414A8 AE220070 */ sw $v0, 0x70($s1) -/* 82476C 802414AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 824770 802414B0 8FB20018 */ lw $s2, 0x18($sp) -/* 824774 802414B4 8FB10014 */ lw $s1, 0x14($sp) -/* 824778 802414B8 8FB00010 */ lw $s0, 0x10($sp) -/* 82477C 802414BC 03E00008 */ jr $ra -/* 824780 802414C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index 4175b7e76a..f159280d92 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -137,7 +137,7 @@ glabel L802416A8_824968 glabel L802416B8_824978 /* 824978 802416B8 0280202D */ daddu $a0, $s4, $zero /* 82497C 802416BC 0260282D */ daddu $a1, $s3, $zero -/* 824980 802416C0 0C0902A2 */ jal func_80240A88_823D48 +/* 824980 802416C0 0C0902A2 */ jal mac_02_UnkFunc13 /* 824984 802416C4 02A0302D */ daddu $a2, $s5, $zero /* 824988 802416C8 080905E6 */ j L80241798_824A58 /* 82498C 802416CC 00000000 */ nop @@ -149,7 +149,7 @@ glabel L802416D0_824990 glabel L802416E0_8249A0 /* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero -/* 8249A8 802416E8 0C09037C */ jal func_80240DF0_8240B0 +/* 8249A8 802416E8 0C09037C */ jal mac_02_UnkFunc14 /* 8249AC 802416EC 02A0302D */ daddu $a2, $s5, $zero /* 8249B0 802416F0 080905E6 */ j L80241798_824A58 /* 8249B4 802416F4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241738_8249F8 glabel L80241748_824A08 /* 824A08 80241748 0280202D */ daddu $a0, $s4, $zero /* 824A0C 8024174C 0260282D */ daddu $a1, $s3, $zero -/* 824A10 80241750 0C09049F */ jal func_8024127C_82453C +/* 824A10 80241750 0C09049F */ jal mac_02_UnkFunc15 /* 824A14 80241754 02A0302D */ daddu $a2, $s5, $zero /* 824A18 80241758 080905E6 */ j L80241798_824A58 /* 824A1C 8024175C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241760_824A20 glabel L80241778_824A38 /* 824A38 80241778 0280202D */ daddu $a0, $s4, $zero /* 824A3C 8024177C 0260282D */ daddu $a1, $s3, $zero -/* 824A40 80241780 0C090501 */ jal func_80241404_8246C4 +/* 824A40 80241780 0C090501 */ jal mac_02_UnkFunc16 /* 824A44 80241784 02A0302D */ daddu $a2, $s5, $zero /* 824A48 80241788 080905E6 */ j L80241798_824A58 /* 824A4C 8024178C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s deleted file mode 100644 index 97e3d57bc1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802405E8_852758.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8_852758 -/* 852758 802405E8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 85275C 802405EC AFB20038 */ sw $s2, 0x38($sp) -/* 852760 802405F0 0080902D */ daddu $s2, $a0, $zero -/* 852764 802405F4 AFBF0044 */ sw $ra, 0x44($sp) -/* 852768 802405F8 AFB40040 */ sw $s4, 0x40($sp) -/* 85276C 802405FC AFB3003C */ sw $s3, 0x3c($sp) -/* 852770 80240600 AFB10034 */ sw $s1, 0x34($sp) -/* 852774 80240604 AFB00030 */ sw $s0, 0x30($sp) -/* 852778 80240608 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 85277C 8024060C F7B40048 */ sdc1 $f20, 0x48($sp) -/* 852780 80240610 8E510148 */ lw $s1, 0x148($s2) -/* 852784 80240614 00A0982D */ daddu $s3, $a1, $zero -/* 852788 80240618 86240008 */ lh $a0, 8($s1) -/* 85278C 8024061C 0C00EABB */ jal get_npc_unsafe -/* 852790 80240620 00C0A02D */ daddu $s4, $a2, $zero -/* 852794 80240624 8E630014 */ lw $v1, 0x14($s3) -/* 852798 80240628 04600030 */ bltz $v1, .L802406EC -/* 85279C 8024062C 0040802D */ daddu $s0, $v0, $zero -/* 8527A0 80240630 8E420074 */ lw $v0, 0x74($s2) -/* 8527A4 80240634 1C40002C */ bgtz $v0, .L802406E8 -/* 8527A8 80240638 2442FFFF */ addiu $v0, $v0, -1 -/* 8527AC 8024063C 0280202D */ daddu $a0, $s4, $zero -/* 8527B0 80240640 AE430074 */ sw $v1, 0x74($s2) -/* 8527B4 80240644 AFA00010 */ sw $zero, 0x10($sp) -/* 8527B8 80240648 8E66000C */ lw $a2, 0xc($s3) -/* 8527BC 8024064C 8E670010 */ lw $a3, 0x10($s3) -/* 8527C0 80240650 0C01242D */ jal func_800490B4 -/* 8527C4 80240654 0220282D */ daddu $a1, $s1, $zero -/* 8527C8 80240658 10400021 */ beqz $v0, .L802406E0 -/* 8527CC 8024065C 0000202D */ daddu $a0, $zero, $zero -/* 8527D0 80240660 0200282D */ daddu $a1, $s0, $zero -/* 8527D4 80240664 0000302D */ daddu $a2, $zero, $zero -/* 8527D8 80240668 860300A8 */ lh $v1, 0xa8($s0) -/* 8527DC 8024066C 3C013F80 */ lui $at, 0x3f80 -/* 8527E0 80240670 44810000 */ mtc1 $at, $f0 -/* 8527E4 80240674 3C014000 */ lui $at, 0x4000 -/* 8527E8 80240678 44811000 */ mtc1 $at, $f2 -/* 8527EC 8024067C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8527F0 80240680 44812000 */ mtc1 $at, $f4 -/* 8527F4 80240684 2402000F */ addiu $v0, $zero, 0xf -/* 8527F8 80240688 AFA2001C */ sw $v0, 0x1c($sp) -/* 8527FC 8024068C 44833000 */ mtc1 $v1, $f6 -/* 852800 80240690 00000000 */ nop -/* 852804 80240694 468031A0 */ cvt.s.w $f6, $f6 -/* 852808 80240698 44073000 */ mfc1 $a3, $f6 -/* 85280C 8024069C 27A20028 */ addiu $v0, $sp, 0x28 -/* 852810 802406A0 AFA20020 */ sw $v0, 0x20($sp) -/* 852814 802406A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 852818 802406A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 85281C 802406AC 0C01BFA4 */ jal fx_emote -/* 852820 802406B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 852824 802406B4 0200202D */ daddu $a0, $s0, $zero -/* 852828 802406B8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 85282C 802406BC 0C012530 */ jal func_800494C0 -/* 852830 802406C0 3C060020 */ lui $a2, 0x20 -/* 852834 802406C4 8E220018 */ lw $v0, 0x18($s1) -/* 852838 802406C8 9442002A */ lhu $v0, 0x2a($v0) -/* 85283C 802406CC 30420001 */ andi $v0, $v0, 1 -/* 852840 802406D0 14400064 */ bnez $v0, .L80240864 -/* 852844 802406D4 2402000A */ addiu $v0, $zero, 0xa -/* 852848 802406D8 08090219 */ j .L80240864 -/* 85284C 802406DC 2402000C */ addiu $v0, $zero, 0xc -.L802406E0: -/* 852850 802406E0 8E420074 */ lw $v0, 0x74($s2) -/* 852854 802406E4 2442FFFF */ addiu $v0, $v0, -1 -.L802406E8: -/* 852858 802406E8 AE420074 */ sw $v0, 0x74($s2) -.L802406EC: -/* 85285C 802406EC 8602008C */ lh $v0, 0x8c($s0) -/* 852860 802406F0 1440005D */ bnez $v0, .L80240868 -/* 852864 802406F4 00000000 */ nop -/* 852868 802406F8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 85286C 802406FC 3C014010 */ lui $at, 0x4010 -/* 852870 80240700 44811800 */ mtc1 $at, $f3 -/* 852874 80240704 44801000 */ mtc1 $zero, $f2 -/* 852878 80240708 46000021 */ cvt.d.s $f0, $f0 -/* 85287C 8024070C 4622003C */ c.lt.d $f0, $f2 -/* 852880 80240710 00000000 */ nop -/* 852884 80240714 45000003 */ bc1f .L80240724 -/* 852888 80240718 0200202D */ daddu $a0, $s0, $zero -/* 85288C 8024071C 080901CA */ j .L80240728 -/* 852890 80240720 0000282D */ daddu $a1, $zero, $zero -.L80240724: -/* 852894 80240724 24050001 */ addiu $a1, $zero, 1 -.L80240728: -/* 852898 80240728 0C00F598 */ jal func_8003D660 -/* 85289C 8024072C 00000000 */ nop -/* 8528A0 80240730 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8528A4 80240734 8E430078 */ lw $v1, 0x78($s2) -/* 8528A8 80240738 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8528AC 8024073C 00031040 */ sll $v0, $v1, 1 -/* 8528B0 80240740 00431021 */ addu $v0, $v0, $v1 -/* 8528B4 80240744 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8528B8 80240748 00021080 */ sll $v0, $v0, 2 -/* 8528BC 8024074C 00431021 */ addu $v0, $v0, $v1 -/* 8528C0 80240750 C4560004 */ lwc1 $f22, 4($v0) -/* 8528C4 80240754 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8528C8 80240758 C454000C */ lwc1 $f20, 0xc($v0) -/* 8528CC 8024075C 4680A520 */ cvt.s.w $f20, $f20 -/* 8528D0 80240760 4406B000 */ mfc1 $a2, $f22 -/* 8528D4 80240764 4407A000 */ mfc1 $a3, $f20 -/* 8528D8 80240768 0C00A720 */ jal atan2 -/* 8528DC 8024076C 00000000 */ nop -/* 8528E0 80240770 8E050018 */ lw $a1, 0x18($s0) -/* 8528E4 80240774 44060000 */ mfc1 $a2, $f0 -/* 8528E8 80240778 0200202D */ daddu $a0, $s0, $zero -/* 8528EC 8024077C 0C00EA95 */ jal npc_move_heading -/* 8528F0 80240780 AE06000C */ sw $a2, 0xc($s0) -/* 8528F4 80240784 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8528F8 80240788 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8528FC 8024078C 4406B000 */ mfc1 $a2, $f22 -/* 852900 80240790 4407A000 */ mfc1 $a3, $f20 -/* 852904 80240794 0C00A7B5 */ jal dist2D -/* 852908 80240798 00000000 */ nop -/* 85290C 8024079C C6020018 */ lwc1 $f2, 0x18($s0) -/* 852910 802407A0 4602003E */ c.le.s $f0, $f2 -/* 852914 802407A4 00000000 */ nop -/* 852918 802407A8 4500002F */ bc1f .L80240868 -/* 85291C 802407AC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 852920 802407B0 24020002 */ addiu $v0, $zero, 2 -/* 852924 802407B4 0C00A67F */ jal rand_int -/* 852928 802407B8 AE420070 */ sw $v0, 0x70($s2) -/* 85292C 802407BC 3C035555 */ lui $v1, 0x5555 -/* 852930 802407C0 34635556 */ ori $v1, $v1, 0x5556 -/* 852934 802407C4 00430018 */ mult $v0, $v1 -/* 852938 802407C8 000227C3 */ sra $a0, $v0, 0x1f -/* 85293C 802407CC 00004010 */ mfhi $t0 -/* 852940 802407D0 01042023 */ subu $a0, $t0, $a0 -/* 852944 802407D4 00041840 */ sll $v1, $a0, 1 -/* 852948 802407D8 00641821 */ addu $v1, $v1, $a0 -/* 85294C 802407DC 00431023 */ subu $v0, $v0, $v1 -/* 852950 802407E0 24430002 */ addiu $v1, $v0, 2 -/* 852954 802407E4 AE430074 */ sw $v1, 0x74($s2) -/* 852958 802407E8 8E62002C */ lw $v0, 0x2c($s3) -/* 85295C 802407EC 18400009 */ blez $v0, .L80240814 -/* 852960 802407F0 24020004 */ addiu $v0, $zero, 4 -/* 852964 802407F4 8E620004 */ lw $v0, 4($s3) -/* 852968 802407F8 18400006 */ blez $v0, .L80240814 -/* 85296C 802407FC 24020004 */ addiu $v0, $zero, 4 -/* 852970 80240800 8E620008 */ lw $v0, 8($s3) -/* 852974 80240804 18400003 */ blez $v0, .L80240814 -/* 852978 80240808 24020004 */ addiu $v0, $zero, 4 -/* 85297C 8024080C 14600002 */ bnez $v1, .L80240818 -/* 852980 80240810 00000000 */ nop -.L80240814: -/* 852984 80240814 AE420070 */ sw $v0, 0x70($s2) -.L80240818: -/* 852988 80240818 0C00A67F */ jal rand_int -/* 85298C 8024081C 24042710 */ addiu $a0, $zero, 0x2710 -/* 852990 80240820 3C0351EB */ lui $v1, 0x51eb -/* 852994 80240824 3463851F */ ori $v1, $v1, 0x851f -/* 852998 80240828 00430018 */ mult $v0, $v1 -/* 85299C 8024082C 00021FC3 */ sra $v1, $v0, 0x1f -/* 8529A0 80240830 00004010 */ mfhi $t0 -/* 8529A4 80240834 00082143 */ sra $a0, $t0, 5 -/* 8529A8 80240838 00832023 */ subu $a0, $a0, $v1 -/* 8529AC 8024083C 00041840 */ sll $v1, $a0, 1 -/* 8529B0 80240840 00641821 */ addu $v1, $v1, $a0 -/* 8529B4 80240844 000318C0 */ sll $v1, $v1, 3 -/* 8529B8 80240848 00641821 */ addu $v1, $v1, $a0 -/* 8529BC 8024084C 00031880 */ sll $v1, $v1, 2 -/* 8529C0 80240850 8E640004 */ lw $a0, 4($s3) -/* 8529C4 80240854 00431023 */ subu $v0, $v0, $v1 -/* 8529C8 80240858 0044102A */ slt $v0, $v0, $a0 -/* 8529CC 8024085C 10400002 */ beqz $v0, .L80240868 -/* 8529D0 80240860 24020004 */ addiu $v0, $zero, 4 -.L80240864: -/* 8529D4 80240864 AE420070 */ sw $v0, 0x70($s2) -.L80240868: -/* 8529D8 80240868 8FBF0044 */ lw $ra, 0x44($sp) -/* 8529DC 8024086C 8FB40040 */ lw $s4, 0x40($sp) -/* 8529E0 80240870 8FB3003C */ lw $s3, 0x3c($sp) -/* 8529E4 80240874 8FB20038 */ lw $s2, 0x38($sp) -/* 8529E8 80240878 8FB10034 */ lw $s1, 0x34($sp) -/* 8529EC 8024087C 8FB00030 */ lw $s0, 0x30($sp) -/* 8529F0 80240880 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 8529F4 80240884 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 8529F8 80240888 03E00008 */ jr $ra -/* 8529FC 8024088C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s deleted file mode 100644 index 6d59accf18..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240950_852AC0 -/* 852AC0 80240950 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852AC4 80240954 AFB40040 */ sw $s4, 0x40($sp) -/* 852AC8 80240958 0080A02D */ daddu $s4, $a0, $zero -/* 852ACC 8024095C AFBF0044 */ sw $ra, 0x44($sp) -/* 852AD0 80240960 AFB3003C */ sw $s3, 0x3c($sp) -/* 852AD4 80240964 AFB20038 */ sw $s2, 0x38($sp) -/* 852AD8 80240968 AFB10034 */ sw $s1, 0x34($sp) -/* 852ADC 8024096C AFB00030 */ sw $s0, 0x30($sp) -/* 852AE0 80240970 8E910148 */ lw $s1, 0x148($s4) -/* 852AE4 80240974 00A0902D */ daddu $s2, $a1, $zero -/* 852AE8 80240978 86240008 */ lh $a0, 8($s1) -/* 852AEC 8024097C 0C00EABB */ jal get_npc_unsafe -/* 852AF0 80240980 00C0982D */ daddu $s3, $a2, $zero -/* 852AF4 80240984 8E430014 */ lw $v1, 0x14($s2) -/* 852AF8 80240988 04600031 */ bltz $v1, .L80240A50 -/* 852AFC 8024098C 0040802D */ daddu $s0, $v0, $zero -/* 852B00 80240990 0260202D */ daddu $a0, $s3, $zero -/* 852B04 80240994 AFA00010 */ sw $zero, 0x10($sp) -/* 852B08 80240998 8E460024 */ lw $a2, 0x24($s2) -/* 852B0C 8024099C 8E470028 */ lw $a3, 0x28($s2) -/* 852B10 802409A0 0C01242D */ jal func_800490B4 -/* 852B14 802409A4 0220282D */ daddu $a1, $s1, $zero -/* 852B18 802409A8 10400029 */ beqz $v0, .L80240A50 -/* 852B1C 802409AC 0000202D */ daddu $a0, $zero, $zero -/* 852B20 802409B0 0200282D */ daddu $a1, $s0, $zero -/* 852B24 802409B4 0000302D */ daddu $a2, $zero, $zero -/* 852B28 802409B8 860300A8 */ lh $v1, 0xa8($s0) -/* 852B2C 802409BC 3C013F80 */ lui $at, 0x3f80 -/* 852B30 802409C0 44810000 */ mtc1 $at, $f0 -/* 852B34 802409C4 3C014000 */ lui $at, 0x4000 -/* 852B38 802409C8 44811000 */ mtc1 $at, $f2 -/* 852B3C 802409CC 3C01C1A0 */ lui $at, 0xc1a0 -/* 852B40 802409D0 44812000 */ mtc1 $at, $f4 -/* 852B44 802409D4 2402000F */ addiu $v0, $zero, 0xf -/* 852B48 802409D8 AFA2001C */ sw $v0, 0x1c($sp) -/* 852B4C 802409DC 44833000 */ mtc1 $v1, $f6 -/* 852B50 802409E0 00000000 */ nop -/* 852B54 802409E4 468031A0 */ cvt.s.w $f6, $f6 -/* 852B58 802409E8 44073000 */ mfc1 $a3, $f6 -/* 852B5C 802409EC 27A20028 */ addiu $v0, $sp, 0x28 -/* 852B60 802409F0 AFA20020 */ sw $v0, 0x20($sp) -/* 852B64 802409F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 852B68 802409F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 852B6C 802409FC 0C01BFA4 */ jal fx_emote -/* 852B70 80240A00 E7A40018 */ swc1 $f4, 0x18($sp) -/* 852B74 80240A04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 852B78 80240A08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 852B7C 80240A0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 852B80 80240A10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 852B84 80240A14 8C460028 */ lw $a2, 0x28($v0) -/* 852B88 80240A18 0C00A720 */ jal atan2 -/* 852B8C 80240A1C 8C470030 */ lw $a3, 0x30($v0) -/* 852B90 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 852B94 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 852B98 80240A28 3C060020 */ lui $a2, 0x20 -/* 852B9C 80240A2C 0C012530 */ jal func_800494C0 -/* 852BA0 80240A30 E480000C */ swc1 $f0, 0xc($a0) -/* 852BA4 80240A34 8E220018 */ lw $v0, 0x18($s1) -/* 852BA8 80240A38 9442002A */ lhu $v0, 0x2a($v0) -/* 852BAC 80240A3C 30420001 */ andi $v0, $v0, 1 -/* 852BB0 80240A40 14400029 */ bnez $v0, .L80240AE8 -/* 852BB4 80240A44 2402000A */ addiu $v0, $zero, 0xa -/* 852BB8 80240A48 080902BA */ j .L80240AE8 -/* 852BBC 80240A4C 2402000C */ addiu $v0, $zero, 0xc -.L80240A50: -/* 852BC0 80240A50 8602008C */ lh $v0, 0x8c($s0) -/* 852BC4 80240A54 14400025 */ bnez $v0, .L80240AEC -/* 852BC8 80240A58 00000000 */ nop -/* 852BCC 80240A5C 9602008E */ lhu $v0, 0x8e($s0) -/* 852BD0 80240A60 2442FFFF */ addiu $v0, $v0, -1 -/* 852BD4 80240A64 A602008E */ sh $v0, 0x8e($s0) -/* 852BD8 80240A68 00021400 */ sll $v0, $v0, 0x10 -/* 852BDC 80240A6C 1440001F */ bnez $v0, .L80240AEC -/* 852BE0 80240A70 00000000 */ nop -/* 852BE4 80240A74 8E820074 */ lw $v0, 0x74($s4) -/* 852BE8 80240A78 2442FFFF */ addiu $v0, $v0, -1 -/* 852BEC 80240A7C 10400019 */ beqz $v0, .L80240AE4 -/* 852BF0 80240A80 AE820074 */ sw $v0, 0x74($s4) -/* 852BF4 80240A84 8E220018 */ lw $v0, 0x18($s1) -/* 852BF8 80240A88 9442002A */ lhu $v0, 0x2a($v0) -/* 852BFC 80240A8C 30420010 */ andi $v0, $v0, 0x10 -/* 852C00 80240A90 14400007 */ bnez $v0, .L80240AB0 -/* 852C04 80240A94 00000000 */ nop -/* 852C08 80240A98 C600000C */ lwc1 $f0, 0xc($s0) -/* 852C0C 80240A9C 3C014334 */ lui $at, 0x4334 -/* 852C10 80240AA0 44816000 */ mtc1 $at, $f12 -/* 852C14 80240AA4 0C00A6C9 */ jal clamp_angle -/* 852C18 80240AA8 460C0300 */ add.s $f12, $f0, $f12 -/* 852C1C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -.L80240AB0: -/* 852C20 80240AB0 8E440008 */ lw $a0, 8($s2) -/* 852C24 80240AB4 000417C2 */ srl $v0, $a0, 0x1f -/* 852C28 80240AB8 00822021 */ addu $a0, $a0, $v0 -/* 852C2C 80240ABC 00042043 */ sra $a0, $a0, 1 -/* 852C30 80240AC0 0C00A67F */ jal rand_int -/* 852C34 80240AC4 24840001 */ addiu $a0, $a0, 1 -/* 852C38 80240AC8 8E430008 */ lw $v1, 8($s2) -/* 852C3C 80240ACC 000327C2 */ srl $a0, $v1, 0x1f -/* 852C40 80240AD0 00641821 */ addu $v1, $v1, $a0 -/* 852C44 80240AD4 00031843 */ sra $v1, $v1, 1 -/* 852C48 80240AD8 00621821 */ addu $v1, $v1, $v0 -/* 852C4C 80240ADC 080902BB */ j .L80240AEC -/* 852C50 80240AE0 A603008E */ sh $v1, 0x8e($s0) -.L80240AE4: -/* 852C54 80240AE4 24020004 */ addiu $v0, $zero, 4 -.L80240AE8: -/* 852C58 80240AE8 AE820070 */ sw $v0, 0x70($s4) -.L80240AEC: -/* 852C5C 80240AEC 8FBF0044 */ lw $ra, 0x44($sp) -/* 852C60 80240AF0 8FB40040 */ lw $s4, 0x40($sp) -/* 852C64 80240AF4 8FB3003C */ lw $s3, 0x3c($sp) -/* 852C68 80240AF8 8FB20038 */ lw $s2, 0x38($sp) -/* 852C6C 80240AFC 8FB10034 */ lw $s1, 0x34($sp) -/* 852C70 80240B00 8FB00030 */ lw $s0, 0x30($sp) -/* 852C74 80240B04 03E00008 */ jr $ra -/* 852C78 80240B08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s deleted file mode 100644 index 28061054c2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_852F4C -/* 852F4C 80240DDC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852F50 80240DE0 AFB3003C */ sw $s3, 0x3c($sp) -/* 852F54 80240DE4 0080982D */ daddu $s3, $a0, $zero -/* 852F58 80240DE8 AFBF0040 */ sw $ra, 0x40($sp) -/* 852F5C 80240DEC AFB20038 */ sw $s2, 0x38($sp) -/* 852F60 80240DF0 AFB10034 */ sw $s1, 0x34($sp) -/* 852F64 80240DF4 AFB00030 */ sw $s0, 0x30($sp) -/* 852F68 80240DF8 8E720148 */ lw $s2, 0x148($s3) -/* 852F6C 80240DFC 00A0882D */ daddu $s1, $a1, $zero -/* 852F70 80240E00 86440008 */ lh $a0, 8($s2) -/* 852F74 80240E04 0C00EABB */ jal get_npc_unsafe -/* 852F78 80240E08 00C0802D */ daddu $s0, $a2, $zero -/* 852F7C 80240E0C 0200202D */ daddu $a0, $s0, $zero -/* 852F80 80240E10 0240282D */ daddu $a1, $s2, $zero -/* 852F84 80240E14 24030001 */ addiu $v1, $zero, 1 -/* 852F88 80240E18 AFA30010 */ sw $v1, 0x10($sp) -/* 852F8C 80240E1C 8E260024 */ lw $a2, 0x24($s1) -/* 852F90 80240E20 8E270028 */ lw $a3, 0x28($s1) -/* 852F94 80240E24 0C01242D */ jal func_800490B4 -/* 852F98 80240E28 0040802D */ daddu $s0, $v0, $zero -/* 852F9C 80240E2C 1440001E */ bnez $v0, .L80240EA8 -/* 852FA0 80240E30 0200202D */ daddu $a0, $s0, $zero -/* 852FA4 80240E34 24040002 */ addiu $a0, $zero, 2 -/* 852FA8 80240E38 0200282D */ daddu $a1, $s0, $zero -/* 852FAC 80240E3C 0000302D */ daddu $a2, $zero, $zero -/* 852FB0 80240E40 860300A8 */ lh $v1, 0xa8($s0) -/* 852FB4 80240E44 3C013F80 */ lui $at, 0x3f80 -/* 852FB8 80240E48 44810000 */ mtc1 $at, $f0 -/* 852FBC 80240E4C 3C014000 */ lui $at, 0x4000 -/* 852FC0 80240E50 44811000 */ mtc1 $at, $f2 -/* 852FC4 80240E54 3C01C1A0 */ lui $at, 0xc1a0 -/* 852FC8 80240E58 44812000 */ mtc1 $at, $f4 -/* 852FCC 80240E5C 2402000F */ addiu $v0, $zero, 0xf -/* 852FD0 80240E60 AFA2001C */ sw $v0, 0x1c($sp) -/* 852FD4 80240E64 44833000 */ mtc1 $v1, $f6 -/* 852FD8 80240E68 00000000 */ nop -/* 852FDC 80240E6C 468031A0 */ cvt.s.w $f6, $f6 -/* 852FE0 80240E70 44073000 */ mfc1 $a3, $f6 -/* 852FE4 80240E74 27A20028 */ addiu $v0, $sp, 0x28 -/* 852FE8 80240E78 AFA20020 */ sw $v0, 0x20($sp) -/* 852FEC 80240E7C E7A00010 */ swc1 $f0, 0x10($sp) -/* 852FF0 80240E80 E7A20014 */ swc1 $f2, 0x14($sp) -/* 852FF4 80240E84 0C01BFA4 */ jal fx_emote -/* 852FF8 80240E88 E7A40018 */ swc1 $f4, 0x18($sp) -/* 852FFC 80240E8C 8E4200CC */ lw $v0, 0xcc($s2) -/* 853000 80240E90 8C430000 */ lw $v1, ($v0) -/* 853004 80240E94 24020019 */ addiu $v0, $zero, 0x19 -/* 853008 80240E98 A602008E */ sh $v0, 0x8e($s0) -/* 85300C 80240E9C 2402000E */ addiu $v0, $zero, 0xe -/* 853010 80240EA0 080903B7 */ j .L80240EDC -/* 853014 80240EA4 AE030028 */ sw $v1, 0x28($s0) -.L80240EA8: -/* 853018 80240EA8 0C00F598 */ jal func_8003D660 -/* 85301C 80240EAC 24050001 */ addiu $a1, $zero, 1 -/* 853020 80240EB0 8E050018 */ lw $a1, 0x18($s0) -/* 853024 80240EB4 8E06000C */ lw $a2, 0xc($s0) -/* 853028 80240EB8 0C00EA95 */ jal npc_move_heading -/* 85302C 80240EBC 0200202D */ daddu $a0, $s0, $zero -/* 853030 80240EC0 8602008E */ lh $v0, 0x8e($s0) -/* 853034 80240EC4 9603008E */ lhu $v1, 0x8e($s0) -/* 853038 80240EC8 18400003 */ blez $v0, .L80240ED8 -/* 85303C 80240ECC 2462FFFF */ addiu $v0, $v1, -1 -/* 853040 80240ED0 080903B8 */ j .L80240EE0 -/* 853044 80240ED4 A602008E */ sh $v0, 0x8e($s0) -.L80240ED8: -/* 853048 80240ED8 2402000C */ addiu $v0, $zero, 0xc -.L80240EDC: -/* 85304C 80240EDC AE620070 */ sw $v0, 0x70($s3) -.L80240EE0: -/* 853050 80240EE0 8FBF0040 */ lw $ra, 0x40($sp) -/* 853054 80240EE4 8FB3003C */ lw $s3, 0x3c($sp) -/* 853058 80240EE8 8FB20038 */ lw $s2, 0x38($sp) -/* 85305C 80240EEC 8FB10034 */ lw $s1, 0x34($sp) -/* 853060 80240EF0 8FB00030 */ lw $s0, 0x30($sp) -/* 853064 80240EF4 03E00008 */ jr $ra -/* 853068 80240EF8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s deleted file mode 100644 index ca17fc179e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F64_8530D4 -/* 8530D4 80240F64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8530D8 80240F68 AFB10014 */ sw $s1, 0x14($sp) -/* 8530DC 80240F6C 0080882D */ daddu $s1, $a0, $zero -/* 8530E0 80240F70 AFBF001C */ sw $ra, 0x1c($sp) -/* 8530E4 80240F74 AFB20018 */ sw $s2, 0x18($sp) -/* 8530E8 80240F78 AFB00010 */ sw $s0, 0x10($sp) -/* 8530EC 80240F7C 8E300148 */ lw $s0, 0x148($s1) -/* 8530F0 80240F80 86040008 */ lh $a0, 8($s0) -/* 8530F4 80240F84 0C00EABB */ jal get_npc_unsafe -/* 8530F8 80240F88 00A0902D */ daddu $s2, $a1, $zero -/* 8530FC 80240F8C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 853100 80240F90 8E240078 */ lw $a0, 0x78($s1) -/* 853104 80240F94 8C630000 */ lw $v1, ($v1) -/* 853108 80240F98 0083182A */ slt $v1, $a0, $v1 -/* 85310C 80240F9C 10600013 */ beqz $v1, .L80240FEC -/* 853110 80240FA0 0040302D */ daddu $a2, $v0, $zero -/* 853114 80240FA4 00041040 */ sll $v0, $a0, 1 -/* 853118 80240FA8 00441021 */ addu $v0, $v0, $a0 -/* 85311C 80240FAC 00022880 */ sll $a1, $v0, 2 -.L80240FB0: -/* 853120 80240FB0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 853124 80240FB4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 853128 80240FB8 00A31021 */ addu $v0, $a1, $v1 -/* 85312C 80240FBC C4400008 */ lwc1 $f0, 8($v0) -/* 853130 80240FC0 46800020 */ cvt.s.w $f0, $f0 -/* 853134 80240FC4 4602003E */ c.le.s $f0, $f2 -/* 853138 80240FC8 00000000 */ nop -/* 85313C 80240FCC 45020003 */ bc1fl .L80240FDC -/* 853140 80240FD0 24840001 */ addiu $a0, $a0, 1 -/* 853144 80240FD4 080903FB */ j .L80240FEC -/* 853148 80240FD8 AE240078 */ sw $a0, 0x78($s1) -.L80240FDC: -/* 85314C 80240FDC 8C620000 */ lw $v0, ($v1) -/* 853150 80240FE0 0082102A */ slt $v0, $a0, $v0 -/* 853154 80240FE4 1440FFF2 */ bnez $v0, .L80240FB0 -/* 853158 80240FE8 24A5000C */ addiu $a1, $a1, 0xc -.L80240FEC: -/* 85315C 80240FEC C6400000 */ lwc1 $f0, ($s2) -/* 853160 80240FF0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 853164 80240FF4 8E0200CC */ lw $v0, 0xcc($s0) -/* 853168 80240FF8 8C420004 */ lw $v0, 4($v0) -/* 85316C 80240FFC ACC20028 */ sw $v0, 0x28($a2) -/* 853170 80241000 24020001 */ addiu $v0, $zero, 1 -/* 853174 80241004 AE200074 */ sw $zero, 0x74($s1) -/* 853178 80241008 AE220070 */ sw $v0, 0x70($s1) -/* 85317C 8024100C 8FBF001C */ lw $ra, 0x1c($sp) -/* 853180 80241010 8FB20018 */ lw $s2, 0x18($sp) -/* 853184 80241014 8FB10014 */ lw $s1, 0x14($sp) -/* 853188 80241018 8FB00010 */ lw $s0, 0x10($sp) -/* 85318C 8024101C 03E00008 */ jr $ra -/* 853190 80241020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index f9ac44e618..dad187931e 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -137,7 +137,7 @@ glabel L80241208_853378 glabel L80241218_853388 /* 853388 80241218 0280202D */ daddu $a0, $s4, $zero /* 85338C 8024121C 0260282D */ daddu $a1, $s3, $zero -/* 853390 80241220 0C09017A */ jal func_802405E8_852758 +/* 853390 80241220 0C09017A */ jal mac_05_UnkFunc13 /* 853394 80241224 02A0302D */ daddu $a2, $s5, $zero /* 853398 80241228 080904BE */ j L802412F8_853468 /* 85339C 8024122C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241230_8533A0 glabel L80241240_8533B0 /* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero -/* 8533B8 80241248 0C090254 */ jal func_80240950_852AC0 +/* 8533B8 80241248 0C090254 */ jal mac_05_UnkFunc14 /* 8533BC 8024124C 02A0302D */ daddu $a2, $s5, $zero /* 8533C0 80241250 080904BE */ j L802412F8_853468 /* 8533C4 80241254 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241298_853408 glabel L802412A8_853418 /* 853418 802412A8 0280202D */ daddu $a0, $s4, $zero /* 85341C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* 853420 802412B0 0C090377 */ jal func_80240DDC_852F4C +/* 853420 802412B0 0C090377 */ jal mac_05_UnkFunc15 /* 853424 802412B4 02A0302D */ daddu $a2, $s5, $zero /* 853428 802412B8 080904BE */ j L802412F8_853468 /* 85342C 802412BC 00000000 */ nop @@ -194,7 +194,7 @@ glabel L802412C0_853430 glabel L802412D8_853448 /* 853448 802412D8 0280202D */ daddu $a0, $s4, $zero /* 85344C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* 853450 802412E0 0C0903D9 */ jal func_80240F64_8530D4 +/* 853450 802412E0 0C0903D9 */ jal mac_05_UnkFunc16 /* 853454 802412E4 02A0302D */ daddu $a2, $s5, $zero /* 853458 802412E8 080904BE */ j L802412F8_853468 /* 85345C 802412EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s deleted file mode 100644 index 58194bc6f3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240438_E0EBD8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240438_E0EBD8 -/* E0EBD8 80240438 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* E0EBDC 8024043C AFB20038 */ sw $s2, 0x38($sp) -/* E0EBE0 80240440 0080902D */ daddu $s2, $a0, $zero -/* E0EBE4 80240444 AFBF0044 */ sw $ra, 0x44($sp) -/* E0EBE8 80240448 AFB40040 */ sw $s4, 0x40($sp) -/* E0EBEC 8024044C AFB3003C */ sw $s3, 0x3c($sp) -/* E0EBF0 80240450 AFB10034 */ sw $s1, 0x34($sp) -/* E0EBF4 80240454 AFB00030 */ sw $s0, 0x30($sp) -/* E0EBF8 80240458 F7B60050 */ sdc1 $f22, 0x50($sp) -/* E0EBFC 8024045C F7B40048 */ sdc1 $f20, 0x48($sp) -/* E0EC00 80240460 8E510148 */ lw $s1, 0x148($s2) -/* E0EC04 80240464 00A0982D */ daddu $s3, $a1, $zero -/* E0EC08 80240468 86240008 */ lh $a0, 8($s1) -/* E0EC0C 8024046C 0C00EABB */ jal get_npc_unsafe -/* E0EC10 80240470 00C0A02D */ daddu $s4, $a2, $zero -/* E0EC14 80240474 8E630014 */ lw $v1, 0x14($s3) -/* E0EC18 80240478 04600030 */ bltz $v1, .L8024053C -/* E0EC1C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* E0EC20 80240480 8E420074 */ lw $v0, 0x74($s2) -/* E0EC24 80240484 1C40002C */ bgtz $v0, .L80240538 -/* E0EC28 80240488 2442FFFF */ addiu $v0, $v0, -1 -/* E0EC2C 8024048C 0280202D */ daddu $a0, $s4, $zero -/* E0EC30 80240490 AE430074 */ sw $v1, 0x74($s2) -/* E0EC34 80240494 AFA00010 */ sw $zero, 0x10($sp) -/* E0EC38 80240498 8E66000C */ lw $a2, 0xc($s3) -/* E0EC3C 8024049C 8E670010 */ lw $a3, 0x10($s3) -/* E0EC40 802404A0 0C01242D */ jal func_800490B4 -/* E0EC44 802404A4 0220282D */ daddu $a1, $s1, $zero -/* E0EC48 802404A8 10400021 */ beqz $v0, .L80240530 -/* E0EC4C 802404AC 0000202D */ daddu $a0, $zero, $zero -/* E0EC50 802404B0 0200282D */ daddu $a1, $s0, $zero -/* E0EC54 802404B4 0000302D */ daddu $a2, $zero, $zero -/* E0EC58 802404B8 860300A8 */ lh $v1, 0xa8($s0) -/* E0EC5C 802404BC 3C013F80 */ lui $at, 0x3f80 -/* E0EC60 802404C0 44810000 */ mtc1 $at, $f0 -/* E0EC64 802404C4 3C014000 */ lui $at, 0x4000 -/* E0EC68 802404C8 44811000 */ mtc1 $at, $f2 -/* E0EC6C 802404CC 3C01C1A0 */ lui $at, 0xc1a0 -/* E0EC70 802404D0 44812000 */ mtc1 $at, $f4 -/* E0EC74 802404D4 2402000F */ addiu $v0, $zero, 0xf -/* E0EC78 802404D8 AFA2001C */ sw $v0, 0x1c($sp) -/* E0EC7C 802404DC 44833000 */ mtc1 $v1, $f6 -/* E0EC80 802404E0 00000000 */ nop -/* E0EC84 802404E4 468031A0 */ cvt.s.w $f6, $f6 -/* E0EC88 802404E8 44073000 */ mfc1 $a3, $f6 -/* E0EC8C 802404EC 27A20028 */ addiu $v0, $sp, 0x28 -/* E0EC90 802404F0 AFA20020 */ sw $v0, 0x20($sp) -/* E0EC94 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* E0EC98 802404F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0EC9C 802404FC 0C01BFA4 */ jal fx_emote -/* E0ECA0 80240500 E7A40018 */ swc1 $f4, 0x18($sp) -/* E0ECA4 80240504 0200202D */ daddu $a0, $s0, $zero -/* E0ECA8 80240508 240502F4 */ addiu $a1, $zero, 0x2f4 -/* E0ECAC 8024050C 0C012530 */ jal func_800494C0 -/* E0ECB0 80240510 3C060020 */ lui $a2, 0x20 -/* E0ECB4 80240514 8E220018 */ lw $v0, 0x18($s1) -/* E0ECB8 80240518 9442002A */ lhu $v0, 0x2a($v0) -/* E0ECBC 8024051C 30420001 */ andi $v0, $v0, 1 -/* E0ECC0 80240520 14400064 */ bnez $v0, .L802406B4 -/* E0ECC4 80240524 2402000A */ addiu $v0, $zero, 0xa -/* E0ECC8 80240528 080901AD */ j .L802406B4 -/* E0ECCC 8024052C 2402000C */ addiu $v0, $zero, 0xc -.L80240530: -/* E0ECD0 80240530 8E420074 */ lw $v0, 0x74($s2) -/* E0ECD4 80240534 2442FFFF */ addiu $v0, $v0, -1 -.L80240538: -/* E0ECD8 80240538 AE420074 */ sw $v0, 0x74($s2) -.L8024053C: -/* E0ECDC 8024053C 8602008C */ lh $v0, 0x8c($s0) -/* E0ECE0 80240540 1440005D */ bnez $v0, .L802406B8 -/* E0ECE4 80240544 00000000 */ nop -/* E0ECE8 80240548 C6000018 */ lwc1 $f0, 0x18($s0) -/* E0ECEC 8024054C 3C014010 */ lui $at, 0x4010 -/* E0ECF0 80240550 44811800 */ mtc1 $at, $f3 -/* E0ECF4 80240554 44801000 */ mtc1 $zero, $f2 -/* E0ECF8 80240558 46000021 */ cvt.d.s $f0, $f0 -/* E0ECFC 8024055C 4622003C */ c.lt.d $f0, $f2 -/* E0ED00 80240560 00000000 */ nop -/* E0ED04 80240564 45000003 */ bc1f .L80240574 -/* E0ED08 80240568 0200202D */ daddu $a0, $s0, $zero -/* E0ED0C 8024056C 0809015E */ j .L80240578 -/* E0ED10 80240570 0000282D */ daddu $a1, $zero, $zero -.L80240574: -/* E0ED14 80240574 24050001 */ addiu $a1, $zero, 1 -.L80240578: -/* E0ED18 80240578 0C00F598 */ jal func_8003D660 -/* E0ED1C 8024057C 00000000 */ nop -/* E0ED20 80240580 C60C0038 */ lwc1 $f12, 0x38($s0) -/* E0ED24 80240584 8E430078 */ lw $v1, 0x78($s2) -/* E0ED28 80240588 C60E0040 */ lwc1 $f14, 0x40($s0) -/* E0ED2C 8024058C 00031040 */ sll $v0, $v1, 1 -/* E0ED30 80240590 00431021 */ addu $v0, $v0, $v1 -/* E0ED34 80240594 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0ED38 80240598 00021080 */ sll $v0, $v0, 2 -/* E0ED3C 8024059C 00431021 */ addu $v0, $v0, $v1 -/* E0ED40 802405A0 C4560004 */ lwc1 $f22, 4($v0) -/* E0ED44 802405A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* E0ED48 802405A8 C454000C */ lwc1 $f20, 0xc($v0) -/* E0ED4C 802405AC 4680A520 */ cvt.s.w $f20, $f20 -/* E0ED50 802405B0 4406B000 */ mfc1 $a2, $f22 -/* E0ED54 802405B4 4407A000 */ mfc1 $a3, $f20 -/* E0ED58 802405B8 0C00A720 */ jal atan2 -/* E0ED5C 802405BC 00000000 */ nop -/* E0ED60 802405C0 8E050018 */ lw $a1, 0x18($s0) -/* E0ED64 802405C4 44060000 */ mfc1 $a2, $f0 -/* E0ED68 802405C8 0200202D */ daddu $a0, $s0, $zero -/* E0ED6C 802405CC 0C00EA95 */ jal npc_move_heading -/* E0ED70 802405D0 AE06000C */ sw $a2, 0xc($s0) -/* E0ED74 802405D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* E0ED78 802405D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* E0ED7C 802405DC 4406B000 */ mfc1 $a2, $f22 -/* E0ED80 802405E0 4407A000 */ mfc1 $a3, $f20 -/* E0ED84 802405E4 0C00A7B5 */ jal dist2D -/* E0ED88 802405E8 00000000 */ nop -/* E0ED8C 802405EC C6020018 */ lwc1 $f2, 0x18($s0) -/* E0ED90 802405F0 4602003E */ c.le.s $f0, $f2 -/* E0ED94 802405F4 00000000 */ nop -/* E0ED98 802405F8 4500002F */ bc1f .L802406B8 -/* E0ED9C 802405FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E0EDA0 80240600 24020002 */ addiu $v0, $zero, 2 -/* E0EDA4 80240604 0C00A67F */ jal rand_int -/* E0EDA8 80240608 AE420070 */ sw $v0, 0x70($s2) -/* E0EDAC 8024060C 3C035555 */ lui $v1, 0x5555 -/* E0EDB0 80240610 34635556 */ ori $v1, $v1, 0x5556 -/* E0EDB4 80240614 00430018 */ mult $v0, $v1 -/* E0EDB8 80240618 000227C3 */ sra $a0, $v0, 0x1f -/* E0EDBC 8024061C 00004010 */ mfhi $t0 -/* E0EDC0 80240620 01042023 */ subu $a0, $t0, $a0 -/* E0EDC4 80240624 00041840 */ sll $v1, $a0, 1 -/* E0EDC8 80240628 00641821 */ addu $v1, $v1, $a0 -/* E0EDCC 8024062C 00431023 */ subu $v0, $v0, $v1 -/* E0EDD0 80240630 24430002 */ addiu $v1, $v0, 2 -/* E0EDD4 80240634 AE430074 */ sw $v1, 0x74($s2) -/* E0EDD8 80240638 8E62002C */ lw $v0, 0x2c($s3) -/* E0EDDC 8024063C 18400009 */ blez $v0, .L80240664 -/* E0EDE0 80240640 24020004 */ addiu $v0, $zero, 4 -/* E0EDE4 80240644 8E620004 */ lw $v0, 4($s3) -/* E0EDE8 80240648 18400006 */ blez $v0, .L80240664 -/* E0EDEC 8024064C 24020004 */ addiu $v0, $zero, 4 -/* E0EDF0 80240650 8E620008 */ lw $v0, 8($s3) -/* E0EDF4 80240654 18400003 */ blez $v0, .L80240664 -/* E0EDF8 80240658 24020004 */ addiu $v0, $zero, 4 -/* E0EDFC 8024065C 14600002 */ bnez $v1, .L80240668 -/* E0EE00 80240660 00000000 */ nop -.L80240664: -/* E0EE04 80240664 AE420070 */ sw $v0, 0x70($s2) -.L80240668: -/* E0EE08 80240668 0C00A67F */ jal rand_int -/* E0EE0C 8024066C 24042710 */ addiu $a0, $zero, 0x2710 -/* E0EE10 80240670 3C0351EB */ lui $v1, 0x51eb -/* E0EE14 80240674 3463851F */ ori $v1, $v1, 0x851f -/* E0EE18 80240678 00430018 */ mult $v0, $v1 -/* E0EE1C 8024067C 00021FC3 */ sra $v1, $v0, 0x1f -/* E0EE20 80240680 00004010 */ mfhi $t0 -/* E0EE24 80240684 00082143 */ sra $a0, $t0, 5 -/* E0EE28 80240688 00832023 */ subu $a0, $a0, $v1 -/* E0EE2C 8024068C 00041840 */ sll $v1, $a0, 1 -/* E0EE30 80240690 00641821 */ addu $v1, $v1, $a0 -/* E0EE34 80240694 000318C0 */ sll $v1, $v1, 3 -/* E0EE38 80240698 00641821 */ addu $v1, $v1, $a0 -/* E0EE3C 8024069C 00031880 */ sll $v1, $v1, 2 -/* E0EE40 802406A0 8E640004 */ lw $a0, 4($s3) -/* E0EE44 802406A4 00431023 */ subu $v0, $v0, $v1 -/* E0EE48 802406A8 0044102A */ slt $v0, $v0, $a0 -/* E0EE4C 802406AC 10400002 */ beqz $v0, .L802406B8 -/* E0EE50 802406B0 24020004 */ addiu $v0, $zero, 4 -.L802406B4: -/* E0EE54 802406B4 AE420070 */ sw $v0, 0x70($s2) -.L802406B8: -/* E0EE58 802406B8 8FBF0044 */ lw $ra, 0x44($sp) -/* E0EE5C 802406BC 8FB40040 */ lw $s4, 0x40($sp) -/* E0EE60 802406C0 8FB3003C */ lw $s3, 0x3c($sp) -/* E0EE64 802406C4 8FB20038 */ lw $s2, 0x38($sp) -/* E0EE68 802406C8 8FB10034 */ lw $s1, 0x34($sp) -/* E0EE6C 802406CC 8FB00030 */ lw $s0, 0x30($sp) -/* E0EE70 802406D0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* E0EE74 802406D4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* E0EE78 802406D8 03E00008 */ jr $ra -/* E0EE7C 802406DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s deleted file mode 100644 index 9b6b0c519c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802407A0_E0EF40.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0_E0EF40 -/* E0EF40 802407A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* E0EF44 802407A4 AFB40040 */ sw $s4, 0x40($sp) -/* E0EF48 802407A8 0080A02D */ daddu $s4, $a0, $zero -/* E0EF4C 802407AC AFBF0044 */ sw $ra, 0x44($sp) -/* E0EF50 802407B0 AFB3003C */ sw $s3, 0x3c($sp) -/* E0EF54 802407B4 AFB20038 */ sw $s2, 0x38($sp) -/* E0EF58 802407B8 AFB10034 */ sw $s1, 0x34($sp) -/* E0EF5C 802407BC AFB00030 */ sw $s0, 0x30($sp) -/* E0EF60 802407C0 8E910148 */ lw $s1, 0x148($s4) -/* E0EF64 802407C4 00A0902D */ daddu $s2, $a1, $zero -/* E0EF68 802407C8 86240008 */ lh $a0, 8($s1) -/* E0EF6C 802407CC 0C00EABB */ jal get_npc_unsafe -/* E0EF70 802407D0 00C0982D */ daddu $s3, $a2, $zero -/* E0EF74 802407D4 8E430014 */ lw $v1, 0x14($s2) -/* E0EF78 802407D8 04600031 */ bltz $v1, .L802408A0 -/* E0EF7C 802407DC 0040802D */ daddu $s0, $v0, $zero -/* E0EF80 802407E0 0260202D */ daddu $a0, $s3, $zero -/* E0EF84 802407E4 AFA00010 */ sw $zero, 0x10($sp) -/* E0EF88 802407E8 8E460024 */ lw $a2, 0x24($s2) -/* E0EF8C 802407EC 8E470028 */ lw $a3, 0x28($s2) -/* E0EF90 802407F0 0C01242D */ jal func_800490B4 -/* E0EF94 802407F4 0220282D */ daddu $a1, $s1, $zero -/* E0EF98 802407F8 10400029 */ beqz $v0, .L802408A0 -/* E0EF9C 802407FC 0000202D */ daddu $a0, $zero, $zero -/* E0EFA0 80240800 0200282D */ daddu $a1, $s0, $zero -/* E0EFA4 80240804 0000302D */ daddu $a2, $zero, $zero -/* E0EFA8 80240808 860300A8 */ lh $v1, 0xa8($s0) -/* E0EFAC 8024080C 3C013F80 */ lui $at, 0x3f80 -/* E0EFB0 80240810 44810000 */ mtc1 $at, $f0 -/* E0EFB4 80240814 3C014000 */ lui $at, 0x4000 -/* E0EFB8 80240818 44811000 */ mtc1 $at, $f2 -/* E0EFBC 8024081C 3C01C1A0 */ lui $at, 0xc1a0 -/* E0EFC0 80240820 44812000 */ mtc1 $at, $f4 -/* E0EFC4 80240824 2402000F */ addiu $v0, $zero, 0xf -/* E0EFC8 80240828 AFA2001C */ sw $v0, 0x1c($sp) -/* E0EFCC 8024082C 44833000 */ mtc1 $v1, $f6 -/* E0EFD0 80240830 00000000 */ nop -/* E0EFD4 80240834 468031A0 */ cvt.s.w $f6, $f6 -/* E0EFD8 80240838 44073000 */ mfc1 $a3, $f6 -/* E0EFDC 8024083C 27A20028 */ addiu $v0, $sp, 0x28 -/* E0EFE0 80240840 AFA20020 */ sw $v0, 0x20($sp) -/* E0EFE4 80240844 E7A00010 */ swc1 $f0, 0x10($sp) -/* E0EFE8 80240848 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0EFEC 8024084C 0C01BFA4 */ jal fx_emote -/* E0EFF0 80240850 E7A40018 */ swc1 $f4, 0x18($sp) -/* E0EFF4 80240854 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E0EFF8 80240858 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E0EFFC 8024085C C60C0038 */ lwc1 $f12, 0x38($s0) -/* E0F000 80240860 C60E0040 */ lwc1 $f14, 0x40($s0) -/* E0F004 80240864 8C460028 */ lw $a2, 0x28($v0) -/* E0F008 80240868 0C00A720 */ jal atan2 -/* E0F00C 8024086C 8C470030 */ lw $a3, 0x30($v0) -/* E0F010 80240870 0200202D */ daddu $a0, $s0, $zero -/* E0F014 80240874 240502F4 */ addiu $a1, $zero, 0x2f4 -/* E0F018 80240878 3C060020 */ lui $a2, 0x20 -/* E0F01C 8024087C 0C012530 */ jal func_800494C0 -/* E0F020 80240880 E480000C */ swc1 $f0, 0xc($a0) -/* E0F024 80240884 8E220018 */ lw $v0, 0x18($s1) -/* E0F028 80240888 9442002A */ lhu $v0, 0x2a($v0) -/* E0F02C 8024088C 30420001 */ andi $v0, $v0, 1 -/* E0F030 80240890 14400029 */ bnez $v0, .L80240938 -/* E0F034 80240894 2402000A */ addiu $v0, $zero, 0xa -/* E0F038 80240898 0809024E */ j .L80240938 -/* E0F03C 8024089C 2402000C */ addiu $v0, $zero, 0xc -.L802408A0: -/* E0F040 802408A0 8602008C */ lh $v0, 0x8c($s0) -/* E0F044 802408A4 14400025 */ bnez $v0, .L8024093C -/* E0F048 802408A8 00000000 */ nop -/* E0F04C 802408AC 9602008E */ lhu $v0, 0x8e($s0) -/* E0F050 802408B0 2442FFFF */ addiu $v0, $v0, -1 -/* E0F054 802408B4 A602008E */ sh $v0, 0x8e($s0) -/* E0F058 802408B8 00021400 */ sll $v0, $v0, 0x10 -/* E0F05C 802408BC 1440001F */ bnez $v0, .L8024093C -/* E0F060 802408C0 00000000 */ nop -/* E0F064 802408C4 8E820074 */ lw $v0, 0x74($s4) -/* E0F068 802408C8 2442FFFF */ addiu $v0, $v0, -1 -/* E0F06C 802408CC 10400019 */ beqz $v0, .L80240934 -/* E0F070 802408D0 AE820074 */ sw $v0, 0x74($s4) -/* E0F074 802408D4 8E220018 */ lw $v0, 0x18($s1) -/* E0F078 802408D8 9442002A */ lhu $v0, 0x2a($v0) -/* E0F07C 802408DC 30420010 */ andi $v0, $v0, 0x10 -/* E0F080 802408E0 14400007 */ bnez $v0, .L80240900 -/* E0F084 802408E4 00000000 */ nop -/* E0F088 802408E8 C600000C */ lwc1 $f0, 0xc($s0) -/* E0F08C 802408EC 3C014334 */ lui $at, 0x4334 -/* E0F090 802408F0 44816000 */ mtc1 $at, $f12 -/* E0F094 802408F4 0C00A6C9 */ jal clamp_angle -/* E0F098 802408F8 460C0300 */ add.s $f12, $f0, $f12 -/* E0F09C 802408FC E600000C */ swc1 $f0, 0xc($s0) -.L80240900: -/* E0F0A0 80240900 8E440008 */ lw $a0, 8($s2) -/* E0F0A4 80240904 000417C2 */ srl $v0, $a0, 0x1f -/* E0F0A8 80240908 00822021 */ addu $a0, $a0, $v0 -/* E0F0AC 8024090C 00042043 */ sra $a0, $a0, 1 -/* E0F0B0 80240910 0C00A67F */ jal rand_int -/* E0F0B4 80240914 24840001 */ addiu $a0, $a0, 1 -/* E0F0B8 80240918 8E430008 */ lw $v1, 8($s2) -/* E0F0BC 8024091C 000327C2 */ srl $a0, $v1, 0x1f -/* E0F0C0 80240920 00641821 */ addu $v1, $v1, $a0 -/* E0F0C4 80240924 00031843 */ sra $v1, $v1, 1 -/* E0F0C8 80240928 00621821 */ addu $v1, $v1, $v0 -/* E0F0CC 8024092C 0809024F */ j .L8024093C -/* E0F0D0 80240930 A603008E */ sh $v1, 0x8e($s0) -.L80240934: -/* E0F0D4 80240934 24020004 */ addiu $v0, $zero, 4 -.L80240938: -/* E0F0D8 80240938 AE820070 */ sw $v0, 0x70($s4) -.L8024093C: -/* E0F0DC 8024093C 8FBF0044 */ lw $ra, 0x44($sp) -/* E0F0E0 80240940 8FB40040 */ lw $s4, 0x40($sp) -/* E0F0E4 80240944 8FB3003C */ lw $s3, 0x3c($sp) -/* E0F0E8 80240948 8FB20038 */ lw $s2, 0x38($sp) -/* E0F0EC 8024094C 8FB10034 */ lw $s1, 0x34($sp) -/* E0F0F0 80240950 8FB00030 */ lw $s0, 0x30($sp) -/* E0F0F4 80240954 03E00008 */ jr $ra -/* E0F0F8 80240958 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s deleted file mode 100644 index c6dee59e8c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240C2C_E0F3CC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C2C_E0F3CC -/* E0F3CC 80240C2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* E0F3D0 80240C30 AFB3003C */ sw $s3, 0x3c($sp) -/* E0F3D4 80240C34 0080982D */ daddu $s3, $a0, $zero -/* E0F3D8 80240C38 AFBF0040 */ sw $ra, 0x40($sp) -/* E0F3DC 80240C3C AFB20038 */ sw $s2, 0x38($sp) -/* E0F3E0 80240C40 AFB10034 */ sw $s1, 0x34($sp) -/* E0F3E4 80240C44 AFB00030 */ sw $s0, 0x30($sp) -/* E0F3E8 80240C48 8E720148 */ lw $s2, 0x148($s3) -/* E0F3EC 80240C4C 00A0882D */ daddu $s1, $a1, $zero -/* E0F3F0 80240C50 86440008 */ lh $a0, 8($s2) -/* E0F3F4 80240C54 0C00EABB */ jal get_npc_unsafe -/* E0F3F8 80240C58 00C0802D */ daddu $s0, $a2, $zero -/* E0F3FC 80240C5C 0200202D */ daddu $a0, $s0, $zero -/* E0F400 80240C60 0240282D */ daddu $a1, $s2, $zero -/* E0F404 80240C64 24030001 */ addiu $v1, $zero, 1 -/* E0F408 80240C68 AFA30010 */ sw $v1, 0x10($sp) -/* E0F40C 80240C6C 8E260024 */ lw $a2, 0x24($s1) -/* E0F410 80240C70 8E270028 */ lw $a3, 0x28($s1) -/* E0F414 80240C74 0C01242D */ jal func_800490B4 -/* E0F418 80240C78 0040802D */ daddu $s0, $v0, $zero -/* E0F41C 80240C7C 1440001E */ bnez $v0, .L80240CF8 -/* E0F420 80240C80 0200202D */ daddu $a0, $s0, $zero -/* E0F424 80240C84 24040002 */ addiu $a0, $zero, 2 -/* E0F428 80240C88 0200282D */ daddu $a1, $s0, $zero -/* E0F42C 80240C8C 0000302D */ daddu $a2, $zero, $zero -/* E0F430 80240C90 860300A8 */ lh $v1, 0xa8($s0) -/* E0F434 80240C94 3C013F80 */ lui $at, 0x3f80 -/* E0F438 80240C98 44810000 */ mtc1 $at, $f0 -/* E0F43C 80240C9C 3C014000 */ lui $at, 0x4000 -/* E0F440 80240CA0 44811000 */ mtc1 $at, $f2 -/* E0F444 80240CA4 3C01C1A0 */ lui $at, 0xc1a0 -/* E0F448 80240CA8 44812000 */ mtc1 $at, $f4 -/* E0F44C 80240CAC 2402000F */ addiu $v0, $zero, 0xf -/* E0F450 80240CB0 AFA2001C */ sw $v0, 0x1c($sp) -/* E0F454 80240CB4 44833000 */ mtc1 $v1, $f6 -/* E0F458 80240CB8 00000000 */ nop -/* E0F45C 80240CBC 468031A0 */ cvt.s.w $f6, $f6 -/* E0F460 80240CC0 44073000 */ mfc1 $a3, $f6 -/* E0F464 80240CC4 27A20028 */ addiu $v0, $sp, 0x28 -/* E0F468 80240CC8 AFA20020 */ sw $v0, 0x20($sp) -/* E0F46C 80240CCC E7A00010 */ swc1 $f0, 0x10($sp) -/* E0F470 80240CD0 E7A20014 */ swc1 $f2, 0x14($sp) -/* E0F474 80240CD4 0C01BFA4 */ jal fx_emote -/* E0F478 80240CD8 E7A40018 */ swc1 $f4, 0x18($sp) -/* E0F47C 80240CDC 8E4200CC */ lw $v0, 0xcc($s2) -/* E0F480 80240CE0 8C430000 */ lw $v1, ($v0) -/* E0F484 80240CE4 24020019 */ addiu $v0, $zero, 0x19 -/* E0F488 80240CE8 A602008E */ sh $v0, 0x8e($s0) -/* E0F48C 80240CEC 2402000E */ addiu $v0, $zero, 0xe -/* E0F490 80240CF0 0809034B */ j .L80240D2C -/* E0F494 80240CF4 AE030028 */ sw $v1, 0x28($s0) -.L80240CF8: -/* E0F498 80240CF8 0C00F598 */ jal func_8003D660 -/* E0F49C 80240CFC 24050001 */ addiu $a1, $zero, 1 -/* E0F4A0 80240D00 8E050018 */ lw $a1, 0x18($s0) -/* E0F4A4 80240D04 8E06000C */ lw $a2, 0xc($s0) -/* E0F4A8 80240D08 0C00EA95 */ jal npc_move_heading -/* E0F4AC 80240D0C 0200202D */ daddu $a0, $s0, $zero -/* E0F4B0 80240D10 8602008E */ lh $v0, 0x8e($s0) -/* E0F4B4 80240D14 9603008E */ lhu $v1, 0x8e($s0) -/* E0F4B8 80240D18 18400003 */ blez $v0, .L80240D28 -/* E0F4BC 80240D1C 2462FFFF */ addiu $v0, $v1, -1 -/* E0F4C0 80240D20 0809034C */ j .L80240D30 -/* E0F4C4 80240D24 A602008E */ sh $v0, 0x8e($s0) -.L80240D28: -/* E0F4C8 80240D28 2402000C */ addiu $v0, $zero, 0xc -.L80240D2C: -/* E0F4CC 80240D2C AE620070 */ sw $v0, 0x70($s3) -.L80240D30: -/* E0F4D0 80240D30 8FBF0040 */ lw $ra, 0x40($sp) -/* E0F4D4 80240D34 8FB3003C */ lw $s3, 0x3c($sp) -/* E0F4D8 80240D38 8FB20038 */ lw $s2, 0x38($sp) -/* E0F4DC 80240D3C 8FB10034 */ lw $s1, 0x34($sp) -/* E0F4E0 80240D40 8FB00030 */ lw $s0, 0x30($sp) -/* E0F4E4 80240D44 03E00008 */ jr $ra -/* E0F4E8 80240D48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s deleted file mode 100644 index 9f1f4eacd5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DB4_E0F554 -/* E0F554 80240DB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F558 80240DB8 AFB10014 */ sw $s1, 0x14($sp) -/* E0F55C 80240DBC 0080882D */ daddu $s1, $a0, $zero -/* E0F560 80240DC0 AFBF001C */ sw $ra, 0x1c($sp) -/* E0F564 80240DC4 AFB20018 */ sw $s2, 0x18($sp) -/* E0F568 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* E0F56C 80240DCC 8E300148 */ lw $s0, 0x148($s1) -/* E0F570 80240DD0 86040008 */ lh $a0, 8($s0) -/* E0F574 80240DD4 0C00EABB */ jal get_npc_unsafe -/* E0F578 80240DD8 00A0902D */ daddu $s2, $a1, $zero -/* E0F57C 80240DDC 8E0300D0 */ lw $v1, 0xd0($s0) -/* E0F580 80240DE0 8E240078 */ lw $a0, 0x78($s1) -/* E0F584 80240DE4 8C630000 */ lw $v1, ($v1) -/* E0F588 80240DE8 0083182A */ slt $v1, $a0, $v1 -/* E0F58C 80240DEC 10600013 */ beqz $v1, .L80240E3C -/* E0F590 80240DF0 0040302D */ daddu $a2, $v0, $zero -/* E0F594 80240DF4 00041040 */ sll $v0, $a0, 1 -/* E0F598 80240DF8 00441021 */ addu $v0, $v0, $a0 -/* E0F59C 80240DFC 00022880 */ sll $a1, $v0, 2 -.L80240E00: -/* E0F5A0 80240E00 8E0300D0 */ lw $v1, 0xd0($s0) -/* E0F5A4 80240E04 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* E0F5A8 80240E08 00A31021 */ addu $v0, $a1, $v1 -/* E0F5AC 80240E0C C4400008 */ lwc1 $f0, 8($v0) -/* E0F5B0 80240E10 46800020 */ cvt.s.w $f0, $f0 -/* E0F5B4 80240E14 4602003E */ c.le.s $f0, $f2 -/* E0F5B8 80240E18 00000000 */ nop -/* E0F5BC 80240E1C 45020003 */ bc1fl .L80240E2C -/* E0F5C0 80240E20 24840001 */ addiu $a0, $a0, 1 -/* E0F5C4 80240E24 0809038F */ j .L80240E3C -/* E0F5C8 80240E28 AE240078 */ sw $a0, 0x78($s1) -.L80240E2C: -/* E0F5CC 80240E2C 8C620000 */ lw $v0, ($v1) -/* E0F5D0 80240E30 0082102A */ slt $v0, $a0, $v0 -/* E0F5D4 80240E34 1440FFF2 */ bnez $v0, .L80240E00 -/* E0F5D8 80240E38 24A5000C */ addiu $a1, $a1, 0xc -.L80240E3C: -/* E0F5DC 80240E3C C6400000 */ lwc1 $f0, ($s2) -/* E0F5E0 80240E40 E4C00018 */ swc1 $f0, 0x18($a2) -/* E0F5E4 80240E44 8E0200CC */ lw $v0, 0xcc($s0) -/* E0F5E8 80240E48 8C420004 */ lw $v0, 4($v0) -/* E0F5EC 80240E4C ACC20028 */ sw $v0, 0x28($a2) -/* E0F5F0 80240E50 24020001 */ addiu $v0, $zero, 1 -/* E0F5F4 80240E54 AE200074 */ sw $zero, 0x74($s1) -/* E0F5F8 80240E58 AE220070 */ sw $v0, 0x70($s1) -/* E0F5FC 80240E5C 8FBF001C */ lw $ra, 0x1c($sp) -/* E0F600 80240E60 8FB20018 */ lw $s2, 0x18($sp) -/* E0F604 80240E64 8FB10014 */ lw $s1, 0x14($sp) -/* E0F608 80240E68 8FB00010 */ lw $s0, 0x10($sp) -/* E0F60C 80240E6C 03E00008 */ jr $ra -/* E0F610 80240E70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 0bf9d0c998..76430804fd 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -137,7 +137,7 @@ glabel L80241058_E0F7F8 glabel L80241068_E0F808 /* E0F808 80241068 0280202D */ daddu $a0, $s4, $zero /* E0F80C 8024106C 0260282D */ daddu $a1, $s3, $zero -/* E0F810 80241070 0C09010E */ jal func_80240438_E0EBD8 +/* E0F810 80241070 0C09010E */ jal mgm_00_UnkFunc13 /* E0F814 80241074 02A0302D */ daddu $a2, $s5, $zero /* E0F818 80241078 08090452 */ j L80241148_E0F8E8 /* E0F81C 8024107C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241080_E0F820 glabel L80241090_E0F830 /* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero -/* E0F838 80241098 0C0901E8 */ jal func_802407A0_E0EF40 +/* E0F838 80241098 0C0901E8 */ jal mgm_00_UnkFunc14 /* E0F83C 8024109C 02A0302D */ daddu $a2, $s5, $zero /* E0F840 802410A0 08090452 */ j L80241148_E0F8E8 /* E0F844 802410A4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L802410E8_E0F888 glabel L802410F8_E0F898 /* E0F898 802410F8 0280202D */ daddu $a0, $s4, $zero /* E0F89C 802410FC 0260282D */ daddu $a1, $s3, $zero -/* E0F8A0 80241100 0C09030B */ jal func_80240C2C_E0F3CC +/* E0F8A0 80241100 0C09030B */ jal mgm_00_UnkFunc15 /* E0F8A4 80241104 02A0302D */ daddu $a2, $s5, $zero /* E0F8A8 80241108 08090452 */ j L80241148_E0F8E8 /* E0F8AC 8024110C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241110_E0F8B0 glabel L80241128_E0F8C8 /* E0F8C8 80241128 0280202D */ daddu $a0, $s4, $zero /* E0F8CC 8024112C 0260282D */ daddu $a1, $s3, $zero -/* E0F8D0 80241130 0C09036D */ jal func_80240DB4_E0F554 +/* E0F8D0 80241130 0C09036D */ jal mgm_00_UnkFunc16 /* E0F8D4 80241134 02A0302D */ daddu $a2, $s5, $zero /* E0F8D8 80241138 08090452 */ j L80241148_E0F8E8 /* E0F8DC 8024113C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s deleted file mode 100644 index 38cbf04a75..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802408BC_B93CFC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408BC_B93CFC -/* B93CFC 802408BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B93D00 802408C0 AFB40028 */ sw $s4, 0x28($sp) -/* B93D04 802408C4 0080A02D */ daddu $s4, $a0, $zero -/* B93D08 802408C8 AFBF002C */ sw $ra, 0x2c($sp) -/* B93D0C 802408CC AFB30024 */ sw $s3, 0x24($sp) -/* B93D10 802408D0 AFB20020 */ sw $s2, 0x20($sp) -/* B93D14 802408D4 AFB1001C */ sw $s1, 0x1c($sp) -/* B93D18 802408D8 AFB00018 */ sw $s0, 0x18($sp) -/* B93D1C 802408DC 8E910148 */ lw $s1, 0x148($s4) -/* B93D20 802408E0 86240008 */ lh $a0, 8($s1) -/* B93D24 802408E4 0C00EABB */ jal get_npc_unsafe -/* B93D28 802408E8 00A0802D */ daddu $s0, $a1, $zero -/* B93D2C 802408EC 16000005 */ bnez $s0, .L80240904 -/* B93D30 802408F0 0040902D */ daddu $s2, $v0, $zero -/* B93D34 802408F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* B93D38 802408F8 30420004 */ andi $v0, $v0, 4 -/* B93D3C 802408FC 10400015 */ beqz $v0, .L80240954 -/* B93D40 80240900 00000000 */ nop -.L80240904: -/* B93D44 80240904 AE800070 */ sw $zero, 0x70($s4) -/* B93D48 80240908 8E420000 */ lw $v0, ($s2) -/* B93D4C 8024090C 3C031F30 */ lui $v1, 0x1f30 -/* B93D50 80240910 A640008E */ sh $zero, 0x8e($s2) -/* B93D54 80240914 34420102 */ ori $v0, $v0, 0x102 -/* B93D58 80240918 AE420000 */ sw $v0, ($s2) -/* B93D5C 8024091C 8E220000 */ lw $v0, ($s1) -/* B93D60 80240920 3C01C47A */ lui $at, 0xc47a -/* B93D64 80240924 44810000 */ mtc1 $at, $f0 -/* B93D68 80240928 00431025 */ or $v0, $v0, $v1 -/* B93D6C 8024092C AE220000 */ sw $v0, ($s1) -/* B93D70 80240930 AE400038 */ sw $zero, 0x38($s2) -/* B93D74 80240934 E640003C */ swc1 $f0, 0x3c($s2) -/* B93D78 80240938 AE400040 */ sw $zero, 0x40($s2) -/* B93D7C 8024093C 8E2300B0 */ lw $v1, 0xb0($s1) -/* B93D80 80240940 30620004 */ andi $v0, $v1, 4 -/* B93D84 80240944 10400003 */ beqz $v0, .L80240954 -/* B93D88 80240948 2402FFFB */ addiu $v0, $zero, -5 -/* B93D8C 8024094C 00621024 */ and $v0, $v1, $v0 -/* B93D90 80240950 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240954: -/* B93D94 80240954 8E930070 */ lw $s3, 0x70($s4) -/* B93D98 80240958 12600005 */ beqz $s3, .L80240970 -/* B93D9C 8024095C 24020001 */ addiu $v0, $zero, 1 -/* B93DA0 80240960 12620048 */ beq $s3, $v0, .L80240A84 -/* B93DA4 80240964 00000000 */ nop -/* B93DA8 80240968 080902BE */ j .L80240AF8 -/* B93DAC 8024096C 00000000 */ nop -.L80240970: -/* B93DB0 80240970 86240008 */ lh $a0, 8($s1) -/* B93DB4 80240974 0C00FB3A */ jal get_enemy -/* B93DB8 80240978 2484FFFF */ addiu $a0, $a0, -1 -/* B93DBC 8024097C 0040802D */ daddu $s0, $v0, $zero -/* B93DC0 80240980 0C00EABB */ jal get_npc_unsafe -/* B93DC4 80240984 86040008 */ lh $a0, 8($s0) -/* B93DC8 80240988 24030001 */ addiu $v1, $zero, 1 -/* B93DCC 8024098C 0040982D */ daddu $s3, $v0, $zero -/* B93DD0 80240990 A2230007 */ sb $v1, 7($s1) -/* B93DD4 80240994 8E03006C */ lw $v1, 0x6c($s0) -/* B93DD8 80240998 24020003 */ addiu $v0, $zero, 3 -/* B93DDC 8024099C 14620056 */ bne $v1, $v0, .L80240AF8 -/* B93DE0 802409A0 00000000 */ nop -/* B93DE4 802409A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* B93DE8 802409A8 10A00003 */ beqz $a1, .L802409B8 -/* B93DEC 802409AC 0260202D */ daddu $a0, $s3, $zero -/* B93DF0 802409B0 0C012530 */ jal func_800494C0 -/* B93DF4 802409B4 0000302D */ daddu $a2, $zero, $zero -.L802409B8: -/* B93DF8 802409B8 27A40010 */ addiu $a0, $sp, 0x10 -/* B93DFC 802409BC C6280070 */ lwc1 $f8, 0x70($s1) -/* B93E00 802409C0 46804220 */ cvt.s.w $f8, $f8 -/* B93E04 802409C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* B93E08 802409C8 3C014387 */ lui $at, 0x4387 -/* B93E0C 802409CC 44810000 */ mtc1 $at, $f0 -/* B93E10 802409D0 44064000 */ mfc1 $a2, $f8 -/* B93E14 802409D4 46020001 */ sub.s $f0, $f0, $f2 -/* B93E18 802409D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* B93E1C 802409DC C6640040 */ lwc1 $f4, 0x40($s3) -/* B93E20 802409E0 44070000 */ mfc1 $a3, $f0 -/* B93E24 802409E4 27A50014 */ addiu $a1, $sp, 0x14 -/* B93E28 802409E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* B93E2C 802409EC 0C00A7E7 */ jal add_vec2D_polar -/* B93E30 802409F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* B93E34 802409F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B93E38 802409F8 4600020D */ trunc.w.s $f8, $f0 -/* B93E3C 802409FC 44024000 */ mfc1 $v0, $f8 -/* B93E40 80240A00 E6400038 */ swc1 $f0, 0x38($s2) -/* B93E44 80240A04 A6220010 */ sh $v0, 0x10($s1) -/* B93E48 80240A08 C660003C */ lwc1 $f0, 0x3c($s3) -/* B93E4C 80240A0C C622006C */ lwc1 $f2, 0x6c($s1) -/* B93E50 80240A10 468010A0 */ cvt.s.w $f2, $f2 -/* B93E54 80240A14 46020000 */ add.s $f0, $f0, $f2 -/* B93E58 80240A18 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B93E5C 80240A1C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B93E60 80240A20 E640003C */ swc1 $f0, 0x3c($s2) -/* B93E64 80240A24 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B93E68 80240A28 4600020D */ trunc.w.s $f8, $f0 -/* B93E6C 80240A2C 44024000 */ mfc1 $v0, $f8 -/* B93E70 80240A30 00000000 */ nop -/* B93E74 80240A34 A6220012 */ sh $v0, 0x12($s1) -/* B93E78 80240A38 4600120D */ trunc.w.s $f8, $f2 -/* B93E7C 80240A3C 44024000 */ mfc1 $v0, $f8 -/* B93E80 80240A40 E6420040 */ swc1 $f2, 0x40($s2) -/* B93E84 80240A44 A6220014 */ sh $v0, 0x14($s1) -/* B93E88 80240A48 8C660028 */ lw $a2, 0x28($v1) -/* B93E8C 80240A4C 8C670030 */ lw $a3, 0x30($v1) -/* B93E90 80240A50 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B93E94 80240A54 0C00A720 */ jal atan2 -/* B93E98 80240A58 C64E0040 */ lwc1 $f14, 0x40($s2) -/* B93E9C 80240A5C 3C03E0EF */ lui $v1, 0xe0ef -/* B93EA0 80240A60 E640000C */ swc1 $f0, 0xc($s2) -/* B93EA4 80240A64 8E220000 */ lw $v0, ($s1) -/* B93EA8 80240A68 3463FFFF */ ori $v1, $v1, 0xffff -/* B93EAC 80240A6C 00431024 */ and $v0, $v0, $v1 -/* B93EB0 80240A70 AE220000 */ sw $v0, ($s1) -/* B93EB4 80240A74 24020001 */ addiu $v0, $zero, 1 -/* B93EB8 80240A78 A640008E */ sh $zero, 0x8e($s2) -/* B93EBC 80240A7C 080902BE */ j .L80240AF8 -/* B93EC0 80240A80 AE820070 */ sw $v0, 0x70($s4) -.L80240A84: -/* B93EC4 80240A84 86240008 */ lh $a0, 8($s1) -/* B93EC8 80240A88 0C00FB3A */ jal get_enemy -/* B93ECC 80240A8C 2484FFFF */ addiu $a0, $a0, -1 -/* B93ED0 80240A90 0040802D */ daddu $s0, $v0, $zero -/* B93ED4 80240A94 0C00EABB */ jal get_npc_unsafe -/* B93ED8 80240A98 86040008 */ lh $a0, 8($s0) -/* B93EDC 80240A9C 9642008E */ lhu $v0, 0x8e($s2) -/* B93EE0 80240AA0 24420001 */ addiu $v0, $v0, 1 -/* B93EE4 80240AA4 A642008E */ sh $v0, 0x8e($s2) -/* B93EE8 80240AA8 00021400 */ sll $v0, $v0, 0x10 -/* B93EEC 80240AAC 8E23007C */ lw $v1, 0x7c($s1) -/* B93EF0 80240AB0 00021403 */ sra $v0, $v0, 0x10 -/* B93EF4 80240AB4 0043102A */ slt $v0, $v0, $v1 -/* B93EF8 80240AB8 50400001 */ beql $v0, $zero, .L80240AC0 -/* B93EFC 80240ABC A2200007 */ sb $zero, 7($s1) -.L80240AC0: -/* B93F00 80240AC0 8E03006C */ lw $v1, 0x6c($s0) -/* B93F04 80240AC4 24020004 */ addiu $v0, $zero, 4 -/* B93F08 80240AC8 1462000B */ bne $v1, $v0, .L80240AF8 -/* B93F0C 80240ACC 3C021F10 */ lui $v0, 0x1f10 -/* B93F10 80240AD0 8E230000 */ lw $v1, ($s1) -/* B93F14 80240AD4 3C01C47A */ lui $at, 0xc47a -/* B93F18 80240AD8 44810000 */ mtc1 $at, $f0 -/* B93F1C 80240ADC 00621825 */ or $v1, $v1, $v0 -/* B93F20 80240AE0 AE230000 */ sw $v1, ($s1) -/* B93F24 80240AE4 AE400038 */ sw $zero, 0x38($s2) -/* B93F28 80240AE8 E640003C */ swc1 $f0, 0x3c($s2) -/* B93F2C 80240AEC AE400040 */ sw $zero, 0x40($s2) -/* B93F30 80240AF0 A2330007 */ sb $s3, 7($s1) -/* B93F34 80240AF4 AE800070 */ sw $zero, 0x70($s4) -.L80240AF8: -/* B93F38 80240AF8 8FBF002C */ lw $ra, 0x2c($sp) -/* B93F3C 80240AFC 8FB40028 */ lw $s4, 0x28($sp) -/* B93F40 80240B00 8FB30024 */ lw $s3, 0x24($sp) -/* B93F44 80240B04 8FB20020 */ lw $s2, 0x20($sp) -/* B93F48 80240B08 8FB1001C */ lw $s1, 0x1c($sp) -/* B93F4C 80240B0C 8FB00018 */ lw $s0, 0x18($sp) -/* B93F50 80240B10 0000102D */ daddu $v0, $zero, $zero -/* B93F54 80240B14 03E00008 */ jr $ra -/* B93F58 80240B18 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s deleted file mode 100644 index 34d0713702..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024042C_BA0B5C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_BA0B5C -/* BA0B5C 8024042C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA0B60 80240430 AFB40028 */ sw $s4, 0x28($sp) -/* BA0B64 80240434 0080A02D */ daddu $s4, $a0, $zero -/* BA0B68 80240438 AFBF002C */ sw $ra, 0x2c($sp) -/* BA0B6C 8024043C AFB30024 */ sw $s3, 0x24($sp) -/* BA0B70 80240440 AFB20020 */ sw $s2, 0x20($sp) -/* BA0B74 80240444 AFB1001C */ sw $s1, 0x1c($sp) -/* BA0B78 80240448 AFB00018 */ sw $s0, 0x18($sp) -/* BA0B7C 8024044C 8E910148 */ lw $s1, 0x148($s4) -/* BA0B80 80240450 86240008 */ lh $a0, 8($s1) -/* BA0B84 80240454 0C00EABB */ jal get_npc_unsafe -/* BA0B88 80240458 00A0802D */ daddu $s0, $a1, $zero -/* BA0B8C 8024045C 16000005 */ bnez $s0, .L80240474 -/* BA0B90 80240460 0040902D */ daddu $s2, $v0, $zero -/* BA0B94 80240464 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA0B98 80240468 30420004 */ andi $v0, $v0, 4 -/* BA0B9C 8024046C 10400015 */ beqz $v0, .L802404C4 -/* BA0BA0 80240470 00000000 */ nop -.L80240474: -/* BA0BA4 80240474 AE800070 */ sw $zero, 0x70($s4) -/* BA0BA8 80240478 8E420000 */ lw $v0, ($s2) -/* BA0BAC 8024047C 3C031F30 */ lui $v1, 0x1f30 -/* BA0BB0 80240480 A640008E */ sh $zero, 0x8e($s2) -/* BA0BB4 80240484 34420102 */ ori $v0, $v0, 0x102 -/* BA0BB8 80240488 AE420000 */ sw $v0, ($s2) -/* BA0BBC 8024048C 8E220000 */ lw $v0, ($s1) -/* BA0BC0 80240490 3C01C47A */ lui $at, 0xc47a -/* BA0BC4 80240494 44810000 */ mtc1 $at, $f0 -/* BA0BC8 80240498 00431025 */ or $v0, $v0, $v1 -/* BA0BCC 8024049C AE220000 */ sw $v0, ($s1) -/* BA0BD0 802404A0 AE400038 */ sw $zero, 0x38($s2) -/* BA0BD4 802404A4 E640003C */ swc1 $f0, 0x3c($s2) -/* BA0BD8 802404A8 AE400040 */ sw $zero, 0x40($s2) -/* BA0BDC 802404AC 8E2300B0 */ lw $v1, 0xb0($s1) -/* BA0BE0 802404B0 30620004 */ andi $v0, $v1, 4 -/* BA0BE4 802404B4 10400003 */ beqz $v0, .L802404C4 -/* BA0BE8 802404B8 2402FFFB */ addiu $v0, $zero, -5 -/* BA0BEC 802404BC 00621024 */ and $v0, $v1, $v0 -/* BA0BF0 802404C0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404C4: -/* BA0BF4 802404C4 8E930070 */ lw $s3, 0x70($s4) -/* BA0BF8 802404C8 12600005 */ beqz $s3, .L802404E0 -/* BA0BFC 802404CC 24020001 */ addiu $v0, $zero, 1 -/* BA0C00 802404D0 12620048 */ beq $s3, $v0, .L802405F4 -/* BA0C04 802404D4 00000000 */ nop -/* BA0C08 802404D8 0809019A */ j .L80240668 -/* BA0C0C 802404DC 00000000 */ nop -.L802404E0: -/* BA0C10 802404E0 86240008 */ lh $a0, 8($s1) -/* BA0C14 802404E4 0C00FB3A */ jal get_enemy -/* BA0C18 802404E8 2484FFFF */ addiu $a0, $a0, -1 -/* BA0C1C 802404EC 0040802D */ daddu $s0, $v0, $zero -/* BA0C20 802404F0 0C00EABB */ jal get_npc_unsafe -/* BA0C24 802404F4 86040008 */ lh $a0, 8($s0) -/* BA0C28 802404F8 24030001 */ addiu $v1, $zero, 1 -/* BA0C2C 802404FC 0040982D */ daddu $s3, $v0, $zero -/* BA0C30 80240500 A2230007 */ sb $v1, 7($s1) -/* BA0C34 80240504 8E03006C */ lw $v1, 0x6c($s0) -/* BA0C38 80240508 24020003 */ addiu $v0, $zero, 3 -/* BA0C3C 8024050C 14620056 */ bne $v1, $v0, .L80240668 -/* BA0C40 80240510 00000000 */ nop -/* BA0C44 80240514 8E2500A8 */ lw $a1, 0xa8($s1) -/* BA0C48 80240518 10A00003 */ beqz $a1, .L80240528 -/* BA0C4C 8024051C 0260202D */ daddu $a0, $s3, $zero -/* BA0C50 80240520 0C012530 */ jal func_800494C0 -/* BA0C54 80240524 0000302D */ daddu $a2, $zero, $zero -.L80240528: -/* BA0C58 80240528 27A40010 */ addiu $a0, $sp, 0x10 -/* BA0C5C 8024052C C6280070 */ lwc1 $f8, 0x70($s1) -/* BA0C60 80240530 46804220 */ cvt.s.w $f8, $f8 -/* BA0C64 80240534 C6620034 */ lwc1 $f2, 0x34($s3) -/* BA0C68 80240538 3C014387 */ lui $at, 0x4387 -/* BA0C6C 8024053C 44810000 */ mtc1 $at, $f0 -/* BA0C70 80240540 44064000 */ mfc1 $a2, $f8 -/* BA0C74 80240544 46020001 */ sub.s $f0, $f0, $f2 -/* BA0C78 80240548 C6660038 */ lwc1 $f6, 0x38($s3) -/* BA0C7C 8024054C C6640040 */ lwc1 $f4, 0x40($s3) -/* BA0C80 80240550 44070000 */ mfc1 $a3, $f0 -/* BA0C84 80240554 27A50014 */ addiu $a1, $sp, 0x14 -/* BA0C88 80240558 E7A60010 */ swc1 $f6, 0x10($sp) -/* BA0C8C 8024055C 0C00A7E7 */ jal add_vec2D_polar -/* BA0C90 80240560 E7A40014 */ swc1 $f4, 0x14($sp) -/* BA0C94 80240564 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BA0C98 80240568 4600020D */ trunc.w.s $f8, $f0 -/* BA0C9C 8024056C 44024000 */ mfc1 $v0, $f8 -/* BA0CA0 80240570 E6400038 */ swc1 $f0, 0x38($s2) -/* BA0CA4 80240574 A6220010 */ sh $v0, 0x10($s1) -/* BA0CA8 80240578 C660003C */ lwc1 $f0, 0x3c($s3) -/* BA0CAC 8024057C C622006C */ lwc1 $f2, 0x6c($s1) -/* BA0CB0 80240580 468010A0 */ cvt.s.w $f2, $f2 -/* BA0CB4 80240584 46020000 */ add.s $f0, $f0, $f2 -/* BA0CB8 80240588 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BA0CBC 8024058C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BA0CC0 80240590 E640003C */ swc1 $f0, 0x3c($s2) -/* BA0CC4 80240594 C7A20014 */ lwc1 $f2, 0x14($sp) -/* BA0CC8 80240598 4600020D */ trunc.w.s $f8, $f0 -/* BA0CCC 8024059C 44024000 */ mfc1 $v0, $f8 -/* BA0CD0 802405A0 00000000 */ nop -/* BA0CD4 802405A4 A6220012 */ sh $v0, 0x12($s1) -/* BA0CD8 802405A8 4600120D */ trunc.w.s $f8, $f2 -/* BA0CDC 802405AC 44024000 */ mfc1 $v0, $f8 -/* BA0CE0 802405B0 E6420040 */ swc1 $f2, 0x40($s2) -/* BA0CE4 802405B4 A6220014 */ sh $v0, 0x14($s1) -/* BA0CE8 802405B8 8C660028 */ lw $a2, 0x28($v1) -/* BA0CEC 802405BC 8C670030 */ lw $a3, 0x30($v1) -/* BA0CF0 802405C0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BA0CF4 802405C4 0C00A720 */ jal atan2 -/* BA0CF8 802405C8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BA0CFC 802405CC 3C03E0EF */ lui $v1, 0xe0ef -/* BA0D00 802405D0 E640000C */ swc1 $f0, 0xc($s2) -/* BA0D04 802405D4 8E220000 */ lw $v0, ($s1) -/* BA0D08 802405D8 3463FFFF */ ori $v1, $v1, 0xffff -/* BA0D0C 802405DC 00431024 */ and $v0, $v0, $v1 -/* BA0D10 802405E0 AE220000 */ sw $v0, ($s1) -/* BA0D14 802405E4 24020001 */ addiu $v0, $zero, 1 -/* BA0D18 802405E8 A640008E */ sh $zero, 0x8e($s2) -/* BA0D1C 802405EC 0809019A */ j .L80240668 -/* BA0D20 802405F0 AE820070 */ sw $v0, 0x70($s4) -.L802405F4: -/* BA0D24 802405F4 86240008 */ lh $a0, 8($s1) -/* BA0D28 802405F8 0C00FB3A */ jal get_enemy -/* BA0D2C 802405FC 2484FFFF */ addiu $a0, $a0, -1 -/* BA0D30 80240600 0040802D */ daddu $s0, $v0, $zero -/* BA0D34 80240604 0C00EABB */ jal get_npc_unsafe -/* BA0D38 80240608 86040008 */ lh $a0, 8($s0) -/* BA0D3C 8024060C 9642008E */ lhu $v0, 0x8e($s2) -/* BA0D40 80240610 24420001 */ addiu $v0, $v0, 1 -/* BA0D44 80240614 A642008E */ sh $v0, 0x8e($s2) -/* BA0D48 80240618 00021400 */ sll $v0, $v0, 0x10 -/* BA0D4C 8024061C 8E23007C */ lw $v1, 0x7c($s1) -/* BA0D50 80240620 00021403 */ sra $v0, $v0, 0x10 -/* BA0D54 80240624 0043102A */ slt $v0, $v0, $v1 -/* BA0D58 80240628 50400001 */ beql $v0, $zero, .L80240630 -/* BA0D5C 8024062C A2200007 */ sb $zero, 7($s1) -.L80240630: -/* BA0D60 80240630 8E03006C */ lw $v1, 0x6c($s0) -/* BA0D64 80240634 24020004 */ addiu $v0, $zero, 4 -/* BA0D68 80240638 1462000B */ bne $v1, $v0, .L80240668 -/* BA0D6C 8024063C 3C021F10 */ lui $v0, 0x1f10 -/* BA0D70 80240640 8E230000 */ lw $v1, ($s1) -/* BA0D74 80240644 3C01C47A */ lui $at, 0xc47a -/* BA0D78 80240648 44810000 */ mtc1 $at, $f0 -/* BA0D7C 8024064C 00621825 */ or $v1, $v1, $v0 -/* BA0D80 80240650 AE230000 */ sw $v1, ($s1) -/* BA0D84 80240654 AE400038 */ sw $zero, 0x38($s2) -/* BA0D88 80240658 E640003C */ swc1 $f0, 0x3c($s2) -/* BA0D8C 8024065C AE400040 */ sw $zero, 0x40($s2) -/* BA0D90 80240660 A2330007 */ sb $s3, 7($s1) -/* BA0D94 80240664 AE800070 */ sw $zero, 0x70($s4) -.L80240668: -/* BA0D98 80240668 8FBF002C */ lw $ra, 0x2c($sp) -/* BA0D9C 8024066C 8FB40028 */ lw $s4, 0x28($sp) -/* BA0DA0 80240670 8FB30024 */ lw $s3, 0x24($sp) -/* BA0DA4 80240674 8FB20020 */ lw $s2, 0x20($sp) -/* BA0DA8 80240678 8FB1001C */ lw $s1, 0x1c($sp) -/* BA0DAC 8024067C 8FB00018 */ lw $s0, 0x18($sp) -/* BA0DB0 80240680 0000102D */ daddu $v0, $zero, $zero -/* BA0DB4 80240684 03E00008 */ jr $ra -/* BA0DB8 80240688 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s deleted file mode 100644 index 0ecdfe9db3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024092C_BA50AC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024092C_BA50AC -/* BA50AC 8024092C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA50B0 80240930 AFB40028 */ sw $s4, 0x28($sp) -/* BA50B4 80240934 0080A02D */ daddu $s4, $a0, $zero -/* BA50B8 80240938 AFBF002C */ sw $ra, 0x2c($sp) -/* BA50BC 8024093C AFB30024 */ sw $s3, 0x24($sp) -/* BA50C0 80240940 AFB20020 */ sw $s2, 0x20($sp) -/* BA50C4 80240944 AFB1001C */ sw $s1, 0x1c($sp) -/* BA50C8 80240948 AFB00018 */ sw $s0, 0x18($sp) -/* BA50CC 8024094C 8E910148 */ lw $s1, 0x148($s4) -/* BA50D0 80240950 86240008 */ lh $a0, 8($s1) -/* BA50D4 80240954 0C00EABB */ jal get_npc_unsafe -/* BA50D8 80240958 00A0802D */ daddu $s0, $a1, $zero -/* BA50DC 8024095C 16000005 */ bnez $s0, .L80240974 -/* BA50E0 80240960 0040902D */ daddu $s2, $v0, $zero -/* BA50E4 80240964 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA50E8 80240968 30420004 */ andi $v0, $v0, 4 -/* BA50EC 8024096C 10400015 */ beqz $v0, .L802409C4 -/* BA50F0 80240970 00000000 */ nop -.L80240974: -/* BA50F4 80240974 AE800070 */ sw $zero, 0x70($s4) -/* BA50F8 80240978 8E420000 */ lw $v0, ($s2) -/* BA50FC 8024097C 3C031F30 */ lui $v1, 0x1f30 -/* BA5100 80240980 A640008E */ sh $zero, 0x8e($s2) -/* BA5104 80240984 34420102 */ ori $v0, $v0, 0x102 -/* BA5108 80240988 AE420000 */ sw $v0, ($s2) -/* BA510C 8024098C 8E220000 */ lw $v0, ($s1) -/* BA5110 80240990 3C01C47A */ lui $at, 0xc47a -/* BA5114 80240994 44810000 */ mtc1 $at, $f0 -/* BA5118 80240998 00431025 */ or $v0, $v0, $v1 -/* BA511C 8024099C AE220000 */ sw $v0, ($s1) -/* BA5120 802409A0 AE400038 */ sw $zero, 0x38($s2) -/* BA5124 802409A4 E640003C */ swc1 $f0, 0x3c($s2) -/* BA5128 802409A8 AE400040 */ sw $zero, 0x40($s2) -/* BA512C 802409AC 8E2300B0 */ lw $v1, 0xb0($s1) -/* BA5130 802409B0 30620004 */ andi $v0, $v1, 4 -/* BA5134 802409B4 10400003 */ beqz $v0, .L802409C4 -/* BA5138 802409B8 2402FFFB */ addiu $v0, $zero, -5 -/* BA513C 802409BC 00621024 */ and $v0, $v1, $v0 -/* BA5140 802409C0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802409C4: -/* BA5144 802409C4 8E930070 */ lw $s3, 0x70($s4) -/* BA5148 802409C8 12600005 */ beqz $s3, .L802409E0 -/* BA514C 802409CC 24020001 */ addiu $v0, $zero, 1 -/* BA5150 802409D0 12620048 */ beq $s3, $v0, .L80240AF4 -/* BA5154 802409D4 00000000 */ nop -/* BA5158 802409D8 080902DA */ j .L80240B68 -/* BA515C 802409DC 00000000 */ nop -.L802409E0: -/* BA5160 802409E0 86240008 */ lh $a0, 8($s1) -/* BA5164 802409E4 0C00FB3A */ jal get_enemy -/* BA5168 802409E8 2484FFFF */ addiu $a0, $a0, -1 -/* BA516C 802409EC 0040802D */ daddu $s0, $v0, $zero -/* BA5170 802409F0 0C00EABB */ jal get_npc_unsafe -/* BA5174 802409F4 86040008 */ lh $a0, 8($s0) -/* BA5178 802409F8 24030001 */ addiu $v1, $zero, 1 -/* BA517C 802409FC 0040982D */ daddu $s3, $v0, $zero -/* BA5180 80240A00 A2230007 */ sb $v1, 7($s1) -/* BA5184 80240A04 8E03006C */ lw $v1, 0x6c($s0) -/* BA5188 80240A08 24020003 */ addiu $v0, $zero, 3 -/* BA518C 80240A0C 14620056 */ bne $v1, $v0, .L80240B68 -/* BA5190 80240A10 00000000 */ nop -/* BA5194 80240A14 8E2500A8 */ lw $a1, 0xa8($s1) -/* BA5198 80240A18 10A00003 */ beqz $a1, .L80240A28 -/* BA519C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* BA51A0 80240A20 0C012530 */ jal func_800494C0 -/* BA51A4 80240A24 0000302D */ daddu $a2, $zero, $zero -.L80240A28: -/* BA51A8 80240A28 27A40010 */ addiu $a0, $sp, 0x10 -/* BA51AC 80240A2C C6280070 */ lwc1 $f8, 0x70($s1) -/* BA51B0 80240A30 46804220 */ cvt.s.w $f8, $f8 -/* BA51B4 80240A34 C6620034 */ lwc1 $f2, 0x34($s3) -/* BA51B8 80240A38 3C014387 */ lui $at, 0x4387 -/* BA51BC 80240A3C 44810000 */ mtc1 $at, $f0 -/* BA51C0 80240A40 44064000 */ mfc1 $a2, $f8 -/* BA51C4 80240A44 46020001 */ sub.s $f0, $f0, $f2 -/* BA51C8 80240A48 C6660038 */ lwc1 $f6, 0x38($s3) -/* BA51CC 80240A4C C6640040 */ lwc1 $f4, 0x40($s3) -/* BA51D0 80240A50 44070000 */ mfc1 $a3, $f0 -/* BA51D4 80240A54 27A50014 */ addiu $a1, $sp, 0x14 -/* BA51D8 80240A58 E7A60010 */ swc1 $f6, 0x10($sp) -/* BA51DC 80240A5C 0C00A7E7 */ jal add_vec2D_polar -/* BA51E0 80240A60 E7A40014 */ swc1 $f4, 0x14($sp) -/* BA51E4 80240A64 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BA51E8 80240A68 4600020D */ trunc.w.s $f8, $f0 -/* BA51EC 80240A6C 44024000 */ mfc1 $v0, $f8 -/* BA51F0 80240A70 E6400038 */ swc1 $f0, 0x38($s2) -/* BA51F4 80240A74 A6220010 */ sh $v0, 0x10($s1) -/* BA51F8 80240A78 C660003C */ lwc1 $f0, 0x3c($s3) -/* BA51FC 80240A7C C622006C */ lwc1 $f2, 0x6c($s1) -/* BA5200 80240A80 468010A0 */ cvt.s.w $f2, $f2 -/* BA5204 80240A84 46020000 */ add.s $f0, $f0, $f2 -/* BA5208 80240A88 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BA520C 80240A8C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BA5210 80240A90 E640003C */ swc1 $f0, 0x3c($s2) -/* BA5214 80240A94 C7A20014 */ lwc1 $f2, 0x14($sp) -/* BA5218 80240A98 4600020D */ trunc.w.s $f8, $f0 -/* BA521C 80240A9C 44024000 */ mfc1 $v0, $f8 -/* BA5220 80240AA0 00000000 */ nop -/* BA5224 80240AA4 A6220012 */ sh $v0, 0x12($s1) -/* BA5228 80240AA8 4600120D */ trunc.w.s $f8, $f2 -/* BA522C 80240AAC 44024000 */ mfc1 $v0, $f8 -/* BA5230 80240AB0 E6420040 */ swc1 $f2, 0x40($s2) -/* BA5234 80240AB4 A6220014 */ sh $v0, 0x14($s1) -/* BA5238 80240AB8 8C660028 */ lw $a2, 0x28($v1) -/* BA523C 80240ABC 8C670030 */ lw $a3, 0x30($v1) -/* BA5240 80240AC0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BA5244 80240AC4 0C00A720 */ jal atan2 -/* BA5248 80240AC8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BA524C 80240ACC 3C03E0EF */ lui $v1, 0xe0ef -/* BA5250 80240AD0 E640000C */ swc1 $f0, 0xc($s2) -/* BA5254 80240AD4 8E220000 */ lw $v0, ($s1) -/* BA5258 80240AD8 3463FFFF */ ori $v1, $v1, 0xffff -/* BA525C 80240ADC 00431024 */ and $v0, $v0, $v1 -/* BA5260 80240AE0 AE220000 */ sw $v0, ($s1) -/* BA5264 80240AE4 24020001 */ addiu $v0, $zero, 1 -/* BA5268 80240AE8 A640008E */ sh $zero, 0x8e($s2) -/* BA526C 80240AEC 080902DA */ j .L80240B68 -/* BA5270 80240AF0 AE820070 */ sw $v0, 0x70($s4) -.L80240AF4: -/* BA5274 80240AF4 86240008 */ lh $a0, 8($s1) -/* BA5278 80240AF8 0C00FB3A */ jal get_enemy -/* BA527C 80240AFC 2484FFFF */ addiu $a0, $a0, -1 -/* BA5280 80240B00 0040802D */ daddu $s0, $v0, $zero -/* BA5284 80240B04 0C00EABB */ jal get_npc_unsafe -/* BA5288 80240B08 86040008 */ lh $a0, 8($s0) -/* BA528C 80240B0C 9642008E */ lhu $v0, 0x8e($s2) -/* BA5290 80240B10 24420001 */ addiu $v0, $v0, 1 -/* BA5294 80240B14 A642008E */ sh $v0, 0x8e($s2) -/* BA5298 80240B18 00021400 */ sll $v0, $v0, 0x10 -/* BA529C 80240B1C 8E23007C */ lw $v1, 0x7c($s1) -/* BA52A0 80240B20 00021403 */ sra $v0, $v0, 0x10 -/* BA52A4 80240B24 0043102A */ slt $v0, $v0, $v1 -/* BA52A8 80240B28 50400001 */ beql $v0, $zero, .L80240B30 -/* BA52AC 80240B2C A2200007 */ sb $zero, 7($s1) -.L80240B30: -/* BA52B0 80240B30 8E03006C */ lw $v1, 0x6c($s0) -/* BA52B4 80240B34 24020004 */ addiu $v0, $zero, 4 -/* BA52B8 80240B38 1462000B */ bne $v1, $v0, .L80240B68 -/* BA52BC 80240B3C 3C021F10 */ lui $v0, 0x1f10 -/* BA52C0 80240B40 8E230000 */ lw $v1, ($s1) -/* BA52C4 80240B44 3C01C47A */ lui $at, 0xc47a -/* BA52C8 80240B48 44810000 */ mtc1 $at, $f0 -/* BA52CC 80240B4C 00621825 */ or $v1, $v1, $v0 -/* BA52D0 80240B50 AE230000 */ sw $v1, ($s1) -/* BA52D4 80240B54 AE400038 */ sw $zero, 0x38($s2) -/* BA52D8 80240B58 E640003C */ swc1 $f0, 0x3c($s2) -/* BA52DC 80240B5C AE400040 */ sw $zero, 0x40($s2) -/* BA52E0 80240B60 A2330007 */ sb $s3, 7($s1) -/* BA52E4 80240B64 AE800070 */ sw $zero, 0x70($s4) -.L80240B68: -/* BA52E8 80240B68 8FBF002C */ lw $ra, 0x2c($sp) -/* BA52EC 80240B6C 8FB40028 */ lw $s4, 0x28($sp) -/* BA52F0 80240B70 8FB30024 */ lw $s3, 0x24($sp) -/* BA52F4 80240B74 8FB20020 */ lw $s2, 0x20($sp) -/* BA52F8 80240B78 8FB1001C */ lw $s1, 0x1c($sp) -/* BA52FC 80240B7C 8FB00018 */ lw $s0, 0x18($sp) -/* BA5300 80240B80 0000102D */ daddu $v0, $zero, $zero -/* BA5304 80240B84 03E00008 */ jr $ra -/* BA5308 80240B88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s deleted file mode 100644 index c4daf142da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240938_BAE278.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240938_BAE278 -/* BAE278 80240938 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BAE27C 8024093C AFB3004C */ sw $s3, 0x4c($sp) -/* BAE280 80240940 0080982D */ daddu $s3, $a0, $zero -/* BAE284 80240944 AFBF0054 */ sw $ra, 0x54($sp) -/* BAE288 80240948 AFB40050 */ sw $s4, 0x50($sp) -/* BAE28C 8024094C AFB20048 */ sw $s2, 0x48($sp) -/* BAE290 80240950 AFB10044 */ sw $s1, 0x44($sp) -/* BAE294 80240954 AFB00040 */ sw $s0, 0x40($sp) -/* BAE298 80240958 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BAE29C 8024095C F7B80068 */ sdc1 $f24, 0x68($sp) -/* BAE2A0 80240960 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BAE2A4 80240964 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BAE2A8 80240968 8E710148 */ lw $s1, 0x148($s3) -/* BAE2AC 8024096C 00A0902D */ daddu $s2, $a1, $zero -/* BAE2B0 80240970 86240008 */ lh $a0, 8($s1) -/* BAE2B4 80240974 0C00EABB */ jal get_npc_unsafe -/* BAE2B8 80240978 00C0A02D */ daddu $s4, $a2, $zero -/* BAE2BC 8024097C 0040802D */ daddu $s0, $v0, $zero -/* BAE2C0 80240980 C6200078 */ lwc1 $f0, 0x78($s1) -/* BAE2C4 80240984 46800020 */ cvt.s.w $f0, $f0 -/* BAE2C8 80240988 46000021 */ cvt.d.s $f0, $f0 -/* BAE2CC 8024098C 3C014059 */ lui $at, 0x4059 -/* BAE2D0 80240990 44811800 */ mtc1 $at, $f3 -/* BAE2D4 80240994 44801000 */ mtc1 $zero, $f2 -/* BAE2D8 80240998 8602008E */ lh $v0, 0x8e($s0) -/* BAE2DC 8024099C 9603008E */ lhu $v1, 0x8e($s0) -/* BAE2E0 802409A0 46220003 */ div.d $f0, $f0, $f2 -/* BAE2E4 802409A4 46200620 */ cvt.s.d $f24, $f0 -/* BAE2E8 802409A8 C6200088 */ lwc1 $f0, 0x88($s1) -/* BAE2EC 802409AC 46800020 */ cvt.s.w $f0, $f0 -/* BAE2F0 802409B0 46000021 */ cvt.d.s $f0, $f0 -/* BAE2F4 802409B4 46220003 */ div.d $f0, $f0, $f2 -/* BAE2F8 802409B8 46200020 */ cvt.s.d $f0, $f0 -/* BAE2FC 802409BC 18400003 */ blez $v0, .L802409CC -/* BAE300 802409C0 4600C680 */ add.s $f26, $f24, $f0 -/* BAE304 802409C4 2462FFFF */ addiu $v0, $v1, -1 -/* BAE308 802409C8 A602008E */ sh $v0, 0x8e($s0) -.L802409CC: -/* BAE30C 802409CC 8E220070 */ lw $v0, 0x70($s1) -/* BAE310 802409D0 18400034 */ blez $v0, .L80240AA4 -/* BAE314 802409D4 00000000 */ nop -/* BAE318 802409D8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BAE31C 802409DC 46806320 */ cvt.s.w $f12, $f12 -/* BAE320 802409E0 44820000 */ mtc1 $v0, $f0 -/* BAE324 802409E4 00000000 */ nop -/* BAE328 802409E8 46800020 */ cvt.s.w $f0, $f0 -/* BAE32C 802409EC 46000021 */ cvt.d.s $f0, $f0 -/* BAE330 802409F0 46220003 */ div.d $f0, $f0, $f2 -/* BAE334 802409F4 0C00A8BB */ jal sin_deg -/* BAE338 802409F8 462005A0 */ cvt.s.d $f22, $f0 -/* BAE33C 802409FC 8E020000 */ lw $v0, ($s0) -/* BAE340 80240A00 30420008 */ andi $v0, $v0, 8 -/* BAE344 80240A04 10400003 */ beqz $v0, .L80240A14 -/* BAE348 80240A08 46000506 */ mov.s $f20, $f0 -/* BAE34C 80240A0C 08090295 */ j .L80240A54 -/* BAE350 80240A10 0000102D */ daddu $v0, $zero, $zero -.L80240A14: -/* BAE354 80240A14 27A50028 */ addiu $a1, $sp, 0x28 -/* BAE358 80240A18 27A6002C */ addiu $a2, $sp, 0x2c -/* BAE35C 80240A1C C6000038 */ lwc1 $f0, 0x38($s0) -/* BAE360 80240A20 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAE364 80240A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* BAE368 80240A28 3C01447A */ lui $at, 0x447a -/* BAE36C 80240A2C 44813000 */ mtc1 $at, $f6 -/* BAE370 80240A30 27A20034 */ addiu $v0, $sp, 0x34 -/* BAE374 80240A34 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAE378 80240A38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BAE37C 80240A3C E7A40030 */ swc1 $f4, 0x30($sp) -/* BAE380 80240A40 E7A60034 */ swc1 $f6, 0x34($sp) -/* BAE384 80240A44 AFA20010 */ sw $v0, 0x10($sp) -/* BAE388 80240A48 8E040080 */ lw $a0, 0x80($s0) -/* BAE38C 80240A4C 0C0372DF */ jal func_800DCB7C -/* BAE390 80240A50 27A70030 */ addiu $a3, $sp, 0x30 -.L80240A54: -/* BAE394 80240A54 10400007 */ beqz $v0, .L80240A74 -/* BAE398 80240A58 00000000 */ nop -/* BAE39C 80240A5C 4616A082 */ mul.s $f2, $f20, $f22 -/* BAE3A0 80240A60 00000000 */ nop -/* BAE3A4 80240A64 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BAE3A8 80240A68 46180000 */ add.s $f0, $f0, $f24 -/* BAE3AC 80240A6C 080902A0 */ j .L80240A80 -/* BAE3B0 80240A70 46020000 */ add.s $f0, $f0, $f2 -.L80240A74: -/* BAE3B4 80240A74 4616A002 */ mul.s $f0, $f20, $f22 -/* BAE3B8 80240A78 00000000 */ nop -/* BAE3BC 80240A7C 4600D000 */ add.s $f0, $f26, $f0 -.L80240A80: -/* BAE3C0 80240A80 E600003C */ swc1 $f0, 0x3c($s0) -/* BAE3C4 80240A84 8E220074 */ lw $v0, 0x74($s1) -/* BAE3C8 80240A88 2442000A */ addiu $v0, $v0, 0xa -/* BAE3CC 80240A8C 44826000 */ mtc1 $v0, $f12 -/* BAE3D0 80240A90 00000000 */ nop -/* BAE3D4 80240A94 0C00A6C9 */ jal clamp_angle -/* BAE3D8 80240A98 46806320 */ cvt.s.w $f12, $f12 -/* BAE3DC 80240A9C 4600020D */ trunc.w.s $f8, $f0 -/* BAE3E0 80240AA0 E6280074 */ swc1 $f8, 0x74($s1) -.L80240AA4: -/* BAE3E4 80240AA4 8E220090 */ lw $v0, 0x90($s1) -/* BAE3E8 80240AA8 1C400040 */ bgtz $v0, .L80240BAC -/* BAE3EC 80240AAC 2442FFFF */ addiu $v0, $v0, -1 -/* BAE3F0 80240AB0 860200A8 */ lh $v0, 0xa8($s0) -/* BAE3F4 80240AB4 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE3F8 80240AB8 44821000 */ mtc1 $v0, $f2 -/* BAE3FC 80240ABC 00000000 */ nop -/* BAE400 80240AC0 468010A0 */ cvt.s.w $f2, $f2 -/* BAE404 80240AC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE408 80240AC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE40C 80240ACC 46020000 */ add.s $f0, $f0, $f2 -/* BAE410 80240AD0 3C014024 */ lui $at, 0x4024 -/* BAE414 80240AD4 44812800 */ mtc1 $at, $f5 -/* BAE418 80240AD8 44802000 */ mtc1 $zero, $f4 -/* BAE41C 80240ADC C442002C */ lwc1 $f2, 0x2c($v0) -/* BAE420 80240AE0 46000021 */ cvt.d.s $f0, $f0 -/* BAE424 80240AE4 46240000 */ add.d $f0, $f0, $f4 -/* BAE428 80240AE8 460010A1 */ cvt.d.s $f2, $f2 -/* BAE42C 80240AEC 4620103C */ c.lt.d $f2, $f0 -/* BAE430 80240AF0 00000000 */ nop -/* BAE434 80240AF4 4500002E */ bc1f .L80240BB0 -/* BAE438 80240AF8 0280202D */ daddu $a0, $s4, $zero -/* BAE43C 80240AFC 24020001 */ addiu $v0, $zero, 1 -/* BAE440 80240B00 AFA20010 */ sw $v0, 0x10($sp) -/* BAE444 80240B04 8E460024 */ lw $a2, 0x24($s2) -/* BAE448 80240B08 8E470028 */ lw $a3, 0x28($s2) -/* BAE44C 80240B0C 0C01242D */ jal func_800490B4 -/* BAE450 80240B10 0220282D */ daddu $a1, $s1, $zero -/* BAE454 80240B14 10400026 */ beqz $v0, .L80240BB0 -/* BAE458 80240B18 0000202D */ daddu $a0, $zero, $zero -/* BAE45C 80240B1C 0200282D */ daddu $a1, $s0, $zero -/* BAE460 80240B20 0000302D */ daddu $a2, $zero, $zero -/* BAE464 80240B24 2412000C */ addiu $s2, $zero, 0xc -/* BAE468 80240B28 860300A8 */ lh $v1, 0xa8($s0) -/* BAE46C 80240B2C 3C013F80 */ lui $at, 0x3f80 -/* BAE470 80240B30 44810000 */ mtc1 $at, $f0 -/* BAE474 80240B34 3C014000 */ lui $at, 0x4000 -/* BAE478 80240B38 44811000 */ mtc1 $at, $f2 -/* BAE47C 80240B3C 3C01C1A0 */ lui $at, 0xc1a0 -/* BAE480 80240B40 44812000 */ mtc1 $at, $f4 -/* BAE484 80240B44 44834000 */ mtc1 $v1, $f8 -/* BAE488 80240B48 00000000 */ nop -/* BAE48C 80240B4C 46804220 */ cvt.s.w $f8, $f8 -/* BAE490 80240B50 44074000 */ mfc1 $a3, $f8 -/* BAE494 80240B54 27A20038 */ addiu $v0, $sp, 0x38 -/* BAE498 80240B58 AFB2001C */ sw $s2, 0x1c($sp) -/* BAE49C 80240B5C AFA20020 */ sw $v0, 0x20($sp) -/* BAE4A0 80240B60 E7A00010 */ swc1 $f0, 0x10($sp) -/* BAE4A4 80240B64 E7A20014 */ swc1 $f2, 0x14($sp) -/* BAE4A8 80240B68 0C01BFA4 */ jal fx_emote -/* BAE4AC 80240B6C E7A40018 */ swc1 $f4, 0x18($sp) -/* BAE4B0 80240B70 0200202D */ daddu $a0, $s0, $zero -/* BAE4B4 80240B74 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BAE4B8 80240B78 C480003C */ lwc1 $f0, 0x3c($a0) -/* BAE4BC 80240B7C 3C060020 */ lui $a2, 0x20 -/* BAE4C0 80240B80 0C012530 */ jal func_800494C0 -/* BAE4C4 80240B84 E4800064 */ swc1 $f0, 0x64($a0) -/* BAE4C8 80240B88 8E220018 */ lw $v0, 0x18($s1) -/* BAE4CC 80240B8C 9442002A */ lhu $v0, 0x2a($v0) -/* BAE4D0 80240B90 30420001 */ andi $v0, $v0, 1 -/* BAE4D4 80240B94 10400003 */ beqz $v0, .L80240BA4 -/* BAE4D8 80240B98 2402000A */ addiu $v0, $zero, 0xa -/* BAE4DC 80240B9C 08090313 */ j .L80240C4C -/* BAE4E0 80240BA0 AE620070 */ sw $v0, 0x70($s3) -.L80240BA4: -/* BAE4E4 80240BA4 08090313 */ j .L80240C4C -/* BAE4E8 80240BA8 AE720070 */ sw $s2, 0x70($s3) -.L80240BAC: -/* BAE4EC 80240BAC AE220090 */ sw $v0, 0x90($s1) -.L80240BB0: -/* BAE4F0 80240BB0 8602008C */ lh $v0, 0x8c($s0) -/* BAE4F4 80240BB4 14400025 */ bnez $v0, .L80240C4C -/* BAE4F8 80240BB8 00000000 */ nop -/* BAE4FC 80240BBC 8602008E */ lh $v0, 0x8e($s0) -/* BAE500 80240BC0 1C400022 */ bgtz $v0, .L80240C4C -/* BAE504 80240BC4 00000000 */ nop -/* BAE508 80240BC8 8E620074 */ lw $v0, 0x74($s3) -/* BAE50C 80240BCC 2442FFFF */ addiu $v0, $v0, -1 -/* BAE510 80240BD0 1840001D */ blez $v0, .L80240C48 -/* BAE514 80240BD4 AE620074 */ sw $v0, 0x74($s3) -/* BAE518 80240BD8 8E220018 */ lw $v0, 0x18($s1) -/* BAE51C 80240BDC 9442002A */ lhu $v0, 0x2a($v0) -/* BAE520 80240BE0 30420010 */ andi $v0, $v0, 0x10 -/* BAE524 80240BE4 14400007 */ bnez $v0, .L80240C04 -/* BAE528 80240BE8 00000000 */ nop -/* BAE52C 80240BEC C600000C */ lwc1 $f0, 0xc($s0) -/* BAE530 80240BF0 3C014334 */ lui $at, 0x4334 -/* BAE534 80240BF4 44816000 */ mtc1 $at, $f12 -/* BAE538 80240BF8 0C00A6C9 */ jal clamp_angle -/* BAE53C 80240BFC 460C0300 */ add.s $f12, $f0, $f12 -/* BAE540 80240C00 E600000C */ swc1 $f0, 0xc($s0) -.L80240C04: -/* BAE544 80240C04 0C00A67F */ jal rand_int -/* BAE548 80240C08 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BAE54C 80240C0C 3C032E8B */ lui $v1, 0x2e8b -/* BAE550 80240C10 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BAE554 80240C14 00430018 */ mult $v0, $v1 -/* BAE558 80240C18 00021FC3 */ sra $v1, $v0, 0x1f -/* BAE55C 80240C1C 00004010 */ mfhi $t0 -/* BAE560 80240C20 00082043 */ sra $a0, $t0, 1 -/* BAE564 80240C24 00832023 */ subu $a0, $a0, $v1 -/* BAE568 80240C28 00041840 */ sll $v1, $a0, 1 -/* BAE56C 80240C2C 00641821 */ addu $v1, $v1, $a0 -/* BAE570 80240C30 00031880 */ sll $v1, $v1, 2 -/* BAE574 80240C34 00641823 */ subu $v1, $v1, $a0 -/* BAE578 80240C38 00431023 */ subu $v0, $v0, $v1 -/* BAE57C 80240C3C 24420005 */ addiu $v0, $v0, 5 -/* BAE580 80240C40 08090313 */ j .L80240C4C -/* BAE584 80240C44 A602008E */ sh $v0, 0x8e($s0) -.L80240C48: -/* BAE588 80240C48 AE600070 */ sw $zero, 0x70($s3) -.L80240C4C: -/* BAE58C 80240C4C 8FBF0054 */ lw $ra, 0x54($sp) -/* BAE590 80240C50 8FB40050 */ lw $s4, 0x50($sp) -/* BAE594 80240C54 8FB3004C */ lw $s3, 0x4c($sp) -/* BAE598 80240C58 8FB20048 */ lw $s2, 0x48($sp) -/* BAE59C 80240C5C 8FB10044 */ lw $s1, 0x44($sp) -/* BAE5A0 80240C60 8FB00040 */ lw $s0, 0x40($sp) -/* BAE5A4 80240C64 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BAE5A8 80240C68 D7B80068 */ ldc1 $f24, 0x68($sp) -/* BAE5AC 80240C6C D7B60060 */ ldc1 $f22, 0x60($sp) -/* BAE5B0 80240C70 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BAE5B4 80240C74 03E00008 */ jr $ra -/* BAE5B8 80240C78 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s deleted file mode 100644 index 2d64bda823..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF8_BAE838 -/* BAE838 80240EF8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BAE83C 80240EFC AFB20030 */ sw $s2, 0x30($sp) -/* BAE840 80240F00 0080902D */ daddu $s2, $a0, $zero -/* BAE844 80240F04 AFBF0038 */ sw $ra, 0x38($sp) -/* BAE848 80240F08 AFB30034 */ sw $s3, 0x34($sp) -/* BAE84C 80240F0C AFB1002C */ sw $s1, 0x2c($sp) -/* BAE850 80240F10 AFB00028 */ sw $s0, 0x28($sp) -/* BAE854 80240F14 F7B60048 */ sdc1 $f22, 0x48($sp) -/* BAE858 80240F18 F7B40040 */ sdc1 $f20, 0x40($sp) -/* BAE85C 80240F1C 8E510148 */ lw $s1, 0x148($s2) -/* BAE860 80240F20 86240008 */ lh $a0, 8($s1) -/* BAE864 80240F24 0C00EABB */ jal get_npc_unsafe -/* BAE868 80240F28 00A0982D */ daddu $s3, $a1, $zero -/* BAE86C 80240F2C 0040802D */ daddu $s0, $v0, $zero -/* BAE870 80240F30 0200202D */ daddu $a0, $s0, $zero -/* BAE874 80240F34 C6220088 */ lwc1 $f2, 0x88($s1) -/* BAE878 80240F38 468010A0 */ cvt.s.w $f2, $f2 -/* BAE87C 80240F3C 460010A1 */ cvt.d.s $f2, $f2 -/* BAE880 80240F40 C604001C */ lwc1 $f4, 0x1c($s0) -/* BAE884 80240F44 C6000014 */ lwc1 $f0, 0x14($s0) -/* BAE888 80240F48 8E050018 */ lw $a1, 0x18($s0) -/* BAE88C 80240F4C 46002100 */ add.s $f4, $f4, $f0 -/* BAE890 80240F50 8E06000C */ lw $a2, 0xc($s0) -/* BAE894 80240F54 C6200078 */ lwc1 $f0, 0x78($s1) -/* BAE898 80240F58 46800020 */ cvt.s.w $f0, $f0 -/* BAE89C 80240F5C E604001C */ swc1 $f4, 0x1c($s0) -/* BAE8A0 80240F60 3C014059 */ lui $at, 0x4059 -/* BAE8A4 80240F64 44812800 */ mtc1 $at, $f5 -/* BAE8A8 80240F68 44802000 */ mtc1 $zero, $f4 -/* BAE8AC 80240F6C 46000021 */ cvt.d.s $f0, $f0 -/* BAE8B0 80240F70 46240003 */ div.d $f0, $f0, $f4 -/* BAE8B4 80240F74 46200520 */ cvt.s.d $f20, $f0 -/* BAE8B8 80240F78 46241083 */ div.d $f2, $f2, $f4 -/* BAE8BC 80240F7C 0C00EA95 */ jal npc_move_heading -/* BAE8C0 80240F80 462015A0 */ cvt.s.d $f22, $f2 -/* BAE8C4 80240F84 C604001C */ lwc1 $f4, 0x1c($s0) -/* BAE8C8 80240F88 44801000 */ mtc1 $zero, $f2 -/* BAE8CC 80240F8C 44801800 */ mtc1 $zero, $f3 -/* BAE8D0 80240F90 46002021 */ cvt.d.s $f0, $f4 -/* BAE8D4 80240F94 4620103E */ c.le.d $f2, $f0 -/* BAE8D8 80240F98 00000000 */ nop -/* BAE8DC 80240F9C 45000030 */ bc1f .L80241060 -/* BAE8E0 80240FA0 00000000 */ nop -/* BAE8E4 80240FA4 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE8E8 80240FA8 46040000 */ add.s $f0, $f0, $f4 -/* BAE8EC 80240FAC E600003C */ swc1 $f0, 0x3c($s0) -/* BAE8F0 80240FB0 8E2200CC */ lw $v0, 0xcc($s1) -/* BAE8F4 80240FB4 8C420024 */ lw $v0, 0x24($v0) -/* BAE8F8 80240FB8 AE020028 */ sw $v0, 0x28($s0) -/* BAE8FC 80240FBC A2200007 */ sb $zero, 7($s1) -/* BAE900 80240FC0 8E020000 */ lw $v0, ($s0) -/* BAE904 80240FC4 30420008 */ andi $v0, $v0, 8 -/* BAE908 80240FC8 14400011 */ bnez $v0, .L80241010 -/* BAE90C 80240FCC 0000102D */ daddu $v0, $zero, $zero -/* BAE910 80240FD0 27A50018 */ addiu $a1, $sp, 0x18 -/* BAE914 80240FD4 27A6001C */ addiu $a2, $sp, 0x1c -/* BAE918 80240FD8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BAE91C 80240FDC C602003C */ lwc1 $f2, 0x3c($s0) -/* BAE920 80240FE0 C6040040 */ lwc1 $f4, 0x40($s0) -/* BAE924 80240FE4 3C01447A */ lui $at, 0x447a -/* BAE928 80240FE8 44813000 */ mtc1 $at, $f6 -/* BAE92C 80240FEC 27A20024 */ addiu $v0, $sp, 0x24 -/* BAE930 80240FF0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAE934 80240FF4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BAE938 80240FF8 E7A40020 */ swc1 $f4, 0x20($sp) -/* BAE93C 80240FFC E7A60024 */ swc1 $f6, 0x24($sp) -/* BAE940 80241000 AFA20010 */ sw $v0, 0x10($sp) -/* BAE944 80241004 8E040080 */ lw $a0, 0x80($s0) -/* BAE948 80241008 0C0372DF */ jal func_800DCB7C -/* BAE94C 8024100C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241010: -/* BAE950 80241010 1040000B */ beqz $v0, .L80241040 -/* BAE954 80241014 00000000 */ nop -/* BAE958 80241018 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BAE95C 8024101C 46140080 */ add.s $f2, $f0, $f20 -/* BAE960 80241020 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE964 80241024 4600103E */ c.le.s $f2, $f0 -/* BAE968 80241028 00000000 */ nop -/* BAE96C 8024102C 4500008D */ bc1f .L80241264 -/* BAE970 80241030 00000000 */ nop -/* BAE974 80241034 E602003C */ swc1 $f2, 0x3c($s0) -/* BAE978 80241038 08090499 */ j .L80241264 -/* BAE97C 8024103C AE400070 */ sw $zero, 0x70($s2) -.L80241040: -/* BAE980 80241040 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAE984 80241044 C6000064 */ lwc1 $f0, 0x64($s0) -/* BAE988 80241048 4602003E */ c.le.s $f0, $f2 -/* BAE98C 8024104C 00000000 */ nop -/* BAE990 80241050 45030084 */ bc1tl .L80241264 -/* BAE994 80241054 AE400070 */ sw $zero, 0x70($s2) -/* BAE998 80241058 08090499 */ j .L80241264 -/* BAE99C 8024105C 00000000 */ nop -.L80241060: -/* BAE9A0 80241060 4622003C */ c.lt.d $f0, $f2 -/* BAE9A4 80241064 00000000 */ nop -/* BAE9A8 80241068 4500007E */ bc1f .L80241264 -/* BAE9AC 8024106C 00000000 */ nop -/* BAE9B0 80241070 9602008E */ lhu $v0, 0x8e($s0) -/* BAE9B4 80241074 24420001 */ addiu $v0, $v0, 1 -/* BAE9B8 80241078 A602008E */ sh $v0, 0x8e($s0) -/* BAE9BC 8024107C 00021400 */ sll $v0, $v0, 0x10 -/* BAE9C0 80241080 8E630020 */ lw $v1, 0x20($s3) -/* BAE9C4 80241084 00021403 */ sra $v0, $v0, 0x10 -/* BAE9C8 80241088 0043102A */ slt $v0, $v0, $v1 -/* BAE9CC 8024108C 14400026 */ bnez $v0, .L80241128 -/* BAE9D0 80241090 00000000 */ nop -/* BAE9D4 80241094 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAE9D8 80241098 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAE9DC 8024109C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE9E0 802410A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE9E4 802410A4 A600008E */ sh $zero, 0x8e($s0) -/* BAE9E8 802410A8 8C460028 */ lw $a2, 0x28($v0) -/* BAE9EC 802410AC 0C00A720 */ jal atan2 -/* BAE9F0 802410B0 8C470030 */ lw $a3, 0x30($v0) -/* BAE9F4 802410B4 46000506 */ mov.s $f20, $f0 -/* BAE9F8 802410B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAE9FC 802410BC 0C00A70A */ jal get_clamped_angle_diff -/* BAEA00 802410C0 4600A386 */ mov.s $f14, $f20 -/* BAEA04 802410C4 46000086 */ mov.s $f2, $f0 -/* BAEA08 802410C8 8E62001C */ lw $v0, 0x1c($s3) -/* BAEA0C 802410CC 46001005 */ abs.s $f0, $f2 -/* BAEA10 802410D0 44822000 */ mtc1 $v0, $f4 -/* BAEA14 802410D4 00000000 */ nop -/* BAEA18 802410D8 46802120 */ cvt.s.w $f4, $f4 -/* BAEA1C 802410DC 4600203C */ c.lt.s $f4, $f0 -/* BAEA20 802410E0 00000000 */ nop -/* BAEA24 802410E4 4500000D */ bc1f .L8024111C -/* BAEA28 802410E8 00000000 */ nop -/* BAEA2C 802410EC 44800000 */ mtc1 $zero, $f0 -/* BAEA30 802410F0 C614000C */ lwc1 $f20, 0xc($s0) -/* BAEA34 802410F4 4600103C */ c.lt.s $f2, $f0 -/* BAEA38 802410F8 00000000 */ nop -/* BAEA3C 802410FC 45000006 */ bc1f .L80241118 -/* BAEA40 80241100 00021023 */ negu $v0, $v0 -/* BAEA44 80241104 44820000 */ mtc1 $v0, $f0 -/* BAEA48 80241108 00000000 */ nop -/* BAEA4C 8024110C 46800020 */ cvt.s.w $f0, $f0 -/* BAEA50 80241110 08090447 */ j .L8024111C -/* BAEA54 80241114 4600A500 */ add.s $f20, $f20, $f0 -.L80241118: -/* BAEA58 80241118 4604A500 */ add.s $f20, $f20, $f4 -.L8024111C: -/* BAEA5C 8024111C 0C00A6C9 */ jal clamp_angle -/* BAEA60 80241120 4600A306 */ mov.s $f12, $f20 -/* BAEA64 80241124 E600000C */ swc1 $f0, 0xc($s0) -.L80241128: -/* BAEA68 80241128 8E020000 */ lw $v0, ($s0) -/* BAEA6C 8024112C 30420008 */ andi $v0, $v0, 8 -/* BAEA70 80241130 1040000A */ beqz $v0, .L8024115C -/* BAEA74 80241134 27A50018 */ addiu $a1, $sp, 0x18 -/* BAEA78 80241138 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAEA7C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) -/* BAEA80 80241140 46001080 */ add.s $f2, $f2, $f0 -/* BAEA84 80241144 4616103C */ c.lt.s $f2, $f22 -/* BAEA88 80241148 00000000 */ nop -/* BAEA8C 8024114C 45020045 */ bc1fl .L80241264 -/* BAEA90 80241150 E602003C */ swc1 $f2, 0x3c($s0) -/* BAEA94 80241154 08090498 */ j .L80241260 -/* BAEA98 80241158 E616003C */ swc1 $f22, 0x3c($s0) -.L8024115C: -/* BAEA9C 8024115C C6000038 */ lwc1 $f0, 0x38($s0) -/* BAEAA0 80241160 27A6001C */ addiu $a2, $sp, 0x1c -/* BAEAA4 80241164 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAEAA8 80241168 860200A8 */ lh $v0, 0xa8($s0) -/* BAEAAC 8024116C C600001C */ lwc1 $f0, 0x1c($s0) -/* BAEAB0 80241170 C604003C */ lwc1 $f4, 0x3c($s0) -/* BAEAB4 80241174 44821000 */ mtc1 $v0, $f2 -/* BAEAB8 80241178 00000000 */ nop -/* BAEABC 8024117C 468010A0 */ cvt.s.w $f2, $f2 -/* BAEAC0 80241180 46000005 */ abs.s $f0, $f0 -/* BAEAC4 80241184 46020000 */ add.s $f0, $f0, $f2 -/* BAEAC8 80241188 C6060040 */ lwc1 $f6, 0x40($s0) -/* BAEACC 8024118C 27A20024 */ addiu $v0, $sp, 0x24 -/* BAEAD0 80241190 46022100 */ add.s $f4, $f4, $f2 -/* BAEAD4 80241194 3C014024 */ lui $at, 0x4024 -/* BAEAD8 80241198 44811800 */ mtc1 $at, $f3 -/* BAEADC 8024119C 44801000 */ mtc1 $zero, $f2 -/* BAEAE0 802411A0 46000021 */ cvt.d.s $f0, $f0 -/* BAEAE4 802411A4 46220000 */ add.d $f0, $f0, $f2 -/* BAEAE8 802411A8 E7A60020 */ swc1 $f6, 0x20($sp) -/* BAEAEC 802411AC E7A4001C */ swc1 $f4, 0x1c($sp) -/* BAEAF0 802411B0 46200020 */ cvt.s.d $f0, $f0 -/* BAEAF4 802411B4 E7A00024 */ swc1 $f0, 0x24($sp) -/* BAEAF8 802411B8 AFA20010 */ sw $v0, 0x10($sp) -/* BAEAFC 802411BC 8E040080 */ lw $a0, 0x80($s0) -/* BAEB00 802411C0 0C0372DF */ jal func_800DCB7C -/* BAEB04 802411C4 27A70020 */ addiu $a3, $sp, 0x20 -/* BAEB08 802411C8 10400015 */ beqz $v0, .L80241220 -/* BAEB0C 802411CC 00000000 */ nop -/* BAEB10 802411D0 860200A8 */ lh $v0, 0xa8($s0) -/* BAEB14 802411D4 C604001C */ lwc1 $f4, 0x1c($s0) -/* BAEB18 802411D8 44820000 */ mtc1 $v0, $f0 -/* BAEB1C 802411DC 00000000 */ nop -/* BAEB20 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* BAEB24 802411E4 46002085 */ abs.s $f2, $f4 -/* BAEB28 802411E8 46020000 */ add.s $f0, $f0, $f2 -/* BAEB2C 802411EC C7A20024 */ lwc1 $f2, 0x24($sp) -/* BAEB30 802411F0 4600103E */ c.le.s $f2, $f0 -/* BAEB34 802411F4 00000000 */ nop -/* BAEB38 802411F8 45000005 */ bc1f .L80241210 -/* BAEB3C 802411FC 00000000 */ nop -/* BAEB40 80241200 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BAEB44 80241204 AE00001C */ sw $zero, 0x1c($s0) -/* BAEB48 80241208 08090499 */ j .L80241264 -/* BAEB4C 8024120C E600003C */ swc1 $f0, 0x3c($s0) -.L80241210: -/* BAEB50 80241210 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAEB54 80241214 46040000 */ add.s $f0, $f0, $f4 -/* BAEB58 80241218 08090499 */ j .L80241264 -/* BAEB5C 8024121C E600003C */ swc1 $f0, 0x3c($s0) -.L80241220: -/* BAEB60 80241220 C606003C */ lwc1 $f6, 0x3c($s0) -/* BAEB64 80241224 860200A8 */ lh $v0, 0xa8($s0) -/* BAEB68 80241228 46163081 */ sub.s $f2, $f6, $f22 -/* BAEB6C 8024122C 44820000 */ mtc1 $v0, $f0 -/* BAEB70 80241230 00000000 */ nop -/* BAEB74 80241234 46800020 */ cvt.s.w $f0, $f0 -/* BAEB78 80241238 46001080 */ add.s $f2, $f2, $f0 -/* BAEB7C 8024123C C604001C */ lwc1 $f4, 0x1c($s0) -/* BAEB80 80241240 46002005 */ abs.s $f0, $f4 -/* BAEB84 80241244 4602003C */ c.lt.s $f0, $f2 -/* BAEB88 80241248 00000000 */ nop -/* BAEB8C 8024124C 45020005 */ bc1fl .L80241264 -/* BAEB90 80241250 AE00001C */ sw $zero, 0x1c($s0) -/* BAEB94 80241254 46043000 */ add.s $f0, $f6, $f4 -/* BAEB98 80241258 08090499 */ j .L80241264 -/* BAEB9C 8024125C E600003C */ swc1 $f0, 0x3c($s0) -.L80241260: -/* BAEBA0 80241260 AE00001C */ sw $zero, 0x1c($s0) -.L80241264: -/* BAEBA4 80241264 8FBF0038 */ lw $ra, 0x38($sp) -/* BAEBA8 80241268 8FB30034 */ lw $s3, 0x34($sp) -/* BAEBAC 8024126C 8FB20030 */ lw $s2, 0x30($sp) -/* BAEBB0 80241270 8FB1002C */ lw $s1, 0x2c($sp) -/* BAEBB4 80241274 8FB00028 */ lw $s0, 0x28($sp) -/* BAEBB8 80241278 D7B60048 */ ldc1 $f22, 0x48($sp) -/* BAEBBC 8024127C D7B40040 */ ldc1 $f20, 0x40($sp) -/* BAEBC0 80241280 03E00008 */ jr $ra -/* BAEBC4 80241284 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s deleted file mode 100644 index cf0524bbab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241288_BAEBC8 -/* BAEBC8 80241288 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BAEBCC 8024128C AFB00028 */ sw $s0, 0x28($sp) -/* BAEBD0 80241290 00A0802D */ daddu $s0, $a1, $zero -/* BAEBD4 80241294 AFB1002C */ sw $s1, 0x2c($sp) -/* BAEBD8 80241298 00C0882D */ daddu $s1, $a2, $zero -/* BAEBDC 8024129C AFBF0034 */ sw $ra, 0x34($sp) -/* BAEBE0 802412A0 AFB20030 */ sw $s2, 0x30($sp) -/* BAEBE4 802412A4 AE200070 */ sw $zero, 0x70($s1) -/* BAEBE8 802412A8 8C830000 */ lw $v1, ($a0) -/* BAEBEC 802412AC 2402FDFF */ addiu $v0, $zero, -0x201 -/* BAEBF0 802412B0 A480008E */ sh $zero, 0x8e($a0) -/* BAEBF4 802412B4 00621824 */ and $v1, $v1, $v0 -/* BAEBF8 802412B8 34650800 */ ori $a1, $v1, 0x800 -/* BAEBFC 802412BC AC850000 */ sw $a1, ($a0) -/* BAEC00 802412C0 8E0200D0 */ lw $v0, 0xd0($s0) -/* BAEC04 802412C4 8C420034 */ lw $v0, 0x34($v0) -/* BAEC08 802412C8 10400003 */ beqz $v0, .L802412D8 -/* BAEC0C 802412CC 00E0902D */ daddu $s2, $a3, $zero -/* BAEC10 802412D0 080904B8 */ j .L802412E0 -/* BAEC14 802412D4 34620808 */ ori $v0, $v1, 0x808 -.L802412D8: -/* BAEC18 802412D8 2402FFF7 */ addiu $v0, $zero, -9 -/* BAEC1C 802412DC 00A21024 */ and $v0, $a1, $v0 -.L802412E0: -/* BAEC20 802412E0 AC820000 */ sw $v0, ($a0) -/* BAEC24 802412E4 27A20024 */ addiu $v0, $sp, 0x24 -/* BAEC28 802412E8 27A50018 */ addiu $a1, $sp, 0x18 -/* BAEC2C 802412EC C4800038 */ lwc1 $f0, 0x38($a0) -/* BAEC30 802412F0 C482003C */ lwc1 $f2, 0x3c($a0) -/* BAEC34 802412F4 C4840040 */ lwc1 $f4, 0x40($a0) -/* BAEC38 802412F8 3C01447A */ lui $at, 0x447a -/* BAEC3C 802412FC 44813000 */ mtc1 $at, $f6 -/* BAEC40 80241300 27A6001C */ addiu $a2, $sp, 0x1c -/* BAEC44 80241304 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAEC48 80241308 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BAEC4C 8024130C E7A40020 */ swc1 $f4, 0x20($sp) -/* BAEC50 80241310 E7A60024 */ swc1 $f6, 0x24($sp) -/* BAEC54 80241314 AFA20010 */ sw $v0, 0x10($sp) -/* BAEC58 80241318 8C840080 */ lw $a0, 0x80($a0) -/* BAEC5C 8024131C 0C0372DF */ jal func_800DCB7C -/* BAEC60 80241320 27A70020 */ addiu $a3, $sp, 0x20 -/* BAEC64 80241324 C7A20024 */ lwc1 $f2, 0x24($sp) -/* BAEC68 80241328 3C014059 */ lui $at, 0x4059 -/* BAEC6C 8024132C 44812800 */ mtc1 $at, $f5 -/* BAEC70 80241330 44802000 */ mtc1 $zero, $f4 -/* BAEC74 80241334 460010A1 */ cvt.d.s $f2, $f2 -/* BAEC78 80241338 46241082 */ mul.d $f2, $f2, $f4 -/* BAEC7C 8024133C 00000000 */ nop -/* BAEC80 80241340 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BAEC84 80241344 46000021 */ cvt.d.s $f0, $f0 -/* BAEC88 80241348 46240002 */ mul.d $f0, $f0, $f4 -/* BAEC8C 8024134C 00000000 */ nop -/* BAEC90 80241350 3C013FE0 */ lui $at, 0x3fe0 -/* BAEC94 80241354 44812800 */ mtc1 $at, $f5 -/* BAEC98 80241358 44802000 */ mtc1 $zero, $f4 -/* BAEC9C 8024135C 00000000 */ nop -/* BAECA0 80241360 46241080 */ add.d $f2, $f2, $f4 -/* BAECA4 80241364 AE000074 */ sw $zero, 0x74($s0) -/* BAECA8 80241368 46240000 */ add.d $f0, $f0, $f4 -/* BAECAC 8024136C AE000090 */ sw $zero, 0x90($s0) -/* BAECB0 80241370 4620120D */ trunc.w.d $f8, $f2 -/* BAECB4 80241374 E6080078 */ swc1 $f8, 0x78($s0) -/* BAECB8 80241378 4620020D */ trunc.w.d $f8, $f0 -/* BAECBC 8024137C E6080088 */ swc1 $f8, 0x88($s0) -/* BAECC0 80241380 8E420014 */ lw $v0, 0x14($s2) -/* BAECC4 80241384 AE220074 */ sw $v0, 0x74($s1) -/* BAECC8 80241388 8E0200B0 */ lw $v0, 0xb0($s0) -/* BAECCC 8024138C 34420010 */ ori $v0, $v0, 0x10 -/* BAECD0 80241390 AE0200B0 */ sw $v0, 0xb0($s0) -/* BAECD4 80241394 8FBF0034 */ lw $ra, 0x34($sp) -/* BAECD8 80241398 8FB20030 */ lw $s2, 0x30($sp) -/* BAECDC 8024139C 8FB1002C */ lw $s1, 0x2c($sp) -/* BAECE0 802413A0 8FB00028 */ lw $s0, 0x28($sp) -/* BAECE4 802413A4 03E00008 */ jr $ra -/* BAECE8 802413A8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 916aef242c..0df3eb2d2d 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -46,7 +46,7 @@ glabel func_802413AC_BAECEC /* BAED90 80241450 02A0202D */ daddu $a0, $s5, $zero /* BAED94 80241454 0240282D */ daddu $a1, $s2, $zero /* BAED98 80241458 0280302D */ daddu $a2, $s4, $zero -/* BAED9C 8024145C 0C0904A2 */ jal func_80241288_BAEBC8 +/* BAED9C 8024145C 0C0904A2 */ jal mim_08_UnkFunc5 /* BAEDA0 80241460 0200382D */ daddu $a3, $s0, $zero .L80241464: /* BAEDA4 80241464 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L802414E0_BAEE20 glabel L802414F0_BAEE30 /* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero /* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero -/* BAEE38 802414F8 0C09024E */ jal func_80240938_BAE278 +/* BAEE38 802414F8 0C09024E */ jal mim_08_UnkFunc4 /* BAEE3C 802414FC 0260302D */ daddu $a2, $s3, $zero /* BAEE40 80241500 0809055D */ j .L80241574 /* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241548_BAEE88 glabel L80241560_BAEEA0 /* BAEEA0 80241560 0280202D */ daddu $a0, $s4, $zero /* BAEEA4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BAEEA8 80241568 0C0903BE */ jal func_80240EF8_BAE838 +/* BAEEA8 80241568 0C0903BE */ jal mim_08_UnkFunc6 /* BAEEAC 8024156C 0260302D */ daddu $a2, $s3, $zero glabel L80241570_BAEEB0 /* BAEEB0 80241570 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s deleted file mode 100644 index 50cfb08a1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241954_BAF294 -/* BAF294 80241954 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BAF298 80241958 AFB40028 */ sw $s4, 0x28($sp) -/* BAF29C 8024195C 0080A02D */ daddu $s4, $a0, $zero -/* BAF2A0 80241960 AFBF002C */ sw $ra, 0x2c($sp) -/* BAF2A4 80241964 AFB30024 */ sw $s3, 0x24($sp) -/* BAF2A8 80241968 AFB20020 */ sw $s2, 0x20($sp) -/* BAF2AC 8024196C AFB1001C */ sw $s1, 0x1c($sp) -/* BAF2B0 80241970 AFB00018 */ sw $s0, 0x18($sp) -/* BAF2B4 80241974 8E910148 */ lw $s1, 0x148($s4) -/* BAF2B8 80241978 86240008 */ lh $a0, 8($s1) -/* BAF2BC 8024197C 0C00EABB */ jal get_npc_unsafe -/* BAF2C0 80241980 00A0802D */ daddu $s0, $a1, $zero -/* BAF2C4 80241984 16000005 */ bnez $s0, .L8024199C -/* BAF2C8 80241988 0040902D */ daddu $s2, $v0, $zero -/* BAF2CC 8024198C 8E2200B0 */ lw $v0, 0xb0($s1) -/* BAF2D0 80241990 30420004 */ andi $v0, $v0, 4 -/* BAF2D4 80241994 10400015 */ beqz $v0, .L802419EC -/* BAF2D8 80241998 00000000 */ nop -.L8024199C: -/* BAF2DC 8024199C AE800070 */ sw $zero, 0x70($s4) -/* BAF2E0 802419A0 8E420000 */ lw $v0, ($s2) -/* BAF2E4 802419A4 3C031F30 */ lui $v1, 0x1f30 -/* BAF2E8 802419A8 A640008E */ sh $zero, 0x8e($s2) -/* BAF2EC 802419AC 34420102 */ ori $v0, $v0, 0x102 -/* BAF2F0 802419B0 AE420000 */ sw $v0, ($s2) -/* BAF2F4 802419B4 8E220000 */ lw $v0, ($s1) -/* BAF2F8 802419B8 3C01C47A */ lui $at, 0xc47a -/* BAF2FC 802419BC 44810000 */ mtc1 $at, $f0 -/* BAF300 802419C0 00431025 */ or $v0, $v0, $v1 -/* BAF304 802419C4 AE220000 */ sw $v0, ($s1) -/* BAF308 802419C8 AE400038 */ sw $zero, 0x38($s2) -/* BAF30C 802419CC E640003C */ swc1 $f0, 0x3c($s2) -/* BAF310 802419D0 AE400040 */ sw $zero, 0x40($s2) -/* BAF314 802419D4 8E2300B0 */ lw $v1, 0xb0($s1) -/* BAF318 802419D8 30620004 */ andi $v0, $v1, 4 -/* BAF31C 802419DC 10400003 */ beqz $v0, .L802419EC -/* BAF320 802419E0 2402FFFB */ addiu $v0, $zero, -5 -/* BAF324 802419E4 00621024 */ and $v0, $v1, $v0 -/* BAF328 802419E8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802419EC: -/* BAF32C 802419EC 8E930070 */ lw $s3, 0x70($s4) -/* BAF330 802419F0 12600005 */ beqz $s3, .L80241A08 -/* BAF334 802419F4 24020001 */ addiu $v0, $zero, 1 -/* BAF338 802419F8 12620048 */ beq $s3, $v0, .L80241B1C -/* BAF33C 802419FC 00000000 */ nop -/* BAF340 80241A00 080906E4 */ j .L80241B90 -/* BAF344 80241A04 00000000 */ nop -.L80241A08: -/* BAF348 80241A08 86240008 */ lh $a0, 8($s1) -/* BAF34C 80241A0C 0C00FB3A */ jal get_enemy -/* BAF350 80241A10 2484FFFF */ addiu $a0, $a0, -1 -/* BAF354 80241A14 0040802D */ daddu $s0, $v0, $zero -/* BAF358 80241A18 0C00EABB */ jal get_npc_unsafe -/* BAF35C 80241A1C 86040008 */ lh $a0, 8($s0) -/* BAF360 80241A20 24030001 */ addiu $v1, $zero, 1 -/* BAF364 80241A24 0040982D */ daddu $s3, $v0, $zero -/* BAF368 80241A28 A2230007 */ sb $v1, 7($s1) -/* BAF36C 80241A2C 8E03006C */ lw $v1, 0x6c($s0) -/* BAF370 80241A30 24020003 */ addiu $v0, $zero, 3 -/* BAF374 80241A34 14620056 */ bne $v1, $v0, .L80241B90 -/* BAF378 80241A38 00000000 */ nop -/* BAF37C 80241A3C 8E2500A8 */ lw $a1, 0xa8($s1) -/* BAF380 80241A40 10A00003 */ beqz $a1, .L80241A50 -/* BAF384 80241A44 0260202D */ daddu $a0, $s3, $zero -/* BAF388 80241A48 0C012530 */ jal func_800494C0 -/* BAF38C 80241A4C 0000302D */ daddu $a2, $zero, $zero -.L80241A50: -/* BAF390 80241A50 27A40010 */ addiu $a0, $sp, 0x10 -/* BAF394 80241A54 C6280070 */ lwc1 $f8, 0x70($s1) -/* BAF398 80241A58 46804220 */ cvt.s.w $f8, $f8 -/* BAF39C 80241A5C C6620034 */ lwc1 $f2, 0x34($s3) -/* BAF3A0 80241A60 3C014387 */ lui $at, 0x4387 -/* BAF3A4 80241A64 44810000 */ mtc1 $at, $f0 -/* BAF3A8 80241A68 44064000 */ mfc1 $a2, $f8 -/* BAF3AC 80241A6C 46020001 */ sub.s $f0, $f0, $f2 -/* BAF3B0 80241A70 C6660038 */ lwc1 $f6, 0x38($s3) -/* BAF3B4 80241A74 C6640040 */ lwc1 $f4, 0x40($s3) -/* BAF3B8 80241A78 44070000 */ mfc1 $a3, $f0 -/* BAF3BC 80241A7C 27A50014 */ addiu $a1, $sp, 0x14 -/* BAF3C0 80241A80 E7A60010 */ swc1 $f6, 0x10($sp) -/* BAF3C4 80241A84 0C00A7E7 */ jal add_vec2D_polar -/* BAF3C8 80241A88 E7A40014 */ swc1 $f4, 0x14($sp) -/* BAF3CC 80241A8C C7A00010 */ lwc1 $f0, 0x10($sp) -/* BAF3D0 80241A90 4600020D */ trunc.w.s $f8, $f0 -/* BAF3D4 80241A94 44024000 */ mfc1 $v0, $f8 -/* BAF3D8 80241A98 E6400038 */ swc1 $f0, 0x38($s2) -/* BAF3DC 80241A9C A6220010 */ sh $v0, 0x10($s1) -/* BAF3E0 80241AA0 C660003C */ lwc1 $f0, 0x3c($s3) -/* BAF3E4 80241AA4 C622006C */ lwc1 $f2, 0x6c($s1) -/* BAF3E8 80241AA8 468010A0 */ cvt.s.w $f2, $f2 -/* BAF3EC 80241AAC 46020000 */ add.s $f0, $f0, $f2 -/* BAF3F0 80241AB0 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BAF3F4 80241AB4 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BAF3F8 80241AB8 E640003C */ swc1 $f0, 0x3c($s2) -/* BAF3FC 80241ABC C7A20014 */ lwc1 $f2, 0x14($sp) -/* BAF400 80241AC0 4600020D */ trunc.w.s $f8, $f0 -/* BAF404 80241AC4 44024000 */ mfc1 $v0, $f8 -/* BAF408 80241AC8 00000000 */ nop -/* BAF40C 80241ACC A6220012 */ sh $v0, 0x12($s1) -/* BAF410 80241AD0 4600120D */ trunc.w.s $f8, $f2 -/* BAF414 80241AD4 44024000 */ mfc1 $v0, $f8 -/* BAF418 80241AD8 E6420040 */ swc1 $f2, 0x40($s2) -/* BAF41C 80241ADC A6220014 */ sh $v0, 0x14($s1) -/* BAF420 80241AE0 8C660028 */ lw $a2, 0x28($v1) -/* BAF424 80241AE4 8C670030 */ lw $a3, 0x30($v1) -/* BAF428 80241AE8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BAF42C 80241AEC 0C00A720 */ jal atan2 -/* BAF430 80241AF0 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BAF434 80241AF4 3C03E0EF */ lui $v1, 0xe0ef -/* BAF438 80241AF8 E640000C */ swc1 $f0, 0xc($s2) -/* BAF43C 80241AFC 8E220000 */ lw $v0, ($s1) -/* BAF440 80241B00 3463FFFF */ ori $v1, $v1, 0xffff -/* BAF444 80241B04 00431024 */ and $v0, $v0, $v1 -/* BAF448 80241B08 AE220000 */ sw $v0, ($s1) -/* BAF44C 80241B0C 24020001 */ addiu $v0, $zero, 1 -/* BAF450 80241B10 A640008E */ sh $zero, 0x8e($s2) -/* BAF454 80241B14 080906E4 */ j .L80241B90 -/* BAF458 80241B18 AE820070 */ sw $v0, 0x70($s4) -.L80241B1C: -/* BAF45C 80241B1C 86240008 */ lh $a0, 8($s1) -/* BAF460 80241B20 0C00FB3A */ jal get_enemy -/* BAF464 80241B24 2484FFFF */ addiu $a0, $a0, -1 -/* BAF468 80241B28 0040802D */ daddu $s0, $v0, $zero -/* BAF46C 80241B2C 0C00EABB */ jal get_npc_unsafe -/* BAF470 80241B30 86040008 */ lh $a0, 8($s0) -/* BAF474 80241B34 9642008E */ lhu $v0, 0x8e($s2) -/* BAF478 80241B38 24420001 */ addiu $v0, $v0, 1 -/* BAF47C 80241B3C A642008E */ sh $v0, 0x8e($s2) -/* BAF480 80241B40 00021400 */ sll $v0, $v0, 0x10 -/* BAF484 80241B44 8E23007C */ lw $v1, 0x7c($s1) -/* BAF488 80241B48 00021403 */ sra $v0, $v0, 0x10 -/* BAF48C 80241B4C 0043102A */ slt $v0, $v0, $v1 -/* BAF490 80241B50 50400001 */ beql $v0, $zero, .L80241B58 -/* BAF494 80241B54 A2200007 */ sb $zero, 7($s1) -.L80241B58: -/* BAF498 80241B58 8E03006C */ lw $v1, 0x6c($s0) -/* BAF49C 80241B5C 24020004 */ addiu $v0, $zero, 4 -/* BAF4A0 80241B60 1462000B */ bne $v1, $v0, .L80241B90 -/* BAF4A4 80241B64 3C021F10 */ lui $v0, 0x1f10 -/* BAF4A8 80241B68 8E230000 */ lw $v1, ($s1) -/* BAF4AC 80241B6C 3C01C47A */ lui $at, 0xc47a -/* BAF4B0 80241B70 44810000 */ mtc1 $at, $f0 -/* BAF4B4 80241B74 00621825 */ or $v1, $v1, $v0 -/* BAF4B8 80241B78 AE230000 */ sw $v1, ($s1) -/* BAF4BC 80241B7C AE400038 */ sw $zero, 0x38($s2) -/* BAF4C0 80241B80 E640003C */ swc1 $f0, 0x3c($s2) -/* BAF4C4 80241B84 AE400040 */ sw $zero, 0x40($s2) -/* BAF4C8 80241B88 A2330007 */ sb $s3, 7($s1) -/* BAF4CC 80241B8C AE800070 */ sw $zero, 0x70($s4) -.L80241B90: -/* BAF4D0 80241B90 8FBF002C */ lw $ra, 0x2c($sp) -/* BAF4D4 80241B94 8FB40028 */ lw $s4, 0x28($sp) -/* BAF4D8 80241B98 8FB30024 */ lw $s3, 0x24($sp) -/* BAF4DC 80241B9C 8FB20020 */ lw $s2, 0x20($sp) -/* BAF4E0 80241BA0 8FB1001C */ lw $s1, 0x1c($sp) -/* BAF4E4 80241BA4 8FB00018 */ lw $s0, 0x18($sp) -/* BAF4E8 80241BA8 0000102D */ daddu $v0, $zero, $zero -/* BAF4EC 80241BAC 03E00008 */ jr $ra -/* BAF4F0 80241BB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s deleted file mode 100644 index c9f535465e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240BD8_9D7BF8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD8_9D7BF8 -/* 9D7BF8 80240BD8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9D7BFC 80240BDC AFB20038 */ sw $s2, 0x38($sp) -/* 9D7C00 80240BE0 0080902D */ daddu $s2, $a0, $zero -/* 9D7C04 80240BE4 AFBF0044 */ sw $ra, 0x44($sp) -/* 9D7C08 80240BE8 AFB40040 */ sw $s4, 0x40($sp) -/* 9D7C0C 80240BEC AFB3003C */ sw $s3, 0x3c($sp) -/* 9D7C10 80240BF0 AFB10034 */ sw $s1, 0x34($sp) -/* 9D7C14 80240BF4 AFB00030 */ sw $s0, 0x30($sp) -/* 9D7C18 80240BF8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9D7C1C 80240BFC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9D7C20 80240C00 8E510148 */ lw $s1, 0x148($s2) -/* 9D7C24 80240C04 00A0982D */ daddu $s3, $a1, $zero -/* 9D7C28 80240C08 86240008 */ lh $a0, 8($s1) -/* 9D7C2C 80240C0C 0C00EABB */ jal get_npc_unsafe -/* 9D7C30 80240C10 00C0A02D */ daddu $s4, $a2, $zero -/* 9D7C34 80240C14 8E630014 */ lw $v1, 0x14($s3) -/* 9D7C38 80240C18 04600030 */ bltz $v1, .L80240CDC -/* 9D7C3C 80240C1C 0040802D */ daddu $s0, $v0, $zero -/* 9D7C40 80240C20 8E420074 */ lw $v0, 0x74($s2) -/* 9D7C44 80240C24 1C40002C */ bgtz $v0, .L80240CD8 -/* 9D7C48 80240C28 2442FFFF */ addiu $v0, $v0, -1 -/* 9D7C4C 80240C2C 0280202D */ daddu $a0, $s4, $zero -/* 9D7C50 80240C30 AE430074 */ sw $v1, 0x74($s2) -/* 9D7C54 80240C34 AFA00010 */ sw $zero, 0x10($sp) -/* 9D7C58 80240C38 8E66000C */ lw $a2, 0xc($s3) -/* 9D7C5C 80240C3C 8E670010 */ lw $a3, 0x10($s3) -/* 9D7C60 80240C40 0C01242D */ jal func_800490B4 -/* 9D7C64 80240C44 0220282D */ daddu $a1, $s1, $zero -/* 9D7C68 80240C48 10400021 */ beqz $v0, .L80240CD0 -/* 9D7C6C 80240C4C 0000202D */ daddu $a0, $zero, $zero -/* 9D7C70 80240C50 0200282D */ daddu $a1, $s0, $zero -/* 9D7C74 80240C54 0000302D */ daddu $a2, $zero, $zero -/* 9D7C78 80240C58 860300A8 */ lh $v1, 0xa8($s0) -/* 9D7C7C 80240C5C 3C013F80 */ lui $at, 0x3f80 -/* 9D7C80 80240C60 44810000 */ mtc1 $at, $f0 -/* 9D7C84 80240C64 3C014000 */ lui $at, 0x4000 -/* 9D7C88 80240C68 44811000 */ mtc1 $at, $f2 -/* 9D7C8C 80240C6C 3C01C1A0 */ lui $at, 0xc1a0 -/* 9D7C90 80240C70 44812000 */ mtc1 $at, $f4 -/* 9D7C94 80240C74 2402000F */ addiu $v0, $zero, 0xf -/* 9D7C98 80240C78 AFA2001C */ sw $v0, 0x1c($sp) -/* 9D7C9C 80240C7C 44833000 */ mtc1 $v1, $f6 -/* 9D7CA0 80240C80 00000000 */ nop -/* 9D7CA4 80240C84 468031A0 */ cvt.s.w $f6, $f6 -/* 9D7CA8 80240C88 44073000 */ mfc1 $a3, $f6 -/* 9D7CAC 80240C8C 27A20028 */ addiu $v0, $sp, 0x28 -/* 9D7CB0 80240C90 AFA20020 */ sw $v0, 0x20($sp) -/* 9D7CB4 80240C94 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D7CB8 80240C98 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D7CBC 80240C9C 0C01BFA4 */ jal fx_emote -/* 9D7CC0 80240CA0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9D7CC4 80240CA4 0200202D */ daddu $a0, $s0, $zero -/* 9D7CC8 80240CA8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9D7CCC 80240CAC 0C012530 */ jal func_800494C0 -/* 9D7CD0 80240CB0 3C060020 */ lui $a2, 0x20 -/* 9D7CD4 80240CB4 8E220018 */ lw $v0, 0x18($s1) -/* 9D7CD8 80240CB8 9442002A */ lhu $v0, 0x2a($v0) -/* 9D7CDC 80240CBC 30420001 */ andi $v0, $v0, 1 -/* 9D7CE0 80240CC0 14400064 */ bnez $v0, .L80240E54 -/* 9D7CE4 80240CC4 2402000A */ addiu $v0, $zero, 0xa -/* 9D7CE8 80240CC8 08090395 */ j .L80240E54 -/* 9D7CEC 80240CCC 2402000C */ addiu $v0, $zero, 0xc -.L80240CD0: -/* 9D7CF0 80240CD0 8E420074 */ lw $v0, 0x74($s2) -/* 9D7CF4 80240CD4 2442FFFF */ addiu $v0, $v0, -1 -.L80240CD8: -/* 9D7CF8 80240CD8 AE420074 */ sw $v0, 0x74($s2) -.L80240CDC: -/* 9D7CFC 80240CDC 8602008C */ lh $v0, 0x8c($s0) -/* 9D7D00 80240CE0 1440005D */ bnez $v0, .L80240E58 -/* 9D7D04 80240CE4 00000000 */ nop -/* 9D7D08 80240CE8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9D7D0C 80240CEC 3C014010 */ lui $at, 0x4010 -/* 9D7D10 80240CF0 44811800 */ mtc1 $at, $f3 -/* 9D7D14 80240CF4 44801000 */ mtc1 $zero, $f2 -/* 9D7D18 80240CF8 46000021 */ cvt.d.s $f0, $f0 -/* 9D7D1C 80240CFC 4622003C */ c.lt.d $f0, $f2 -/* 9D7D20 80240D00 00000000 */ nop -/* 9D7D24 80240D04 45000003 */ bc1f .L80240D14 -/* 9D7D28 80240D08 0200202D */ daddu $a0, $s0, $zero -/* 9D7D2C 80240D0C 08090346 */ j .L80240D18 -/* 9D7D30 80240D10 0000282D */ daddu $a1, $zero, $zero -.L80240D14: -/* 9D7D34 80240D14 24050001 */ addiu $a1, $zero, 1 -.L80240D18: -/* 9D7D38 80240D18 0C00F598 */ jal func_8003D660 -/* 9D7D3C 80240D1C 00000000 */ nop -/* 9D7D40 80240D20 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9D7D44 80240D24 8E430078 */ lw $v1, 0x78($s2) -/* 9D7D48 80240D28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9D7D4C 80240D2C 00031040 */ sll $v0, $v1, 1 -/* 9D7D50 80240D30 00431021 */ addu $v0, $v0, $v1 -/* 9D7D54 80240D34 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D7D58 80240D38 00021080 */ sll $v0, $v0, 2 -/* 9D7D5C 80240D3C 00431021 */ addu $v0, $v0, $v1 -/* 9D7D60 80240D40 C4560004 */ lwc1 $f22, 4($v0) -/* 9D7D64 80240D44 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D7D68 80240D48 C454000C */ lwc1 $f20, 0xc($v0) -/* 9D7D6C 80240D4C 4680A520 */ cvt.s.w $f20, $f20 -/* 9D7D70 80240D50 4406B000 */ mfc1 $a2, $f22 -/* 9D7D74 80240D54 4407A000 */ mfc1 $a3, $f20 -/* 9D7D78 80240D58 0C00A720 */ jal atan2 -/* 9D7D7C 80240D5C 00000000 */ nop -/* 9D7D80 80240D60 8E050018 */ lw $a1, 0x18($s0) -/* 9D7D84 80240D64 44060000 */ mfc1 $a2, $f0 -/* 9D7D88 80240D68 0200202D */ daddu $a0, $s0, $zero -/* 9D7D8C 80240D6C 0C00EA95 */ jal npc_move_heading -/* 9D7D90 80240D70 AE06000C */ sw $a2, 0xc($s0) -/* 9D7D94 80240D74 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9D7D98 80240D78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9D7D9C 80240D7C 4406B000 */ mfc1 $a2, $f22 -/* 9D7DA0 80240D80 4407A000 */ mfc1 $a3, $f20 -/* 9D7DA4 80240D84 0C00A7B5 */ jal dist2D -/* 9D7DA8 80240D88 00000000 */ nop -/* 9D7DAC 80240D8C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9D7DB0 80240D90 4602003E */ c.le.s $f0, $f2 -/* 9D7DB4 80240D94 00000000 */ nop -/* 9D7DB8 80240D98 4500002F */ bc1f .L80240E58 -/* 9D7DBC 80240D9C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9D7DC0 80240DA0 24020002 */ addiu $v0, $zero, 2 -/* 9D7DC4 80240DA4 0C00A67F */ jal rand_int -/* 9D7DC8 80240DA8 AE420070 */ sw $v0, 0x70($s2) -/* 9D7DCC 80240DAC 3C035555 */ lui $v1, 0x5555 -/* 9D7DD0 80240DB0 34635556 */ ori $v1, $v1, 0x5556 -/* 9D7DD4 80240DB4 00430018 */ mult $v0, $v1 -/* 9D7DD8 80240DB8 000227C3 */ sra $a0, $v0, 0x1f -/* 9D7DDC 80240DBC 00004010 */ mfhi $t0 -/* 9D7DE0 80240DC0 01042023 */ subu $a0, $t0, $a0 -/* 9D7DE4 80240DC4 00041840 */ sll $v1, $a0, 1 -/* 9D7DE8 80240DC8 00641821 */ addu $v1, $v1, $a0 -/* 9D7DEC 80240DCC 00431023 */ subu $v0, $v0, $v1 -/* 9D7DF0 80240DD0 24430002 */ addiu $v1, $v0, 2 -/* 9D7DF4 80240DD4 AE430074 */ sw $v1, 0x74($s2) -/* 9D7DF8 80240DD8 8E62002C */ lw $v0, 0x2c($s3) -/* 9D7DFC 80240DDC 18400009 */ blez $v0, .L80240E04 -/* 9D7E00 80240DE0 24020004 */ addiu $v0, $zero, 4 -/* 9D7E04 80240DE4 8E620004 */ lw $v0, 4($s3) -/* 9D7E08 80240DE8 18400006 */ blez $v0, .L80240E04 -/* 9D7E0C 80240DEC 24020004 */ addiu $v0, $zero, 4 -/* 9D7E10 80240DF0 8E620008 */ lw $v0, 8($s3) -/* 9D7E14 80240DF4 18400003 */ blez $v0, .L80240E04 -/* 9D7E18 80240DF8 24020004 */ addiu $v0, $zero, 4 -/* 9D7E1C 80240DFC 14600002 */ bnez $v1, .L80240E08 -/* 9D7E20 80240E00 00000000 */ nop -.L80240E04: -/* 9D7E24 80240E04 AE420070 */ sw $v0, 0x70($s2) -.L80240E08: -/* 9D7E28 80240E08 0C00A67F */ jal rand_int -/* 9D7E2C 80240E0C 24042710 */ addiu $a0, $zero, 0x2710 -/* 9D7E30 80240E10 3C0351EB */ lui $v1, 0x51eb -/* 9D7E34 80240E14 3463851F */ ori $v1, $v1, 0x851f -/* 9D7E38 80240E18 00430018 */ mult $v0, $v1 -/* 9D7E3C 80240E1C 00021FC3 */ sra $v1, $v0, 0x1f -/* 9D7E40 80240E20 00004010 */ mfhi $t0 -/* 9D7E44 80240E24 00082143 */ sra $a0, $t0, 5 -/* 9D7E48 80240E28 00832023 */ subu $a0, $a0, $v1 -/* 9D7E4C 80240E2C 00041840 */ sll $v1, $a0, 1 -/* 9D7E50 80240E30 00641821 */ addu $v1, $v1, $a0 -/* 9D7E54 80240E34 000318C0 */ sll $v1, $v1, 3 -/* 9D7E58 80240E38 00641821 */ addu $v1, $v1, $a0 -/* 9D7E5C 80240E3C 00031880 */ sll $v1, $v1, 2 -/* 9D7E60 80240E40 8E640004 */ lw $a0, 4($s3) -/* 9D7E64 80240E44 00431023 */ subu $v0, $v0, $v1 -/* 9D7E68 80240E48 0044102A */ slt $v0, $v0, $a0 -/* 9D7E6C 80240E4C 10400002 */ beqz $v0, .L80240E58 -/* 9D7E70 80240E50 24020004 */ addiu $v0, $zero, 4 -.L80240E54: -/* 9D7E74 80240E54 AE420070 */ sw $v0, 0x70($s2) -.L80240E58: -/* 9D7E78 80240E58 8FBF0044 */ lw $ra, 0x44($sp) -/* 9D7E7C 80240E5C 8FB40040 */ lw $s4, 0x40($sp) -/* 9D7E80 80240E60 8FB3003C */ lw $s3, 0x3c($sp) -/* 9D7E84 80240E64 8FB20038 */ lw $s2, 0x38($sp) -/* 9D7E88 80240E68 8FB10034 */ lw $s1, 0x34($sp) -/* 9D7E8C 80240E6C 8FB00030 */ lw $s0, 0x30($sp) -/* 9D7E90 80240E70 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9D7E94 80240E74 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9D7E98 80240E78 03E00008 */ jr $ra -/* 9D7E9C 80240E7C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s deleted file mode 100644 index 1e206386df..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240F40_9D7F60.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F40_9D7F60 -/* 9D7F60 80240F40 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D7F64 80240F44 AFB40040 */ sw $s4, 0x40($sp) -/* 9D7F68 80240F48 0080A02D */ daddu $s4, $a0, $zero -/* 9D7F6C 80240F4C AFBF0044 */ sw $ra, 0x44($sp) -/* 9D7F70 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 9D7F74 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 9D7F78 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 9D7F7C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 9D7F80 80240F60 8E910148 */ lw $s1, 0x148($s4) -/* 9D7F84 80240F64 00A0902D */ daddu $s2, $a1, $zero -/* 9D7F88 80240F68 86240008 */ lh $a0, 8($s1) -/* 9D7F8C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 9D7F90 80240F70 00C0982D */ daddu $s3, $a2, $zero -/* 9D7F94 80240F74 8E430014 */ lw $v1, 0x14($s2) -/* 9D7F98 80240F78 04600031 */ bltz $v1, .L80241040 -/* 9D7F9C 80240F7C 0040802D */ daddu $s0, $v0, $zero -/* 9D7FA0 80240F80 0260202D */ daddu $a0, $s3, $zero -/* 9D7FA4 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 9D7FA8 80240F88 8E460024 */ lw $a2, 0x24($s2) -/* 9D7FAC 80240F8C 8E470028 */ lw $a3, 0x28($s2) -/* 9D7FB0 80240F90 0C01242D */ jal func_800490B4 -/* 9D7FB4 80240F94 0220282D */ daddu $a1, $s1, $zero -/* 9D7FB8 80240F98 10400029 */ beqz $v0, .L80241040 -/* 9D7FBC 80240F9C 0000202D */ daddu $a0, $zero, $zero -/* 9D7FC0 80240FA0 0200282D */ daddu $a1, $s0, $zero -/* 9D7FC4 80240FA4 0000302D */ daddu $a2, $zero, $zero -/* 9D7FC8 80240FA8 860300A8 */ lh $v1, 0xa8($s0) -/* 9D7FCC 80240FAC 3C013F80 */ lui $at, 0x3f80 -/* 9D7FD0 80240FB0 44810000 */ mtc1 $at, $f0 -/* 9D7FD4 80240FB4 3C014000 */ lui $at, 0x4000 -/* 9D7FD8 80240FB8 44811000 */ mtc1 $at, $f2 -/* 9D7FDC 80240FBC 3C01C1A0 */ lui $at, 0xc1a0 -/* 9D7FE0 80240FC0 44812000 */ mtc1 $at, $f4 -/* 9D7FE4 80240FC4 2402000F */ addiu $v0, $zero, 0xf -/* 9D7FE8 80240FC8 AFA2001C */ sw $v0, 0x1c($sp) -/* 9D7FEC 80240FCC 44833000 */ mtc1 $v1, $f6 -/* 9D7FF0 80240FD0 00000000 */ nop -/* 9D7FF4 80240FD4 468031A0 */ cvt.s.w $f6, $f6 -/* 9D7FF8 80240FD8 44073000 */ mfc1 $a3, $f6 -/* 9D7FFC 80240FDC 27A20028 */ addiu $v0, $sp, 0x28 -/* 9D8000 80240FE0 AFA20020 */ sw $v0, 0x20($sp) -/* 9D8004 80240FE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D8008 80240FE8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D800C 80240FEC 0C01BFA4 */ jal fx_emote -/* 9D8010 80240FF0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9D8014 80240FF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9D8018 80240FF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9D801C 80240FFC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9D8020 80241000 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9D8024 80241004 8C460028 */ lw $a2, 0x28($v0) -/* 9D8028 80241008 0C00A720 */ jal atan2 -/* 9D802C 8024100C 8C470030 */ lw $a3, 0x30($v0) -/* 9D8030 80241010 0200202D */ daddu $a0, $s0, $zero -/* 9D8034 80241014 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9D8038 80241018 3C060020 */ lui $a2, 0x20 -/* 9D803C 8024101C 0C012530 */ jal func_800494C0 -/* 9D8040 80241020 E480000C */ swc1 $f0, 0xc($a0) -/* 9D8044 80241024 8E220018 */ lw $v0, 0x18($s1) -/* 9D8048 80241028 9442002A */ lhu $v0, 0x2a($v0) -/* 9D804C 8024102C 30420001 */ andi $v0, $v0, 1 -/* 9D8050 80241030 14400029 */ bnez $v0, .L802410D8 -/* 9D8054 80241034 2402000A */ addiu $v0, $zero, 0xa -/* 9D8058 80241038 08090436 */ j .L802410D8 -/* 9D805C 8024103C 2402000C */ addiu $v0, $zero, 0xc -.L80241040: -/* 9D8060 80241040 8602008C */ lh $v0, 0x8c($s0) -/* 9D8064 80241044 14400025 */ bnez $v0, .L802410DC -/* 9D8068 80241048 00000000 */ nop -/* 9D806C 8024104C 9602008E */ lhu $v0, 0x8e($s0) -/* 9D8070 80241050 2442FFFF */ addiu $v0, $v0, -1 -/* 9D8074 80241054 A602008E */ sh $v0, 0x8e($s0) -/* 9D8078 80241058 00021400 */ sll $v0, $v0, 0x10 -/* 9D807C 8024105C 1440001F */ bnez $v0, .L802410DC -/* 9D8080 80241060 00000000 */ nop -/* 9D8084 80241064 8E820074 */ lw $v0, 0x74($s4) -/* 9D8088 80241068 2442FFFF */ addiu $v0, $v0, -1 -/* 9D808C 8024106C 10400019 */ beqz $v0, .L802410D4 -/* 9D8090 80241070 AE820074 */ sw $v0, 0x74($s4) -/* 9D8094 80241074 8E220018 */ lw $v0, 0x18($s1) -/* 9D8098 80241078 9442002A */ lhu $v0, 0x2a($v0) -/* 9D809C 8024107C 30420010 */ andi $v0, $v0, 0x10 -/* 9D80A0 80241080 14400007 */ bnez $v0, .L802410A0 -/* 9D80A4 80241084 00000000 */ nop -/* 9D80A8 80241088 C600000C */ lwc1 $f0, 0xc($s0) -/* 9D80AC 8024108C 3C014334 */ lui $at, 0x4334 -/* 9D80B0 80241090 44816000 */ mtc1 $at, $f12 -/* 9D80B4 80241094 0C00A6C9 */ jal clamp_angle -/* 9D80B8 80241098 460C0300 */ add.s $f12, $f0, $f12 -/* 9D80BC 8024109C E600000C */ swc1 $f0, 0xc($s0) -.L802410A0: -/* 9D80C0 802410A0 8E440008 */ lw $a0, 8($s2) -/* 9D80C4 802410A4 000417C2 */ srl $v0, $a0, 0x1f -/* 9D80C8 802410A8 00822021 */ addu $a0, $a0, $v0 -/* 9D80CC 802410AC 00042043 */ sra $a0, $a0, 1 -/* 9D80D0 802410B0 0C00A67F */ jal rand_int -/* 9D80D4 802410B4 24840001 */ addiu $a0, $a0, 1 -/* 9D80D8 802410B8 8E430008 */ lw $v1, 8($s2) -/* 9D80DC 802410BC 000327C2 */ srl $a0, $v1, 0x1f -/* 9D80E0 802410C0 00641821 */ addu $v1, $v1, $a0 -/* 9D80E4 802410C4 00031843 */ sra $v1, $v1, 1 -/* 9D80E8 802410C8 00621821 */ addu $v1, $v1, $v0 -/* 9D80EC 802410CC 08090437 */ j .L802410DC -/* 9D80F0 802410D0 A603008E */ sh $v1, 0x8e($s0) -.L802410D4: -/* 9D80F4 802410D4 24020004 */ addiu $v0, $zero, 4 -.L802410D8: -/* 9D80F8 802410D8 AE820070 */ sw $v0, 0x70($s4) -.L802410DC: -/* 9D80FC 802410DC 8FBF0044 */ lw $ra, 0x44($sp) -/* 9D8100 802410E0 8FB40040 */ lw $s4, 0x40($sp) -/* 9D8104 802410E4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9D8108 802410E8 8FB20038 */ lw $s2, 0x38($sp) -/* 9D810C 802410EC 8FB10034 */ lw $s1, 0x34($sp) -/* 9D8110 802410F0 8FB00030 */ lw $s0, 0x30($sp) -/* 9D8114 802410F4 03E00008 */ jr $ra -/* 9D8118 802410F8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s deleted file mode 100644 index 543e314c75..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_9D83EC -/* 9D83EC 802413CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D83F0 802413D0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9D83F4 802413D4 0080982D */ daddu $s3, $a0, $zero -/* 9D83F8 802413D8 AFBF0040 */ sw $ra, 0x40($sp) -/* 9D83FC 802413DC AFB20038 */ sw $s2, 0x38($sp) -/* 9D8400 802413E0 AFB10034 */ sw $s1, 0x34($sp) -/* 9D8404 802413E4 AFB00030 */ sw $s0, 0x30($sp) -/* 9D8408 802413E8 8E720148 */ lw $s2, 0x148($s3) -/* 9D840C 802413EC 00A0882D */ daddu $s1, $a1, $zero -/* 9D8410 802413F0 86440008 */ lh $a0, 8($s2) -/* 9D8414 802413F4 0C00EABB */ jal get_npc_unsafe -/* 9D8418 802413F8 00C0802D */ daddu $s0, $a2, $zero -/* 9D841C 802413FC 0200202D */ daddu $a0, $s0, $zero -/* 9D8420 80241400 0240282D */ daddu $a1, $s2, $zero -/* 9D8424 80241404 24030001 */ addiu $v1, $zero, 1 -/* 9D8428 80241408 AFA30010 */ sw $v1, 0x10($sp) -/* 9D842C 8024140C 8E260024 */ lw $a2, 0x24($s1) -/* 9D8430 80241410 8E270028 */ lw $a3, 0x28($s1) -/* 9D8434 80241414 0C01242D */ jal func_800490B4 -/* 9D8438 80241418 0040802D */ daddu $s0, $v0, $zero -/* 9D843C 8024141C 1440001E */ bnez $v0, .L80241498 -/* 9D8440 80241420 0200202D */ daddu $a0, $s0, $zero -/* 9D8444 80241424 24040002 */ addiu $a0, $zero, 2 -/* 9D8448 80241428 0200282D */ daddu $a1, $s0, $zero -/* 9D844C 8024142C 0000302D */ daddu $a2, $zero, $zero -/* 9D8450 80241430 860300A8 */ lh $v1, 0xa8($s0) -/* 9D8454 80241434 3C013F80 */ lui $at, 0x3f80 -/* 9D8458 80241438 44810000 */ mtc1 $at, $f0 -/* 9D845C 8024143C 3C014000 */ lui $at, 0x4000 -/* 9D8460 80241440 44811000 */ mtc1 $at, $f2 -/* 9D8464 80241444 3C01C1A0 */ lui $at, 0xc1a0 -/* 9D8468 80241448 44812000 */ mtc1 $at, $f4 -/* 9D846C 8024144C 2402000F */ addiu $v0, $zero, 0xf -/* 9D8470 80241450 AFA2001C */ sw $v0, 0x1c($sp) -/* 9D8474 80241454 44833000 */ mtc1 $v1, $f6 -/* 9D8478 80241458 00000000 */ nop -/* 9D847C 8024145C 468031A0 */ cvt.s.w $f6, $f6 -/* 9D8480 80241460 44073000 */ mfc1 $a3, $f6 -/* 9D8484 80241464 27A20028 */ addiu $v0, $sp, 0x28 -/* 9D8488 80241468 AFA20020 */ sw $v0, 0x20($sp) -/* 9D848C 8024146C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D8490 80241470 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D8494 80241474 0C01BFA4 */ jal fx_emote -/* 9D8498 80241478 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9D849C 8024147C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9D84A0 80241480 8C430000 */ lw $v1, ($v0) -/* 9D84A4 80241484 24020019 */ addiu $v0, $zero, 0x19 -/* 9D84A8 80241488 A602008E */ sh $v0, 0x8e($s0) -/* 9D84AC 8024148C 2402000E */ addiu $v0, $zero, 0xe -/* 9D84B0 80241490 08090533 */ j .L802414CC -/* 9D84B4 80241494 AE030028 */ sw $v1, 0x28($s0) -.L80241498: -/* 9D84B8 80241498 0C00F598 */ jal func_8003D660 -/* 9D84BC 8024149C 24050001 */ addiu $a1, $zero, 1 -/* 9D84C0 802414A0 8E050018 */ lw $a1, 0x18($s0) -/* 9D84C4 802414A4 8E06000C */ lw $a2, 0xc($s0) -/* 9D84C8 802414A8 0C00EA95 */ jal npc_move_heading -/* 9D84CC 802414AC 0200202D */ daddu $a0, $s0, $zero -/* 9D84D0 802414B0 8602008E */ lh $v0, 0x8e($s0) -/* 9D84D4 802414B4 9603008E */ lhu $v1, 0x8e($s0) -/* 9D84D8 802414B8 18400003 */ blez $v0, .L802414C8 -/* 9D84DC 802414BC 2462FFFF */ addiu $v0, $v1, -1 -/* 9D84E0 802414C0 08090534 */ j .L802414D0 -/* 9D84E4 802414C4 A602008E */ sh $v0, 0x8e($s0) -.L802414C8: -/* 9D84E8 802414C8 2402000C */ addiu $v0, $zero, 0xc -.L802414CC: -/* 9D84EC 802414CC AE620070 */ sw $v0, 0x70($s3) -.L802414D0: -/* 9D84F0 802414D0 8FBF0040 */ lw $ra, 0x40($sp) -/* 9D84F4 802414D4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9D84F8 802414D8 8FB20038 */ lw $s2, 0x38($sp) -/* 9D84FC 802414DC 8FB10034 */ lw $s1, 0x34($sp) -/* 9D8500 802414E0 8FB00030 */ lw $s0, 0x30($sp) -/* 9D8504 802414E4 03E00008 */ jr $ra -/* 9D8508 802414E8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s deleted file mode 100644 index 5f7c592875..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241554_9D8574 -/* 9D8574 80241554 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8578 80241558 AFB10014 */ sw $s1, 0x14($sp) -/* 9D857C 8024155C 0080882D */ daddu $s1, $a0, $zero -/* 9D8580 80241560 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D8584 80241564 AFB20018 */ sw $s2, 0x18($sp) -/* 9D8588 80241568 AFB00010 */ sw $s0, 0x10($sp) -/* 9D858C 8024156C 8E300148 */ lw $s0, 0x148($s1) -/* 9D8590 80241570 86040008 */ lh $a0, 8($s0) -/* 9D8594 80241574 0C00EABB */ jal get_npc_unsafe -/* 9D8598 80241578 00A0902D */ daddu $s2, $a1, $zero -/* 9D859C 8024157C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9D85A0 80241580 8E240078 */ lw $a0, 0x78($s1) -/* 9D85A4 80241584 8C630000 */ lw $v1, ($v1) -/* 9D85A8 80241588 0083182A */ slt $v1, $a0, $v1 -/* 9D85AC 8024158C 10600013 */ beqz $v1, .L802415DC -/* 9D85B0 80241590 0040302D */ daddu $a2, $v0, $zero -/* 9D85B4 80241594 00041040 */ sll $v0, $a0, 1 -/* 9D85B8 80241598 00441021 */ addu $v0, $v0, $a0 -/* 9D85BC 8024159C 00022880 */ sll $a1, $v0, 2 -.L802415A0: -/* 9D85C0 802415A0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9D85C4 802415A4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9D85C8 802415A8 00A31021 */ addu $v0, $a1, $v1 -/* 9D85CC 802415AC C4400008 */ lwc1 $f0, 8($v0) -/* 9D85D0 802415B0 46800020 */ cvt.s.w $f0, $f0 -/* 9D85D4 802415B4 4602003E */ c.le.s $f0, $f2 -/* 9D85D8 802415B8 00000000 */ nop -/* 9D85DC 802415BC 45020003 */ bc1fl .L802415CC -/* 9D85E0 802415C0 24840001 */ addiu $a0, $a0, 1 -/* 9D85E4 802415C4 08090577 */ j .L802415DC -/* 9D85E8 802415C8 AE240078 */ sw $a0, 0x78($s1) -.L802415CC: -/* 9D85EC 802415CC 8C620000 */ lw $v0, ($v1) -/* 9D85F0 802415D0 0082102A */ slt $v0, $a0, $v0 -/* 9D85F4 802415D4 1440FFF2 */ bnez $v0, .L802415A0 -/* 9D85F8 802415D8 24A5000C */ addiu $a1, $a1, 0xc -.L802415DC: -/* 9D85FC 802415DC C6400000 */ lwc1 $f0, ($s2) -/* 9D8600 802415E0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9D8604 802415E4 8E0200CC */ lw $v0, 0xcc($s0) -/* 9D8608 802415E8 8C420004 */ lw $v0, 4($v0) -/* 9D860C 802415EC ACC20028 */ sw $v0, 0x28($a2) -/* 9D8610 802415F0 24020001 */ addiu $v0, $zero, 1 -/* 9D8614 802415F4 AE200074 */ sw $zero, 0x74($s1) -/* 9D8618 802415F8 AE220070 */ sw $v0, 0x70($s1) -/* 9D861C 802415FC 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D8620 80241600 8FB20018 */ lw $s2, 0x18($sp) -/* 9D8624 80241604 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8628 80241608 8FB00010 */ lw $s0, 0x10($sp) -/* 9D862C 8024160C 03E00008 */ jr $ra -/* 9D8630 80241610 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index 96168c9312..c4ea91454c 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -137,7 +137,7 @@ glabel L802417F8_9D8818 glabel L80241808_9D8828 /* 9D8828 80241808 0280202D */ daddu $a0, $s4, $zero /* 9D882C 8024180C 0260282D */ daddu $a1, $s3, $zero -/* 9D8830 80241810 0C0902F6 */ jal func_80240BD8_9D7BF8 +/* 9D8830 80241810 0C0902F6 */ jal nok_02_UnkFunc13 /* 9D8834 80241814 02A0302D */ daddu $a2, $s5, $zero /* 9D8838 80241818 0809063A */ j L802418E8_9D8908 /* 9D883C 8024181C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241820_9D8840 glabel L80241830_9D8850 /* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero -/* 9D8858 80241838 0C0903D0 */ jal func_80240F40_9D7F60 +/* 9D8858 80241838 0C0903D0 */ jal nok_02_UnkFunc14 /* 9D885C 8024183C 02A0302D */ daddu $a2, $s5, $zero /* 9D8860 80241840 0809063A */ j L802418E8_9D8908 /* 9D8864 80241844 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241888_9D88A8 glabel L80241898_9D88B8 /* 9D88B8 80241898 0280202D */ daddu $a0, $s4, $zero /* 9D88BC 8024189C 0260282D */ daddu $a1, $s3, $zero -/* 9D88C0 802418A0 0C0904F3 */ jal func_802413CC_9D83EC +/* 9D88C0 802418A0 0C0904F3 */ jal nok_02_UnkFunc15 /* 9D88C4 802418A4 02A0302D */ daddu $a2, $s5, $zero /* 9D88C8 802418A8 0809063A */ j L802418E8_9D8908 /* 9D88CC 802418AC 00000000 */ nop @@ -194,7 +194,7 @@ glabel L802418B0_9D88D0 glabel L802418C8_9D88E8 /* 9D88E8 802418C8 0280202D */ daddu $a0, $s4, $zero /* 9D88EC 802418CC 0260282D */ daddu $a1, $s3, $zero -/* 9D88F0 802418D0 0C090555 */ jal func_80241554_9D8574 +/* 9D88F0 802418D0 0C090555 */ jal nok_02_UnkFunc16 /* 9D88F4 802418D4 02A0302D */ daddu $a2, $s5, $zero /* 9D88F8 802418D8 0809063A */ j L802418E8_9D8908 /* 9D88FC 802418DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s deleted file mode 100644 index a15572a8a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024106C_9F5AAC.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024106C_9F5AAC -/* 9F5AAC 8024106C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 9F5AB0 80241070 AFB3004C */ sw $s3, 0x4c($sp) -/* 9F5AB4 80241074 0080982D */ daddu $s3, $a0, $zero -/* 9F5AB8 80241078 AFBF0054 */ sw $ra, 0x54($sp) -/* 9F5ABC 8024107C AFB40050 */ sw $s4, 0x50($sp) -/* 9F5AC0 80241080 AFB20048 */ sw $s2, 0x48($sp) -/* 9F5AC4 80241084 AFB10044 */ sw $s1, 0x44($sp) -/* 9F5AC8 80241088 AFB00040 */ sw $s0, 0x40($sp) -/* 9F5ACC 8024108C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 9F5AD0 80241090 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 9F5AD4 80241094 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 9F5AD8 80241098 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9F5ADC 8024109C 8E710148 */ lw $s1, 0x148($s3) -/* 9F5AE0 802410A0 00A0902D */ daddu $s2, $a1, $zero -/* 9F5AE4 802410A4 86240008 */ lh $a0, 8($s1) -/* 9F5AE8 802410A8 0C00EABB */ jal get_npc_unsafe -/* 9F5AEC 802410AC 00C0A02D */ daddu $s4, $a2, $zero -/* 9F5AF0 802410B0 0040802D */ daddu $s0, $v0, $zero -/* 9F5AF4 802410B4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9F5AF8 802410B8 46800020 */ cvt.s.w $f0, $f0 -/* 9F5AFC 802410BC 46000021 */ cvt.d.s $f0, $f0 -/* 9F5B00 802410C0 3C014059 */ lui $at, 0x4059 -/* 9F5B04 802410C4 44811800 */ mtc1 $at, $f3 -/* 9F5B08 802410C8 44801000 */ mtc1 $zero, $f2 -/* 9F5B0C 802410CC 8602008E */ lh $v0, 0x8e($s0) -/* 9F5B10 802410D0 9603008E */ lhu $v1, 0x8e($s0) -/* 9F5B14 802410D4 46220003 */ div.d $f0, $f0, $f2 -/* 9F5B18 802410D8 46200620 */ cvt.s.d $f24, $f0 -/* 9F5B1C 802410DC C6200088 */ lwc1 $f0, 0x88($s1) -/* 9F5B20 802410E0 46800020 */ cvt.s.w $f0, $f0 -/* 9F5B24 802410E4 46000021 */ cvt.d.s $f0, $f0 -/* 9F5B28 802410E8 46220003 */ div.d $f0, $f0, $f2 -/* 9F5B2C 802410EC 46200020 */ cvt.s.d $f0, $f0 -/* 9F5B30 802410F0 18400003 */ blez $v0, .L80241100 -/* 9F5B34 802410F4 4600C680 */ add.s $f26, $f24, $f0 -/* 9F5B38 802410F8 2462FFFF */ addiu $v0, $v1, -1 -/* 9F5B3C 802410FC A602008E */ sh $v0, 0x8e($s0) -.L80241100: -/* 9F5B40 80241100 8E220070 */ lw $v0, 0x70($s1) -/* 9F5B44 80241104 18400034 */ blez $v0, .L802411D8 -/* 9F5B48 80241108 00000000 */ nop -/* 9F5B4C 8024110C C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9F5B50 80241110 46806320 */ cvt.s.w $f12, $f12 -/* 9F5B54 80241114 44820000 */ mtc1 $v0, $f0 -/* 9F5B58 80241118 00000000 */ nop -/* 9F5B5C 8024111C 46800020 */ cvt.s.w $f0, $f0 -/* 9F5B60 80241120 46000021 */ cvt.d.s $f0, $f0 -/* 9F5B64 80241124 46220003 */ div.d $f0, $f0, $f2 -/* 9F5B68 80241128 0C00A8BB */ jal sin_deg -/* 9F5B6C 8024112C 462005A0 */ cvt.s.d $f22, $f0 -/* 9F5B70 80241130 8E020000 */ lw $v0, ($s0) -/* 9F5B74 80241134 30420008 */ andi $v0, $v0, 8 -/* 9F5B78 80241138 10400003 */ beqz $v0, .L80241148 -/* 9F5B7C 8024113C 46000506 */ mov.s $f20, $f0 -/* 9F5B80 80241140 08090462 */ j .L80241188 -/* 9F5B84 80241144 0000102D */ daddu $v0, $zero, $zero -.L80241148: -/* 9F5B88 80241148 27A50028 */ addiu $a1, $sp, 0x28 -/* 9F5B8C 8024114C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9F5B90 80241150 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F5B94 80241154 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F5B98 80241158 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F5B9C 8024115C 3C01447A */ lui $at, 0x447a -/* 9F5BA0 80241160 44813000 */ mtc1 $at, $f6 -/* 9F5BA4 80241164 27A20034 */ addiu $v0, $sp, 0x34 -/* 9F5BA8 80241168 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F5BAC 8024116C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9F5BB0 80241170 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9F5BB4 80241174 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9F5BB8 80241178 AFA20010 */ sw $v0, 0x10($sp) -/* 9F5BBC 8024117C 8E040080 */ lw $a0, 0x80($s0) -/* 9F5BC0 80241180 0C0372DF */ jal func_800DCB7C -/* 9F5BC4 80241184 27A70030 */ addiu $a3, $sp, 0x30 -.L80241188: -/* 9F5BC8 80241188 10400007 */ beqz $v0, .L802411A8 -/* 9F5BCC 8024118C 00000000 */ nop -/* 9F5BD0 80241190 4616A082 */ mul.s $f2, $f20, $f22 -/* 9F5BD4 80241194 00000000 */ nop -/* 9F5BD8 80241198 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9F5BDC 8024119C 46180000 */ add.s $f0, $f0, $f24 -/* 9F5BE0 802411A0 0809046D */ j .L802411B4 -/* 9F5BE4 802411A4 46020000 */ add.s $f0, $f0, $f2 -.L802411A8: -/* 9F5BE8 802411A8 4616A002 */ mul.s $f0, $f20, $f22 -/* 9F5BEC 802411AC 00000000 */ nop -/* 9F5BF0 802411B0 4600D000 */ add.s $f0, $f26, $f0 -.L802411B4: -/* 9F5BF4 802411B4 E600003C */ swc1 $f0, 0x3c($s0) -/* 9F5BF8 802411B8 8E220074 */ lw $v0, 0x74($s1) -/* 9F5BFC 802411BC 2442000A */ addiu $v0, $v0, 0xa -/* 9F5C00 802411C0 44826000 */ mtc1 $v0, $f12 -/* 9F5C04 802411C4 00000000 */ nop -/* 9F5C08 802411C8 0C00A6C9 */ jal clamp_angle -/* 9F5C0C 802411CC 46806320 */ cvt.s.w $f12, $f12 -/* 9F5C10 802411D0 4600020D */ trunc.w.s $f8, $f0 -/* 9F5C14 802411D4 E6280074 */ swc1 $f8, 0x74($s1) -.L802411D8: -/* 9F5C18 802411D8 8E220090 */ lw $v0, 0x90($s1) -/* 9F5C1C 802411DC 1C400040 */ bgtz $v0, .L802412E0 -/* 9F5C20 802411E0 2442FFFF */ addiu $v0, $v0, -1 -/* 9F5C24 802411E4 860200A8 */ lh $v0, 0xa8($s0) -/* 9F5C28 802411E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F5C2C 802411EC 44821000 */ mtc1 $v0, $f2 -/* 9F5C30 802411F0 00000000 */ nop -/* 9F5C34 802411F4 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5C38 802411F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5C3C 802411FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5C40 80241200 46020000 */ add.s $f0, $f0, $f2 -/* 9F5C44 80241204 3C014024 */ lui $at, 0x4024 -/* 9F5C48 80241208 44812800 */ mtc1 $at, $f5 -/* 9F5C4C 8024120C 44802000 */ mtc1 $zero, $f4 -/* 9F5C50 80241210 C442002C */ lwc1 $f2, 0x2c($v0) -/* 9F5C54 80241214 46000021 */ cvt.d.s $f0, $f0 -/* 9F5C58 80241218 46240000 */ add.d $f0, $f0, $f4 -/* 9F5C5C 8024121C 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5C60 80241220 4620103C */ c.lt.d $f2, $f0 -/* 9F5C64 80241224 00000000 */ nop -/* 9F5C68 80241228 4500002E */ bc1f .L802412E4 -/* 9F5C6C 8024122C 0280202D */ daddu $a0, $s4, $zero -/* 9F5C70 80241230 24020001 */ addiu $v0, $zero, 1 -/* 9F5C74 80241234 AFA20010 */ sw $v0, 0x10($sp) -/* 9F5C78 80241238 8E460024 */ lw $a2, 0x24($s2) -/* 9F5C7C 8024123C 8E470028 */ lw $a3, 0x28($s2) -/* 9F5C80 80241240 0C01242D */ jal func_800490B4 -/* 9F5C84 80241244 0220282D */ daddu $a1, $s1, $zero -/* 9F5C88 80241248 10400026 */ beqz $v0, .L802412E4 -/* 9F5C8C 8024124C 0000202D */ daddu $a0, $zero, $zero -/* 9F5C90 80241250 0200282D */ daddu $a1, $s0, $zero -/* 9F5C94 80241254 0000302D */ daddu $a2, $zero, $zero -/* 9F5C98 80241258 2412000C */ addiu $s2, $zero, 0xc -/* 9F5C9C 8024125C 860300A8 */ lh $v1, 0xa8($s0) -/* 9F5CA0 80241260 3C013F80 */ lui $at, 0x3f80 -/* 9F5CA4 80241264 44810000 */ mtc1 $at, $f0 -/* 9F5CA8 80241268 3C014000 */ lui $at, 0x4000 -/* 9F5CAC 8024126C 44811000 */ mtc1 $at, $f2 -/* 9F5CB0 80241270 3C01C1A0 */ lui $at, 0xc1a0 -/* 9F5CB4 80241274 44812000 */ mtc1 $at, $f4 -/* 9F5CB8 80241278 44834000 */ mtc1 $v1, $f8 -/* 9F5CBC 8024127C 00000000 */ nop -/* 9F5CC0 80241280 46804220 */ cvt.s.w $f8, $f8 -/* 9F5CC4 80241284 44074000 */ mfc1 $a3, $f8 -/* 9F5CC8 80241288 27A20038 */ addiu $v0, $sp, 0x38 -/* 9F5CCC 8024128C AFB2001C */ sw $s2, 0x1c($sp) -/* 9F5CD0 80241290 AFA20020 */ sw $v0, 0x20($sp) -/* 9F5CD4 80241294 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F5CD8 80241298 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9F5CDC 8024129C 0C01BFA4 */ jal fx_emote -/* 9F5CE0 802412A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9F5CE4 802412A4 0200202D */ daddu $a0, $s0, $zero -/* 9F5CE8 802412A8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9F5CEC 802412AC C480003C */ lwc1 $f0, 0x3c($a0) -/* 9F5CF0 802412B0 3C060020 */ lui $a2, 0x20 -/* 9F5CF4 802412B4 0C012530 */ jal func_800494C0 -/* 9F5CF8 802412B8 E4800064 */ swc1 $f0, 0x64($a0) -/* 9F5CFC 802412BC 8E220018 */ lw $v0, 0x18($s1) -/* 9F5D00 802412C0 9442002A */ lhu $v0, 0x2a($v0) -/* 9F5D04 802412C4 30420001 */ andi $v0, $v0, 1 -/* 9F5D08 802412C8 10400003 */ beqz $v0, .L802412D8 -/* 9F5D0C 802412CC 2402000A */ addiu $v0, $zero, 0xa -/* 9F5D10 802412D0 080904E0 */ j .L80241380 -/* 9F5D14 802412D4 AE620070 */ sw $v0, 0x70($s3) -.L802412D8: -/* 9F5D18 802412D8 080904E0 */ j .L80241380 -/* 9F5D1C 802412DC AE720070 */ sw $s2, 0x70($s3) -.L802412E0: -/* 9F5D20 802412E0 AE220090 */ sw $v0, 0x90($s1) -.L802412E4: -/* 9F5D24 802412E4 8602008C */ lh $v0, 0x8c($s0) -/* 9F5D28 802412E8 14400025 */ bnez $v0, .L80241380 -/* 9F5D2C 802412EC 00000000 */ nop -/* 9F5D30 802412F0 8602008E */ lh $v0, 0x8e($s0) -/* 9F5D34 802412F4 1C400022 */ bgtz $v0, .L80241380 -/* 9F5D38 802412F8 00000000 */ nop -/* 9F5D3C 802412FC 8E620074 */ lw $v0, 0x74($s3) -/* 9F5D40 80241300 2442FFFF */ addiu $v0, $v0, -1 -/* 9F5D44 80241304 1840001D */ blez $v0, .L8024137C -/* 9F5D48 80241308 AE620074 */ sw $v0, 0x74($s3) -/* 9F5D4C 8024130C 8E220018 */ lw $v0, 0x18($s1) -/* 9F5D50 80241310 9442002A */ lhu $v0, 0x2a($v0) -/* 9F5D54 80241314 30420010 */ andi $v0, $v0, 0x10 -/* 9F5D58 80241318 14400007 */ bnez $v0, .L80241338 -/* 9F5D5C 8024131C 00000000 */ nop -/* 9F5D60 80241320 C600000C */ lwc1 $f0, 0xc($s0) -/* 9F5D64 80241324 3C014334 */ lui $at, 0x4334 -/* 9F5D68 80241328 44816000 */ mtc1 $at, $f12 -/* 9F5D6C 8024132C 0C00A6C9 */ jal clamp_angle -/* 9F5D70 80241330 460C0300 */ add.s $f12, $f0, $f12 -/* 9F5D74 80241334 E600000C */ swc1 $f0, 0xc($s0) -.L80241338: -/* 9F5D78 80241338 0C00A67F */ jal rand_int -/* 9F5D7C 8024133C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9F5D80 80241340 3C032E8B */ lui $v1, 0x2e8b -/* 9F5D84 80241344 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9F5D88 80241348 00430018 */ mult $v0, $v1 -/* 9F5D8C 8024134C 00021FC3 */ sra $v1, $v0, 0x1f -/* 9F5D90 80241350 00004010 */ mfhi $t0 -/* 9F5D94 80241354 00082043 */ sra $a0, $t0, 1 -/* 9F5D98 80241358 00832023 */ subu $a0, $a0, $v1 -/* 9F5D9C 8024135C 00041840 */ sll $v1, $a0, 1 -/* 9F5DA0 80241360 00641821 */ addu $v1, $v1, $a0 -/* 9F5DA4 80241364 00031880 */ sll $v1, $v1, 2 -/* 9F5DA8 80241368 00641823 */ subu $v1, $v1, $a0 -/* 9F5DAC 8024136C 00431023 */ subu $v0, $v0, $v1 -/* 9F5DB0 80241370 24420005 */ addiu $v0, $v0, 5 -/* 9F5DB4 80241374 080904E0 */ j .L80241380 -/* 9F5DB8 80241378 A602008E */ sh $v0, 0x8e($s0) -.L8024137C: -/* 9F5DBC 8024137C AE600070 */ sw $zero, 0x70($s3) -.L80241380: -/* 9F5DC0 80241380 8FBF0054 */ lw $ra, 0x54($sp) -/* 9F5DC4 80241384 8FB40050 */ lw $s4, 0x50($sp) -/* 9F5DC8 80241388 8FB3004C */ lw $s3, 0x4c($sp) -/* 9F5DCC 8024138C 8FB20048 */ lw $s2, 0x48($sp) -/* 9F5DD0 80241390 8FB10044 */ lw $s1, 0x44($sp) -/* 9F5DD4 80241394 8FB00040 */ lw $s0, 0x40($sp) -/* 9F5DD8 80241398 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 9F5DDC 8024139C D7B80068 */ ldc1 $f24, 0x68($sp) -/* 9F5DE0 802413A0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 9F5DE4 802413A4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9F5DE8 802413A8 03E00008 */ jr $ra -/* 9F5DEC 802413AC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s deleted file mode 100644 index 303017dd55..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024162C_9F606C -/* 9F606C 8024162C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9F6070 80241630 AFB20030 */ sw $s2, 0x30($sp) -/* 9F6074 80241634 0080902D */ daddu $s2, $a0, $zero -/* 9F6078 80241638 AFBF0038 */ sw $ra, 0x38($sp) -/* 9F607C 8024163C AFB30034 */ sw $s3, 0x34($sp) -/* 9F6080 80241640 AFB1002C */ sw $s1, 0x2c($sp) -/* 9F6084 80241644 AFB00028 */ sw $s0, 0x28($sp) -/* 9F6088 80241648 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9F608C 8024164C F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9F6090 80241650 8E510148 */ lw $s1, 0x148($s2) -/* 9F6094 80241654 86240008 */ lh $a0, 8($s1) -/* 9F6098 80241658 0C00EABB */ jal get_npc_unsafe -/* 9F609C 8024165C 00A0982D */ daddu $s3, $a1, $zero -/* 9F60A0 80241660 0040802D */ daddu $s0, $v0, $zero -/* 9F60A4 80241664 0200202D */ daddu $a0, $s0, $zero -/* 9F60A8 80241668 C6220088 */ lwc1 $f2, 0x88($s1) -/* 9F60AC 8024166C 468010A0 */ cvt.s.w $f2, $f2 -/* 9F60B0 80241670 460010A1 */ cvt.d.s $f2, $f2 -/* 9F60B4 80241674 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F60B8 80241678 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9F60BC 8024167C 8E050018 */ lw $a1, 0x18($s0) -/* 9F60C0 80241680 46002100 */ add.s $f4, $f4, $f0 -/* 9F60C4 80241684 8E06000C */ lw $a2, 0xc($s0) -/* 9F60C8 80241688 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9F60CC 8024168C 46800020 */ cvt.s.w $f0, $f0 -/* 9F60D0 80241690 E604001C */ swc1 $f4, 0x1c($s0) -/* 9F60D4 80241694 3C014059 */ lui $at, 0x4059 -/* 9F60D8 80241698 44812800 */ mtc1 $at, $f5 -/* 9F60DC 8024169C 44802000 */ mtc1 $zero, $f4 -/* 9F60E0 802416A0 46000021 */ cvt.d.s $f0, $f0 -/* 9F60E4 802416A4 46240003 */ div.d $f0, $f0, $f4 -/* 9F60E8 802416A8 46200520 */ cvt.s.d $f20, $f0 -/* 9F60EC 802416AC 46241083 */ div.d $f2, $f2, $f4 -/* 9F60F0 802416B0 0C00EA95 */ jal npc_move_heading -/* 9F60F4 802416B4 462015A0 */ cvt.s.d $f22, $f2 -/* 9F60F8 802416B8 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F60FC 802416BC 44801000 */ mtc1 $zero, $f2 -/* 9F6100 802416C0 44801800 */ mtc1 $zero, $f3 -/* 9F6104 802416C4 46002021 */ cvt.d.s $f0, $f4 -/* 9F6108 802416C8 4620103E */ c.le.d $f2, $f0 -/* 9F610C 802416CC 00000000 */ nop -/* 9F6110 802416D0 45000030 */ bc1f .L80241794 -/* 9F6114 802416D4 00000000 */ nop -/* 9F6118 802416D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F611C 802416DC 46040000 */ add.s $f0, $f0, $f4 -/* 9F6120 802416E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9F6124 802416E4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F6128 802416E8 8C420024 */ lw $v0, 0x24($v0) -/* 9F612C 802416EC AE020028 */ sw $v0, 0x28($s0) -/* 9F6130 802416F0 A2200007 */ sb $zero, 7($s1) -/* 9F6134 802416F4 8E020000 */ lw $v0, ($s0) -/* 9F6138 802416F8 30420008 */ andi $v0, $v0, 8 -/* 9F613C 802416FC 14400011 */ bnez $v0, .L80241744 -/* 9F6140 80241700 0000102D */ daddu $v0, $zero, $zero -/* 9F6144 80241704 27A50018 */ addiu $a1, $sp, 0x18 -/* 9F6148 80241708 27A6001C */ addiu $a2, $sp, 0x1c -/* 9F614C 8024170C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F6150 80241710 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F6154 80241714 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F6158 80241718 3C01447A */ lui $at, 0x447a -/* 9F615C 8024171C 44813000 */ mtc1 $at, $f6 -/* 9F6160 80241720 27A20024 */ addiu $v0, $sp, 0x24 -/* 9F6164 80241724 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F6168 80241728 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9F616C 8024172C E7A40020 */ swc1 $f4, 0x20($sp) -/* 9F6170 80241730 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9F6174 80241734 AFA20010 */ sw $v0, 0x10($sp) -/* 9F6178 80241738 8E040080 */ lw $a0, 0x80($s0) -/* 9F617C 8024173C 0C0372DF */ jal func_800DCB7C -/* 9F6180 80241740 27A70020 */ addiu $a3, $sp, 0x20 -.L80241744: -/* 9F6184 80241744 1040000B */ beqz $v0, .L80241774 -/* 9F6188 80241748 00000000 */ nop -/* 9F618C 8024174C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9F6190 80241750 46140080 */ add.s $f2, $f0, $f20 -/* 9F6194 80241754 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F6198 80241758 4600103E */ c.le.s $f2, $f0 -/* 9F619C 8024175C 00000000 */ nop -/* 9F61A0 80241760 4500008D */ bc1f .L80241998 -/* 9F61A4 80241764 00000000 */ nop -/* 9F61A8 80241768 E602003C */ swc1 $f2, 0x3c($s0) -/* 9F61AC 8024176C 08090666 */ j .L80241998 -/* 9F61B0 80241770 AE400070 */ sw $zero, 0x70($s2) -.L80241774: -/* 9F61B4 80241774 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F61B8 80241778 C6000064 */ lwc1 $f0, 0x64($s0) -/* 9F61BC 8024177C 4602003E */ c.le.s $f0, $f2 -/* 9F61C0 80241780 00000000 */ nop -/* 9F61C4 80241784 45030084 */ bc1tl .L80241998 -/* 9F61C8 80241788 AE400070 */ sw $zero, 0x70($s2) -/* 9F61CC 8024178C 08090666 */ j .L80241998 -/* 9F61D0 80241790 00000000 */ nop -.L80241794: -/* 9F61D4 80241794 4622003C */ c.lt.d $f0, $f2 -/* 9F61D8 80241798 00000000 */ nop -/* 9F61DC 8024179C 4500007E */ bc1f .L80241998 -/* 9F61E0 802417A0 00000000 */ nop -/* 9F61E4 802417A4 9602008E */ lhu $v0, 0x8e($s0) -/* 9F61E8 802417A8 24420001 */ addiu $v0, $v0, 1 -/* 9F61EC 802417AC A602008E */ sh $v0, 0x8e($s0) -/* 9F61F0 802417B0 00021400 */ sll $v0, $v0, 0x10 -/* 9F61F4 802417B4 8E630020 */ lw $v1, 0x20($s3) -/* 9F61F8 802417B8 00021403 */ sra $v0, $v0, 0x10 -/* 9F61FC 802417BC 0043102A */ slt $v0, $v0, $v1 -/* 9F6200 802417C0 14400026 */ bnez $v0, .L8024185C -/* 9F6204 802417C4 00000000 */ nop -/* 9F6208 802417C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F620C 802417CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F6210 802417D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F6214 802417D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F6218 802417D8 A600008E */ sh $zero, 0x8e($s0) -/* 9F621C 802417DC 8C460028 */ lw $a2, 0x28($v0) -/* 9F6220 802417E0 0C00A720 */ jal atan2 -/* 9F6224 802417E4 8C470030 */ lw $a3, 0x30($v0) -/* 9F6228 802417E8 46000506 */ mov.s $f20, $f0 -/* 9F622C 802417EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F6230 802417F0 0C00A70A */ jal get_clamped_angle_diff -/* 9F6234 802417F4 4600A386 */ mov.s $f14, $f20 -/* 9F6238 802417F8 46000086 */ mov.s $f2, $f0 -/* 9F623C 802417FC 8E62001C */ lw $v0, 0x1c($s3) -/* 9F6240 80241800 46001005 */ abs.s $f0, $f2 -/* 9F6244 80241804 44822000 */ mtc1 $v0, $f4 -/* 9F6248 80241808 00000000 */ nop -/* 9F624C 8024180C 46802120 */ cvt.s.w $f4, $f4 -/* 9F6250 80241810 4600203C */ c.lt.s $f4, $f0 -/* 9F6254 80241814 00000000 */ nop -/* 9F6258 80241818 4500000D */ bc1f .L80241850 -/* 9F625C 8024181C 00000000 */ nop -/* 9F6260 80241820 44800000 */ mtc1 $zero, $f0 -/* 9F6264 80241824 C614000C */ lwc1 $f20, 0xc($s0) -/* 9F6268 80241828 4600103C */ c.lt.s $f2, $f0 -/* 9F626C 8024182C 00000000 */ nop -/* 9F6270 80241830 45000006 */ bc1f .L8024184C -/* 9F6274 80241834 00021023 */ negu $v0, $v0 -/* 9F6278 80241838 44820000 */ mtc1 $v0, $f0 -/* 9F627C 8024183C 00000000 */ nop -/* 9F6280 80241840 46800020 */ cvt.s.w $f0, $f0 -/* 9F6284 80241844 08090614 */ j .L80241850 -/* 9F6288 80241848 4600A500 */ add.s $f20, $f20, $f0 -.L8024184C: -/* 9F628C 8024184C 4604A500 */ add.s $f20, $f20, $f4 -.L80241850: -/* 9F6290 80241850 0C00A6C9 */ jal clamp_angle -/* 9F6294 80241854 4600A306 */ mov.s $f12, $f20 -/* 9F6298 80241858 E600000C */ swc1 $f0, 0xc($s0) -.L8024185C: -/* 9F629C 8024185C 8E020000 */ lw $v0, ($s0) -/* 9F62A0 80241860 30420008 */ andi $v0, $v0, 8 -/* 9F62A4 80241864 1040000A */ beqz $v0, .L80241890 -/* 9F62A8 80241868 27A50018 */ addiu $a1, $sp, 0x18 -/* 9F62AC 8024186C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F62B0 80241870 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9F62B4 80241874 46001080 */ add.s $f2, $f2, $f0 -/* 9F62B8 80241878 4616103C */ c.lt.s $f2, $f22 -/* 9F62BC 8024187C 00000000 */ nop -/* 9F62C0 80241880 45020045 */ bc1fl .L80241998 -/* 9F62C4 80241884 E602003C */ swc1 $f2, 0x3c($s0) -/* 9F62C8 80241888 08090665 */ j .L80241994 -/* 9F62CC 8024188C E616003C */ swc1 $f22, 0x3c($s0) -.L80241890: -/* 9F62D0 80241890 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F62D4 80241894 27A6001C */ addiu $a2, $sp, 0x1c -/* 9F62D8 80241898 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F62DC 8024189C 860200A8 */ lh $v0, 0xa8($s0) -/* 9F62E0 802418A0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9F62E4 802418A4 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9F62E8 802418A8 44821000 */ mtc1 $v0, $f2 -/* 9F62EC 802418AC 00000000 */ nop -/* 9F62F0 802418B0 468010A0 */ cvt.s.w $f2, $f2 -/* 9F62F4 802418B4 46000005 */ abs.s $f0, $f0 -/* 9F62F8 802418B8 46020000 */ add.s $f0, $f0, $f2 -/* 9F62FC 802418BC C6060040 */ lwc1 $f6, 0x40($s0) -/* 9F6300 802418C0 27A20024 */ addiu $v0, $sp, 0x24 -/* 9F6304 802418C4 46022100 */ add.s $f4, $f4, $f2 -/* 9F6308 802418C8 3C014024 */ lui $at, 0x4024 -/* 9F630C 802418CC 44811800 */ mtc1 $at, $f3 -/* 9F6310 802418D0 44801000 */ mtc1 $zero, $f2 -/* 9F6314 802418D4 46000021 */ cvt.d.s $f0, $f0 -/* 9F6318 802418D8 46220000 */ add.d $f0, $f0, $f2 -/* 9F631C 802418DC E7A60020 */ swc1 $f6, 0x20($sp) -/* 9F6320 802418E0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9F6324 802418E4 46200020 */ cvt.s.d $f0, $f0 -/* 9F6328 802418E8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 9F632C 802418EC AFA20010 */ sw $v0, 0x10($sp) -/* 9F6330 802418F0 8E040080 */ lw $a0, 0x80($s0) -/* 9F6334 802418F4 0C0372DF */ jal func_800DCB7C -/* 9F6338 802418F8 27A70020 */ addiu $a3, $sp, 0x20 -/* 9F633C 802418FC 10400015 */ beqz $v0, .L80241954 -/* 9F6340 80241900 00000000 */ nop -/* 9F6344 80241904 860200A8 */ lh $v0, 0xa8($s0) -/* 9F6348 80241908 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F634C 8024190C 44820000 */ mtc1 $v0, $f0 -/* 9F6350 80241910 00000000 */ nop -/* 9F6354 80241914 46800020 */ cvt.s.w $f0, $f0 -/* 9F6358 80241918 46002085 */ abs.s $f2, $f4 -/* 9F635C 8024191C 46020000 */ add.s $f0, $f0, $f2 -/* 9F6360 80241920 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9F6364 80241924 4600103E */ c.le.s $f2, $f0 -/* 9F6368 80241928 00000000 */ nop -/* 9F636C 8024192C 45000005 */ bc1f .L80241944 -/* 9F6370 80241930 00000000 */ nop -/* 9F6374 80241934 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9F6378 80241938 AE00001C */ sw $zero, 0x1c($s0) -/* 9F637C 8024193C 08090666 */ j .L80241998 -/* 9F6380 80241940 E600003C */ swc1 $f0, 0x3c($s0) -.L80241944: -/* 9F6384 80241944 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F6388 80241948 46040000 */ add.s $f0, $f0, $f4 -/* 9F638C 8024194C 08090666 */ j .L80241998 -/* 9F6390 80241950 E600003C */ swc1 $f0, 0x3c($s0) -.L80241954: -/* 9F6394 80241954 C606003C */ lwc1 $f6, 0x3c($s0) -/* 9F6398 80241958 860200A8 */ lh $v0, 0xa8($s0) -/* 9F639C 8024195C 46163081 */ sub.s $f2, $f6, $f22 -/* 9F63A0 80241960 44820000 */ mtc1 $v0, $f0 -/* 9F63A4 80241964 00000000 */ nop -/* 9F63A8 80241968 46800020 */ cvt.s.w $f0, $f0 -/* 9F63AC 8024196C 46001080 */ add.s $f2, $f2, $f0 -/* 9F63B0 80241970 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F63B4 80241974 46002005 */ abs.s $f0, $f4 -/* 9F63B8 80241978 4602003C */ c.lt.s $f0, $f2 -/* 9F63BC 8024197C 00000000 */ nop -/* 9F63C0 80241980 45020005 */ bc1fl .L80241998 -/* 9F63C4 80241984 AE00001C */ sw $zero, 0x1c($s0) -/* 9F63C8 80241988 46043000 */ add.s $f0, $f6, $f4 -/* 9F63CC 8024198C 08090666 */ j .L80241998 -/* 9F63D0 80241990 E600003C */ swc1 $f0, 0x3c($s0) -.L80241994: -/* 9F63D4 80241994 AE00001C */ sw $zero, 0x1c($s0) -.L80241998: -/* 9F63D8 80241998 8FBF0038 */ lw $ra, 0x38($sp) -/* 9F63DC 8024199C 8FB30034 */ lw $s3, 0x34($sp) -/* 9F63E0 802419A0 8FB20030 */ lw $s2, 0x30($sp) -/* 9F63E4 802419A4 8FB1002C */ lw $s1, 0x2c($sp) -/* 9F63E8 802419A8 8FB00028 */ lw $s0, 0x28($sp) -/* 9F63EC 802419AC D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9F63F0 802419B0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9F63F4 802419B4 03E00008 */ jr $ra -/* 9F63F8 802419B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s deleted file mode 100644 index 055ea195f0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802419BC_9F63FC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419BC_9F63FC -/* 9F63FC 802419BC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9F6400 802419C0 AFB00028 */ sw $s0, 0x28($sp) -/* 9F6404 802419C4 00A0802D */ daddu $s0, $a1, $zero -/* 9F6408 802419C8 AFB1002C */ sw $s1, 0x2c($sp) -/* 9F640C 802419CC 00C0882D */ daddu $s1, $a2, $zero -/* 9F6410 802419D0 AFBF0034 */ sw $ra, 0x34($sp) -/* 9F6414 802419D4 AFB20030 */ sw $s2, 0x30($sp) -/* 9F6418 802419D8 AE200070 */ sw $zero, 0x70($s1) -/* 9F641C 802419DC 8C830000 */ lw $v1, ($a0) -/* 9F6420 802419E0 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9F6424 802419E4 A480008E */ sh $zero, 0x8e($a0) -/* 9F6428 802419E8 00621824 */ and $v1, $v1, $v0 -/* 9F642C 802419EC 34650800 */ ori $a1, $v1, 0x800 -/* 9F6430 802419F0 AC850000 */ sw $a1, ($a0) -/* 9F6434 802419F4 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9F6438 802419F8 8C420034 */ lw $v0, 0x34($v0) -/* 9F643C 802419FC 10400003 */ beqz $v0, .L80241A0C -/* 9F6440 80241A00 00E0902D */ daddu $s2, $a3, $zero -/* 9F6444 80241A04 08090685 */ j .L80241A14 -/* 9F6448 80241A08 34620808 */ ori $v0, $v1, 0x808 -.L80241A0C: -/* 9F644C 80241A0C 2402FFF7 */ addiu $v0, $zero, -9 -/* 9F6450 80241A10 00A21024 */ and $v0, $a1, $v0 -.L80241A14: -/* 9F6454 80241A14 AC820000 */ sw $v0, ($a0) -/* 9F6458 80241A18 27A20024 */ addiu $v0, $sp, 0x24 -/* 9F645C 80241A1C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9F6460 80241A20 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9F6464 80241A24 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9F6468 80241A28 C4840040 */ lwc1 $f4, 0x40($a0) -/* 9F646C 80241A2C 3C01447A */ lui $at, 0x447a -/* 9F6470 80241A30 44813000 */ mtc1 $at, $f6 -/* 9F6474 80241A34 27A6001C */ addiu $a2, $sp, 0x1c -/* 9F6478 80241A38 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F647C 80241A3C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9F6480 80241A40 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9F6484 80241A44 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9F6488 80241A48 AFA20010 */ sw $v0, 0x10($sp) -/* 9F648C 80241A4C 8C840080 */ lw $a0, 0x80($a0) -/* 9F6490 80241A50 0C0372DF */ jal func_800DCB7C -/* 9F6494 80241A54 27A70020 */ addiu $a3, $sp, 0x20 -/* 9F6498 80241A58 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9F649C 80241A5C 3C014059 */ lui $at, 0x4059 -/* 9F64A0 80241A60 44812800 */ mtc1 $at, $f5 -/* 9F64A4 80241A64 44802000 */ mtc1 $zero, $f4 -/* 9F64A8 80241A68 460010A1 */ cvt.d.s $f2, $f2 -/* 9F64AC 80241A6C 46241082 */ mul.d $f2, $f2, $f4 -/* 9F64B0 80241A70 00000000 */ nop -/* 9F64B4 80241A74 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9F64B8 80241A78 46000021 */ cvt.d.s $f0, $f0 -/* 9F64BC 80241A7C 46240002 */ mul.d $f0, $f0, $f4 -/* 9F64C0 80241A80 00000000 */ nop -/* 9F64C4 80241A84 3C013FE0 */ lui $at, 0x3fe0 -/* 9F64C8 80241A88 44812800 */ mtc1 $at, $f5 -/* 9F64CC 80241A8C 44802000 */ mtc1 $zero, $f4 -/* 9F64D0 80241A90 00000000 */ nop -/* 9F64D4 80241A94 46241080 */ add.d $f2, $f2, $f4 -/* 9F64D8 80241A98 AE000074 */ sw $zero, 0x74($s0) -/* 9F64DC 80241A9C 46240000 */ add.d $f0, $f0, $f4 -/* 9F64E0 80241AA0 AE000090 */ sw $zero, 0x90($s0) -/* 9F64E4 80241AA4 4620120D */ trunc.w.d $f8, $f2 -/* 9F64E8 80241AA8 E6080078 */ swc1 $f8, 0x78($s0) -/* 9F64EC 80241AAC 4620020D */ trunc.w.d $f8, $f0 -/* 9F64F0 80241AB0 E6080088 */ swc1 $f8, 0x88($s0) -/* 9F64F4 80241AB4 8E420014 */ lw $v0, 0x14($s2) -/* 9F64F8 80241AB8 AE220074 */ sw $v0, 0x74($s1) -/* 9F64FC 80241ABC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9F6500 80241AC0 34420010 */ ori $v0, $v0, 0x10 -/* 9F6504 80241AC4 AE0200B0 */ sw $v0, 0xb0($s0) -/* 9F6508 80241AC8 8FBF0034 */ lw $ra, 0x34($sp) -/* 9F650C 80241ACC 8FB20030 */ lw $s2, 0x30($sp) -/* 9F6510 80241AD0 8FB1002C */ lw $s1, 0x2c($sp) -/* 9F6514 80241AD4 8FB00028 */ lw $s0, 0x28($sp) -/* 9F6518 80241AD8 03E00008 */ jr $ra -/* 9F651C 80241ADC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index e770e81f89..e792279c5e 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -46,7 +46,7 @@ glabel func_80241AE0_9F6520 /* 9F65C4 80241B84 02A0202D */ daddu $a0, $s5, $zero /* 9F65C8 80241B88 0240282D */ daddu $a1, $s2, $zero /* 9F65CC 80241B8C 0280302D */ daddu $a2, $s4, $zero -/* 9F65D0 80241B90 0C09066F */ jal func_802419BC_9F63FC +/* 9F65D0 80241B90 0C09066F */ jal nok_11_UnkFunc5 /* 9F65D4 80241B94 0200382D */ daddu $a3, $s0, $zero .L80241B98: /* 9F65D8 80241B98 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241C14_9F6654 glabel L80241C24_9F6664 /* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero /* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero -/* 9F666C 80241C2C 0C09041B */ jal func_8024106C_9F5AAC +/* 9F666C 80241C2C 0C09041B */ jal nok_11_UnkFunc4 /* 9F6670 80241C30 0260302D */ daddu $a2, $s3, $zero /* 9F6674 80241C34 0809072A */ j .L80241CA8 /* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241C7C_9F66BC glabel L80241C94_9F66D4 /* 9F66D4 80241C94 0280202D */ daddu $a0, $s4, $zero /* 9F66D8 80241C98 0200282D */ daddu $a1, $s0, $zero -/* 9F66DC 80241C9C 0C09058B */ jal func_8024162C_9F606C +/* 9F66DC 80241C9C 0C09058B */ jal nok_11_UnkFunc6 /* 9F66E0 80241CA0 0260302D */ daddu $a2, $s3, $zero glabel L80241CA4_9F66E4 /* 9F66E4 80241CA4 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s deleted file mode 100644 index aabd32b135..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240E9C_9FB68C.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E9C_9FB68C -/* 9FB68C 80240E9C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9FB690 80240EA0 AFB20038 */ sw $s2, 0x38($sp) -/* 9FB694 80240EA4 0080902D */ daddu $s2, $a0, $zero -/* 9FB698 80240EA8 AFBF0044 */ sw $ra, 0x44($sp) -/* 9FB69C 80240EAC AFB40040 */ sw $s4, 0x40($sp) -/* 9FB6A0 80240EB0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FB6A4 80240EB4 AFB10034 */ sw $s1, 0x34($sp) -/* 9FB6A8 80240EB8 AFB00030 */ sw $s0, 0x30($sp) -/* 9FB6AC 80240EBC F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9FB6B0 80240EC0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9FB6B4 80240EC4 8E510148 */ lw $s1, 0x148($s2) -/* 9FB6B8 80240EC8 00A0982D */ daddu $s3, $a1, $zero -/* 9FB6BC 80240ECC 86240008 */ lh $a0, 8($s1) -/* 9FB6C0 80240ED0 0C00EABB */ jal get_npc_unsafe -/* 9FB6C4 80240ED4 00C0A02D */ daddu $s4, $a2, $zero -/* 9FB6C8 80240ED8 8E630014 */ lw $v1, 0x14($s3) -/* 9FB6CC 80240EDC 04600030 */ bltz $v1, .L80240FA0 -/* 9FB6D0 80240EE0 0040802D */ daddu $s0, $v0, $zero -/* 9FB6D4 80240EE4 8E420074 */ lw $v0, 0x74($s2) -/* 9FB6D8 80240EE8 1C40002C */ bgtz $v0, .L80240F9C -/* 9FB6DC 80240EEC 2442FFFF */ addiu $v0, $v0, -1 -/* 9FB6E0 80240EF0 0280202D */ daddu $a0, $s4, $zero -/* 9FB6E4 80240EF4 AE430074 */ sw $v1, 0x74($s2) -/* 9FB6E8 80240EF8 AFA00010 */ sw $zero, 0x10($sp) -/* 9FB6EC 80240EFC 8E66000C */ lw $a2, 0xc($s3) -/* 9FB6F0 80240F00 8E670010 */ lw $a3, 0x10($s3) -/* 9FB6F4 80240F04 0C01242D */ jal func_800490B4 -/* 9FB6F8 80240F08 0220282D */ daddu $a1, $s1, $zero -/* 9FB6FC 80240F0C 10400021 */ beqz $v0, .L80240F94 -/* 9FB700 80240F10 0000202D */ daddu $a0, $zero, $zero -/* 9FB704 80240F14 0200282D */ daddu $a1, $s0, $zero -/* 9FB708 80240F18 0000302D */ daddu $a2, $zero, $zero -/* 9FB70C 80240F1C 860300A8 */ lh $v1, 0xa8($s0) -/* 9FB710 80240F20 3C013F80 */ lui $at, 0x3f80 -/* 9FB714 80240F24 44810000 */ mtc1 $at, $f0 -/* 9FB718 80240F28 3C014000 */ lui $at, 0x4000 -/* 9FB71C 80240F2C 44811000 */ mtc1 $at, $f2 -/* 9FB720 80240F30 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FB724 80240F34 44812000 */ mtc1 $at, $f4 -/* 9FB728 80240F38 2402000F */ addiu $v0, $zero, 0xf -/* 9FB72C 80240F3C AFA2001C */ sw $v0, 0x1c($sp) -/* 9FB730 80240F40 44833000 */ mtc1 $v1, $f6 -/* 9FB734 80240F44 00000000 */ nop -/* 9FB738 80240F48 468031A0 */ cvt.s.w $f6, $f6 -/* 9FB73C 80240F4C 44073000 */ mfc1 $a3, $f6 -/* 9FB740 80240F50 27A20028 */ addiu $v0, $sp, 0x28 -/* 9FB744 80240F54 AFA20020 */ sw $v0, 0x20($sp) -/* 9FB748 80240F58 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FB74C 80240F5C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FB750 80240F60 0C01BFA4 */ jal fx_emote -/* 9FB754 80240F64 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FB758 80240F68 0200202D */ daddu $a0, $s0, $zero -/* 9FB75C 80240F6C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9FB760 80240F70 0C012530 */ jal func_800494C0 -/* 9FB764 80240F74 3C060020 */ lui $a2, 0x20 -/* 9FB768 80240F78 8E220018 */ lw $v0, 0x18($s1) -/* 9FB76C 80240F7C 9442002A */ lhu $v0, 0x2a($v0) -/* 9FB770 80240F80 30420001 */ andi $v0, $v0, 1 -/* 9FB774 80240F84 14400064 */ bnez $v0, .L80241118 -/* 9FB778 80240F88 2402000A */ addiu $v0, $zero, 0xa -/* 9FB77C 80240F8C 08090446 */ j .L80241118 -/* 9FB780 80240F90 2402000C */ addiu $v0, $zero, 0xc -.L80240F94: -/* 9FB784 80240F94 8E420074 */ lw $v0, 0x74($s2) -/* 9FB788 80240F98 2442FFFF */ addiu $v0, $v0, -1 -.L80240F9C: -/* 9FB78C 80240F9C AE420074 */ sw $v0, 0x74($s2) -.L80240FA0: -/* 9FB790 80240FA0 8602008C */ lh $v0, 0x8c($s0) -/* 9FB794 80240FA4 1440005D */ bnez $v0, .L8024111C -/* 9FB798 80240FA8 00000000 */ nop -/* 9FB79C 80240FAC C6000018 */ lwc1 $f0, 0x18($s0) -/* 9FB7A0 80240FB0 3C014010 */ lui $at, 0x4010 -/* 9FB7A4 80240FB4 44811800 */ mtc1 $at, $f3 -/* 9FB7A8 80240FB8 44801000 */ mtc1 $zero, $f2 -/* 9FB7AC 80240FBC 46000021 */ cvt.d.s $f0, $f0 -/* 9FB7B0 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 9FB7B4 80240FC4 00000000 */ nop -/* 9FB7B8 80240FC8 45000003 */ bc1f .L80240FD8 -/* 9FB7BC 80240FCC 0200202D */ daddu $a0, $s0, $zero -/* 9FB7C0 80240FD0 080903F7 */ j .L80240FDC -/* 9FB7C4 80240FD4 0000282D */ daddu $a1, $zero, $zero -.L80240FD8: -/* 9FB7C8 80240FD8 24050001 */ addiu $a1, $zero, 1 -.L80240FDC: -/* 9FB7CC 80240FDC 0C00F598 */ jal func_8003D660 -/* 9FB7D0 80240FE0 00000000 */ nop -/* 9FB7D4 80240FE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FB7D8 80240FE8 8E430078 */ lw $v1, 0x78($s2) -/* 9FB7DC 80240FEC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FB7E0 80240FF0 00031040 */ sll $v0, $v1, 1 -/* 9FB7E4 80240FF4 00431021 */ addu $v0, $v0, $v1 -/* 9FB7E8 80240FF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FB7EC 80240FFC 00021080 */ sll $v0, $v0, 2 -/* 9FB7F0 80241000 00431021 */ addu $v0, $v0, $v1 -/* 9FB7F4 80241004 C4560004 */ lwc1 $f22, 4($v0) -/* 9FB7F8 80241008 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9FB7FC 8024100C C454000C */ lwc1 $f20, 0xc($v0) -/* 9FB800 80241010 4680A520 */ cvt.s.w $f20, $f20 -/* 9FB804 80241014 4406B000 */ mfc1 $a2, $f22 -/* 9FB808 80241018 4407A000 */ mfc1 $a3, $f20 -/* 9FB80C 8024101C 0C00A720 */ jal atan2 -/* 9FB810 80241020 00000000 */ nop -/* 9FB814 80241024 8E050018 */ lw $a1, 0x18($s0) -/* 9FB818 80241028 44060000 */ mfc1 $a2, $f0 -/* 9FB81C 8024102C 0200202D */ daddu $a0, $s0, $zero -/* 9FB820 80241030 0C00EA95 */ jal npc_move_heading -/* 9FB824 80241034 AE06000C */ sw $a2, 0xc($s0) -/* 9FB828 80241038 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FB82C 8024103C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FB830 80241040 4406B000 */ mfc1 $a2, $f22 -/* 9FB834 80241044 4407A000 */ mfc1 $a3, $f20 -/* 9FB838 80241048 0C00A7B5 */ jal dist2D -/* 9FB83C 8024104C 00000000 */ nop -/* 9FB840 80241050 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9FB844 80241054 4602003E */ c.le.s $f0, $f2 -/* 9FB848 80241058 00000000 */ nop -/* 9FB84C 8024105C 4500002F */ bc1f .L8024111C -/* 9FB850 80241060 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9FB854 80241064 24020002 */ addiu $v0, $zero, 2 -/* 9FB858 80241068 0C00A67F */ jal rand_int -/* 9FB85C 8024106C AE420070 */ sw $v0, 0x70($s2) -/* 9FB860 80241070 3C035555 */ lui $v1, 0x5555 -/* 9FB864 80241074 34635556 */ ori $v1, $v1, 0x5556 -/* 9FB868 80241078 00430018 */ mult $v0, $v1 -/* 9FB86C 8024107C 000227C3 */ sra $a0, $v0, 0x1f -/* 9FB870 80241080 00004010 */ mfhi $t0 -/* 9FB874 80241084 01042023 */ subu $a0, $t0, $a0 -/* 9FB878 80241088 00041840 */ sll $v1, $a0, 1 -/* 9FB87C 8024108C 00641821 */ addu $v1, $v1, $a0 -/* 9FB880 80241090 00431023 */ subu $v0, $v0, $v1 -/* 9FB884 80241094 24430002 */ addiu $v1, $v0, 2 -/* 9FB888 80241098 AE430074 */ sw $v1, 0x74($s2) -/* 9FB88C 8024109C 8E62002C */ lw $v0, 0x2c($s3) -/* 9FB890 802410A0 18400009 */ blez $v0, .L802410C8 -/* 9FB894 802410A4 24020004 */ addiu $v0, $zero, 4 -/* 9FB898 802410A8 8E620004 */ lw $v0, 4($s3) -/* 9FB89C 802410AC 18400006 */ blez $v0, .L802410C8 -/* 9FB8A0 802410B0 24020004 */ addiu $v0, $zero, 4 -/* 9FB8A4 802410B4 8E620008 */ lw $v0, 8($s3) -/* 9FB8A8 802410B8 18400003 */ blez $v0, .L802410C8 -/* 9FB8AC 802410BC 24020004 */ addiu $v0, $zero, 4 -/* 9FB8B0 802410C0 14600002 */ bnez $v1, .L802410CC -/* 9FB8B4 802410C4 00000000 */ nop -.L802410C8: -/* 9FB8B8 802410C8 AE420070 */ sw $v0, 0x70($s2) -.L802410CC: -/* 9FB8BC 802410CC 0C00A67F */ jal rand_int -/* 9FB8C0 802410D0 24042710 */ addiu $a0, $zero, 0x2710 -/* 9FB8C4 802410D4 3C0351EB */ lui $v1, 0x51eb -/* 9FB8C8 802410D8 3463851F */ ori $v1, $v1, 0x851f -/* 9FB8CC 802410DC 00430018 */ mult $v0, $v1 -/* 9FB8D0 802410E0 00021FC3 */ sra $v1, $v0, 0x1f -/* 9FB8D4 802410E4 00004010 */ mfhi $t0 -/* 9FB8D8 802410E8 00082143 */ sra $a0, $t0, 5 -/* 9FB8DC 802410EC 00832023 */ subu $a0, $a0, $v1 -/* 9FB8E0 802410F0 00041840 */ sll $v1, $a0, 1 -/* 9FB8E4 802410F4 00641821 */ addu $v1, $v1, $a0 -/* 9FB8E8 802410F8 000318C0 */ sll $v1, $v1, 3 -/* 9FB8EC 802410FC 00641821 */ addu $v1, $v1, $a0 -/* 9FB8F0 80241100 00031880 */ sll $v1, $v1, 2 -/* 9FB8F4 80241104 8E640004 */ lw $a0, 4($s3) -/* 9FB8F8 80241108 00431023 */ subu $v0, $v0, $v1 -/* 9FB8FC 8024110C 0044102A */ slt $v0, $v0, $a0 -/* 9FB900 80241110 10400002 */ beqz $v0, .L8024111C -/* 9FB904 80241114 24020004 */ addiu $v0, $zero, 4 -.L80241118: -/* 9FB908 80241118 AE420070 */ sw $v0, 0x70($s2) -.L8024111C: -/* 9FB90C 8024111C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9FB910 80241120 8FB40040 */ lw $s4, 0x40($sp) -/* 9FB914 80241124 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FB918 80241128 8FB20038 */ lw $s2, 0x38($sp) -/* 9FB91C 8024112C 8FB10034 */ lw $s1, 0x34($sp) -/* 9FB920 80241130 8FB00030 */ lw $s0, 0x30($sp) -/* 9FB924 80241134 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9FB928 80241138 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9FB92C 8024113C 03E00008 */ jr $ra -/* 9FB930 80241140 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s deleted file mode 100644 index 08626d9bc9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241204_9FB9F4.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241204_9FB9F4 -/* 9FB9F4 80241204 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FB9F8 80241208 AFB40040 */ sw $s4, 0x40($sp) -/* 9FB9FC 8024120C 0080A02D */ daddu $s4, $a0, $zero -/* 9FBA00 80241210 AFBF0044 */ sw $ra, 0x44($sp) -/* 9FBA04 80241214 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FBA08 80241218 AFB20038 */ sw $s2, 0x38($sp) -/* 9FBA0C 8024121C AFB10034 */ sw $s1, 0x34($sp) -/* 9FBA10 80241220 AFB00030 */ sw $s0, 0x30($sp) -/* 9FBA14 80241224 8E910148 */ lw $s1, 0x148($s4) -/* 9FBA18 80241228 00A0902D */ daddu $s2, $a1, $zero -/* 9FBA1C 8024122C 86240008 */ lh $a0, 8($s1) -/* 9FBA20 80241230 0C00EABB */ jal get_npc_unsafe -/* 9FBA24 80241234 00C0982D */ daddu $s3, $a2, $zero -/* 9FBA28 80241238 8E430014 */ lw $v1, 0x14($s2) -/* 9FBA2C 8024123C 04600031 */ bltz $v1, .L80241304 -/* 9FBA30 80241240 0040802D */ daddu $s0, $v0, $zero -/* 9FBA34 80241244 0260202D */ daddu $a0, $s3, $zero -/* 9FBA38 80241248 AFA00010 */ sw $zero, 0x10($sp) -/* 9FBA3C 8024124C 8E460024 */ lw $a2, 0x24($s2) -/* 9FBA40 80241250 8E470028 */ lw $a3, 0x28($s2) -/* 9FBA44 80241254 0C01242D */ jal func_800490B4 -/* 9FBA48 80241258 0220282D */ daddu $a1, $s1, $zero -/* 9FBA4C 8024125C 10400029 */ beqz $v0, .L80241304 -/* 9FBA50 80241260 0000202D */ daddu $a0, $zero, $zero -/* 9FBA54 80241264 0200282D */ daddu $a1, $s0, $zero -/* 9FBA58 80241268 0000302D */ daddu $a2, $zero, $zero -/* 9FBA5C 8024126C 860300A8 */ lh $v1, 0xa8($s0) -/* 9FBA60 80241270 3C013F80 */ lui $at, 0x3f80 -/* 9FBA64 80241274 44810000 */ mtc1 $at, $f0 -/* 9FBA68 80241278 3C014000 */ lui $at, 0x4000 -/* 9FBA6C 8024127C 44811000 */ mtc1 $at, $f2 -/* 9FBA70 80241280 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FBA74 80241284 44812000 */ mtc1 $at, $f4 -/* 9FBA78 80241288 2402000F */ addiu $v0, $zero, 0xf -/* 9FBA7C 8024128C AFA2001C */ sw $v0, 0x1c($sp) -/* 9FBA80 80241290 44833000 */ mtc1 $v1, $f6 -/* 9FBA84 80241294 00000000 */ nop -/* 9FBA88 80241298 468031A0 */ cvt.s.w $f6, $f6 -/* 9FBA8C 8024129C 44073000 */ mfc1 $a3, $f6 -/* 9FBA90 802412A0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9FBA94 802412A4 AFA20020 */ sw $v0, 0x20($sp) -/* 9FBA98 802412A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FBA9C 802412AC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FBAA0 802412B0 0C01BFA4 */ jal fx_emote -/* 9FBAA4 802412B4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FBAA8 802412B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9FBAAC 802412BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9FBAB0 802412C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FBAB4 802412C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FBAB8 802412C8 8C460028 */ lw $a2, 0x28($v0) -/* 9FBABC 802412CC 0C00A720 */ jal atan2 -/* 9FBAC0 802412D0 8C470030 */ lw $a3, 0x30($v0) -/* 9FBAC4 802412D4 0200202D */ daddu $a0, $s0, $zero -/* 9FBAC8 802412D8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9FBACC 802412DC 3C060020 */ lui $a2, 0x20 -/* 9FBAD0 802412E0 0C012530 */ jal func_800494C0 -/* 9FBAD4 802412E4 E480000C */ swc1 $f0, 0xc($a0) -/* 9FBAD8 802412E8 8E220018 */ lw $v0, 0x18($s1) -/* 9FBADC 802412EC 9442002A */ lhu $v0, 0x2a($v0) -/* 9FBAE0 802412F0 30420001 */ andi $v0, $v0, 1 -/* 9FBAE4 802412F4 14400029 */ bnez $v0, .L8024139C -/* 9FBAE8 802412F8 2402000A */ addiu $v0, $zero, 0xa -/* 9FBAEC 802412FC 080904E7 */ j .L8024139C -/* 9FBAF0 80241300 2402000C */ addiu $v0, $zero, 0xc -.L80241304: -/* 9FBAF4 80241304 8602008C */ lh $v0, 0x8c($s0) -/* 9FBAF8 80241308 14400025 */ bnez $v0, .L802413A0 -/* 9FBAFC 8024130C 00000000 */ nop -/* 9FBB00 80241310 9602008E */ lhu $v0, 0x8e($s0) -/* 9FBB04 80241314 2442FFFF */ addiu $v0, $v0, -1 -/* 9FBB08 80241318 A602008E */ sh $v0, 0x8e($s0) -/* 9FBB0C 8024131C 00021400 */ sll $v0, $v0, 0x10 -/* 9FBB10 80241320 1440001F */ bnez $v0, .L802413A0 -/* 9FBB14 80241324 00000000 */ nop -/* 9FBB18 80241328 8E820074 */ lw $v0, 0x74($s4) -/* 9FBB1C 8024132C 2442FFFF */ addiu $v0, $v0, -1 -/* 9FBB20 80241330 10400019 */ beqz $v0, .L80241398 -/* 9FBB24 80241334 AE820074 */ sw $v0, 0x74($s4) -/* 9FBB28 80241338 8E220018 */ lw $v0, 0x18($s1) -/* 9FBB2C 8024133C 9442002A */ lhu $v0, 0x2a($v0) -/* 9FBB30 80241340 30420010 */ andi $v0, $v0, 0x10 -/* 9FBB34 80241344 14400007 */ bnez $v0, .L80241364 -/* 9FBB38 80241348 00000000 */ nop -/* 9FBB3C 8024134C C600000C */ lwc1 $f0, 0xc($s0) -/* 9FBB40 80241350 3C014334 */ lui $at, 0x4334 -/* 9FBB44 80241354 44816000 */ mtc1 $at, $f12 -/* 9FBB48 80241358 0C00A6C9 */ jal clamp_angle -/* 9FBB4C 8024135C 460C0300 */ add.s $f12, $f0, $f12 -/* 9FBB50 80241360 E600000C */ swc1 $f0, 0xc($s0) -.L80241364: -/* 9FBB54 80241364 8E440008 */ lw $a0, 8($s2) -/* 9FBB58 80241368 000417C2 */ srl $v0, $a0, 0x1f -/* 9FBB5C 8024136C 00822021 */ addu $a0, $a0, $v0 -/* 9FBB60 80241370 00042043 */ sra $a0, $a0, 1 -/* 9FBB64 80241374 0C00A67F */ jal rand_int -/* 9FBB68 80241378 24840001 */ addiu $a0, $a0, 1 -/* 9FBB6C 8024137C 8E430008 */ lw $v1, 8($s2) -/* 9FBB70 80241380 000327C2 */ srl $a0, $v1, 0x1f -/* 9FBB74 80241384 00641821 */ addu $v1, $v1, $a0 -/* 9FBB78 80241388 00031843 */ sra $v1, $v1, 1 -/* 9FBB7C 8024138C 00621821 */ addu $v1, $v1, $v0 -/* 9FBB80 80241390 080904E8 */ j .L802413A0 -/* 9FBB84 80241394 A603008E */ sh $v1, 0x8e($s0) -.L80241398: -/* 9FBB88 80241398 24020004 */ addiu $v0, $zero, 4 -.L8024139C: -/* 9FBB8C 8024139C AE820070 */ sw $v0, 0x70($s4) -.L802413A0: -/* 9FBB90 802413A0 8FBF0044 */ lw $ra, 0x44($sp) -/* 9FBB94 802413A4 8FB40040 */ lw $s4, 0x40($sp) -/* 9FBB98 802413A8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FBB9C 802413AC 8FB20038 */ lw $s2, 0x38($sp) -/* 9FBBA0 802413B0 8FB10034 */ lw $s1, 0x34($sp) -/* 9FBBA4 802413B4 8FB00030 */ lw $s0, 0x30($sp) -/* 9FBBA8 802413B8 03E00008 */ jr $ra -/* 9FBBAC 802413BC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s deleted file mode 100644 index 265d8423a2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241690_9FBE80 -/* 9FBE80 80241690 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FBE84 80241694 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FBE88 80241698 0080982D */ daddu $s3, $a0, $zero -/* 9FBE8C 8024169C AFBF0040 */ sw $ra, 0x40($sp) -/* 9FBE90 802416A0 AFB20038 */ sw $s2, 0x38($sp) -/* 9FBE94 802416A4 AFB10034 */ sw $s1, 0x34($sp) -/* 9FBE98 802416A8 AFB00030 */ sw $s0, 0x30($sp) -/* 9FBE9C 802416AC 8E720148 */ lw $s2, 0x148($s3) -/* 9FBEA0 802416B0 00A0882D */ daddu $s1, $a1, $zero -/* 9FBEA4 802416B4 86440008 */ lh $a0, 8($s2) -/* 9FBEA8 802416B8 0C00EABB */ jal get_npc_unsafe -/* 9FBEAC 802416BC 00C0802D */ daddu $s0, $a2, $zero -/* 9FBEB0 802416C0 0200202D */ daddu $a0, $s0, $zero -/* 9FBEB4 802416C4 0240282D */ daddu $a1, $s2, $zero -/* 9FBEB8 802416C8 24030001 */ addiu $v1, $zero, 1 -/* 9FBEBC 802416CC AFA30010 */ sw $v1, 0x10($sp) -/* 9FBEC0 802416D0 8E260024 */ lw $a2, 0x24($s1) -/* 9FBEC4 802416D4 8E270028 */ lw $a3, 0x28($s1) -/* 9FBEC8 802416D8 0C01242D */ jal func_800490B4 -/* 9FBECC 802416DC 0040802D */ daddu $s0, $v0, $zero -/* 9FBED0 802416E0 1440001E */ bnez $v0, .L8024175C -/* 9FBED4 802416E4 0200202D */ daddu $a0, $s0, $zero -/* 9FBED8 802416E8 24040002 */ addiu $a0, $zero, 2 -/* 9FBEDC 802416EC 0200282D */ daddu $a1, $s0, $zero -/* 9FBEE0 802416F0 0000302D */ daddu $a2, $zero, $zero -/* 9FBEE4 802416F4 860300A8 */ lh $v1, 0xa8($s0) -/* 9FBEE8 802416F8 3C013F80 */ lui $at, 0x3f80 -/* 9FBEEC 802416FC 44810000 */ mtc1 $at, $f0 -/* 9FBEF0 80241700 3C014000 */ lui $at, 0x4000 -/* 9FBEF4 80241704 44811000 */ mtc1 $at, $f2 -/* 9FBEF8 80241708 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FBEFC 8024170C 44812000 */ mtc1 $at, $f4 -/* 9FBF00 80241710 2402000F */ addiu $v0, $zero, 0xf -/* 9FBF04 80241714 AFA2001C */ sw $v0, 0x1c($sp) -/* 9FBF08 80241718 44833000 */ mtc1 $v1, $f6 -/* 9FBF0C 8024171C 00000000 */ nop -/* 9FBF10 80241720 468031A0 */ cvt.s.w $f6, $f6 -/* 9FBF14 80241724 44073000 */ mfc1 $a3, $f6 -/* 9FBF18 80241728 27A20028 */ addiu $v0, $sp, 0x28 -/* 9FBF1C 8024172C AFA20020 */ sw $v0, 0x20($sp) -/* 9FBF20 80241730 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FBF24 80241734 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FBF28 80241738 0C01BFA4 */ jal fx_emote -/* 9FBF2C 8024173C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FBF30 80241740 8E4200CC */ lw $v0, 0xcc($s2) -/* 9FBF34 80241744 8C430000 */ lw $v1, ($v0) -/* 9FBF38 80241748 24020019 */ addiu $v0, $zero, 0x19 -/* 9FBF3C 8024174C A602008E */ sh $v0, 0x8e($s0) -/* 9FBF40 80241750 2402000E */ addiu $v0, $zero, 0xe -/* 9FBF44 80241754 080905E4 */ j .L80241790 -/* 9FBF48 80241758 AE030028 */ sw $v1, 0x28($s0) -.L8024175C: -/* 9FBF4C 8024175C 0C00F598 */ jal func_8003D660 -/* 9FBF50 80241760 24050001 */ addiu $a1, $zero, 1 -/* 9FBF54 80241764 8E050018 */ lw $a1, 0x18($s0) -/* 9FBF58 80241768 8E06000C */ lw $a2, 0xc($s0) -/* 9FBF5C 8024176C 0C00EA95 */ jal npc_move_heading -/* 9FBF60 80241770 0200202D */ daddu $a0, $s0, $zero -/* 9FBF64 80241774 8602008E */ lh $v0, 0x8e($s0) -/* 9FBF68 80241778 9603008E */ lhu $v1, 0x8e($s0) -/* 9FBF6C 8024177C 18400003 */ blez $v0, .L8024178C -/* 9FBF70 80241780 2462FFFF */ addiu $v0, $v1, -1 -/* 9FBF74 80241784 080905E5 */ j .L80241794 -/* 9FBF78 80241788 A602008E */ sh $v0, 0x8e($s0) -.L8024178C: -/* 9FBF7C 8024178C 2402000C */ addiu $v0, $zero, 0xc -.L80241790: -/* 9FBF80 80241790 AE620070 */ sw $v0, 0x70($s3) -.L80241794: -/* 9FBF84 80241794 8FBF0040 */ lw $ra, 0x40($sp) -/* 9FBF88 80241798 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FBF8C 8024179C 8FB20038 */ lw $s2, 0x38($sp) -/* 9FBF90 802417A0 8FB10034 */ lw $s1, 0x34($sp) -/* 9FBF94 802417A4 8FB00030 */ lw $s0, 0x30($sp) -/* 9FBF98 802417A8 03E00008 */ jr $ra -/* 9FBF9C 802417AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s deleted file mode 100644 index 7883930024..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241818_9FC008.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241818_9FC008 -/* 9FC008 80241818 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FC00C 8024181C AFB10014 */ sw $s1, 0x14($sp) -/* 9FC010 80241820 0080882D */ daddu $s1, $a0, $zero -/* 9FC014 80241824 AFBF001C */ sw $ra, 0x1c($sp) -/* 9FC018 80241828 AFB20018 */ sw $s2, 0x18($sp) -/* 9FC01C 8024182C AFB00010 */ sw $s0, 0x10($sp) -/* 9FC020 80241830 8E300148 */ lw $s0, 0x148($s1) -/* 9FC024 80241834 86040008 */ lh $a0, 8($s0) -/* 9FC028 80241838 0C00EABB */ jal get_npc_unsafe -/* 9FC02C 8024183C 00A0902D */ daddu $s2, $a1, $zero -/* 9FC030 80241840 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9FC034 80241844 8E240078 */ lw $a0, 0x78($s1) -/* 9FC038 80241848 8C630000 */ lw $v1, ($v1) -/* 9FC03C 8024184C 0083182A */ slt $v1, $a0, $v1 -/* 9FC040 80241850 10600013 */ beqz $v1, .L802418A0 -/* 9FC044 80241854 0040302D */ daddu $a2, $v0, $zero -/* 9FC048 80241858 00041040 */ sll $v0, $a0, 1 -/* 9FC04C 8024185C 00441021 */ addu $v0, $v0, $a0 -/* 9FC050 80241860 00022880 */ sll $a1, $v0, 2 -.L80241864: -/* 9FC054 80241864 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9FC058 80241868 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9FC05C 8024186C 00A31021 */ addu $v0, $a1, $v1 -/* 9FC060 80241870 C4400008 */ lwc1 $f0, 8($v0) -/* 9FC064 80241874 46800020 */ cvt.s.w $f0, $f0 -/* 9FC068 80241878 4602003E */ c.le.s $f0, $f2 -/* 9FC06C 8024187C 00000000 */ nop -/* 9FC070 80241880 45020003 */ bc1fl .L80241890 -/* 9FC074 80241884 24840001 */ addiu $a0, $a0, 1 -/* 9FC078 80241888 08090628 */ j .L802418A0 -/* 9FC07C 8024188C AE240078 */ sw $a0, 0x78($s1) -.L80241890: -/* 9FC080 80241890 8C620000 */ lw $v0, ($v1) -/* 9FC084 80241894 0082102A */ slt $v0, $a0, $v0 -/* 9FC088 80241898 1440FFF2 */ bnez $v0, .L80241864 -/* 9FC08C 8024189C 24A5000C */ addiu $a1, $a1, 0xc -.L802418A0: -/* 9FC090 802418A0 C6400000 */ lwc1 $f0, ($s2) -/* 9FC094 802418A4 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9FC098 802418A8 8E0200CC */ lw $v0, 0xcc($s0) -/* 9FC09C 802418AC 8C420004 */ lw $v0, 4($v0) -/* 9FC0A0 802418B0 ACC20028 */ sw $v0, 0x28($a2) -/* 9FC0A4 802418B4 24020001 */ addiu $v0, $zero, 1 -/* 9FC0A8 802418B8 AE200074 */ sw $zero, 0x74($s1) -/* 9FC0AC 802418BC AE220070 */ sw $v0, 0x70($s1) -/* 9FC0B0 802418C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9FC0B4 802418C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9FC0B8 802418C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9FC0BC 802418CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC0C0 802418D0 03E00008 */ jr $ra -/* 9FC0C4 802418D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 14d4684f71..f7b2af2cdc 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -137,7 +137,7 @@ glabel L80241ABC_9FC2AC glabel L80241ACC_9FC2BC /* 9FC2BC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9FC2C0 80241AD0 0260282D */ daddu $a1, $s3, $zero -/* 9FC2C4 80241AD4 0C0903A7 */ jal func_80240E9C_9FB68C +/* 9FC2C4 80241AD4 0C0903A7 */ jal nok_12_UnkFunc13 /* 9FC2C8 80241AD8 02A0302D */ daddu $a2, $s5, $zero /* 9FC2CC 80241ADC 080906EB */ j L80241BAC_9FC39C /* 9FC2D0 80241AE0 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241AE4_9FC2D4 glabel L80241AF4_9FC2E4 /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2EC 80241AFC 0C090481 */ jal func_80241204_9FB9F4 +/* 9FC2EC 80241AFC 0C090481 */ jal nok_12_UnkFunc14 /* 9FC2F0 80241B00 02A0302D */ daddu $a2, $s5, $zero /* 9FC2F4 80241B04 080906EB */ j L80241BAC_9FC39C /* 9FC2F8 80241B08 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241B4C_9FC33C glabel L80241B5C_9FC34C /* 9FC34C 80241B5C 0280202D */ daddu $a0, $s4, $zero /* 9FC350 80241B60 0260282D */ daddu $a1, $s3, $zero -/* 9FC354 80241B64 0C0905A4 */ jal func_80241690_9FBE80 +/* 9FC354 80241B64 0C0905A4 */ jal nok_12_UnkFunc15 /* 9FC358 80241B68 02A0302D */ daddu $a2, $s5, $zero /* 9FC35C 80241B6C 080906EB */ j L80241BAC_9FC39C /* 9FC360 80241B70 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241B74_9FC364 glabel L80241B8C_9FC37C /* 9FC37C 80241B8C 0280202D */ daddu $a0, $s4, $zero /* 9FC380 80241B90 0260282D */ daddu $a1, $s3, $zero -/* 9FC384 80241B94 0C090606 */ jal func_80241818_9FC008 +/* 9FC384 80241B94 0C090606 */ jal nok_12_UnkFunc16 /* 9FC388 80241B98 02A0302D */ daddu $a2, $s5, $zero /* 9FC38C 80241B9C 080906EB */ j L80241BAC_9FC39C /* 9FC390 80241BA0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index dced198119..c4b868d003 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -149,7 +149,7 @@ glabel L80241DE0_9FC5D0 glabel L80241DF8_9FC5E8 /* 9FC5E8 80241DF8 0260202D */ daddu $a0, $s3, $zero /* 9FC5EC 80241DFC 0280282D */ daddu $a1, $s4, $zero -/* 9FC5F0 80241E00 0C0903A7 */ jal func_80240E9C_9FB68C +/* 9FC5F0 80241E00 0C0903A7 */ jal nok_12_UnkFunc13 /* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero /* 9FC5F8 80241E08 080907AC */ j L80241EB0_9FC6A0 /* 9FC5FC 80241E0C 00000000 */ nop @@ -161,7 +161,7 @@ glabel L80241E10_9FC600 glabel L80241E20_9FC610 /* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero -/* 9FC618 80241E28 0C090481 */ jal func_80241204_9FB9F4 +/* 9FC618 80241E28 0C090481 */ jal nok_12_UnkFunc14 /* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 9FC620 80241E30 080907AC */ j L80241EB0_9FC6A0 /* 9FC624 80241E34 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s deleted file mode 100644 index ede077c629..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024122C_A03A6C -/* A03A6C 8024122C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A03A70 80241230 AFB3004C */ sw $s3, 0x4c($sp) -/* A03A74 80241234 0080982D */ daddu $s3, $a0, $zero -/* A03A78 80241238 AFBF0054 */ sw $ra, 0x54($sp) -/* A03A7C 8024123C AFB40050 */ sw $s4, 0x50($sp) -/* A03A80 80241240 AFB20048 */ sw $s2, 0x48($sp) -/* A03A84 80241244 AFB10044 */ sw $s1, 0x44($sp) -/* A03A88 80241248 AFB00040 */ sw $s0, 0x40($sp) -/* A03A8C 8024124C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A03A90 80241250 F7B80068 */ sdc1 $f24, 0x68($sp) -/* A03A94 80241254 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A03A98 80241258 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A03A9C 8024125C 8E710148 */ lw $s1, 0x148($s3) -/* A03AA0 80241260 00A0902D */ daddu $s2, $a1, $zero -/* A03AA4 80241264 86240008 */ lh $a0, 8($s1) -/* A03AA8 80241268 0C00EABB */ jal get_npc_unsafe -/* A03AAC 8024126C 00C0A02D */ daddu $s4, $a2, $zero -/* A03AB0 80241270 0040802D */ daddu $s0, $v0, $zero -/* A03AB4 80241274 C6200078 */ lwc1 $f0, 0x78($s1) -/* A03AB8 80241278 46800020 */ cvt.s.w $f0, $f0 -/* A03ABC 8024127C 46000021 */ cvt.d.s $f0, $f0 -/* A03AC0 80241280 3C014059 */ lui $at, 0x4059 -/* A03AC4 80241284 44811800 */ mtc1 $at, $f3 -/* A03AC8 80241288 44801000 */ mtc1 $zero, $f2 -/* A03ACC 8024128C 8602008E */ lh $v0, 0x8e($s0) -/* A03AD0 80241290 9603008E */ lhu $v1, 0x8e($s0) -/* A03AD4 80241294 46220003 */ div.d $f0, $f0, $f2 -/* A03AD8 80241298 46200620 */ cvt.s.d $f24, $f0 -/* A03ADC 8024129C C6200088 */ lwc1 $f0, 0x88($s1) -/* A03AE0 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* A03AE4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* A03AE8 802412A8 46220003 */ div.d $f0, $f0, $f2 -/* A03AEC 802412AC 46200020 */ cvt.s.d $f0, $f0 -/* A03AF0 802412B0 18400003 */ blez $v0, .L802412C0 -/* A03AF4 802412B4 4600C680 */ add.s $f26, $f24, $f0 -/* A03AF8 802412B8 2462FFFF */ addiu $v0, $v1, -1 -/* A03AFC 802412BC A602008E */ sh $v0, 0x8e($s0) -.L802412C0: -/* A03B00 802412C0 8E220070 */ lw $v0, 0x70($s1) -/* A03B04 802412C4 18400034 */ blez $v0, .L80241398 -/* A03B08 802412C8 00000000 */ nop -/* A03B0C 802412CC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A03B10 802412D0 46806320 */ cvt.s.w $f12, $f12 -/* A03B14 802412D4 44820000 */ mtc1 $v0, $f0 -/* A03B18 802412D8 00000000 */ nop -/* A03B1C 802412DC 46800020 */ cvt.s.w $f0, $f0 -/* A03B20 802412E0 46000021 */ cvt.d.s $f0, $f0 -/* A03B24 802412E4 46220003 */ div.d $f0, $f0, $f2 -/* A03B28 802412E8 0C00A8BB */ jal sin_deg -/* A03B2C 802412EC 462005A0 */ cvt.s.d $f22, $f0 -/* A03B30 802412F0 8E020000 */ lw $v0, ($s0) -/* A03B34 802412F4 30420008 */ andi $v0, $v0, 8 -/* A03B38 802412F8 10400003 */ beqz $v0, .L80241308 -/* A03B3C 802412FC 46000506 */ mov.s $f20, $f0 -/* A03B40 80241300 080904D2 */ j .L80241348 -/* A03B44 80241304 0000102D */ daddu $v0, $zero, $zero -.L80241308: -/* A03B48 80241308 27A50028 */ addiu $a1, $sp, 0x28 -/* A03B4C 8024130C 27A6002C */ addiu $a2, $sp, 0x2c -/* A03B50 80241310 C6000038 */ lwc1 $f0, 0x38($s0) -/* A03B54 80241314 C602003C */ lwc1 $f2, 0x3c($s0) -/* A03B58 80241318 C6040040 */ lwc1 $f4, 0x40($s0) -/* A03B5C 8024131C 3C01447A */ lui $at, 0x447a -/* A03B60 80241320 44813000 */ mtc1 $at, $f6 -/* A03B64 80241324 27A20034 */ addiu $v0, $sp, 0x34 -/* A03B68 80241328 E7A00028 */ swc1 $f0, 0x28($sp) -/* A03B6C 8024132C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A03B70 80241330 E7A40030 */ swc1 $f4, 0x30($sp) -/* A03B74 80241334 E7A60034 */ swc1 $f6, 0x34($sp) -/* A03B78 80241338 AFA20010 */ sw $v0, 0x10($sp) -/* A03B7C 8024133C 8E040080 */ lw $a0, 0x80($s0) -/* A03B80 80241340 0C0372DF */ jal func_800DCB7C -/* A03B84 80241344 27A70030 */ addiu $a3, $sp, 0x30 -.L80241348: -/* A03B88 80241348 10400007 */ beqz $v0, .L80241368 -/* A03B8C 8024134C 00000000 */ nop -/* A03B90 80241350 4616A082 */ mul.s $f2, $f20, $f22 -/* A03B94 80241354 00000000 */ nop -/* A03B98 80241358 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A03B9C 8024135C 46180000 */ add.s $f0, $f0, $f24 -/* A03BA0 80241360 080904DD */ j .L80241374 -/* A03BA4 80241364 46020000 */ add.s $f0, $f0, $f2 -.L80241368: -/* A03BA8 80241368 4616A002 */ mul.s $f0, $f20, $f22 -/* A03BAC 8024136C 00000000 */ nop -/* A03BB0 80241370 4600D000 */ add.s $f0, $f26, $f0 -.L80241374: -/* A03BB4 80241374 E600003C */ swc1 $f0, 0x3c($s0) -/* A03BB8 80241378 8E220074 */ lw $v0, 0x74($s1) -/* A03BBC 8024137C 2442000A */ addiu $v0, $v0, 0xa -/* A03BC0 80241380 44826000 */ mtc1 $v0, $f12 -/* A03BC4 80241384 00000000 */ nop -/* A03BC8 80241388 0C00A6C9 */ jal clamp_angle -/* A03BCC 8024138C 46806320 */ cvt.s.w $f12, $f12 -/* A03BD0 80241390 4600020D */ trunc.w.s $f8, $f0 -/* A03BD4 80241394 E6280074 */ swc1 $f8, 0x74($s1) -.L80241398: -/* A03BD8 80241398 8E220090 */ lw $v0, 0x90($s1) -/* A03BDC 8024139C 1C400040 */ bgtz $v0, .L802414A0 -/* A03BE0 802413A0 2442FFFF */ addiu $v0, $v0, -1 -/* A03BE4 802413A4 860200A8 */ lh $v0, 0xa8($s0) -/* A03BE8 802413A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A03BEC 802413AC 44821000 */ mtc1 $v0, $f2 -/* A03BF0 802413B0 00000000 */ nop -/* A03BF4 802413B4 468010A0 */ cvt.s.w $f2, $f2 -/* A03BF8 802413B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A03BFC 802413BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A03C00 802413C0 46020000 */ add.s $f0, $f0, $f2 -/* A03C04 802413C4 3C014024 */ lui $at, 0x4024 -/* A03C08 802413C8 44812800 */ mtc1 $at, $f5 -/* A03C0C 802413CC 44802000 */ mtc1 $zero, $f4 -/* A03C10 802413D0 C442002C */ lwc1 $f2, 0x2c($v0) -/* A03C14 802413D4 46000021 */ cvt.d.s $f0, $f0 -/* A03C18 802413D8 46240000 */ add.d $f0, $f0, $f4 -/* A03C1C 802413DC 460010A1 */ cvt.d.s $f2, $f2 -/* A03C20 802413E0 4620103C */ c.lt.d $f2, $f0 -/* A03C24 802413E4 00000000 */ nop -/* A03C28 802413E8 4500002E */ bc1f .L802414A4 -/* A03C2C 802413EC 0280202D */ daddu $a0, $s4, $zero -/* A03C30 802413F0 24020001 */ addiu $v0, $zero, 1 -/* A03C34 802413F4 AFA20010 */ sw $v0, 0x10($sp) -/* A03C38 802413F8 8E460024 */ lw $a2, 0x24($s2) -/* A03C3C 802413FC 8E470028 */ lw $a3, 0x28($s2) -/* A03C40 80241400 0C01242D */ jal func_800490B4 -/* A03C44 80241404 0220282D */ daddu $a1, $s1, $zero -/* A03C48 80241408 10400026 */ beqz $v0, .L802414A4 -/* A03C4C 8024140C 0000202D */ daddu $a0, $zero, $zero -/* A03C50 80241410 0200282D */ daddu $a1, $s0, $zero -/* A03C54 80241414 0000302D */ daddu $a2, $zero, $zero -/* A03C58 80241418 2412000C */ addiu $s2, $zero, 0xc -/* A03C5C 8024141C 860300A8 */ lh $v1, 0xa8($s0) -/* A03C60 80241420 3C013F80 */ lui $at, 0x3f80 -/* A03C64 80241424 44810000 */ mtc1 $at, $f0 -/* A03C68 80241428 3C014000 */ lui $at, 0x4000 -/* A03C6C 8024142C 44811000 */ mtc1 $at, $f2 -/* A03C70 80241430 3C01C1A0 */ lui $at, 0xc1a0 -/* A03C74 80241434 44812000 */ mtc1 $at, $f4 -/* A03C78 80241438 44834000 */ mtc1 $v1, $f8 -/* A03C7C 8024143C 00000000 */ nop -/* A03C80 80241440 46804220 */ cvt.s.w $f8, $f8 -/* A03C84 80241444 44074000 */ mfc1 $a3, $f8 -/* A03C88 80241448 27A20038 */ addiu $v0, $sp, 0x38 -/* A03C8C 8024144C AFB2001C */ sw $s2, 0x1c($sp) -/* A03C90 80241450 AFA20020 */ sw $v0, 0x20($sp) -/* A03C94 80241454 E7A00010 */ swc1 $f0, 0x10($sp) -/* A03C98 80241458 E7A20014 */ swc1 $f2, 0x14($sp) -/* A03C9C 8024145C 0C01BFA4 */ jal fx_emote -/* A03CA0 80241460 E7A40018 */ swc1 $f4, 0x18($sp) -/* A03CA4 80241464 0200202D */ daddu $a0, $s0, $zero -/* A03CA8 80241468 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A03CAC 8024146C C480003C */ lwc1 $f0, 0x3c($a0) -/* A03CB0 80241470 3C060020 */ lui $a2, 0x20 -/* A03CB4 80241474 0C012530 */ jal func_800494C0 -/* A03CB8 80241478 E4800064 */ swc1 $f0, 0x64($a0) -/* A03CBC 8024147C 8E220018 */ lw $v0, 0x18($s1) -/* A03CC0 80241480 9442002A */ lhu $v0, 0x2a($v0) -/* A03CC4 80241484 30420001 */ andi $v0, $v0, 1 -/* A03CC8 80241488 10400003 */ beqz $v0, .L80241498 -/* A03CCC 8024148C 2402000A */ addiu $v0, $zero, 0xa -/* A03CD0 80241490 08090550 */ j .L80241540 -/* A03CD4 80241494 AE620070 */ sw $v0, 0x70($s3) -.L80241498: -/* A03CD8 80241498 08090550 */ j .L80241540 -/* A03CDC 8024149C AE720070 */ sw $s2, 0x70($s3) -.L802414A0: -/* A03CE0 802414A0 AE220090 */ sw $v0, 0x90($s1) -.L802414A4: -/* A03CE4 802414A4 8602008C */ lh $v0, 0x8c($s0) -/* A03CE8 802414A8 14400025 */ bnez $v0, .L80241540 -/* A03CEC 802414AC 00000000 */ nop -/* A03CF0 802414B0 8602008E */ lh $v0, 0x8e($s0) -/* A03CF4 802414B4 1C400022 */ bgtz $v0, .L80241540 -/* A03CF8 802414B8 00000000 */ nop -/* A03CFC 802414BC 8E620074 */ lw $v0, 0x74($s3) -/* A03D00 802414C0 2442FFFF */ addiu $v0, $v0, -1 -/* A03D04 802414C4 1840001D */ blez $v0, .L8024153C -/* A03D08 802414C8 AE620074 */ sw $v0, 0x74($s3) -/* A03D0C 802414CC 8E220018 */ lw $v0, 0x18($s1) -/* A03D10 802414D0 9442002A */ lhu $v0, 0x2a($v0) -/* A03D14 802414D4 30420010 */ andi $v0, $v0, 0x10 -/* A03D18 802414D8 14400007 */ bnez $v0, .L802414F8 -/* A03D1C 802414DC 00000000 */ nop -/* A03D20 802414E0 C600000C */ lwc1 $f0, 0xc($s0) -/* A03D24 802414E4 3C014334 */ lui $at, 0x4334 -/* A03D28 802414E8 44816000 */ mtc1 $at, $f12 -/* A03D2C 802414EC 0C00A6C9 */ jal clamp_angle -/* A03D30 802414F0 460C0300 */ add.s $f12, $f0, $f12 -/* A03D34 802414F4 E600000C */ swc1 $f0, 0xc($s0) -.L802414F8: -/* A03D38 802414F8 0C00A67F */ jal rand_int -/* A03D3C 802414FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A03D40 80241500 3C032E8B */ lui $v1, 0x2e8b -/* A03D44 80241504 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A03D48 80241508 00430018 */ mult $v0, $v1 -/* A03D4C 8024150C 00021FC3 */ sra $v1, $v0, 0x1f -/* A03D50 80241510 00004010 */ mfhi $t0 -/* A03D54 80241514 00082043 */ sra $a0, $t0, 1 -/* A03D58 80241518 00832023 */ subu $a0, $a0, $v1 -/* A03D5C 8024151C 00041840 */ sll $v1, $a0, 1 -/* A03D60 80241520 00641821 */ addu $v1, $v1, $a0 -/* A03D64 80241524 00031880 */ sll $v1, $v1, 2 -/* A03D68 80241528 00641823 */ subu $v1, $v1, $a0 -/* A03D6C 8024152C 00431023 */ subu $v0, $v0, $v1 -/* A03D70 80241530 24420005 */ addiu $v0, $v0, 5 -/* A03D74 80241534 08090550 */ j .L80241540 -/* A03D78 80241538 A602008E */ sh $v0, 0x8e($s0) -.L8024153C: -/* A03D7C 8024153C AE600070 */ sw $zero, 0x70($s3) -.L80241540: -/* A03D80 80241540 8FBF0054 */ lw $ra, 0x54($sp) -/* A03D84 80241544 8FB40050 */ lw $s4, 0x50($sp) -/* A03D88 80241548 8FB3004C */ lw $s3, 0x4c($sp) -/* A03D8C 8024154C 8FB20048 */ lw $s2, 0x48($sp) -/* A03D90 80241550 8FB10044 */ lw $s1, 0x44($sp) -/* A03D94 80241554 8FB00040 */ lw $s0, 0x40($sp) -/* A03D98 80241558 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A03D9C 8024155C D7B80068 */ ldc1 $f24, 0x68($sp) -/* A03DA0 80241560 D7B60060 */ ldc1 $f22, 0x60($sp) -/* A03DA4 80241564 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A03DA8 80241568 03E00008 */ jr $ra -/* A03DAC 8024156C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s deleted file mode 100644 index ca973f366f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417EC_A0402C -/* A0402C 802417EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A04030 802417F0 AFB20030 */ sw $s2, 0x30($sp) -/* A04034 802417F4 0080902D */ daddu $s2, $a0, $zero -/* A04038 802417F8 AFBF0038 */ sw $ra, 0x38($sp) -/* A0403C 802417FC AFB30034 */ sw $s3, 0x34($sp) -/* A04040 80241800 AFB1002C */ sw $s1, 0x2c($sp) -/* A04044 80241804 AFB00028 */ sw $s0, 0x28($sp) -/* A04048 80241808 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A0404C 8024180C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A04050 80241810 8E510148 */ lw $s1, 0x148($s2) -/* A04054 80241814 86240008 */ lh $a0, 8($s1) -/* A04058 80241818 0C00EABB */ jal get_npc_unsafe -/* A0405C 8024181C 00A0982D */ daddu $s3, $a1, $zero -/* A04060 80241820 0040802D */ daddu $s0, $v0, $zero -/* A04064 80241824 0200202D */ daddu $a0, $s0, $zero -/* A04068 80241828 C6220088 */ lwc1 $f2, 0x88($s1) -/* A0406C 8024182C 468010A0 */ cvt.s.w $f2, $f2 -/* A04070 80241830 460010A1 */ cvt.d.s $f2, $f2 -/* A04074 80241834 C604001C */ lwc1 $f4, 0x1c($s0) -/* A04078 80241838 C6000014 */ lwc1 $f0, 0x14($s0) -/* A0407C 8024183C 8E050018 */ lw $a1, 0x18($s0) -/* A04080 80241840 46002100 */ add.s $f4, $f4, $f0 -/* A04084 80241844 8E06000C */ lw $a2, 0xc($s0) -/* A04088 80241848 C6200078 */ lwc1 $f0, 0x78($s1) -/* A0408C 8024184C 46800020 */ cvt.s.w $f0, $f0 -/* A04090 80241850 E604001C */ swc1 $f4, 0x1c($s0) -/* A04094 80241854 3C014059 */ lui $at, 0x4059 -/* A04098 80241858 44812800 */ mtc1 $at, $f5 -/* A0409C 8024185C 44802000 */ mtc1 $zero, $f4 -/* A040A0 80241860 46000021 */ cvt.d.s $f0, $f0 -/* A040A4 80241864 46240003 */ div.d $f0, $f0, $f4 -/* A040A8 80241868 46200520 */ cvt.s.d $f20, $f0 -/* A040AC 8024186C 46241083 */ div.d $f2, $f2, $f4 -/* A040B0 80241870 0C00EA95 */ jal npc_move_heading -/* A040B4 80241874 462015A0 */ cvt.s.d $f22, $f2 -/* A040B8 80241878 C604001C */ lwc1 $f4, 0x1c($s0) -/* A040BC 8024187C 44801000 */ mtc1 $zero, $f2 -/* A040C0 80241880 44801800 */ mtc1 $zero, $f3 -/* A040C4 80241884 46002021 */ cvt.d.s $f0, $f4 -/* A040C8 80241888 4620103E */ c.le.d $f2, $f0 -/* A040CC 8024188C 00000000 */ nop -/* A040D0 80241890 45000030 */ bc1f .L80241954 -/* A040D4 80241894 00000000 */ nop -/* A040D8 80241898 C600003C */ lwc1 $f0, 0x3c($s0) -/* A040DC 8024189C 46040000 */ add.s $f0, $f0, $f4 -/* A040E0 802418A0 E600003C */ swc1 $f0, 0x3c($s0) -/* A040E4 802418A4 8E2200CC */ lw $v0, 0xcc($s1) -/* A040E8 802418A8 8C420024 */ lw $v0, 0x24($v0) -/* A040EC 802418AC AE020028 */ sw $v0, 0x28($s0) -/* A040F0 802418B0 A2200007 */ sb $zero, 7($s1) -/* A040F4 802418B4 8E020000 */ lw $v0, ($s0) -/* A040F8 802418B8 30420008 */ andi $v0, $v0, 8 -/* A040FC 802418BC 14400011 */ bnez $v0, .L80241904 -/* A04100 802418C0 0000102D */ daddu $v0, $zero, $zero -/* A04104 802418C4 27A50018 */ addiu $a1, $sp, 0x18 -/* A04108 802418C8 27A6001C */ addiu $a2, $sp, 0x1c -/* A0410C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) -/* A04110 802418D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* A04114 802418D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A04118 802418D8 3C01447A */ lui $at, 0x447a -/* A0411C 802418DC 44813000 */ mtc1 $at, $f6 -/* A04120 802418E0 27A20024 */ addiu $v0, $sp, 0x24 -/* A04124 802418E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A04128 802418E8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A0412C 802418EC E7A40020 */ swc1 $f4, 0x20($sp) -/* A04130 802418F0 E7A60024 */ swc1 $f6, 0x24($sp) -/* A04134 802418F4 AFA20010 */ sw $v0, 0x10($sp) -/* A04138 802418F8 8E040080 */ lw $a0, 0x80($s0) -/* A0413C 802418FC 0C0372DF */ jal func_800DCB7C -/* A04140 80241900 27A70020 */ addiu $a3, $sp, 0x20 -.L80241904: -/* A04144 80241904 1040000B */ beqz $v0, .L80241934 -/* A04148 80241908 00000000 */ nop -/* A0414C 8024190C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04150 80241910 46140080 */ add.s $f2, $f0, $f20 -/* A04154 80241914 C600003C */ lwc1 $f0, 0x3c($s0) -/* A04158 80241918 4600103E */ c.le.s $f2, $f0 -/* A0415C 8024191C 00000000 */ nop -/* A04160 80241920 4500008D */ bc1f .L80241B58 -/* A04164 80241924 00000000 */ nop -/* A04168 80241928 E602003C */ swc1 $f2, 0x3c($s0) -/* A0416C 8024192C 080906D6 */ j .L80241B58 -/* A04170 80241930 AE400070 */ sw $zero, 0x70($s2) -.L80241934: -/* A04174 80241934 C602003C */ lwc1 $f2, 0x3c($s0) -/* A04178 80241938 C6000064 */ lwc1 $f0, 0x64($s0) -/* A0417C 8024193C 4602003E */ c.le.s $f0, $f2 -/* A04180 80241940 00000000 */ nop -/* A04184 80241944 45030084 */ bc1tl .L80241B58 -/* A04188 80241948 AE400070 */ sw $zero, 0x70($s2) -/* A0418C 8024194C 080906D6 */ j .L80241B58 -/* A04190 80241950 00000000 */ nop -.L80241954: -/* A04194 80241954 4622003C */ c.lt.d $f0, $f2 -/* A04198 80241958 00000000 */ nop -/* A0419C 8024195C 4500007E */ bc1f .L80241B58 -/* A041A0 80241960 00000000 */ nop -/* A041A4 80241964 9602008E */ lhu $v0, 0x8e($s0) -/* A041A8 80241968 24420001 */ addiu $v0, $v0, 1 -/* A041AC 8024196C A602008E */ sh $v0, 0x8e($s0) -/* A041B0 80241970 00021400 */ sll $v0, $v0, 0x10 -/* A041B4 80241974 8E630020 */ lw $v1, 0x20($s3) -/* A041B8 80241978 00021403 */ sra $v0, $v0, 0x10 -/* A041BC 8024197C 0043102A */ slt $v0, $v0, $v1 -/* A041C0 80241980 14400026 */ bnez $v0, .L80241A1C -/* A041C4 80241984 00000000 */ nop -/* A041C8 80241988 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A041CC 8024198C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A041D0 80241990 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A041D4 80241994 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A041D8 80241998 A600008E */ sh $zero, 0x8e($s0) -/* A041DC 8024199C 8C460028 */ lw $a2, 0x28($v0) -/* A041E0 802419A0 0C00A720 */ jal atan2 -/* A041E4 802419A4 8C470030 */ lw $a3, 0x30($v0) -/* A041E8 802419A8 46000506 */ mov.s $f20, $f0 -/* A041EC 802419AC C60C000C */ lwc1 $f12, 0xc($s0) -/* A041F0 802419B0 0C00A70A */ jal get_clamped_angle_diff -/* A041F4 802419B4 4600A386 */ mov.s $f14, $f20 -/* A041F8 802419B8 46000086 */ mov.s $f2, $f0 -/* A041FC 802419BC 8E62001C */ lw $v0, 0x1c($s3) -/* A04200 802419C0 46001005 */ abs.s $f0, $f2 -/* A04204 802419C4 44822000 */ mtc1 $v0, $f4 -/* A04208 802419C8 00000000 */ nop -/* A0420C 802419CC 46802120 */ cvt.s.w $f4, $f4 -/* A04210 802419D0 4600203C */ c.lt.s $f4, $f0 -/* A04214 802419D4 00000000 */ nop -/* A04218 802419D8 4500000D */ bc1f .L80241A10 -/* A0421C 802419DC 00000000 */ nop -/* A04220 802419E0 44800000 */ mtc1 $zero, $f0 -/* A04224 802419E4 C614000C */ lwc1 $f20, 0xc($s0) -/* A04228 802419E8 4600103C */ c.lt.s $f2, $f0 -/* A0422C 802419EC 00000000 */ nop -/* A04230 802419F0 45000006 */ bc1f .L80241A0C -/* A04234 802419F4 00021023 */ negu $v0, $v0 -/* A04238 802419F8 44820000 */ mtc1 $v0, $f0 -/* A0423C 802419FC 00000000 */ nop -/* A04240 80241A00 46800020 */ cvt.s.w $f0, $f0 -/* A04244 80241A04 08090684 */ j .L80241A10 -/* A04248 80241A08 4600A500 */ add.s $f20, $f20, $f0 -.L80241A0C: -/* A0424C 80241A0C 4604A500 */ add.s $f20, $f20, $f4 -.L80241A10: -/* A04250 80241A10 0C00A6C9 */ jal clamp_angle -/* A04254 80241A14 4600A306 */ mov.s $f12, $f20 -/* A04258 80241A18 E600000C */ swc1 $f0, 0xc($s0) -.L80241A1C: -/* A0425C 80241A1C 8E020000 */ lw $v0, ($s0) -/* A04260 80241A20 30420008 */ andi $v0, $v0, 8 -/* A04264 80241A24 1040000A */ beqz $v0, .L80241A50 -/* A04268 80241A28 27A50018 */ addiu $a1, $sp, 0x18 -/* A0426C 80241A2C C602003C */ lwc1 $f2, 0x3c($s0) -/* A04270 80241A30 C600001C */ lwc1 $f0, 0x1c($s0) -/* A04274 80241A34 46001080 */ add.s $f2, $f2, $f0 -/* A04278 80241A38 4616103C */ c.lt.s $f2, $f22 -/* A0427C 80241A3C 00000000 */ nop -/* A04280 80241A40 45020045 */ bc1fl .L80241B58 -/* A04284 80241A44 E602003C */ swc1 $f2, 0x3c($s0) -/* A04288 80241A48 080906D5 */ j .L80241B54 -/* A0428C 80241A4C E616003C */ swc1 $f22, 0x3c($s0) -.L80241A50: -/* A04290 80241A50 C6000038 */ lwc1 $f0, 0x38($s0) -/* A04294 80241A54 27A6001C */ addiu $a2, $sp, 0x1c -/* A04298 80241A58 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0429C 80241A5C 860200A8 */ lh $v0, 0xa8($s0) -/* A042A0 80241A60 C600001C */ lwc1 $f0, 0x1c($s0) -/* A042A4 80241A64 C604003C */ lwc1 $f4, 0x3c($s0) -/* A042A8 80241A68 44821000 */ mtc1 $v0, $f2 -/* A042AC 80241A6C 00000000 */ nop -/* A042B0 80241A70 468010A0 */ cvt.s.w $f2, $f2 -/* A042B4 80241A74 46000005 */ abs.s $f0, $f0 -/* A042B8 80241A78 46020000 */ add.s $f0, $f0, $f2 -/* A042BC 80241A7C C6060040 */ lwc1 $f6, 0x40($s0) -/* A042C0 80241A80 27A20024 */ addiu $v0, $sp, 0x24 -/* A042C4 80241A84 46022100 */ add.s $f4, $f4, $f2 -/* A042C8 80241A88 3C014024 */ lui $at, 0x4024 -/* A042CC 80241A8C 44811800 */ mtc1 $at, $f3 -/* A042D0 80241A90 44801000 */ mtc1 $zero, $f2 -/* A042D4 80241A94 46000021 */ cvt.d.s $f0, $f0 -/* A042D8 80241A98 46220000 */ add.d $f0, $f0, $f2 -/* A042DC 80241A9C E7A60020 */ swc1 $f6, 0x20($sp) -/* A042E0 80241AA0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* A042E4 80241AA4 46200020 */ cvt.s.d $f0, $f0 -/* A042E8 80241AA8 E7A00024 */ swc1 $f0, 0x24($sp) -/* A042EC 80241AAC AFA20010 */ sw $v0, 0x10($sp) -/* A042F0 80241AB0 8E040080 */ lw $a0, 0x80($s0) -/* A042F4 80241AB4 0C0372DF */ jal func_800DCB7C -/* A042F8 80241AB8 27A70020 */ addiu $a3, $sp, 0x20 -/* A042FC 80241ABC 10400015 */ beqz $v0, .L80241B14 -/* A04300 80241AC0 00000000 */ nop -/* A04304 80241AC4 860200A8 */ lh $v0, 0xa8($s0) -/* A04308 80241AC8 C604001C */ lwc1 $f4, 0x1c($s0) -/* A0430C 80241ACC 44820000 */ mtc1 $v0, $f0 -/* A04310 80241AD0 00000000 */ nop -/* A04314 80241AD4 46800020 */ cvt.s.w $f0, $f0 -/* A04318 80241AD8 46002085 */ abs.s $f2, $f4 -/* A0431C 80241ADC 46020000 */ add.s $f0, $f0, $f2 -/* A04320 80241AE0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A04324 80241AE4 4600103E */ c.le.s $f2, $f0 -/* A04328 80241AE8 00000000 */ nop -/* A0432C 80241AEC 45000005 */ bc1f .L80241B04 -/* A04330 80241AF0 00000000 */ nop -/* A04334 80241AF4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04338 80241AF8 AE00001C */ sw $zero, 0x1c($s0) -/* A0433C 80241AFC 080906D6 */ j .L80241B58 -/* A04340 80241B00 E600003C */ swc1 $f0, 0x3c($s0) -.L80241B04: -/* A04344 80241B04 C600003C */ lwc1 $f0, 0x3c($s0) -/* A04348 80241B08 46040000 */ add.s $f0, $f0, $f4 -/* A0434C 80241B0C 080906D6 */ j .L80241B58 -/* A04350 80241B10 E600003C */ swc1 $f0, 0x3c($s0) -.L80241B14: -/* A04354 80241B14 C606003C */ lwc1 $f6, 0x3c($s0) -/* A04358 80241B18 860200A8 */ lh $v0, 0xa8($s0) -/* A0435C 80241B1C 46163081 */ sub.s $f2, $f6, $f22 -/* A04360 80241B20 44820000 */ mtc1 $v0, $f0 -/* A04364 80241B24 00000000 */ nop -/* A04368 80241B28 46800020 */ cvt.s.w $f0, $f0 -/* A0436C 80241B2C 46001080 */ add.s $f2, $f2, $f0 -/* A04370 80241B30 C604001C */ lwc1 $f4, 0x1c($s0) -/* A04374 80241B34 46002005 */ abs.s $f0, $f4 -/* A04378 80241B38 4602003C */ c.lt.s $f0, $f2 -/* A0437C 80241B3C 00000000 */ nop -/* A04380 80241B40 45020005 */ bc1fl .L80241B58 -/* A04384 80241B44 AE00001C */ sw $zero, 0x1c($s0) -/* A04388 80241B48 46043000 */ add.s $f0, $f6, $f4 -/* A0438C 80241B4C 080906D6 */ j .L80241B58 -/* A04390 80241B50 E600003C */ swc1 $f0, 0x3c($s0) -.L80241B54: -/* A04394 80241B54 AE00001C */ sw $zero, 0x1c($s0) -.L80241B58: -/* A04398 80241B58 8FBF0038 */ lw $ra, 0x38($sp) -/* A0439C 80241B5C 8FB30034 */ lw $s3, 0x34($sp) -/* A043A0 80241B60 8FB20030 */ lw $s2, 0x30($sp) -/* A043A4 80241B64 8FB1002C */ lw $s1, 0x2c($sp) -/* A043A8 80241B68 8FB00028 */ lw $s0, 0x28($sp) -/* A043AC 80241B6C D7B60048 */ ldc1 $f22, 0x48($sp) -/* A043B0 80241B70 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A043B4 80241B74 03E00008 */ jr $ra -/* A043B8 80241B78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s deleted file mode 100644 index bd3e725e91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B7C_A043BC -/* A043BC 80241B7C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A043C0 80241B80 AFB00028 */ sw $s0, 0x28($sp) -/* A043C4 80241B84 00A0802D */ daddu $s0, $a1, $zero -/* A043C8 80241B88 AFB1002C */ sw $s1, 0x2c($sp) -/* A043CC 80241B8C 00C0882D */ daddu $s1, $a2, $zero -/* A043D0 80241B90 AFBF0034 */ sw $ra, 0x34($sp) -/* A043D4 80241B94 AFB20030 */ sw $s2, 0x30($sp) -/* A043D8 80241B98 AE200070 */ sw $zero, 0x70($s1) -/* A043DC 80241B9C 8C830000 */ lw $v1, ($a0) -/* A043E0 80241BA0 2402FDFF */ addiu $v0, $zero, -0x201 -/* A043E4 80241BA4 A480008E */ sh $zero, 0x8e($a0) -/* A043E8 80241BA8 00621824 */ and $v1, $v1, $v0 -/* A043EC 80241BAC 34650800 */ ori $a1, $v1, 0x800 -/* A043F0 80241BB0 AC850000 */ sw $a1, ($a0) -/* A043F4 80241BB4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A043F8 80241BB8 8C420034 */ lw $v0, 0x34($v0) -/* A043FC 80241BBC 10400003 */ beqz $v0, .L80241BCC -/* A04400 80241BC0 00E0902D */ daddu $s2, $a3, $zero -/* A04404 80241BC4 080906F5 */ j .L80241BD4 -/* A04408 80241BC8 34620808 */ ori $v0, $v1, 0x808 -.L80241BCC: -/* A0440C 80241BCC 2402FFF7 */ addiu $v0, $zero, -9 -/* A04410 80241BD0 00A21024 */ and $v0, $a1, $v0 -.L80241BD4: -/* A04414 80241BD4 AC820000 */ sw $v0, ($a0) -/* A04418 80241BD8 27A20024 */ addiu $v0, $sp, 0x24 -/* A0441C 80241BDC 27A50018 */ addiu $a1, $sp, 0x18 -/* A04420 80241BE0 C4800038 */ lwc1 $f0, 0x38($a0) -/* A04424 80241BE4 C482003C */ lwc1 $f2, 0x3c($a0) -/* A04428 80241BE8 C4840040 */ lwc1 $f4, 0x40($a0) -/* A0442C 80241BEC 3C01447A */ lui $at, 0x447a -/* A04430 80241BF0 44813000 */ mtc1 $at, $f6 -/* A04434 80241BF4 27A6001C */ addiu $a2, $sp, 0x1c -/* A04438 80241BF8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0443C 80241BFC E7A2001C */ swc1 $f2, 0x1c($sp) -/* A04440 80241C00 E7A40020 */ swc1 $f4, 0x20($sp) -/* A04444 80241C04 E7A60024 */ swc1 $f6, 0x24($sp) -/* A04448 80241C08 AFA20010 */ sw $v0, 0x10($sp) -/* A0444C 80241C0C 8C840080 */ lw $a0, 0x80($a0) -/* A04450 80241C10 0C0372DF */ jal func_800DCB7C -/* A04454 80241C14 27A70020 */ addiu $a3, $sp, 0x20 -/* A04458 80241C18 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A0445C 80241C1C 3C014059 */ lui $at, 0x4059 -/* A04460 80241C20 44812800 */ mtc1 $at, $f5 -/* A04464 80241C24 44802000 */ mtc1 $zero, $f4 -/* A04468 80241C28 460010A1 */ cvt.d.s $f2, $f2 -/* A0446C 80241C2C 46241082 */ mul.d $f2, $f2, $f4 -/* A04470 80241C30 00000000 */ nop -/* A04474 80241C34 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04478 80241C38 46000021 */ cvt.d.s $f0, $f0 -/* A0447C 80241C3C 46240002 */ mul.d $f0, $f0, $f4 -/* A04480 80241C40 00000000 */ nop -/* A04484 80241C44 3C013FE0 */ lui $at, 0x3fe0 -/* A04488 80241C48 44812800 */ mtc1 $at, $f5 -/* A0448C 80241C4C 44802000 */ mtc1 $zero, $f4 -/* A04490 80241C50 00000000 */ nop -/* A04494 80241C54 46241080 */ add.d $f2, $f2, $f4 -/* A04498 80241C58 AE000074 */ sw $zero, 0x74($s0) -/* A0449C 80241C5C 46240000 */ add.d $f0, $f0, $f4 -/* A044A0 80241C60 AE000090 */ sw $zero, 0x90($s0) -/* A044A4 80241C64 4620120D */ trunc.w.d $f8, $f2 -/* A044A8 80241C68 E6080078 */ swc1 $f8, 0x78($s0) -/* A044AC 80241C6C 4620020D */ trunc.w.d $f8, $f0 -/* A044B0 80241C70 E6080088 */ swc1 $f8, 0x88($s0) -/* A044B4 80241C74 8E420014 */ lw $v0, 0x14($s2) -/* A044B8 80241C78 AE220074 */ sw $v0, 0x74($s1) -/* A044BC 80241C7C 8E0200B0 */ lw $v0, 0xb0($s0) -/* A044C0 80241C80 34420010 */ ori $v0, $v0, 0x10 -/* A044C4 80241C84 AE0200B0 */ sw $v0, 0xb0($s0) -/* A044C8 80241C88 8FBF0034 */ lw $ra, 0x34($sp) -/* A044CC 80241C8C 8FB20030 */ lw $s2, 0x30($sp) -/* A044D0 80241C90 8FB1002C */ lw $s1, 0x2c($sp) -/* A044D4 80241C94 8FB00028 */ lw $s0, 0x28($sp) -/* A044D8 80241C98 03E00008 */ jr $ra -/* A044DC 80241C9C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index f33874f7c0..34cd0a1425 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -46,7 +46,7 @@ glabel func_80241CA0_A044E0 /* A04584 80241D44 02A0202D */ daddu $a0, $s5, $zero /* A04588 80241D48 0240282D */ daddu $a1, $s2, $zero /* A0458C 80241D4C 0280302D */ daddu $a2, $s4, $zero -/* A04590 80241D50 0C0906DF */ jal func_80241B7C_A043BC +/* A04590 80241D50 0C0906DF */ jal nok_14_UnkFunc5 /* A04594 80241D54 0200382D */ daddu $a3, $s0, $zero .L80241D58: /* A04598 80241D58 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241DD4_A04614 glabel L80241DE4_A04624 /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero -/* A0462C 80241DEC 0C09048B */ jal func_8024122C_A03A6C +/* A0462C 80241DEC 0C09048B */ jal nok_14_UnkFunc4 /* A04630 80241DF0 0260302D */ daddu $a2, $s3, $zero /* A04634 80241DF4 0809079A */ j .L80241E68 /* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241E3C_A0467C glabel L80241E54_A04694 /* A04694 80241E54 0280202D */ daddu $a0, $s4, $zero /* A04698 80241E58 0200282D */ daddu $a1, $s0, $zero -/* A0469C 80241E5C 0C0905FB */ jal func_802417EC_A0402C +/* A0469C 80241E5C 0C0905FB */ jal nok_14_UnkFunc6 /* A046A0 80241E60 0260302D */ daddu $a2, $s3, $zero glabel L80241E64_A046A4 /* A046A4 80241E64 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index a1d8a3fced..f5c46fe401 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -46,7 +46,7 @@ glabel func_802421CC_A04A0C /* A04AB0 80242270 02A0202D */ daddu $a0, $s5, $zero /* A04AB4 80242274 0240282D */ daddu $a1, $s2, $zero /* A04AB8 80242278 0260302D */ daddu $a2, $s3, $zero -/* A04ABC 8024227C 0C0906DF */ jal func_80241B7C_A043BC +/* A04ABC 8024227C 0C0906DF */ jal nok_14_UnkFunc5 /* A04AC0 80242280 0200382D */ daddu $a3, $s0, $zero /* A04AC4 80242284 86A200A8 */ lh $v0, 0xa8($s5) /* A04AC8 80242288 AE42008C */ sw $v0, 0x8c($s2) @@ -96,7 +96,7 @@ glabel L80242314_A04B54 glabel L80242324_A04B64 /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero /* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero -/* A04B6C 8024232C 0C09048B */ jal func_8024122C_A03A6C +/* A04B6C 8024232C 0C09048B */ jal nok_14_UnkFunc4 /* A04B70 80242330 0280302D */ daddu $a2, $s4, $zero /* A04B74 80242334 8E630070 */ lw $v1, 0x70($s3) /* A04B78 80242338 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s deleted file mode 100644 index 376d258e42..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024134C_A0824C -/* A0824C 8024134C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A08250 80241350 AFB3004C */ sw $s3, 0x4c($sp) -/* A08254 80241354 0080982D */ daddu $s3, $a0, $zero -/* A08258 80241358 AFBF0054 */ sw $ra, 0x54($sp) -/* A0825C 8024135C AFB40050 */ sw $s4, 0x50($sp) -/* A08260 80241360 AFB20048 */ sw $s2, 0x48($sp) -/* A08264 80241364 AFB10044 */ sw $s1, 0x44($sp) -/* A08268 80241368 AFB00040 */ sw $s0, 0x40($sp) -/* A0826C 8024136C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A08270 80241370 F7B80068 */ sdc1 $f24, 0x68($sp) -/* A08274 80241374 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A08278 80241378 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A0827C 8024137C 8E710148 */ lw $s1, 0x148($s3) -/* A08280 80241380 00A0902D */ daddu $s2, $a1, $zero -/* A08284 80241384 86240008 */ lh $a0, 8($s1) -/* A08288 80241388 0C00EABB */ jal get_npc_unsafe -/* A0828C 8024138C 00C0A02D */ daddu $s4, $a2, $zero -/* A08290 80241390 0040802D */ daddu $s0, $v0, $zero -/* A08294 80241394 C6200078 */ lwc1 $f0, 0x78($s1) -/* A08298 80241398 46800020 */ cvt.s.w $f0, $f0 -/* A0829C 8024139C 46000021 */ cvt.d.s $f0, $f0 -/* A082A0 802413A0 3C014059 */ lui $at, 0x4059 -/* A082A4 802413A4 44811800 */ mtc1 $at, $f3 -/* A082A8 802413A8 44801000 */ mtc1 $zero, $f2 -/* A082AC 802413AC 8602008E */ lh $v0, 0x8e($s0) -/* A082B0 802413B0 9603008E */ lhu $v1, 0x8e($s0) -/* A082B4 802413B4 46220003 */ div.d $f0, $f0, $f2 -/* A082B8 802413B8 46200620 */ cvt.s.d $f24, $f0 -/* A082BC 802413BC C6200088 */ lwc1 $f0, 0x88($s1) -/* A082C0 802413C0 46800020 */ cvt.s.w $f0, $f0 -/* A082C4 802413C4 46000021 */ cvt.d.s $f0, $f0 -/* A082C8 802413C8 46220003 */ div.d $f0, $f0, $f2 -/* A082CC 802413CC 46200020 */ cvt.s.d $f0, $f0 -/* A082D0 802413D0 18400003 */ blez $v0, .L802413E0 -/* A082D4 802413D4 4600C680 */ add.s $f26, $f24, $f0 -/* A082D8 802413D8 2462FFFF */ addiu $v0, $v1, -1 -/* A082DC 802413DC A602008E */ sh $v0, 0x8e($s0) -.L802413E0: -/* A082E0 802413E0 8E220070 */ lw $v0, 0x70($s1) -/* A082E4 802413E4 18400034 */ blez $v0, .L802414B8 -/* A082E8 802413E8 00000000 */ nop -/* A082EC 802413EC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A082F0 802413F0 46806320 */ cvt.s.w $f12, $f12 -/* A082F4 802413F4 44820000 */ mtc1 $v0, $f0 -/* A082F8 802413F8 00000000 */ nop -/* A082FC 802413FC 46800020 */ cvt.s.w $f0, $f0 -/* A08300 80241400 46000021 */ cvt.d.s $f0, $f0 -/* A08304 80241404 46220003 */ div.d $f0, $f0, $f2 -/* A08308 80241408 0C00A8BB */ jal sin_deg -/* A0830C 8024140C 462005A0 */ cvt.s.d $f22, $f0 -/* A08310 80241410 8E020000 */ lw $v0, ($s0) -/* A08314 80241414 30420008 */ andi $v0, $v0, 8 -/* A08318 80241418 10400003 */ beqz $v0, .L80241428 -/* A0831C 8024141C 46000506 */ mov.s $f20, $f0 -/* A08320 80241420 0809051A */ j .L80241468 -/* A08324 80241424 0000102D */ daddu $v0, $zero, $zero -.L80241428: -/* A08328 80241428 27A50028 */ addiu $a1, $sp, 0x28 -/* A0832C 8024142C 27A6002C */ addiu $a2, $sp, 0x2c -/* A08330 80241430 C6000038 */ lwc1 $f0, 0x38($s0) -/* A08334 80241434 C602003C */ lwc1 $f2, 0x3c($s0) -/* A08338 80241438 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0833C 8024143C 3C01447A */ lui $at, 0x447a -/* A08340 80241440 44813000 */ mtc1 $at, $f6 -/* A08344 80241444 27A20034 */ addiu $v0, $sp, 0x34 -/* A08348 80241448 E7A00028 */ swc1 $f0, 0x28($sp) -/* A0834C 8024144C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A08350 80241450 E7A40030 */ swc1 $f4, 0x30($sp) -/* A08354 80241454 E7A60034 */ swc1 $f6, 0x34($sp) -/* A08358 80241458 AFA20010 */ sw $v0, 0x10($sp) -/* A0835C 8024145C 8E040080 */ lw $a0, 0x80($s0) -/* A08360 80241460 0C0372DF */ jal func_800DCB7C -/* A08364 80241464 27A70030 */ addiu $a3, $sp, 0x30 -.L80241468: -/* A08368 80241468 10400007 */ beqz $v0, .L80241488 -/* A0836C 8024146C 00000000 */ nop -/* A08370 80241470 4616A082 */ mul.s $f2, $f20, $f22 -/* A08374 80241474 00000000 */ nop -/* A08378 80241478 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A0837C 8024147C 46180000 */ add.s $f0, $f0, $f24 -/* A08380 80241480 08090525 */ j .L80241494 -/* A08384 80241484 46020000 */ add.s $f0, $f0, $f2 -.L80241488: -/* A08388 80241488 4616A002 */ mul.s $f0, $f20, $f22 -/* A0838C 8024148C 00000000 */ nop -/* A08390 80241490 4600D000 */ add.s $f0, $f26, $f0 -.L80241494: -/* A08394 80241494 E600003C */ swc1 $f0, 0x3c($s0) -/* A08398 80241498 8E220074 */ lw $v0, 0x74($s1) -/* A0839C 8024149C 2442000A */ addiu $v0, $v0, 0xa -/* A083A0 802414A0 44826000 */ mtc1 $v0, $f12 -/* A083A4 802414A4 00000000 */ nop -/* A083A8 802414A8 0C00A6C9 */ jal clamp_angle -/* A083AC 802414AC 46806320 */ cvt.s.w $f12, $f12 -/* A083B0 802414B0 4600020D */ trunc.w.s $f8, $f0 -/* A083B4 802414B4 E6280074 */ swc1 $f8, 0x74($s1) -.L802414B8: -/* A083B8 802414B8 8E220090 */ lw $v0, 0x90($s1) -/* A083BC 802414BC 1C400040 */ bgtz $v0, .L802415C0 -/* A083C0 802414C0 2442FFFF */ addiu $v0, $v0, -1 -/* A083C4 802414C4 860200A8 */ lh $v0, 0xa8($s0) -/* A083C8 802414C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A083CC 802414CC 44821000 */ mtc1 $v0, $f2 -/* A083D0 802414D0 00000000 */ nop -/* A083D4 802414D4 468010A0 */ cvt.s.w $f2, $f2 -/* A083D8 802414D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A083DC 802414DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A083E0 802414E0 46020000 */ add.s $f0, $f0, $f2 -/* A083E4 802414E4 3C014024 */ lui $at, 0x4024 -/* A083E8 802414E8 44812800 */ mtc1 $at, $f5 -/* A083EC 802414EC 44802000 */ mtc1 $zero, $f4 -/* A083F0 802414F0 C442002C */ lwc1 $f2, 0x2c($v0) -/* A083F4 802414F4 46000021 */ cvt.d.s $f0, $f0 -/* A083F8 802414F8 46240000 */ add.d $f0, $f0, $f4 -/* A083FC 802414FC 460010A1 */ cvt.d.s $f2, $f2 -/* A08400 80241500 4620103C */ c.lt.d $f2, $f0 -/* A08404 80241504 00000000 */ nop -/* A08408 80241508 4500002E */ bc1f .L802415C4 -/* A0840C 8024150C 0280202D */ daddu $a0, $s4, $zero -/* A08410 80241510 24020001 */ addiu $v0, $zero, 1 -/* A08414 80241514 AFA20010 */ sw $v0, 0x10($sp) -/* A08418 80241518 8E460024 */ lw $a2, 0x24($s2) -/* A0841C 8024151C 8E470028 */ lw $a3, 0x28($s2) -/* A08420 80241520 0C01242D */ jal func_800490B4 -/* A08424 80241524 0220282D */ daddu $a1, $s1, $zero -/* A08428 80241528 10400026 */ beqz $v0, .L802415C4 -/* A0842C 8024152C 0000202D */ daddu $a0, $zero, $zero -/* A08430 80241530 0200282D */ daddu $a1, $s0, $zero -/* A08434 80241534 0000302D */ daddu $a2, $zero, $zero -/* A08438 80241538 2412000C */ addiu $s2, $zero, 0xc -/* A0843C 8024153C 860300A8 */ lh $v1, 0xa8($s0) -/* A08440 80241540 3C013F80 */ lui $at, 0x3f80 -/* A08444 80241544 44810000 */ mtc1 $at, $f0 -/* A08448 80241548 3C014000 */ lui $at, 0x4000 -/* A0844C 8024154C 44811000 */ mtc1 $at, $f2 -/* A08450 80241550 3C01C1A0 */ lui $at, 0xc1a0 -/* A08454 80241554 44812000 */ mtc1 $at, $f4 -/* A08458 80241558 44834000 */ mtc1 $v1, $f8 -/* A0845C 8024155C 00000000 */ nop -/* A08460 80241560 46804220 */ cvt.s.w $f8, $f8 -/* A08464 80241564 44074000 */ mfc1 $a3, $f8 -/* A08468 80241568 27A20038 */ addiu $v0, $sp, 0x38 -/* A0846C 8024156C AFB2001C */ sw $s2, 0x1c($sp) -/* A08470 80241570 AFA20020 */ sw $v0, 0x20($sp) -/* A08474 80241574 E7A00010 */ swc1 $f0, 0x10($sp) -/* A08478 80241578 E7A20014 */ swc1 $f2, 0x14($sp) -/* A0847C 8024157C 0C01BFA4 */ jal fx_emote -/* A08480 80241580 E7A40018 */ swc1 $f4, 0x18($sp) -/* A08484 80241584 0200202D */ daddu $a0, $s0, $zero -/* A08488 80241588 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A0848C 8024158C C480003C */ lwc1 $f0, 0x3c($a0) -/* A08490 80241590 3C060020 */ lui $a2, 0x20 -/* A08494 80241594 0C012530 */ jal func_800494C0 -/* A08498 80241598 E4800064 */ swc1 $f0, 0x64($a0) -/* A0849C 8024159C 8E220018 */ lw $v0, 0x18($s1) -/* A084A0 802415A0 9442002A */ lhu $v0, 0x2a($v0) -/* A084A4 802415A4 30420001 */ andi $v0, $v0, 1 -/* A084A8 802415A8 10400003 */ beqz $v0, .L802415B8 -/* A084AC 802415AC 2402000A */ addiu $v0, $zero, 0xa -/* A084B0 802415B0 08090598 */ j .L80241660 -/* A084B4 802415B4 AE620070 */ sw $v0, 0x70($s3) -.L802415B8: -/* A084B8 802415B8 08090598 */ j .L80241660 -/* A084BC 802415BC AE720070 */ sw $s2, 0x70($s3) -.L802415C0: -/* A084C0 802415C0 AE220090 */ sw $v0, 0x90($s1) -.L802415C4: -/* A084C4 802415C4 8602008C */ lh $v0, 0x8c($s0) -/* A084C8 802415C8 14400025 */ bnez $v0, .L80241660 -/* A084CC 802415CC 00000000 */ nop -/* A084D0 802415D0 8602008E */ lh $v0, 0x8e($s0) -/* A084D4 802415D4 1C400022 */ bgtz $v0, .L80241660 -/* A084D8 802415D8 00000000 */ nop -/* A084DC 802415DC 8E620074 */ lw $v0, 0x74($s3) -/* A084E0 802415E0 2442FFFF */ addiu $v0, $v0, -1 -/* A084E4 802415E4 1840001D */ blez $v0, .L8024165C -/* A084E8 802415E8 AE620074 */ sw $v0, 0x74($s3) -/* A084EC 802415EC 8E220018 */ lw $v0, 0x18($s1) -/* A084F0 802415F0 9442002A */ lhu $v0, 0x2a($v0) -/* A084F4 802415F4 30420010 */ andi $v0, $v0, 0x10 -/* A084F8 802415F8 14400007 */ bnez $v0, .L80241618 -/* A084FC 802415FC 00000000 */ nop -/* A08500 80241600 C600000C */ lwc1 $f0, 0xc($s0) -/* A08504 80241604 3C014334 */ lui $at, 0x4334 -/* A08508 80241608 44816000 */ mtc1 $at, $f12 -/* A0850C 8024160C 0C00A6C9 */ jal clamp_angle -/* A08510 80241610 460C0300 */ add.s $f12, $f0, $f12 -/* A08514 80241614 E600000C */ swc1 $f0, 0xc($s0) -.L80241618: -/* A08518 80241618 0C00A67F */ jal rand_int -/* A0851C 8024161C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A08520 80241620 3C032E8B */ lui $v1, 0x2e8b -/* A08524 80241624 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A08528 80241628 00430018 */ mult $v0, $v1 -/* A0852C 8024162C 00021FC3 */ sra $v1, $v0, 0x1f -/* A08530 80241630 00004010 */ mfhi $t0 -/* A08534 80241634 00082043 */ sra $a0, $t0, 1 -/* A08538 80241638 00832023 */ subu $a0, $a0, $v1 -/* A0853C 8024163C 00041840 */ sll $v1, $a0, 1 -/* A08540 80241640 00641821 */ addu $v1, $v1, $a0 -/* A08544 80241644 00031880 */ sll $v1, $v1, 2 -/* A08548 80241648 00641823 */ subu $v1, $v1, $a0 -/* A0854C 8024164C 00431023 */ subu $v0, $v0, $v1 -/* A08550 80241650 24420005 */ addiu $v0, $v0, 5 -/* A08554 80241654 08090598 */ j .L80241660 -/* A08558 80241658 A602008E */ sh $v0, 0x8e($s0) -.L8024165C: -/* A0855C 8024165C AE600070 */ sw $zero, 0x70($s3) -.L80241660: -/* A08560 80241660 8FBF0054 */ lw $ra, 0x54($sp) -/* A08564 80241664 8FB40050 */ lw $s4, 0x50($sp) -/* A08568 80241668 8FB3004C */ lw $s3, 0x4c($sp) -/* A0856C 8024166C 8FB20048 */ lw $s2, 0x48($sp) -/* A08570 80241670 8FB10044 */ lw $s1, 0x44($sp) -/* A08574 80241674 8FB00040 */ lw $s0, 0x40($sp) -/* A08578 80241678 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A0857C 8024167C D7B80068 */ ldc1 $f24, 0x68($sp) -/* A08580 80241680 D7B60060 */ ldc1 $f22, 0x60($sp) -/* A08584 80241684 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A08588 80241688 03E00008 */ jr $ra -/* A0858C 8024168C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s deleted file mode 100644 index 6e0c0c69b4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024190C_A0880C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024190C_A0880C -/* A0880C 8024190C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A08810 80241910 AFB20030 */ sw $s2, 0x30($sp) -/* A08814 80241914 0080902D */ daddu $s2, $a0, $zero -/* A08818 80241918 AFBF0038 */ sw $ra, 0x38($sp) -/* A0881C 8024191C AFB30034 */ sw $s3, 0x34($sp) -/* A08820 80241920 AFB1002C */ sw $s1, 0x2c($sp) -/* A08824 80241924 AFB00028 */ sw $s0, 0x28($sp) -/* A08828 80241928 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A0882C 8024192C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A08830 80241930 8E510148 */ lw $s1, 0x148($s2) -/* A08834 80241934 86240008 */ lh $a0, 8($s1) -/* A08838 80241938 0C00EABB */ jal get_npc_unsafe -/* A0883C 8024193C 00A0982D */ daddu $s3, $a1, $zero -/* A08840 80241940 0040802D */ daddu $s0, $v0, $zero -/* A08844 80241944 0200202D */ daddu $a0, $s0, $zero -/* A08848 80241948 C6220088 */ lwc1 $f2, 0x88($s1) -/* A0884C 8024194C 468010A0 */ cvt.s.w $f2, $f2 -/* A08850 80241950 460010A1 */ cvt.d.s $f2, $f2 -/* A08854 80241954 C604001C */ lwc1 $f4, 0x1c($s0) -/* A08858 80241958 C6000014 */ lwc1 $f0, 0x14($s0) -/* A0885C 8024195C 8E050018 */ lw $a1, 0x18($s0) -/* A08860 80241960 46002100 */ add.s $f4, $f4, $f0 -/* A08864 80241964 8E06000C */ lw $a2, 0xc($s0) -/* A08868 80241968 C6200078 */ lwc1 $f0, 0x78($s1) -/* A0886C 8024196C 46800020 */ cvt.s.w $f0, $f0 -/* A08870 80241970 E604001C */ swc1 $f4, 0x1c($s0) -/* A08874 80241974 3C014059 */ lui $at, 0x4059 -/* A08878 80241978 44812800 */ mtc1 $at, $f5 -/* A0887C 8024197C 44802000 */ mtc1 $zero, $f4 -/* A08880 80241980 46000021 */ cvt.d.s $f0, $f0 -/* A08884 80241984 46240003 */ div.d $f0, $f0, $f4 -/* A08888 80241988 46200520 */ cvt.s.d $f20, $f0 -/* A0888C 8024198C 46241083 */ div.d $f2, $f2, $f4 -/* A08890 80241990 0C00EA95 */ jal npc_move_heading -/* A08894 80241994 462015A0 */ cvt.s.d $f22, $f2 -/* A08898 80241998 C604001C */ lwc1 $f4, 0x1c($s0) -/* A0889C 8024199C 44801000 */ mtc1 $zero, $f2 -/* A088A0 802419A0 44801800 */ mtc1 $zero, $f3 -/* A088A4 802419A4 46002021 */ cvt.d.s $f0, $f4 -/* A088A8 802419A8 4620103E */ c.le.d $f2, $f0 -/* A088AC 802419AC 00000000 */ nop -/* A088B0 802419B0 45000030 */ bc1f .L80241A74 -/* A088B4 802419B4 00000000 */ nop -/* A088B8 802419B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A088BC 802419BC 46040000 */ add.s $f0, $f0, $f4 -/* A088C0 802419C0 E600003C */ swc1 $f0, 0x3c($s0) -/* A088C4 802419C4 8E2200CC */ lw $v0, 0xcc($s1) -/* A088C8 802419C8 8C420024 */ lw $v0, 0x24($v0) -/* A088CC 802419CC AE020028 */ sw $v0, 0x28($s0) -/* A088D0 802419D0 A2200007 */ sb $zero, 7($s1) -/* A088D4 802419D4 8E020000 */ lw $v0, ($s0) -/* A088D8 802419D8 30420008 */ andi $v0, $v0, 8 -/* A088DC 802419DC 14400011 */ bnez $v0, .L80241A24 -/* A088E0 802419E0 0000102D */ daddu $v0, $zero, $zero -/* A088E4 802419E4 27A50018 */ addiu $a1, $sp, 0x18 -/* A088E8 802419E8 27A6001C */ addiu $a2, $sp, 0x1c -/* A088EC 802419EC C6000038 */ lwc1 $f0, 0x38($s0) -/* A088F0 802419F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* A088F4 802419F4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A088F8 802419F8 3C01447A */ lui $at, 0x447a -/* A088FC 802419FC 44813000 */ mtc1 $at, $f6 -/* A08900 80241A00 27A20024 */ addiu $v0, $sp, 0x24 -/* A08904 80241A04 E7A00018 */ swc1 $f0, 0x18($sp) -/* A08908 80241A08 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A0890C 80241A0C E7A40020 */ swc1 $f4, 0x20($sp) -/* A08910 80241A10 E7A60024 */ swc1 $f6, 0x24($sp) -/* A08914 80241A14 AFA20010 */ sw $v0, 0x10($sp) -/* A08918 80241A18 8E040080 */ lw $a0, 0x80($s0) -/* A0891C 80241A1C 0C0372DF */ jal func_800DCB7C -/* A08920 80241A20 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A24: -/* A08924 80241A24 1040000B */ beqz $v0, .L80241A54 -/* A08928 80241A28 00000000 */ nop -/* A0892C 80241A2C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A08930 80241A30 46140080 */ add.s $f2, $f0, $f20 -/* A08934 80241A34 C600003C */ lwc1 $f0, 0x3c($s0) -/* A08938 80241A38 4600103E */ c.le.s $f2, $f0 -/* A0893C 80241A3C 00000000 */ nop -/* A08940 80241A40 4500008D */ bc1f .L80241C78 -/* A08944 80241A44 00000000 */ nop -/* A08948 80241A48 E602003C */ swc1 $f2, 0x3c($s0) -/* A0894C 80241A4C 0809071E */ j .L80241C78 -/* A08950 80241A50 AE400070 */ sw $zero, 0x70($s2) -.L80241A54: -/* A08954 80241A54 C602003C */ lwc1 $f2, 0x3c($s0) -/* A08958 80241A58 C6000064 */ lwc1 $f0, 0x64($s0) -/* A0895C 80241A5C 4602003E */ c.le.s $f0, $f2 -/* A08960 80241A60 00000000 */ nop -/* A08964 80241A64 45030084 */ bc1tl .L80241C78 -/* A08968 80241A68 AE400070 */ sw $zero, 0x70($s2) -/* A0896C 80241A6C 0809071E */ j .L80241C78 -/* A08970 80241A70 00000000 */ nop -.L80241A74: -/* A08974 80241A74 4622003C */ c.lt.d $f0, $f2 -/* A08978 80241A78 00000000 */ nop -/* A0897C 80241A7C 4500007E */ bc1f .L80241C78 -/* A08980 80241A80 00000000 */ nop -/* A08984 80241A84 9602008E */ lhu $v0, 0x8e($s0) -/* A08988 80241A88 24420001 */ addiu $v0, $v0, 1 -/* A0898C 80241A8C A602008E */ sh $v0, 0x8e($s0) -/* A08990 80241A90 00021400 */ sll $v0, $v0, 0x10 -/* A08994 80241A94 8E630020 */ lw $v1, 0x20($s3) -/* A08998 80241A98 00021403 */ sra $v0, $v0, 0x10 -/* A0899C 80241A9C 0043102A */ slt $v0, $v0, $v1 -/* A089A0 80241AA0 14400026 */ bnez $v0, .L80241B3C -/* A089A4 80241AA4 00000000 */ nop -/* A089A8 80241AA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A089AC 80241AAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A089B0 80241AB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A089B4 80241AB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A089B8 80241AB8 A600008E */ sh $zero, 0x8e($s0) -/* A089BC 80241ABC 8C460028 */ lw $a2, 0x28($v0) -/* A089C0 80241AC0 0C00A720 */ jal atan2 -/* A089C4 80241AC4 8C470030 */ lw $a3, 0x30($v0) -/* A089C8 80241AC8 46000506 */ mov.s $f20, $f0 -/* A089CC 80241ACC C60C000C */ lwc1 $f12, 0xc($s0) -/* A089D0 80241AD0 0C00A70A */ jal get_clamped_angle_diff -/* A089D4 80241AD4 4600A386 */ mov.s $f14, $f20 -/* A089D8 80241AD8 46000086 */ mov.s $f2, $f0 -/* A089DC 80241ADC 8E62001C */ lw $v0, 0x1c($s3) -/* A089E0 80241AE0 46001005 */ abs.s $f0, $f2 -/* A089E4 80241AE4 44822000 */ mtc1 $v0, $f4 -/* A089E8 80241AE8 00000000 */ nop -/* A089EC 80241AEC 46802120 */ cvt.s.w $f4, $f4 -/* A089F0 80241AF0 4600203C */ c.lt.s $f4, $f0 -/* A089F4 80241AF4 00000000 */ nop -/* A089F8 80241AF8 4500000D */ bc1f .L80241B30 -/* A089FC 80241AFC 00000000 */ nop -/* A08A00 80241B00 44800000 */ mtc1 $zero, $f0 -/* A08A04 80241B04 C614000C */ lwc1 $f20, 0xc($s0) -/* A08A08 80241B08 4600103C */ c.lt.s $f2, $f0 -/* A08A0C 80241B0C 00000000 */ nop -/* A08A10 80241B10 45000006 */ bc1f .L80241B2C -/* A08A14 80241B14 00021023 */ negu $v0, $v0 -/* A08A18 80241B18 44820000 */ mtc1 $v0, $f0 -/* A08A1C 80241B1C 00000000 */ nop -/* A08A20 80241B20 46800020 */ cvt.s.w $f0, $f0 -/* A08A24 80241B24 080906CC */ j .L80241B30 -/* A08A28 80241B28 4600A500 */ add.s $f20, $f20, $f0 -.L80241B2C: -/* A08A2C 80241B2C 4604A500 */ add.s $f20, $f20, $f4 -.L80241B30: -/* A08A30 80241B30 0C00A6C9 */ jal clamp_angle -/* A08A34 80241B34 4600A306 */ mov.s $f12, $f20 -/* A08A38 80241B38 E600000C */ swc1 $f0, 0xc($s0) -.L80241B3C: -/* A08A3C 80241B3C 8E020000 */ lw $v0, ($s0) -/* A08A40 80241B40 30420008 */ andi $v0, $v0, 8 -/* A08A44 80241B44 1040000A */ beqz $v0, .L80241B70 -/* A08A48 80241B48 27A50018 */ addiu $a1, $sp, 0x18 -/* A08A4C 80241B4C C602003C */ lwc1 $f2, 0x3c($s0) -/* A08A50 80241B50 C600001C */ lwc1 $f0, 0x1c($s0) -/* A08A54 80241B54 46001080 */ add.s $f2, $f2, $f0 -/* A08A58 80241B58 4616103C */ c.lt.s $f2, $f22 -/* A08A5C 80241B5C 00000000 */ nop -/* A08A60 80241B60 45020045 */ bc1fl .L80241C78 -/* A08A64 80241B64 E602003C */ swc1 $f2, 0x3c($s0) -/* A08A68 80241B68 0809071D */ j .L80241C74 -/* A08A6C 80241B6C E616003C */ swc1 $f22, 0x3c($s0) -.L80241B70: -/* A08A70 80241B70 C6000038 */ lwc1 $f0, 0x38($s0) -/* A08A74 80241B74 27A6001C */ addiu $a2, $sp, 0x1c -/* A08A78 80241B78 E7A00018 */ swc1 $f0, 0x18($sp) -/* A08A7C 80241B7C 860200A8 */ lh $v0, 0xa8($s0) -/* A08A80 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) -/* A08A84 80241B84 C604003C */ lwc1 $f4, 0x3c($s0) -/* A08A88 80241B88 44821000 */ mtc1 $v0, $f2 -/* A08A8C 80241B8C 00000000 */ nop -/* A08A90 80241B90 468010A0 */ cvt.s.w $f2, $f2 -/* A08A94 80241B94 46000005 */ abs.s $f0, $f0 -/* A08A98 80241B98 46020000 */ add.s $f0, $f0, $f2 -/* A08A9C 80241B9C C6060040 */ lwc1 $f6, 0x40($s0) -/* A08AA0 80241BA0 27A20024 */ addiu $v0, $sp, 0x24 -/* A08AA4 80241BA4 46022100 */ add.s $f4, $f4, $f2 -/* A08AA8 80241BA8 3C014024 */ lui $at, 0x4024 -/* A08AAC 80241BAC 44811800 */ mtc1 $at, $f3 -/* A08AB0 80241BB0 44801000 */ mtc1 $zero, $f2 -/* A08AB4 80241BB4 46000021 */ cvt.d.s $f0, $f0 -/* A08AB8 80241BB8 46220000 */ add.d $f0, $f0, $f2 -/* A08ABC 80241BBC E7A60020 */ swc1 $f6, 0x20($sp) -/* A08AC0 80241BC0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* A08AC4 80241BC4 46200020 */ cvt.s.d $f0, $f0 -/* A08AC8 80241BC8 E7A00024 */ swc1 $f0, 0x24($sp) -/* A08ACC 80241BCC AFA20010 */ sw $v0, 0x10($sp) -/* A08AD0 80241BD0 8E040080 */ lw $a0, 0x80($s0) -/* A08AD4 80241BD4 0C0372DF */ jal func_800DCB7C -/* A08AD8 80241BD8 27A70020 */ addiu $a3, $sp, 0x20 -/* A08ADC 80241BDC 10400015 */ beqz $v0, .L80241C34 -/* A08AE0 80241BE0 00000000 */ nop -/* A08AE4 80241BE4 860200A8 */ lh $v0, 0xa8($s0) -/* A08AE8 80241BE8 C604001C */ lwc1 $f4, 0x1c($s0) -/* A08AEC 80241BEC 44820000 */ mtc1 $v0, $f0 -/* A08AF0 80241BF0 00000000 */ nop -/* A08AF4 80241BF4 46800020 */ cvt.s.w $f0, $f0 -/* A08AF8 80241BF8 46002085 */ abs.s $f2, $f4 -/* A08AFC 80241BFC 46020000 */ add.s $f0, $f0, $f2 -/* A08B00 80241C00 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A08B04 80241C04 4600103E */ c.le.s $f2, $f0 -/* A08B08 80241C08 00000000 */ nop -/* A08B0C 80241C0C 45000005 */ bc1f .L80241C24 -/* A08B10 80241C10 00000000 */ nop -/* A08B14 80241C14 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A08B18 80241C18 AE00001C */ sw $zero, 0x1c($s0) -/* A08B1C 80241C1C 0809071E */ j .L80241C78 -/* A08B20 80241C20 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C24: -/* A08B24 80241C24 C600003C */ lwc1 $f0, 0x3c($s0) -/* A08B28 80241C28 46040000 */ add.s $f0, $f0, $f4 -/* A08B2C 80241C2C 0809071E */ j .L80241C78 -/* A08B30 80241C30 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C34: -/* A08B34 80241C34 C606003C */ lwc1 $f6, 0x3c($s0) -/* A08B38 80241C38 860200A8 */ lh $v0, 0xa8($s0) -/* A08B3C 80241C3C 46163081 */ sub.s $f2, $f6, $f22 -/* A08B40 80241C40 44820000 */ mtc1 $v0, $f0 -/* A08B44 80241C44 00000000 */ nop -/* A08B48 80241C48 46800020 */ cvt.s.w $f0, $f0 -/* A08B4C 80241C4C 46001080 */ add.s $f2, $f2, $f0 -/* A08B50 80241C50 C604001C */ lwc1 $f4, 0x1c($s0) -/* A08B54 80241C54 46002005 */ abs.s $f0, $f4 -/* A08B58 80241C58 4602003C */ c.lt.s $f0, $f2 -/* A08B5C 80241C5C 00000000 */ nop -/* A08B60 80241C60 45020005 */ bc1fl .L80241C78 -/* A08B64 80241C64 AE00001C */ sw $zero, 0x1c($s0) -/* A08B68 80241C68 46043000 */ add.s $f0, $f6, $f4 -/* A08B6C 80241C6C 0809071E */ j .L80241C78 -/* A08B70 80241C70 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C74: -/* A08B74 80241C74 AE00001C */ sw $zero, 0x1c($s0) -.L80241C78: -/* A08B78 80241C78 8FBF0038 */ lw $ra, 0x38($sp) -/* A08B7C 80241C7C 8FB30034 */ lw $s3, 0x34($sp) -/* A08B80 80241C80 8FB20030 */ lw $s2, 0x30($sp) -/* A08B84 80241C84 8FB1002C */ lw $s1, 0x2c($sp) -/* A08B88 80241C88 8FB00028 */ lw $s0, 0x28($sp) -/* A08B8C 80241C8C D7B60048 */ ldc1 $f22, 0x48($sp) -/* A08B90 80241C90 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A08B94 80241C94 03E00008 */ jr $ra -/* A08B98 80241C98 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s deleted file mode 100644 index 76bbcfbd35..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241C9C_A08B9C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C9C_A08B9C -/* A08B9C 80241C9C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A08BA0 80241CA0 AFB00028 */ sw $s0, 0x28($sp) -/* A08BA4 80241CA4 00A0802D */ daddu $s0, $a1, $zero -/* A08BA8 80241CA8 AFB1002C */ sw $s1, 0x2c($sp) -/* A08BAC 80241CAC 00C0882D */ daddu $s1, $a2, $zero -/* A08BB0 80241CB0 AFBF0034 */ sw $ra, 0x34($sp) -/* A08BB4 80241CB4 AFB20030 */ sw $s2, 0x30($sp) -/* A08BB8 80241CB8 AE200070 */ sw $zero, 0x70($s1) -/* A08BBC 80241CBC 8C830000 */ lw $v1, ($a0) -/* A08BC0 80241CC0 2402FDFF */ addiu $v0, $zero, -0x201 -/* A08BC4 80241CC4 A480008E */ sh $zero, 0x8e($a0) -/* A08BC8 80241CC8 00621824 */ and $v1, $v1, $v0 -/* A08BCC 80241CCC 34650800 */ ori $a1, $v1, 0x800 -/* A08BD0 80241CD0 AC850000 */ sw $a1, ($a0) -/* A08BD4 80241CD4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A08BD8 80241CD8 8C420034 */ lw $v0, 0x34($v0) -/* A08BDC 80241CDC 10400003 */ beqz $v0, .L80241CEC -/* A08BE0 80241CE0 00E0902D */ daddu $s2, $a3, $zero -/* A08BE4 80241CE4 0809073D */ j .L80241CF4 -/* A08BE8 80241CE8 34620808 */ ori $v0, $v1, 0x808 -.L80241CEC: -/* A08BEC 80241CEC 2402FFF7 */ addiu $v0, $zero, -9 -/* A08BF0 80241CF0 00A21024 */ and $v0, $a1, $v0 -.L80241CF4: -/* A08BF4 80241CF4 AC820000 */ sw $v0, ($a0) -/* A08BF8 80241CF8 27A20024 */ addiu $v0, $sp, 0x24 -/* A08BFC 80241CFC 27A50018 */ addiu $a1, $sp, 0x18 -/* A08C00 80241D00 C4800038 */ lwc1 $f0, 0x38($a0) -/* A08C04 80241D04 C482003C */ lwc1 $f2, 0x3c($a0) -/* A08C08 80241D08 C4840040 */ lwc1 $f4, 0x40($a0) -/* A08C0C 80241D0C 3C01447A */ lui $at, 0x447a -/* A08C10 80241D10 44813000 */ mtc1 $at, $f6 -/* A08C14 80241D14 27A6001C */ addiu $a2, $sp, 0x1c -/* A08C18 80241D18 E7A00018 */ swc1 $f0, 0x18($sp) -/* A08C1C 80241D1C E7A2001C */ swc1 $f2, 0x1c($sp) -/* A08C20 80241D20 E7A40020 */ swc1 $f4, 0x20($sp) -/* A08C24 80241D24 E7A60024 */ swc1 $f6, 0x24($sp) -/* A08C28 80241D28 AFA20010 */ sw $v0, 0x10($sp) -/* A08C2C 80241D2C 8C840080 */ lw $a0, 0x80($a0) -/* A08C30 80241D30 0C0372DF */ jal func_800DCB7C -/* A08C34 80241D34 27A70020 */ addiu $a3, $sp, 0x20 -/* A08C38 80241D38 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A08C3C 80241D3C 3C014059 */ lui $at, 0x4059 -/* A08C40 80241D40 44812800 */ mtc1 $at, $f5 -/* A08C44 80241D44 44802000 */ mtc1 $zero, $f4 -/* A08C48 80241D48 460010A1 */ cvt.d.s $f2, $f2 -/* A08C4C 80241D4C 46241082 */ mul.d $f2, $f2, $f4 -/* A08C50 80241D50 00000000 */ nop -/* A08C54 80241D54 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A08C58 80241D58 46000021 */ cvt.d.s $f0, $f0 -/* A08C5C 80241D5C 46240002 */ mul.d $f0, $f0, $f4 -/* A08C60 80241D60 00000000 */ nop -/* A08C64 80241D64 3C013FE0 */ lui $at, 0x3fe0 -/* A08C68 80241D68 44812800 */ mtc1 $at, $f5 -/* A08C6C 80241D6C 44802000 */ mtc1 $zero, $f4 -/* A08C70 80241D70 00000000 */ nop -/* A08C74 80241D74 46241080 */ add.d $f2, $f2, $f4 -/* A08C78 80241D78 AE000074 */ sw $zero, 0x74($s0) -/* A08C7C 80241D7C 46240000 */ add.d $f0, $f0, $f4 -/* A08C80 80241D80 AE000090 */ sw $zero, 0x90($s0) -/* A08C84 80241D84 4620120D */ trunc.w.d $f8, $f2 -/* A08C88 80241D88 E6080078 */ swc1 $f8, 0x78($s0) -/* A08C8C 80241D8C 4620020D */ trunc.w.d $f8, $f0 -/* A08C90 80241D90 E6080088 */ swc1 $f8, 0x88($s0) -/* A08C94 80241D94 8E420014 */ lw $v0, 0x14($s2) -/* A08C98 80241D98 AE220074 */ sw $v0, 0x74($s1) -/* A08C9C 80241D9C 8E0200B0 */ lw $v0, 0xb0($s0) -/* A08CA0 80241DA0 34420010 */ ori $v0, $v0, 0x10 -/* A08CA4 80241DA4 AE0200B0 */ sw $v0, 0xb0($s0) -/* A08CA8 80241DA8 8FBF0034 */ lw $ra, 0x34($sp) -/* A08CAC 80241DAC 8FB20030 */ lw $s2, 0x30($sp) -/* A08CB0 80241DB0 8FB1002C */ lw $s1, 0x2c($sp) -/* A08CB4 80241DB4 8FB00028 */ lw $s0, 0x28($sp) -/* A08CB8 80241DB8 03E00008 */ jr $ra -/* A08CBC 80241DBC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index b26843fe11..a89ece12cc 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -46,7 +46,7 @@ glabel func_80241DC0_A08CC0 /* A08D64 80241E64 02A0202D */ daddu $a0, $s5, $zero /* A08D68 80241E68 0240282D */ daddu $a1, $s2, $zero /* A08D6C 80241E6C 0280302D */ daddu $a2, $s4, $zero -/* A08D70 80241E70 0C090727 */ jal func_80241C9C_A08B9C +/* A08D70 80241E70 0C090727 */ jal nok_15_UnkFunc5 /* A08D74 80241E74 0200382D */ daddu $a3, $s0, $zero .L80241E78: /* A08D78 80241E78 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241EF4_A08DF4 glabel L80241F04_A08E04 /* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero /* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero -/* A08E0C 80241F0C 0C0904D3 */ jal func_8024134C_A0824C +/* A08E0C 80241F0C 0C0904D3 */ jal nok_15_UnkFunc4 /* A08E10 80241F10 0260302D */ daddu $a2, $s3, $zero /* A08E14 80241F14 080907E2 */ j .L80241F88 /* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241F5C_A08E5C glabel L80241F74_A08E74 /* A08E74 80241F74 0280202D */ daddu $a0, $s4, $zero /* A08E78 80241F78 0200282D */ daddu $a1, $s0, $zero -/* A08E7C 80241F7C 0C090643 */ jal func_8024190C_A0880C +/* A08E7C 80241F7C 0C090643 */ jal nok_15_UnkFunc6 /* A08E80 80241F80 0260302D */ daddu $a2, $s3, $zero glabel L80241F84_A08E84 /* A08E84 80241F84 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index b8f557ae80..9a4d1c628e 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -46,7 +46,7 @@ glabel func_802422EC_A091EC /* A09290 80242390 02A0202D */ daddu $a0, $s5, $zero /* A09294 80242394 0240282D */ daddu $a1, $s2, $zero /* A09298 80242398 0260302D */ daddu $a2, $s3, $zero -/* A0929C 8024239C 0C090727 */ jal func_80241C9C_A08B9C +/* A0929C 8024239C 0C090727 */ jal nok_15_UnkFunc5 /* A092A0 802423A0 0200382D */ daddu $a3, $s0, $zero /* A092A4 802423A4 86A200A8 */ lh $v0, 0xa8($s5) /* A092A8 802423A8 AE42008C */ sw $v0, 0x8c($s2) @@ -96,7 +96,7 @@ glabel L80242434_A09334 glabel L80242444_A09344 /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero /* A09348 80242448 0200282D */ daddu $a1, $s0, $zero -/* A0934C 8024244C 0C0904D3 */ jal func_8024134C_A0824C +/* A0934C 8024244C 0C0904D3 */ jal nok_15_UnkFunc4 /* A09350 80242450 0280302D */ daddu $a2, $s4, $zero /* A09354 80242454 8E630070 */ lw $v1, 0x70($s3) /* A09358 80242458 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s deleted file mode 100644 index 1577d7a741..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240C38_DAE038.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38_DAE038 -/* DAE038 80240C38 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DAE03C 80240C3C AFB3004C */ sw $s3, 0x4c($sp) -/* DAE040 80240C40 0080982D */ daddu $s3, $a0, $zero -/* DAE044 80240C44 AFBF0054 */ sw $ra, 0x54($sp) -/* DAE048 80240C48 AFB40050 */ sw $s4, 0x50($sp) -/* DAE04C 80240C4C AFB20048 */ sw $s2, 0x48($sp) -/* DAE050 80240C50 AFB10044 */ sw $s1, 0x44($sp) -/* DAE054 80240C54 AFB00040 */ sw $s0, 0x40($sp) -/* DAE058 80240C58 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DAE05C 80240C5C F7B80068 */ sdc1 $f24, 0x68($sp) -/* DAE060 80240C60 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DAE064 80240C64 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DAE068 80240C68 8E710148 */ lw $s1, 0x148($s3) -/* DAE06C 80240C6C 00A0902D */ daddu $s2, $a1, $zero -/* DAE070 80240C70 86240008 */ lh $a0, 8($s1) -/* DAE074 80240C74 0C00EABB */ jal get_npc_unsafe -/* DAE078 80240C78 00C0A02D */ daddu $s4, $a2, $zero -/* DAE07C 80240C7C 0040802D */ daddu $s0, $v0, $zero -/* DAE080 80240C80 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAE084 80240C84 46800020 */ cvt.s.w $f0, $f0 -/* DAE088 80240C88 46000021 */ cvt.d.s $f0, $f0 -/* DAE08C 80240C8C 3C014059 */ lui $at, 0x4059 -/* DAE090 80240C90 44811800 */ mtc1 $at, $f3 -/* DAE094 80240C94 44801000 */ mtc1 $zero, $f2 -/* DAE098 80240C98 8602008E */ lh $v0, 0x8e($s0) -/* DAE09C 80240C9C 9603008E */ lhu $v1, 0x8e($s0) -/* DAE0A0 80240CA0 46220003 */ div.d $f0, $f0, $f2 -/* DAE0A4 80240CA4 46200620 */ cvt.s.d $f24, $f0 -/* DAE0A8 80240CA8 C6200088 */ lwc1 $f0, 0x88($s1) -/* DAE0AC 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* DAE0B0 80240CB0 46000021 */ cvt.d.s $f0, $f0 -/* DAE0B4 80240CB4 46220003 */ div.d $f0, $f0, $f2 -/* DAE0B8 80240CB8 46200020 */ cvt.s.d $f0, $f0 -/* DAE0BC 80240CBC 18400003 */ blez $v0, .L80240CCC -/* DAE0C0 80240CC0 4600C680 */ add.s $f26, $f24, $f0 -/* DAE0C4 80240CC4 2462FFFF */ addiu $v0, $v1, -1 -/* DAE0C8 80240CC8 A602008E */ sh $v0, 0x8e($s0) -.L80240CCC: -/* DAE0CC 80240CCC 8E220070 */ lw $v0, 0x70($s1) -/* DAE0D0 80240CD0 18400034 */ blez $v0, .L80240DA4 -/* DAE0D4 80240CD4 00000000 */ nop -/* DAE0D8 80240CD8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DAE0DC 80240CDC 46806320 */ cvt.s.w $f12, $f12 -/* DAE0E0 80240CE0 44820000 */ mtc1 $v0, $f0 -/* DAE0E4 80240CE4 00000000 */ nop -/* DAE0E8 80240CE8 46800020 */ cvt.s.w $f0, $f0 -/* DAE0EC 80240CEC 46000021 */ cvt.d.s $f0, $f0 -/* DAE0F0 80240CF0 46220003 */ div.d $f0, $f0, $f2 -/* DAE0F4 80240CF4 0C00A8BB */ jal sin_deg -/* DAE0F8 80240CF8 462005A0 */ cvt.s.d $f22, $f0 -/* DAE0FC 80240CFC 8E020000 */ lw $v0, ($s0) -/* DAE100 80240D00 30420008 */ andi $v0, $v0, 8 -/* DAE104 80240D04 10400003 */ beqz $v0, .L80240D14 -/* DAE108 80240D08 46000506 */ mov.s $f20, $f0 -/* DAE10C 80240D0C 08090355 */ j .L80240D54 -/* DAE110 80240D10 0000102D */ daddu $v0, $zero, $zero -.L80240D14: -/* DAE114 80240D14 27A50028 */ addiu $a1, $sp, 0x28 -/* DAE118 80240D18 27A6002C */ addiu $a2, $sp, 0x2c -/* DAE11C 80240D1C C6000038 */ lwc1 $f0, 0x38($s0) -/* DAE120 80240D20 C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE124 80240D24 C6040040 */ lwc1 $f4, 0x40($s0) -/* DAE128 80240D28 3C01447A */ lui $at, 0x447a -/* DAE12C 80240D2C 44813000 */ mtc1 $at, $f6 -/* DAE130 80240D30 27A20034 */ addiu $v0, $sp, 0x34 -/* DAE134 80240D34 E7A00028 */ swc1 $f0, 0x28($sp) -/* DAE138 80240D38 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DAE13C 80240D3C E7A40030 */ swc1 $f4, 0x30($sp) -/* DAE140 80240D40 E7A60034 */ swc1 $f6, 0x34($sp) -/* DAE144 80240D44 AFA20010 */ sw $v0, 0x10($sp) -/* DAE148 80240D48 8E040080 */ lw $a0, 0x80($s0) -/* DAE14C 80240D4C 0C0372DF */ jal func_800DCB7C -/* DAE150 80240D50 27A70030 */ addiu $a3, $sp, 0x30 -.L80240D54: -/* DAE154 80240D54 10400007 */ beqz $v0, .L80240D74 -/* DAE158 80240D58 00000000 */ nop -/* DAE15C 80240D5C 4616A082 */ mul.s $f2, $f20, $f22 -/* DAE160 80240D60 00000000 */ nop -/* DAE164 80240D64 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DAE168 80240D68 46180000 */ add.s $f0, $f0, $f24 -/* DAE16C 80240D6C 08090360 */ j .L80240D80 -/* DAE170 80240D70 46020000 */ add.s $f0, $f0, $f2 -.L80240D74: -/* DAE174 80240D74 4616A002 */ mul.s $f0, $f20, $f22 -/* DAE178 80240D78 00000000 */ nop -/* DAE17C 80240D7C 4600D000 */ add.s $f0, $f26, $f0 -.L80240D80: -/* DAE180 80240D80 E600003C */ swc1 $f0, 0x3c($s0) -/* DAE184 80240D84 8E220074 */ lw $v0, 0x74($s1) -/* DAE188 80240D88 2442000A */ addiu $v0, $v0, 0xa -/* DAE18C 80240D8C 44826000 */ mtc1 $v0, $f12 -/* DAE190 80240D90 00000000 */ nop -/* DAE194 80240D94 0C00A6C9 */ jal clamp_angle -/* DAE198 80240D98 46806320 */ cvt.s.w $f12, $f12 -/* DAE19C 80240D9C 4600020D */ trunc.w.s $f8, $f0 -/* DAE1A0 80240DA0 E6280074 */ swc1 $f8, 0x74($s1) -.L80240DA4: -/* DAE1A4 80240DA4 8E220090 */ lw $v0, 0x90($s1) -/* DAE1A8 80240DA8 1C400040 */ bgtz $v0, .L80240EAC -/* DAE1AC 80240DAC 2442FFFF */ addiu $v0, $v0, -1 -/* DAE1B0 80240DB0 860200A8 */ lh $v0, 0xa8($s0) -/* DAE1B4 80240DB4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE1B8 80240DB8 44821000 */ mtc1 $v0, $f2 -/* DAE1BC 80240DBC 00000000 */ nop -/* DAE1C0 80240DC0 468010A0 */ cvt.s.w $f2, $f2 -/* DAE1C4 80240DC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE1C8 80240DC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE1CC 80240DCC 46020000 */ add.s $f0, $f0, $f2 -/* DAE1D0 80240DD0 3C014024 */ lui $at, 0x4024 -/* DAE1D4 80240DD4 44812800 */ mtc1 $at, $f5 -/* DAE1D8 80240DD8 44802000 */ mtc1 $zero, $f4 -/* DAE1DC 80240DDC C442002C */ lwc1 $f2, 0x2c($v0) -/* DAE1E0 80240DE0 46000021 */ cvt.d.s $f0, $f0 -/* DAE1E4 80240DE4 46240000 */ add.d $f0, $f0, $f4 -/* DAE1E8 80240DE8 460010A1 */ cvt.d.s $f2, $f2 -/* DAE1EC 80240DEC 4620103C */ c.lt.d $f2, $f0 -/* DAE1F0 80240DF0 00000000 */ nop -/* DAE1F4 80240DF4 4500002E */ bc1f .L80240EB0 -/* DAE1F8 80240DF8 0280202D */ daddu $a0, $s4, $zero -/* DAE1FC 80240DFC 24020001 */ addiu $v0, $zero, 1 -/* DAE200 80240E00 AFA20010 */ sw $v0, 0x10($sp) -/* DAE204 80240E04 8E460024 */ lw $a2, 0x24($s2) -/* DAE208 80240E08 8E470028 */ lw $a3, 0x28($s2) -/* DAE20C 80240E0C 0C01242D */ jal func_800490B4 -/* DAE210 80240E10 0220282D */ daddu $a1, $s1, $zero -/* DAE214 80240E14 10400026 */ beqz $v0, .L80240EB0 -/* DAE218 80240E18 0000202D */ daddu $a0, $zero, $zero -/* DAE21C 80240E1C 0200282D */ daddu $a1, $s0, $zero -/* DAE220 80240E20 0000302D */ daddu $a2, $zero, $zero -/* DAE224 80240E24 2412000C */ addiu $s2, $zero, 0xc -/* DAE228 80240E28 860300A8 */ lh $v1, 0xa8($s0) -/* DAE22C 80240E2C 3C013F80 */ lui $at, 0x3f80 -/* DAE230 80240E30 44810000 */ mtc1 $at, $f0 -/* DAE234 80240E34 3C014000 */ lui $at, 0x4000 -/* DAE238 80240E38 44811000 */ mtc1 $at, $f2 -/* DAE23C 80240E3C 3C01C1A0 */ lui $at, 0xc1a0 -/* DAE240 80240E40 44812000 */ mtc1 $at, $f4 -/* DAE244 80240E44 44834000 */ mtc1 $v1, $f8 -/* DAE248 80240E48 00000000 */ nop -/* DAE24C 80240E4C 46804220 */ cvt.s.w $f8, $f8 -/* DAE250 80240E50 44074000 */ mfc1 $a3, $f8 -/* DAE254 80240E54 27A20038 */ addiu $v0, $sp, 0x38 -/* DAE258 80240E58 AFB2001C */ sw $s2, 0x1c($sp) -/* DAE25C 80240E5C AFA20020 */ sw $v0, 0x20($sp) -/* DAE260 80240E60 E7A00010 */ swc1 $f0, 0x10($sp) -/* DAE264 80240E64 E7A20014 */ swc1 $f2, 0x14($sp) -/* DAE268 80240E68 0C01BFA4 */ jal fx_emote -/* DAE26C 80240E6C E7A40018 */ swc1 $f4, 0x18($sp) -/* DAE270 80240E70 0200202D */ daddu $a0, $s0, $zero -/* DAE274 80240E74 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DAE278 80240E78 C480003C */ lwc1 $f0, 0x3c($a0) -/* DAE27C 80240E7C 3C060020 */ lui $a2, 0x20 -/* DAE280 80240E80 0C012530 */ jal func_800494C0 -/* DAE284 80240E84 E4800064 */ swc1 $f0, 0x64($a0) -/* DAE288 80240E88 8E220018 */ lw $v0, 0x18($s1) -/* DAE28C 80240E8C 9442002A */ lhu $v0, 0x2a($v0) -/* DAE290 80240E90 30420001 */ andi $v0, $v0, 1 -/* DAE294 80240E94 10400003 */ beqz $v0, .L80240EA4 -/* DAE298 80240E98 2402000A */ addiu $v0, $zero, 0xa -/* DAE29C 80240E9C 080903D3 */ j .L80240F4C -/* DAE2A0 80240EA0 AE620070 */ sw $v0, 0x70($s3) -.L80240EA4: -/* DAE2A4 80240EA4 080903D3 */ j .L80240F4C -/* DAE2A8 80240EA8 AE720070 */ sw $s2, 0x70($s3) -.L80240EAC: -/* DAE2AC 80240EAC AE220090 */ sw $v0, 0x90($s1) -.L80240EB0: -/* DAE2B0 80240EB0 8602008C */ lh $v0, 0x8c($s0) -/* DAE2B4 80240EB4 14400025 */ bnez $v0, .L80240F4C -/* DAE2B8 80240EB8 00000000 */ nop -/* DAE2BC 80240EBC 8602008E */ lh $v0, 0x8e($s0) -/* DAE2C0 80240EC0 1C400022 */ bgtz $v0, .L80240F4C -/* DAE2C4 80240EC4 00000000 */ nop -/* DAE2C8 80240EC8 8E620074 */ lw $v0, 0x74($s3) -/* DAE2CC 80240ECC 2442FFFF */ addiu $v0, $v0, -1 -/* DAE2D0 80240ED0 1840001D */ blez $v0, .L80240F48 -/* DAE2D4 80240ED4 AE620074 */ sw $v0, 0x74($s3) -/* DAE2D8 80240ED8 8E220018 */ lw $v0, 0x18($s1) -/* DAE2DC 80240EDC 9442002A */ lhu $v0, 0x2a($v0) -/* DAE2E0 80240EE0 30420010 */ andi $v0, $v0, 0x10 -/* DAE2E4 80240EE4 14400007 */ bnez $v0, .L80240F04 -/* DAE2E8 80240EE8 00000000 */ nop -/* DAE2EC 80240EEC C600000C */ lwc1 $f0, 0xc($s0) -/* DAE2F0 80240EF0 3C014334 */ lui $at, 0x4334 -/* DAE2F4 80240EF4 44816000 */ mtc1 $at, $f12 -/* DAE2F8 80240EF8 0C00A6C9 */ jal clamp_angle -/* DAE2FC 80240EFC 460C0300 */ add.s $f12, $f0, $f12 -/* DAE300 80240F00 E600000C */ swc1 $f0, 0xc($s0) -.L80240F04: -/* DAE304 80240F04 0C00A67F */ jal rand_int -/* DAE308 80240F08 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DAE30C 80240F0C 3C032E8B */ lui $v1, 0x2e8b -/* DAE310 80240F10 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DAE314 80240F14 00430018 */ mult $v0, $v1 -/* DAE318 80240F18 00021FC3 */ sra $v1, $v0, 0x1f -/* DAE31C 80240F1C 00004010 */ mfhi $t0 -/* DAE320 80240F20 00082043 */ sra $a0, $t0, 1 -/* DAE324 80240F24 00832023 */ subu $a0, $a0, $v1 -/* DAE328 80240F28 00041840 */ sll $v1, $a0, 1 -/* DAE32C 80240F2C 00641821 */ addu $v1, $v1, $a0 -/* DAE330 80240F30 00031880 */ sll $v1, $v1, 2 -/* DAE334 80240F34 00641823 */ subu $v1, $v1, $a0 -/* DAE338 80240F38 00431023 */ subu $v0, $v0, $v1 -/* DAE33C 80240F3C 24420005 */ addiu $v0, $v0, 5 -/* DAE340 80240F40 080903D3 */ j .L80240F4C -/* DAE344 80240F44 A602008E */ sh $v0, 0x8e($s0) -.L80240F48: -/* DAE348 80240F48 AE600070 */ sw $zero, 0x70($s3) -.L80240F4C: -/* DAE34C 80240F4C 8FBF0054 */ lw $ra, 0x54($sp) -/* DAE350 80240F50 8FB40050 */ lw $s4, 0x50($sp) -/* DAE354 80240F54 8FB3004C */ lw $s3, 0x4c($sp) -/* DAE358 80240F58 8FB20048 */ lw $s2, 0x48($sp) -/* DAE35C 80240F5C 8FB10044 */ lw $s1, 0x44($sp) -/* DAE360 80240F60 8FB00040 */ lw $s0, 0x40($sp) -/* DAE364 80240F64 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DAE368 80240F68 D7B80068 */ ldc1 $f24, 0x68($sp) -/* DAE36C 80240F6C D7B60060 */ ldc1 $f22, 0x60($sp) -/* DAE370 80240F70 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DAE374 80240F74 03E00008 */ jr $ra -/* DAE378 80240F78 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s deleted file mode 100644 index 9a8ea044d2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802411F8_DAE5F8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F8_DAE5F8 -/* DAE5F8 802411F8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DAE5FC 802411FC AFB20030 */ sw $s2, 0x30($sp) -/* DAE600 80241200 0080902D */ daddu $s2, $a0, $zero -/* DAE604 80241204 AFBF0038 */ sw $ra, 0x38($sp) -/* DAE608 80241208 AFB30034 */ sw $s3, 0x34($sp) -/* DAE60C 8024120C AFB1002C */ sw $s1, 0x2c($sp) -/* DAE610 80241210 AFB00028 */ sw $s0, 0x28($sp) -/* DAE614 80241214 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DAE618 80241218 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DAE61C 8024121C 8E510148 */ lw $s1, 0x148($s2) -/* DAE620 80241220 86240008 */ lh $a0, 8($s1) -/* DAE624 80241224 0C00EABB */ jal get_npc_unsafe -/* DAE628 80241228 00A0982D */ daddu $s3, $a1, $zero -/* DAE62C 8024122C 0040802D */ daddu $s0, $v0, $zero -/* DAE630 80241230 0200202D */ daddu $a0, $s0, $zero -/* DAE634 80241234 C6220088 */ lwc1 $f2, 0x88($s1) -/* DAE638 80241238 468010A0 */ cvt.s.w $f2, $f2 -/* DAE63C 8024123C 460010A1 */ cvt.d.s $f2, $f2 -/* DAE640 80241240 C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE644 80241244 C6000014 */ lwc1 $f0, 0x14($s0) -/* DAE648 80241248 8E050018 */ lw $a1, 0x18($s0) -/* DAE64C 8024124C 46002100 */ add.s $f4, $f4, $f0 -/* DAE650 80241250 8E06000C */ lw $a2, 0xc($s0) -/* DAE654 80241254 C6200078 */ lwc1 $f0, 0x78($s1) -/* DAE658 80241258 46800020 */ cvt.s.w $f0, $f0 -/* DAE65C 8024125C E604001C */ swc1 $f4, 0x1c($s0) -/* DAE660 80241260 3C014059 */ lui $at, 0x4059 -/* DAE664 80241264 44812800 */ mtc1 $at, $f5 -/* DAE668 80241268 44802000 */ mtc1 $zero, $f4 -/* DAE66C 8024126C 46000021 */ cvt.d.s $f0, $f0 -/* DAE670 80241270 46240003 */ div.d $f0, $f0, $f4 -/* DAE674 80241274 46200520 */ cvt.s.d $f20, $f0 -/* DAE678 80241278 46241083 */ div.d $f2, $f2, $f4 -/* DAE67C 8024127C 0C00EA95 */ jal npc_move_heading -/* DAE680 80241280 462015A0 */ cvt.s.d $f22, $f2 -/* DAE684 80241284 C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE688 80241288 44801000 */ mtc1 $zero, $f2 -/* DAE68C 8024128C 44801800 */ mtc1 $zero, $f3 -/* DAE690 80241290 46002021 */ cvt.d.s $f0, $f4 -/* DAE694 80241294 4620103E */ c.le.d $f2, $f0 -/* DAE698 80241298 00000000 */ nop -/* DAE69C 8024129C 45000030 */ bc1f .L80241360 -/* DAE6A0 802412A0 00000000 */ nop -/* DAE6A4 802412A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE6A8 802412A8 46040000 */ add.s $f0, $f0, $f4 -/* DAE6AC 802412AC E600003C */ swc1 $f0, 0x3c($s0) -/* DAE6B0 802412B0 8E2200CC */ lw $v0, 0xcc($s1) -/* DAE6B4 802412B4 8C420024 */ lw $v0, 0x24($v0) -/* DAE6B8 802412B8 AE020028 */ sw $v0, 0x28($s0) -/* DAE6BC 802412BC A2200007 */ sb $zero, 7($s1) -/* DAE6C0 802412C0 8E020000 */ lw $v0, ($s0) -/* DAE6C4 802412C4 30420008 */ andi $v0, $v0, 8 -/* DAE6C8 802412C8 14400011 */ bnez $v0, .L80241310 -/* DAE6CC 802412CC 0000102D */ daddu $v0, $zero, $zero -/* DAE6D0 802412D0 27A50018 */ addiu $a1, $sp, 0x18 -/* DAE6D4 802412D4 27A6001C */ addiu $a2, $sp, 0x1c -/* DAE6D8 802412D8 C6000038 */ lwc1 $f0, 0x38($s0) -/* DAE6DC 802412DC C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE6E0 802412E0 C6040040 */ lwc1 $f4, 0x40($s0) -/* DAE6E4 802412E4 3C01447A */ lui $at, 0x447a -/* DAE6E8 802412E8 44813000 */ mtc1 $at, $f6 -/* DAE6EC 802412EC 27A20024 */ addiu $v0, $sp, 0x24 -/* DAE6F0 802412F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAE6F4 802412F4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DAE6F8 802412F8 E7A40020 */ swc1 $f4, 0x20($sp) -/* DAE6FC 802412FC E7A60024 */ swc1 $f6, 0x24($sp) -/* DAE700 80241300 AFA20010 */ sw $v0, 0x10($sp) -/* DAE704 80241304 8E040080 */ lw $a0, 0x80($s0) -/* DAE708 80241308 0C0372DF */ jal func_800DCB7C -/* DAE70C 8024130C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241310: -/* DAE710 80241310 1040000B */ beqz $v0, .L80241340 -/* DAE714 80241314 00000000 */ nop -/* DAE718 80241318 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DAE71C 8024131C 46140080 */ add.s $f2, $f0, $f20 -/* DAE720 80241320 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE724 80241324 4600103E */ c.le.s $f2, $f0 -/* DAE728 80241328 00000000 */ nop -/* DAE72C 8024132C 4500008D */ bc1f .L80241564 -/* DAE730 80241330 00000000 */ nop -/* DAE734 80241334 E602003C */ swc1 $f2, 0x3c($s0) -/* DAE738 80241338 08090559 */ j .L80241564 -/* DAE73C 8024133C AE400070 */ sw $zero, 0x70($s2) -.L80241340: -/* DAE740 80241340 C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE744 80241344 C6000064 */ lwc1 $f0, 0x64($s0) -/* DAE748 80241348 4602003E */ c.le.s $f0, $f2 -/* DAE74C 8024134C 00000000 */ nop -/* DAE750 80241350 45030084 */ bc1tl .L80241564 -/* DAE754 80241354 AE400070 */ sw $zero, 0x70($s2) -/* DAE758 80241358 08090559 */ j .L80241564 -/* DAE75C 8024135C 00000000 */ nop -.L80241360: -/* DAE760 80241360 4622003C */ c.lt.d $f0, $f2 -/* DAE764 80241364 00000000 */ nop -/* DAE768 80241368 4500007E */ bc1f .L80241564 -/* DAE76C 8024136C 00000000 */ nop -/* DAE770 80241370 9602008E */ lhu $v0, 0x8e($s0) -/* DAE774 80241374 24420001 */ addiu $v0, $v0, 1 -/* DAE778 80241378 A602008E */ sh $v0, 0x8e($s0) -/* DAE77C 8024137C 00021400 */ sll $v0, $v0, 0x10 -/* DAE780 80241380 8E630020 */ lw $v1, 0x20($s3) -/* DAE784 80241384 00021403 */ sra $v0, $v0, 0x10 -/* DAE788 80241388 0043102A */ slt $v0, $v0, $v1 -/* DAE78C 8024138C 14400026 */ bnez $v0, .L80241428 -/* DAE790 80241390 00000000 */ nop -/* DAE794 80241394 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DAE798 80241398 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DAE79C 8024139C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DAE7A0 802413A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DAE7A4 802413A4 A600008E */ sh $zero, 0x8e($s0) -/* DAE7A8 802413A8 8C460028 */ lw $a2, 0x28($v0) -/* DAE7AC 802413AC 0C00A720 */ jal atan2 -/* DAE7B0 802413B0 8C470030 */ lw $a3, 0x30($v0) -/* DAE7B4 802413B4 46000506 */ mov.s $f20, $f0 -/* DAE7B8 802413B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* DAE7BC 802413BC 0C00A70A */ jal get_clamped_angle_diff -/* DAE7C0 802413C0 4600A386 */ mov.s $f14, $f20 -/* DAE7C4 802413C4 46000086 */ mov.s $f2, $f0 -/* DAE7C8 802413C8 8E62001C */ lw $v0, 0x1c($s3) -/* DAE7CC 802413CC 46001005 */ abs.s $f0, $f2 -/* DAE7D0 802413D0 44822000 */ mtc1 $v0, $f4 -/* DAE7D4 802413D4 00000000 */ nop -/* DAE7D8 802413D8 46802120 */ cvt.s.w $f4, $f4 -/* DAE7DC 802413DC 4600203C */ c.lt.s $f4, $f0 -/* DAE7E0 802413E0 00000000 */ nop -/* DAE7E4 802413E4 4500000D */ bc1f .L8024141C -/* DAE7E8 802413E8 00000000 */ nop -/* DAE7EC 802413EC 44800000 */ mtc1 $zero, $f0 -/* DAE7F0 802413F0 C614000C */ lwc1 $f20, 0xc($s0) -/* DAE7F4 802413F4 4600103C */ c.lt.s $f2, $f0 -/* DAE7F8 802413F8 00000000 */ nop -/* DAE7FC 802413FC 45000006 */ bc1f .L80241418 -/* DAE800 80241400 00021023 */ negu $v0, $v0 -/* DAE804 80241404 44820000 */ mtc1 $v0, $f0 -/* DAE808 80241408 00000000 */ nop -/* DAE80C 8024140C 46800020 */ cvt.s.w $f0, $f0 -/* DAE810 80241410 08090507 */ j .L8024141C -/* DAE814 80241414 4600A500 */ add.s $f20, $f20, $f0 -.L80241418: -/* DAE818 80241418 4604A500 */ add.s $f20, $f20, $f4 -.L8024141C: -/* DAE81C 8024141C 0C00A6C9 */ jal clamp_angle -/* DAE820 80241420 4600A306 */ mov.s $f12, $f20 -/* DAE824 80241424 E600000C */ swc1 $f0, 0xc($s0) -.L80241428: -/* DAE828 80241428 8E020000 */ lw $v0, ($s0) -/* DAE82C 8024142C 30420008 */ andi $v0, $v0, 8 -/* DAE830 80241430 1040000A */ beqz $v0, .L8024145C -/* DAE834 80241434 27A50018 */ addiu $a1, $sp, 0x18 -/* DAE838 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* DAE83C 8024143C C600001C */ lwc1 $f0, 0x1c($s0) -/* DAE840 80241440 46001080 */ add.s $f2, $f2, $f0 -/* DAE844 80241444 4616103C */ c.lt.s $f2, $f22 -/* DAE848 80241448 00000000 */ nop -/* DAE84C 8024144C 45020045 */ bc1fl .L80241564 -/* DAE850 80241450 E602003C */ swc1 $f2, 0x3c($s0) -/* DAE854 80241454 08090558 */ j .L80241560 -/* DAE858 80241458 E616003C */ swc1 $f22, 0x3c($s0) -.L8024145C: -/* DAE85C 8024145C C6000038 */ lwc1 $f0, 0x38($s0) -/* DAE860 80241460 27A6001C */ addiu $a2, $sp, 0x1c -/* DAE864 80241464 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAE868 80241468 860200A8 */ lh $v0, 0xa8($s0) -/* DAE86C 8024146C C600001C */ lwc1 $f0, 0x1c($s0) -/* DAE870 80241470 C604003C */ lwc1 $f4, 0x3c($s0) -/* DAE874 80241474 44821000 */ mtc1 $v0, $f2 -/* DAE878 80241478 00000000 */ nop -/* DAE87C 8024147C 468010A0 */ cvt.s.w $f2, $f2 -/* DAE880 80241480 46000005 */ abs.s $f0, $f0 -/* DAE884 80241484 46020000 */ add.s $f0, $f0, $f2 -/* DAE888 80241488 C6060040 */ lwc1 $f6, 0x40($s0) -/* DAE88C 8024148C 27A20024 */ addiu $v0, $sp, 0x24 -/* DAE890 80241490 46022100 */ add.s $f4, $f4, $f2 -/* DAE894 80241494 3C014024 */ lui $at, 0x4024 -/* DAE898 80241498 44811800 */ mtc1 $at, $f3 -/* DAE89C 8024149C 44801000 */ mtc1 $zero, $f2 -/* DAE8A0 802414A0 46000021 */ cvt.d.s $f0, $f0 -/* DAE8A4 802414A4 46220000 */ add.d $f0, $f0, $f2 -/* DAE8A8 802414A8 E7A60020 */ swc1 $f6, 0x20($sp) -/* DAE8AC 802414AC E7A4001C */ swc1 $f4, 0x1c($sp) -/* DAE8B0 802414B0 46200020 */ cvt.s.d $f0, $f0 -/* DAE8B4 802414B4 E7A00024 */ swc1 $f0, 0x24($sp) -/* DAE8B8 802414B8 AFA20010 */ sw $v0, 0x10($sp) -/* DAE8BC 802414BC 8E040080 */ lw $a0, 0x80($s0) -/* DAE8C0 802414C0 0C0372DF */ jal func_800DCB7C -/* DAE8C4 802414C4 27A70020 */ addiu $a3, $sp, 0x20 -/* DAE8C8 802414C8 10400015 */ beqz $v0, .L80241520 -/* DAE8CC 802414CC 00000000 */ nop -/* DAE8D0 802414D0 860200A8 */ lh $v0, 0xa8($s0) -/* DAE8D4 802414D4 C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE8D8 802414D8 44820000 */ mtc1 $v0, $f0 -/* DAE8DC 802414DC 00000000 */ nop -/* DAE8E0 802414E0 46800020 */ cvt.s.w $f0, $f0 -/* DAE8E4 802414E4 46002085 */ abs.s $f2, $f4 -/* DAE8E8 802414E8 46020000 */ add.s $f0, $f0, $f2 -/* DAE8EC 802414EC C7A20024 */ lwc1 $f2, 0x24($sp) -/* DAE8F0 802414F0 4600103E */ c.le.s $f2, $f0 -/* DAE8F4 802414F4 00000000 */ nop -/* DAE8F8 802414F8 45000005 */ bc1f .L80241510 -/* DAE8FC 802414FC 00000000 */ nop -/* DAE900 80241500 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DAE904 80241504 AE00001C */ sw $zero, 0x1c($s0) -/* DAE908 80241508 08090559 */ j .L80241564 -/* DAE90C 8024150C E600003C */ swc1 $f0, 0x3c($s0) -.L80241510: -/* DAE910 80241510 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAE914 80241514 46040000 */ add.s $f0, $f0, $f4 -/* DAE918 80241518 08090559 */ j .L80241564 -/* DAE91C 8024151C E600003C */ swc1 $f0, 0x3c($s0) -.L80241520: -/* DAE920 80241520 C606003C */ lwc1 $f6, 0x3c($s0) -/* DAE924 80241524 860200A8 */ lh $v0, 0xa8($s0) -/* DAE928 80241528 46163081 */ sub.s $f2, $f6, $f22 -/* DAE92C 8024152C 44820000 */ mtc1 $v0, $f0 -/* DAE930 80241530 00000000 */ nop -/* DAE934 80241534 46800020 */ cvt.s.w $f0, $f0 -/* DAE938 80241538 46001080 */ add.s $f2, $f2, $f0 -/* DAE93C 8024153C C604001C */ lwc1 $f4, 0x1c($s0) -/* DAE940 80241540 46002005 */ abs.s $f0, $f4 -/* DAE944 80241544 4602003C */ c.lt.s $f0, $f2 -/* DAE948 80241548 00000000 */ nop -/* DAE94C 8024154C 45020005 */ bc1fl .L80241564 -/* DAE950 80241550 AE00001C */ sw $zero, 0x1c($s0) -/* DAE954 80241554 46043000 */ add.s $f0, $f6, $f4 -/* DAE958 80241558 08090559 */ j .L80241564 -/* DAE95C 8024155C E600003C */ swc1 $f0, 0x3c($s0) -.L80241560: -/* DAE960 80241560 AE00001C */ sw $zero, 0x1c($s0) -.L80241564: -/* DAE964 80241564 8FBF0038 */ lw $ra, 0x38($sp) -/* DAE968 80241568 8FB30034 */ lw $s3, 0x34($sp) -/* DAE96C 8024156C 8FB20030 */ lw $s2, 0x30($sp) -/* DAE970 80241570 8FB1002C */ lw $s1, 0x2c($sp) -/* DAE974 80241574 8FB00028 */ lw $s0, 0x28($sp) -/* DAE978 80241578 D7B60048 */ ldc1 $f22, 0x48($sp) -/* DAE97C 8024157C D7B40040 */ ldc1 $f20, 0x40($sp) -/* DAE980 80241580 03E00008 */ jr $ra -/* DAE984 80241584 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s deleted file mode 100644 index 8b6e67f7f9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241588_DAE988.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241588_DAE988 -/* DAE988 80241588 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DAE98C 8024158C AFB00028 */ sw $s0, 0x28($sp) -/* DAE990 80241590 00A0802D */ daddu $s0, $a1, $zero -/* DAE994 80241594 AFB1002C */ sw $s1, 0x2c($sp) -/* DAE998 80241598 00C0882D */ daddu $s1, $a2, $zero -/* DAE99C 8024159C AFBF0034 */ sw $ra, 0x34($sp) -/* DAE9A0 802415A0 AFB20030 */ sw $s2, 0x30($sp) -/* DAE9A4 802415A4 AE200070 */ sw $zero, 0x70($s1) -/* DAE9A8 802415A8 8C830000 */ lw $v1, ($a0) -/* DAE9AC 802415AC 2402FDFF */ addiu $v0, $zero, -0x201 -/* DAE9B0 802415B0 A480008E */ sh $zero, 0x8e($a0) -/* DAE9B4 802415B4 00621824 */ and $v1, $v1, $v0 -/* DAE9B8 802415B8 34650800 */ ori $a1, $v1, 0x800 -/* DAE9BC 802415BC AC850000 */ sw $a1, ($a0) -/* DAE9C0 802415C0 8E0200D0 */ lw $v0, 0xd0($s0) -/* DAE9C4 802415C4 8C420034 */ lw $v0, 0x34($v0) -/* DAE9C8 802415C8 10400003 */ beqz $v0, .L802415D8 -/* DAE9CC 802415CC 00E0902D */ daddu $s2, $a3, $zero -/* DAE9D0 802415D0 08090578 */ j .L802415E0 -/* DAE9D4 802415D4 34620808 */ ori $v0, $v1, 0x808 -.L802415D8: -/* DAE9D8 802415D8 2402FFF7 */ addiu $v0, $zero, -9 -/* DAE9DC 802415DC 00A21024 */ and $v0, $a1, $v0 -.L802415E0: -/* DAE9E0 802415E0 AC820000 */ sw $v0, ($a0) -/* DAE9E4 802415E4 27A20024 */ addiu $v0, $sp, 0x24 -/* DAE9E8 802415E8 27A50018 */ addiu $a1, $sp, 0x18 -/* DAE9EC 802415EC C4800038 */ lwc1 $f0, 0x38($a0) -/* DAE9F0 802415F0 C482003C */ lwc1 $f2, 0x3c($a0) -/* DAE9F4 802415F4 C4840040 */ lwc1 $f4, 0x40($a0) -/* DAE9F8 802415F8 3C01447A */ lui $at, 0x447a -/* DAE9FC 802415FC 44813000 */ mtc1 $at, $f6 -/* DAEA00 80241600 27A6001C */ addiu $a2, $sp, 0x1c -/* DAEA04 80241604 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAEA08 80241608 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DAEA0C 8024160C E7A40020 */ swc1 $f4, 0x20($sp) -/* DAEA10 80241610 E7A60024 */ swc1 $f6, 0x24($sp) -/* DAEA14 80241614 AFA20010 */ sw $v0, 0x10($sp) -/* DAEA18 80241618 8C840080 */ lw $a0, 0x80($a0) -/* DAEA1C 8024161C 0C0372DF */ jal func_800DCB7C -/* DAEA20 80241620 27A70020 */ addiu $a3, $sp, 0x20 -/* DAEA24 80241624 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DAEA28 80241628 3C014059 */ lui $at, 0x4059 -/* DAEA2C 8024162C 44812800 */ mtc1 $at, $f5 -/* DAEA30 80241630 44802000 */ mtc1 $zero, $f4 -/* DAEA34 80241634 460010A1 */ cvt.d.s $f2, $f2 -/* DAEA38 80241638 46241082 */ mul.d $f2, $f2, $f4 -/* DAEA3C 8024163C 00000000 */ nop -/* DAEA40 80241640 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DAEA44 80241644 46000021 */ cvt.d.s $f0, $f0 -/* DAEA48 80241648 46240002 */ mul.d $f0, $f0, $f4 -/* DAEA4C 8024164C 00000000 */ nop -/* DAEA50 80241650 3C013FE0 */ lui $at, 0x3fe0 -/* DAEA54 80241654 44812800 */ mtc1 $at, $f5 -/* DAEA58 80241658 44802000 */ mtc1 $zero, $f4 -/* DAEA5C 8024165C 00000000 */ nop -/* DAEA60 80241660 46241080 */ add.d $f2, $f2, $f4 -/* DAEA64 80241664 AE000074 */ sw $zero, 0x74($s0) -/* DAEA68 80241668 46240000 */ add.d $f0, $f0, $f4 -/* DAEA6C 8024166C AE000090 */ sw $zero, 0x90($s0) -/* DAEA70 80241670 4620120D */ trunc.w.d $f8, $f2 -/* DAEA74 80241674 E6080078 */ swc1 $f8, 0x78($s0) -/* DAEA78 80241678 4620020D */ trunc.w.d $f8, $f0 -/* DAEA7C 8024167C E6080088 */ swc1 $f8, 0x88($s0) -/* DAEA80 80241680 8E420014 */ lw $v0, 0x14($s2) -/* DAEA84 80241684 AE220074 */ sw $v0, 0x74($s1) -/* DAEA88 80241688 8E0200B0 */ lw $v0, 0xb0($s0) -/* DAEA8C 8024168C 34420010 */ ori $v0, $v0, 0x10 -/* DAEA90 80241690 AE0200B0 */ sw $v0, 0xb0($s0) -/* DAEA94 80241694 8FBF0034 */ lw $ra, 0x34($sp) -/* DAEA98 80241698 8FB20030 */ lw $s2, 0x30($sp) -/* DAEA9C 8024169C 8FB1002C */ lw $s1, 0x2c($sp) -/* DAEAA0 802416A0 8FB00028 */ lw $s0, 0x28($sp) -/* DAEAA4 802416A4 03E00008 */ jr $ra -/* DAEAA8 802416A8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index 3539bae3ae..287d9b9b98 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -46,7 +46,7 @@ glabel func_802416AC_DAEAAC /* DAEB50 80241750 02A0202D */ daddu $a0, $s5, $zero /* DAEB54 80241754 0240282D */ daddu $a1, $s2, $zero /* DAEB58 80241758 0280302D */ daddu $a2, $s4, $zero -/* DAEB5C 8024175C 0C090562 */ jal func_80241588_DAE988 +/* DAEB5C 8024175C 0C090562 */ jal omo_04_UnkFunc5 /* DAEB60 80241760 0200382D */ daddu $a3, $s0, $zero .L80241764: /* DAEB64 80241764 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L802417E0_DAEBE0 glabel L802417F0_DAEBF0 /* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero /* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero -/* DAEBF8 802417F8 0C09030E */ jal func_80240C38_DAE038 +/* DAEBF8 802417F8 0C09030E */ jal omo_04_UnkFunc4 /* DAEBFC 802417FC 0260302D */ daddu $a2, $s3, $zero /* DAEC00 80241800 0809061D */ j .L80241874 /* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241848_DAEC48 glabel L80241860_DAEC60 /* DAEC60 80241860 0280202D */ daddu $a0, $s4, $zero /* DAEC64 80241864 0200282D */ daddu $a1, $s0, $zero -/* DAEC68 80241868 0C09047E */ jal func_802411F8_DAE5F8 +/* DAEC68 80241868 0C09047E */ jal omo_04_UnkFunc6 /* DAEC6C 8024186C 0260302D */ daddu $a2, $s3, $zero glabel L80241870_DAEC70 /* DAEC70 80241870 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s deleted file mode 100644 index d963a0dcdb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802412EC_DB35AC.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412EC_DB35AC -/* DB35AC 802412EC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DB35B0 802412F0 AFB3004C */ sw $s3, 0x4c($sp) -/* DB35B4 802412F4 0080982D */ daddu $s3, $a0, $zero -/* DB35B8 802412F8 AFBF0054 */ sw $ra, 0x54($sp) -/* DB35BC 802412FC AFB40050 */ sw $s4, 0x50($sp) -/* DB35C0 80241300 AFB20048 */ sw $s2, 0x48($sp) -/* DB35C4 80241304 AFB10044 */ sw $s1, 0x44($sp) -/* DB35C8 80241308 AFB00040 */ sw $s0, 0x40($sp) -/* DB35CC 8024130C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DB35D0 80241310 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DB35D4 80241314 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DB35D8 80241318 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DB35DC 8024131C 8E710148 */ lw $s1, 0x148($s3) -/* DB35E0 80241320 00A0902D */ daddu $s2, $a1, $zero -/* DB35E4 80241324 86240008 */ lh $a0, 8($s1) -/* DB35E8 80241328 0C00EABB */ jal get_npc_unsafe -/* DB35EC 8024132C 00C0A02D */ daddu $s4, $a2, $zero -/* DB35F0 80241330 0040802D */ daddu $s0, $v0, $zero -/* DB35F4 80241334 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB35F8 80241338 46800020 */ cvt.s.w $f0, $f0 -/* DB35FC 8024133C 46000021 */ cvt.d.s $f0, $f0 -/* DB3600 80241340 3C014059 */ lui $at, 0x4059 -/* DB3604 80241344 44811800 */ mtc1 $at, $f3 -/* DB3608 80241348 44801000 */ mtc1 $zero, $f2 -/* DB360C 8024134C 8602008E */ lh $v0, 0x8e($s0) -/* DB3610 80241350 9603008E */ lhu $v1, 0x8e($s0) -/* DB3614 80241354 46220003 */ div.d $f0, $f0, $f2 -/* DB3618 80241358 46200620 */ cvt.s.d $f24, $f0 -/* DB361C 8024135C C6200088 */ lwc1 $f0, 0x88($s1) -/* DB3620 80241360 46800020 */ cvt.s.w $f0, $f0 -/* DB3624 80241364 46000021 */ cvt.d.s $f0, $f0 -/* DB3628 80241368 46220003 */ div.d $f0, $f0, $f2 -/* DB362C 8024136C 46200020 */ cvt.s.d $f0, $f0 -/* DB3630 80241370 18400003 */ blez $v0, .L80241380 -/* DB3634 80241374 4600C680 */ add.s $f26, $f24, $f0 -/* DB3638 80241378 2462FFFF */ addiu $v0, $v1, -1 -/* DB363C 8024137C A602008E */ sh $v0, 0x8e($s0) -.L80241380: -/* DB3640 80241380 8E220070 */ lw $v0, 0x70($s1) -/* DB3644 80241384 18400034 */ blez $v0, .L80241458 -/* DB3648 80241388 00000000 */ nop -/* DB364C 8024138C C62C0074 */ lwc1 $f12, 0x74($s1) -/* DB3650 80241390 46806320 */ cvt.s.w $f12, $f12 -/* DB3654 80241394 44820000 */ mtc1 $v0, $f0 -/* DB3658 80241398 00000000 */ nop -/* DB365C 8024139C 46800020 */ cvt.s.w $f0, $f0 -/* DB3660 802413A0 46000021 */ cvt.d.s $f0, $f0 -/* DB3664 802413A4 46220003 */ div.d $f0, $f0, $f2 -/* DB3668 802413A8 0C00A8BB */ jal sin_deg -/* DB366C 802413AC 462005A0 */ cvt.s.d $f22, $f0 -/* DB3670 802413B0 8E020000 */ lw $v0, ($s0) -/* DB3674 802413B4 30420008 */ andi $v0, $v0, 8 -/* DB3678 802413B8 10400003 */ beqz $v0, .L802413C8 -/* DB367C 802413BC 46000506 */ mov.s $f20, $f0 -/* DB3680 802413C0 08090502 */ j .L80241408 -/* DB3684 802413C4 0000102D */ daddu $v0, $zero, $zero -.L802413C8: -/* DB3688 802413C8 27A50028 */ addiu $a1, $sp, 0x28 -/* DB368C 802413CC 27A6002C */ addiu $a2, $sp, 0x2c -/* DB3690 802413D0 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3694 802413D4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3698 802413D8 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB369C 802413DC 3C01447A */ lui $at, 0x447a -/* DB36A0 802413E0 44813000 */ mtc1 $at, $f6 -/* DB36A4 802413E4 27A20034 */ addiu $v0, $sp, 0x34 -/* DB36A8 802413E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB36AC 802413EC E7A2002C */ swc1 $f2, 0x2c($sp) -/* DB36B0 802413F0 E7A40030 */ swc1 $f4, 0x30($sp) -/* DB36B4 802413F4 E7A60034 */ swc1 $f6, 0x34($sp) -/* DB36B8 802413F8 AFA20010 */ sw $v0, 0x10($sp) -/* DB36BC 802413FC 8E040080 */ lw $a0, 0x80($s0) -/* DB36C0 80241400 0C0372DF */ jal func_800DCB7C -/* DB36C4 80241404 27A70030 */ addiu $a3, $sp, 0x30 -.L80241408: -/* DB36C8 80241408 10400007 */ beqz $v0, .L80241428 -/* DB36CC 8024140C 00000000 */ nop -/* DB36D0 80241410 4616A082 */ mul.s $f2, $f20, $f22 -/* DB36D4 80241414 00000000 */ nop -/* DB36D8 80241418 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DB36DC 8024141C 46180000 */ add.s $f0, $f0, $f24 -/* DB36E0 80241420 0809050D */ j .L80241434 -/* DB36E4 80241424 46020000 */ add.s $f0, $f0, $f2 -.L80241428: -/* DB36E8 80241428 4616A002 */ mul.s $f0, $f20, $f22 -/* DB36EC 8024142C 00000000 */ nop -/* DB36F0 80241430 4600D000 */ add.s $f0, $f26, $f0 -.L80241434: -/* DB36F4 80241434 E600003C */ swc1 $f0, 0x3c($s0) -/* DB36F8 80241438 8E220074 */ lw $v0, 0x74($s1) -/* DB36FC 8024143C 2442000A */ addiu $v0, $v0, 0xa -/* DB3700 80241440 44826000 */ mtc1 $v0, $f12 -/* DB3704 80241444 00000000 */ nop -/* DB3708 80241448 0C00A6C9 */ jal clamp_angle -/* DB370C 8024144C 46806320 */ cvt.s.w $f12, $f12 -/* DB3710 80241450 4600020D */ trunc.w.s $f8, $f0 -/* DB3714 80241454 E6280074 */ swc1 $f8, 0x74($s1) -.L80241458: -/* DB3718 80241458 8E220090 */ lw $v0, 0x90($s1) -/* DB371C 8024145C 1C400040 */ bgtz $v0, .L80241560 -/* DB3720 80241460 2442FFFF */ addiu $v0, $v0, -1 -/* DB3724 80241464 860200A8 */ lh $v0, 0xa8($s0) -/* DB3728 80241468 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB372C 8024146C 44821000 */ mtc1 $v0, $f2 -/* DB3730 80241470 00000000 */ nop -/* DB3734 80241474 468010A0 */ cvt.s.w $f2, $f2 -/* DB3738 80241478 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB373C 8024147C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3740 80241480 46020000 */ add.s $f0, $f0, $f2 -/* DB3744 80241484 3C014024 */ lui $at, 0x4024 -/* DB3748 80241488 44812800 */ mtc1 $at, $f5 -/* DB374C 8024148C 44802000 */ mtc1 $zero, $f4 -/* DB3750 80241490 C442002C */ lwc1 $f2, 0x2c($v0) -/* DB3754 80241494 46000021 */ cvt.d.s $f0, $f0 -/* DB3758 80241498 46240000 */ add.d $f0, $f0, $f4 -/* DB375C 8024149C 460010A1 */ cvt.d.s $f2, $f2 -/* DB3760 802414A0 4620103C */ c.lt.d $f2, $f0 -/* DB3764 802414A4 00000000 */ nop -/* DB3768 802414A8 4500002E */ bc1f .L80241564 -/* DB376C 802414AC 0280202D */ daddu $a0, $s4, $zero -/* DB3770 802414B0 24020001 */ addiu $v0, $zero, 1 -/* DB3774 802414B4 AFA20010 */ sw $v0, 0x10($sp) -/* DB3778 802414B8 8E460024 */ lw $a2, 0x24($s2) -/* DB377C 802414BC 8E470028 */ lw $a3, 0x28($s2) -/* DB3780 802414C0 0C01242D */ jal func_800490B4 -/* DB3784 802414C4 0220282D */ daddu $a1, $s1, $zero -/* DB3788 802414C8 10400026 */ beqz $v0, .L80241564 -/* DB378C 802414CC 0000202D */ daddu $a0, $zero, $zero -/* DB3790 802414D0 0200282D */ daddu $a1, $s0, $zero -/* DB3794 802414D4 0000302D */ daddu $a2, $zero, $zero -/* DB3798 802414D8 2412000C */ addiu $s2, $zero, 0xc -/* DB379C 802414DC 860300A8 */ lh $v1, 0xa8($s0) -/* DB37A0 802414E0 3C013F80 */ lui $at, 0x3f80 -/* DB37A4 802414E4 44810000 */ mtc1 $at, $f0 -/* DB37A8 802414E8 3C014000 */ lui $at, 0x4000 -/* DB37AC 802414EC 44811000 */ mtc1 $at, $f2 -/* DB37B0 802414F0 3C01C1A0 */ lui $at, 0xc1a0 -/* DB37B4 802414F4 44812000 */ mtc1 $at, $f4 -/* DB37B8 802414F8 44834000 */ mtc1 $v1, $f8 -/* DB37BC 802414FC 00000000 */ nop -/* DB37C0 80241500 46804220 */ cvt.s.w $f8, $f8 -/* DB37C4 80241504 44074000 */ mfc1 $a3, $f8 -/* DB37C8 80241508 27A20038 */ addiu $v0, $sp, 0x38 -/* DB37CC 8024150C AFB2001C */ sw $s2, 0x1c($sp) -/* DB37D0 80241510 AFA20020 */ sw $v0, 0x20($sp) -/* DB37D4 80241514 E7A00010 */ swc1 $f0, 0x10($sp) -/* DB37D8 80241518 E7A20014 */ swc1 $f2, 0x14($sp) -/* DB37DC 8024151C 0C01BFA4 */ jal fx_emote -/* DB37E0 80241520 E7A40018 */ swc1 $f4, 0x18($sp) -/* DB37E4 80241524 0200202D */ daddu $a0, $s0, $zero -/* DB37E8 80241528 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DB37EC 8024152C C480003C */ lwc1 $f0, 0x3c($a0) -/* DB37F0 80241530 3C060020 */ lui $a2, 0x20 -/* DB37F4 80241534 0C012530 */ jal func_800494C0 -/* DB37F8 80241538 E4800064 */ swc1 $f0, 0x64($a0) -/* DB37FC 8024153C 8E220018 */ lw $v0, 0x18($s1) -/* DB3800 80241540 9442002A */ lhu $v0, 0x2a($v0) -/* DB3804 80241544 30420001 */ andi $v0, $v0, 1 -/* DB3808 80241548 10400003 */ beqz $v0, .L80241558 -/* DB380C 8024154C 2402000A */ addiu $v0, $zero, 0xa -/* DB3810 80241550 08090580 */ j .L80241600 -/* DB3814 80241554 AE620070 */ sw $v0, 0x70($s3) -.L80241558: -/* DB3818 80241558 08090580 */ j .L80241600 -/* DB381C 8024155C AE720070 */ sw $s2, 0x70($s3) -.L80241560: -/* DB3820 80241560 AE220090 */ sw $v0, 0x90($s1) -.L80241564: -/* DB3824 80241564 8602008C */ lh $v0, 0x8c($s0) -/* DB3828 80241568 14400025 */ bnez $v0, .L80241600 -/* DB382C 8024156C 00000000 */ nop -/* DB3830 80241570 8602008E */ lh $v0, 0x8e($s0) -/* DB3834 80241574 1C400022 */ bgtz $v0, .L80241600 -/* DB3838 80241578 00000000 */ nop -/* DB383C 8024157C 8E620074 */ lw $v0, 0x74($s3) -/* DB3840 80241580 2442FFFF */ addiu $v0, $v0, -1 -/* DB3844 80241584 1840001D */ blez $v0, .L802415FC -/* DB3848 80241588 AE620074 */ sw $v0, 0x74($s3) -/* DB384C 8024158C 8E220018 */ lw $v0, 0x18($s1) -/* DB3850 80241590 9442002A */ lhu $v0, 0x2a($v0) -/* DB3854 80241594 30420010 */ andi $v0, $v0, 0x10 -/* DB3858 80241598 14400007 */ bnez $v0, .L802415B8 -/* DB385C 8024159C 00000000 */ nop -/* DB3860 802415A0 C600000C */ lwc1 $f0, 0xc($s0) -/* DB3864 802415A4 3C014334 */ lui $at, 0x4334 -/* DB3868 802415A8 44816000 */ mtc1 $at, $f12 -/* DB386C 802415AC 0C00A6C9 */ jal clamp_angle -/* DB3870 802415B0 460C0300 */ add.s $f12, $f0, $f12 -/* DB3874 802415B4 E600000C */ swc1 $f0, 0xc($s0) -.L802415B8: -/* DB3878 802415B8 0C00A67F */ jal rand_int -/* DB387C 802415BC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DB3880 802415C0 3C032E8B */ lui $v1, 0x2e8b -/* DB3884 802415C4 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DB3888 802415C8 00430018 */ mult $v0, $v1 -/* DB388C 802415CC 00021FC3 */ sra $v1, $v0, 0x1f -/* DB3890 802415D0 00004010 */ mfhi $t0 -/* DB3894 802415D4 00082043 */ sra $a0, $t0, 1 -/* DB3898 802415D8 00832023 */ subu $a0, $a0, $v1 -/* DB389C 802415DC 00041840 */ sll $v1, $a0, 1 -/* DB38A0 802415E0 00641821 */ addu $v1, $v1, $a0 -/* DB38A4 802415E4 00031880 */ sll $v1, $v1, 2 -/* DB38A8 802415E8 00641823 */ subu $v1, $v1, $a0 -/* DB38AC 802415EC 00431023 */ subu $v0, $v0, $v1 -/* DB38B0 802415F0 24420005 */ addiu $v0, $v0, 5 -/* DB38B4 802415F4 08090580 */ j .L80241600 -/* DB38B8 802415F8 A602008E */ sh $v0, 0x8e($s0) -.L802415FC: -/* DB38BC 802415FC AE600070 */ sw $zero, 0x70($s3) -.L80241600: -/* DB38C0 80241600 8FBF0054 */ lw $ra, 0x54($sp) -/* DB38C4 80241604 8FB40050 */ lw $s4, 0x50($sp) -/* DB38C8 80241608 8FB3004C */ lw $s3, 0x4c($sp) -/* DB38CC 8024160C 8FB20048 */ lw $s2, 0x48($sp) -/* DB38D0 80241610 8FB10044 */ lw $s1, 0x44($sp) -/* DB38D4 80241614 8FB00040 */ lw $s0, 0x40($sp) -/* DB38D8 80241618 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DB38DC 8024161C D7B80068 */ ldc1 $f24, 0x68($sp) -/* DB38E0 80241620 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DB38E4 80241624 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DB38E8 80241628 03E00008 */ jr $ra -/* DB38EC 8024162C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s deleted file mode 100644 index 8daed52250..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802418AC_DB3B6C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418AC_DB3B6C -/* DB3B6C 802418AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DB3B70 802418B0 AFB20030 */ sw $s2, 0x30($sp) -/* DB3B74 802418B4 0080902D */ daddu $s2, $a0, $zero -/* DB3B78 802418B8 AFBF0038 */ sw $ra, 0x38($sp) -/* DB3B7C 802418BC AFB30034 */ sw $s3, 0x34($sp) -/* DB3B80 802418C0 AFB1002C */ sw $s1, 0x2c($sp) -/* DB3B84 802418C4 AFB00028 */ sw $s0, 0x28($sp) -/* DB3B88 802418C8 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DB3B8C 802418CC F7B40040 */ sdc1 $f20, 0x40($sp) -/* DB3B90 802418D0 8E510148 */ lw $s1, 0x148($s2) -/* DB3B94 802418D4 86240008 */ lh $a0, 8($s1) -/* DB3B98 802418D8 0C00EABB */ jal get_npc_unsafe -/* DB3B9C 802418DC 00A0982D */ daddu $s3, $a1, $zero -/* DB3BA0 802418E0 0040802D */ daddu $s0, $v0, $zero -/* DB3BA4 802418E4 0200202D */ daddu $a0, $s0, $zero -/* DB3BA8 802418E8 C6220088 */ lwc1 $f2, 0x88($s1) -/* DB3BAC 802418EC 468010A0 */ cvt.s.w $f2, $f2 -/* DB3BB0 802418F0 460010A1 */ cvt.d.s $f2, $f2 -/* DB3BB4 802418F4 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3BB8 802418F8 C6000014 */ lwc1 $f0, 0x14($s0) -/* DB3BBC 802418FC 8E050018 */ lw $a1, 0x18($s0) -/* DB3BC0 80241900 46002100 */ add.s $f4, $f4, $f0 -/* DB3BC4 80241904 8E06000C */ lw $a2, 0xc($s0) -/* DB3BC8 80241908 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB3BCC 8024190C 46800020 */ cvt.s.w $f0, $f0 -/* DB3BD0 80241910 E604001C */ swc1 $f4, 0x1c($s0) -/* DB3BD4 80241914 3C014059 */ lui $at, 0x4059 -/* DB3BD8 80241918 44812800 */ mtc1 $at, $f5 -/* DB3BDC 8024191C 44802000 */ mtc1 $zero, $f4 -/* DB3BE0 80241920 46000021 */ cvt.d.s $f0, $f0 -/* DB3BE4 80241924 46240003 */ div.d $f0, $f0, $f4 -/* DB3BE8 80241928 46200520 */ cvt.s.d $f20, $f0 -/* DB3BEC 8024192C 46241083 */ div.d $f2, $f2, $f4 -/* DB3BF0 80241930 0C00EA95 */ jal npc_move_heading -/* DB3BF4 80241934 462015A0 */ cvt.s.d $f22, $f2 -/* DB3BF8 80241938 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3BFC 8024193C 44801000 */ mtc1 $zero, $f2 -/* DB3C00 80241940 44801800 */ mtc1 $zero, $f3 -/* DB3C04 80241944 46002021 */ cvt.d.s $f0, $f4 -/* DB3C08 80241948 4620103E */ c.le.d $f2, $f0 -/* DB3C0C 8024194C 00000000 */ nop -/* DB3C10 80241950 45000030 */ bc1f .L80241A14 -/* DB3C14 80241954 00000000 */ nop -/* DB3C18 80241958 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB3C1C 8024195C 46040000 */ add.s $f0, $f0, $f4 -/* DB3C20 80241960 E600003C */ swc1 $f0, 0x3c($s0) -/* DB3C24 80241964 8E2200CC */ lw $v0, 0xcc($s1) -/* DB3C28 80241968 8C420024 */ lw $v0, 0x24($v0) -/* DB3C2C 8024196C AE020028 */ sw $v0, 0x28($s0) -/* DB3C30 80241970 A2200007 */ sb $zero, 7($s1) -/* DB3C34 80241974 8E020000 */ lw $v0, ($s0) -/* DB3C38 80241978 30420008 */ andi $v0, $v0, 8 -/* DB3C3C 8024197C 14400011 */ bnez $v0, .L802419C4 -/* DB3C40 80241980 0000102D */ daddu $v0, $zero, $zero -/* DB3C44 80241984 27A50018 */ addiu $a1, $sp, 0x18 -/* DB3C48 80241988 27A6001C */ addiu $a2, $sp, 0x1c -/* DB3C4C 8024198C C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3C50 80241990 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3C54 80241994 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB3C58 80241998 3C01447A */ lui $at, 0x447a -/* DB3C5C 8024199C 44813000 */ mtc1 $at, $f6 -/* DB3C60 802419A0 27A20024 */ addiu $v0, $sp, 0x24 -/* DB3C64 802419A4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3C68 802419A8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DB3C6C 802419AC E7A40020 */ swc1 $f4, 0x20($sp) -/* DB3C70 802419B0 E7A60024 */ swc1 $f6, 0x24($sp) -/* DB3C74 802419B4 AFA20010 */ sw $v0, 0x10($sp) -/* DB3C78 802419B8 8E040080 */ lw $a0, 0x80($s0) -/* DB3C7C 802419BC 0C0372DF */ jal func_800DCB7C -/* DB3C80 802419C0 27A70020 */ addiu $a3, $sp, 0x20 -.L802419C4: -/* DB3C84 802419C4 1040000B */ beqz $v0, .L802419F4 -/* DB3C88 802419C8 00000000 */ nop -/* DB3C8C 802419CC C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DB3C90 802419D0 46140080 */ add.s $f2, $f0, $f20 -/* DB3C94 802419D4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB3C98 802419D8 4600103E */ c.le.s $f2, $f0 -/* DB3C9C 802419DC 00000000 */ nop -/* DB3CA0 802419E0 4500008D */ bc1f .L80241C18 -/* DB3CA4 802419E4 00000000 */ nop -/* DB3CA8 802419E8 E602003C */ swc1 $f2, 0x3c($s0) -/* DB3CAC 802419EC 08090706 */ j .L80241C18 -/* DB3CB0 802419F0 AE400070 */ sw $zero, 0x70($s2) -.L802419F4: -/* DB3CB4 802419F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3CB8 802419F8 C6000064 */ lwc1 $f0, 0x64($s0) -/* DB3CBC 802419FC 4602003E */ c.le.s $f0, $f2 -/* DB3CC0 80241A00 00000000 */ nop -/* DB3CC4 80241A04 45030084 */ bc1tl .L80241C18 -/* DB3CC8 80241A08 AE400070 */ sw $zero, 0x70($s2) -/* DB3CCC 80241A0C 08090706 */ j .L80241C18 -/* DB3CD0 80241A10 00000000 */ nop -.L80241A14: -/* DB3CD4 80241A14 4622003C */ c.lt.d $f0, $f2 -/* DB3CD8 80241A18 00000000 */ nop -/* DB3CDC 80241A1C 4500007E */ bc1f .L80241C18 -/* DB3CE0 80241A20 00000000 */ nop -/* DB3CE4 80241A24 9602008E */ lhu $v0, 0x8e($s0) -/* DB3CE8 80241A28 24420001 */ addiu $v0, $v0, 1 -/* DB3CEC 80241A2C A602008E */ sh $v0, 0x8e($s0) -/* DB3CF0 80241A30 00021400 */ sll $v0, $v0, 0x10 -/* DB3CF4 80241A34 8E630020 */ lw $v1, 0x20($s3) -/* DB3CF8 80241A38 00021403 */ sra $v0, $v0, 0x10 -/* DB3CFC 80241A3C 0043102A */ slt $v0, $v0, $v1 -/* DB3D00 80241A40 14400026 */ bnez $v0, .L80241ADC -/* DB3D04 80241A44 00000000 */ nop -/* DB3D08 80241A48 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB3D0C 80241A4C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB3D10 80241A50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB3D14 80241A54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3D18 80241A58 A600008E */ sh $zero, 0x8e($s0) -/* DB3D1C 80241A5C 8C460028 */ lw $a2, 0x28($v0) -/* DB3D20 80241A60 0C00A720 */ jal atan2 -/* DB3D24 80241A64 8C470030 */ lw $a3, 0x30($v0) -/* DB3D28 80241A68 46000506 */ mov.s $f20, $f0 -/* DB3D2C 80241A6C C60C000C */ lwc1 $f12, 0xc($s0) -/* DB3D30 80241A70 0C00A70A */ jal get_clamped_angle_diff -/* DB3D34 80241A74 4600A386 */ mov.s $f14, $f20 -/* DB3D38 80241A78 46000086 */ mov.s $f2, $f0 -/* DB3D3C 80241A7C 8E62001C */ lw $v0, 0x1c($s3) -/* DB3D40 80241A80 46001005 */ abs.s $f0, $f2 -/* DB3D44 80241A84 44822000 */ mtc1 $v0, $f4 -/* DB3D48 80241A88 00000000 */ nop -/* DB3D4C 80241A8C 46802120 */ cvt.s.w $f4, $f4 -/* DB3D50 80241A90 4600203C */ c.lt.s $f4, $f0 -/* DB3D54 80241A94 00000000 */ nop -/* DB3D58 80241A98 4500000D */ bc1f .L80241AD0 -/* DB3D5C 80241A9C 00000000 */ nop -/* DB3D60 80241AA0 44800000 */ mtc1 $zero, $f0 -/* DB3D64 80241AA4 C614000C */ lwc1 $f20, 0xc($s0) -/* DB3D68 80241AA8 4600103C */ c.lt.s $f2, $f0 -/* DB3D6C 80241AAC 00000000 */ nop -/* DB3D70 80241AB0 45000006 */ bc1f .L80241ACC -/* DB3D74 80241AB4 00021023 */ negu $v0, $v0 -/* DB3D78 80241AB8 44820000 */ mtc1 $v0, $f0 -/* DB3D7C 80241ABC 00000000 */ nop -/* DB3D80 80241AC0 46800020 */ cvt.s.w $f0, $f0 -/* DB3D84 80241AC4 080906B4 */ j .L80241AD0 -/* DB3D88 80241AC8 4600A500 */ add.s $f20, $f20, $f0 -.L80241ACC: -/* DB3D8C 80241ACC 4604A500 */ add.s $f20, $f20, $f4 -.L80241AD0: -/* DB3D90 80241AD0 0C00A6C9 */ jal clamp_angle -/* DB3D94 80241AD4 4600A306 */ mov.s $f12, $f20 -/* DB3D98 80241AD8 E600000C */ swc1 $f0, 0xc($s0) -.L80241ADC: -/* DB3D9C 80241ADC 8E020000 */ lw $v0, ($s0) -/* DB3DA0 80241AE0 30420008 */ andi $v0, $v0, 8 -/* DB3DA4 80241AE4 1040000A */ beqz $v0, .L80241B10 -/* DB3DA8 80241AE8 27A50018 */ addiu $a1, $sp, 0x18 -/* DB3DAC 80241AEC C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3DB0 80241AF0 C600001C */ lwc1 $f0, 0x1c($s0) -/* DB3DB4 80241AF4 46001080 */ add.s $f2, $f2, $f0 -/* DB3DB8 80241AF8 4616103C */ c.lt.s $f2, $f22 -/* DB3DBC 80241AFC 00000000 */ nop -/* DB3DC0 80241B00 45020045 */ bc1fl .L80241C18 -/* DB3DC4 80241B04 E602003C */ swc1 $f2, 0x3c($s0) -/* DB3DC8 80241B08 08090705 */ j .L80241C14 -/* DB3DCC 80241B0C E616003C */ swc1 $f22, 0x3c($s0) -.L80241B10: -/* DB3DD0 80241B10 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3DD4 80241B14 27A6001C */ addiu $a2, $sp, 0x1c -/* DB3DD8 80241B18 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3DDC 80241B1C 860200A8 */ lh $v0, 0xa8($s0) -/* DB3DE0 80241B20 C600001C */ lwc1 $f0, 0x1c($s0) -/* DB3DE4 80241B24 C604003C */ lwc1 $f4, 0x3c($s0) -/* DB3DE8 80241B28 44821000 */ mtc1 $v0, $f2 -/* DB3DEC 80241B2C 00000000 */ nop -/* DB3DF0 80241B30 468010A0 */ cvt.s.w $f2, $f2 -/* DB3DF4 80241B34 46000005 */ abs.s $f0, $f0 -/* DB3DF8 80241B38 46020000 */ add.s $f0, $f0, $f2 -/* DB3DFC 80241B3C C6060040 */ lwc1 $f6, 0x40($s0) -/* DB3E00 80241B40 27A20024 */ addiu $v0, $sp, 0x24 -/* DB3E04 80241B44 46022100 */ add.s $f4, $f4, $f2 -/* DB3E08 80241B48 3C014024 */ lui $at, 0x4024 -/* DB3E0C 80241B4C 44811800 */ mtc1 $at, $f3 -/* DB3E10 80241B50 44801000 */ mtc1 $zero, $f2 -/* DB3E14 80241B54 46000021 */ cvt.d.s $f0, $f0 -/* DB3E18 80241B58 46220000 */ add.d $f0, $f0, $f2 -/* DB3E1C 80241B5C E7A60020 */ swc1 $f6, 0x20($sp) -/* DB3E20 80241B60 E7A4001C */ swc1 $f4, 0x1c($sp) -/* DB3E24 80241B64 46200020 */ cvt.s.d $f0, $f0 -/* DB3E28 80241B68 E7A00024 */ swc1 $f0, 0x24($sp) -/* DB3E2C 80241B6C AFA20010 */ sw $v0, 0x10($sp) -/* DB3E30 80241B70 8E040080 */ lw $a0, 0x80($s0) -/* DB3E34 80241B74 0C0372DF */ jal func_800DCB7C -/* DB3E38 80241B78 27A70020 */ addiu $a3, $sp, 0x20 -/* DB3E3C 80241B7C 10400015 */ beqz $v0, .L80241BD4 -/* DB3E40 80241B80 00000000 */ nop -/* DB3E44 80241B84 860200A8 */ lh $v0, 0xa8($s0) -/* DB3E48 80241B88 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3E4C 80241B8C 44820000 */ mtc1 $v0, $f0 -/* DB3E50 80241B90 00000000 */ nop -/* DB3E54 80241B94 46800020 */ cvt.s.w $f0, $f0 -/* DB3E58 80241B98 46002085 */ abs.s $f2, $f4 -/* DB3E5C 80241B9C 46020000 */ add.s $f0, $f0, $f2 -/* DB3E60 80241BA0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DB3E64 80241BA4 4600103E */ c.le.s $f2, $f0 -/* DB3E68 80241BA8 00000000 */ nop -/* DB3E6C 80241BAC 45000005 */ bc1f .L80241BC4 -/* DB3E70 80241BB0 00000000 */ nop -/* DB3E74 80241BB4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DB3E78 80241BB8 AE00001C */ sw $zero, 0x1c($s0) -/* DB3E7C 80241BBC 08090706 */ j .L80241C18 -/* DB3E80 80241BC0 E600003C */ swc1 $f0, 0x3c($s0) -.L80241BC4: -/* DB3E84 80241BC4 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB3E88 80241BC8 46040000 */ add.s $f0, $f0, $f4 -/* DB3E8C 80241BCC 08090706 */ j .L80241C18 -/* DB3E90 80241BD0 E600003C */ swc1 $f0, 0x3c($s0) -.L80241BD4: -/* DB3E94 80241BD4 C606003C */ lwc1 $f6, 0x3c($s0) -/* DB3E98 80241BD8 860200A8 */ lh $v0, 0xa8($s0) -/* DB3E9C 80241BDC 46163081 */ sub.s $f2, $f6, $f22 -/* DB3EA0 80241BE0 44820000 */ mtc1 $v0, $f0 -/* DB3EA4 80241BE4 00000000 */ nop -/* DB3EA8 80241BE8 46800020 */ cvt.s.w $f0, $f0 -/* DB3EAC 80241BEC 46001080 */ add.s $f2, $f2, $f0 -/* DB3EB0 80241BF0 C604001C */ lwc1 $f4, 0x1c($s0) -/* DB3EB4 80241BF4 46002005 */ abs.s $f0, $f4 -/* DB3EB8 80241BF8 4602003C */ c.lt.s $f0, $f2 -/* DB3EBC 80241BFC 00000000 */ nop -/* DB3EC0 80241C00 45020005 */ bc1fl .L80241C18 -/* DB3EC4 80241C04 AE00001C */ sw $zero, 0x1c($s0) -/* DB3EC8 80241C08 46043000 */ add.s $f0, $f6, $f4 -/* DB3ECC 80241C0C 08090706 */ j .L80241C18 -/* DB3ED0 80241C10 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C14: -/* DB3ED4 80241C14 AE00001C */ sw $zero, 0x1c($s0) -.L80241C18: -/* DB3ED8 80241C18 8FBF0038 */ lw $ra, 0x38($sp) -/* DB3EDC 80241C1C 8FB30034 */ lw $s3, 0x34($sp) -/* DB3EE0 80241C20 8FB20030 */ lw $s2, 0x30($sp) -/* DB3EE4 80241C24 8FB1002C */ lw $s1, 0x2c($sp) -/* DB3EE8 80241C28 8FB00028 */ lw $s0, 0x28($sp) -/* DB3EEC 80241C2C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DB3EF0 80241C30 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DB3EF4 80241C34 03E00008 */ jr $ra -/* DB3EF8 80241C38 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s deleted file mode 100644 index 1476b6263e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C3C_DB3EFC -/* DB3EFC 80241C3C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB3F00 80241C40 AFB00028 */ sw $s0, 0x28($sp) -/* DB3F04 80241C44 00A0802D */ daddu $s0, $a1, $zero -/* DB3F08 80241C48 AFB1002C */ sw $s1, 0x2c($sp) -/* DB3F0C 80241C4C 00C0882D */ daddu $s1, $a2, $zero -/* DB3F10 80241C50 AFBF0034 */ sw $ra, 0x34($sp) -/* DB3F14 80241C54 AFB20030 */ sw $s2, 0x30($sp) -/* DB3F18 80241C58 AE200070 */ sw $zero, 0x70($s1) -/* DB3F1C 80241C5C 8C830000 */ lw $v1, ($a0) -/* DB3F20 80241C60 2402FDFF */ addiu $v0, $zero, -0x201 -/* DB3F24 80241C64 A480008E */ sh $zero, 0x8e($a0) -/* DB3F28 80241C68 00621824 */ and $v1, $v1, $v0 -/* DB3F2C 80241C6C 34650800 */ ori $a1, $v1, 0x800 -/* DB3F30 80241C70 AC850000 */ sw $a1, ($a0) -/* DB3F34 80241C74 8E0200D0 */ lw $v0, 0xd0($s0) -/* DB3F38 80241C78 8C420034 */ lw $v0, 0x34($v0) -/* DB3F3C 80241C7C 10400003 */ beqz $v0, .L80241C8C -/* DB3F40 80241C80 00E0902D */ daddu $s2, $a3, $zero -/* DB3F44 80241C84 08090725 */ j .L80241C94 -/* DB3F48 80241C88 34620808 */ ori $v0, $v1, 0x808 -.L80241C8C: -/* DB3F4C 80241C8C 2402FFF7 */ addiu $v0, $zero, -9 -/* DB3F50 80241C90 00A21024 */ and $v0, $a1, $v0 -.L80241C94: -/* DB3F54 80241C94 AC820000 */ sw $v0, ($a0) -/* DB3F58 80241C98 27A20024 */ addiu $v0, $sp, 0x24 -/* DB3F5C 80241C9C 27A50018 */ addiu $a1, $sp, 0x18 -/* DB3F60 80241CA0 C4800038 */ lwc1 $f0, 0x38($a0) -/* DB3F64 80241CA4 C482003C */ lwc1 $f2, 0x3c($a0) -/* DB3F68 80241CA8 C4840040 */ lwc1 $f4, 0x40($a0) -/* DB3F6C 80241CAC 3C01447A */ lui $at, 0x447a -/* DB3F70 80241CB0 44813000 */ mtc1 $at, $f6 -/* DB3F74 80241CB4 27A6001C */ addiu $a2, $sp, 0x1c -/* DB3F78 80241CB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3F7C 80241CBC E7A2001C */ swc1 $f2, 0x1c($sp) -/* DB3F80 80241CC0 E7A40020 */ swc1 $f4, 0x20($sp) -/* DB3F84 80241CC4 E7A60024 */ swc1 $f6, 0x24($sp) -/* DB3F88 80241CC8 AFA20010 */ sw $v0, 0x10($sp) -/* DB3F8C 80241CCC 8C840080 */ lw $a0, 0x80($a0) -/* DB3F90 80241CD0 0C0372DF */ jal func_800DCB7C -/* DB3F94 80241CD4 27A70020 */ addiu $a3, $sp, 0x20 -/* DB3F98 80241CD8 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DB3F9C 80241CDC 3C014059 */ lui $at, 0x4059 -/* DB3FA0 80241CE0 44812800 */ mtc1 $at, $f5 -/* DB3FA4 80241CE4 44802000 */ mtc1 $zero, $f4 -/* DB3FA8 80241CE8 460010A1 */ cvt.d.s $f2, $f2 -/* DB3FAC 80241CEC 46241082 */ mul.d $f2, $f2, $f4 -/* DB3FB0 80241CF0 00000000 */ nop -/* DB3FB4 80241CF4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DB3FB8 80241CF8 46000021 */ cvt.d.s $f0, $f0 -/* DB3FBC 80241CFC 46240002 */ mul.d $f0, $f0, $f4 -/* DB3FC0 80241D00 00000000 */ nop -/* DB3FC4 80241D04 3C013FE0 */ lui $at, 0x3fe0 -/* DB3FC8 80241D08 44812800 */ mtc1 $at, $f5 -/* DB3FCC 80241D0C 44802000 */ mtc1 $zero, $f4 -/* DB3FD0 80241D10 00000000 */ nop -/* DB3FD4 80241D14 46241080 */ add.d $f2, $f2, $f4 -/* DB3FD8 80241D18 AE000074 */ sw $zero, 0x74($s0) -/* DB3FDC 80241D1C 46240000 */ add.d $f0, $f0, $f4 -/* DB3FE0 80241D20 AE000090 */ sw $zero, 0x90($s0) -/* DB3FE4 80241D24 4620120D */ trunc.w.d $f8, $f2 -/* DB3FE8 80241D28 E6080078 */ swc1 $f8, 0x78($s0) -/* DB3FEC 80241D2C 4620020D */ trunc.w.d $f8, $f0 -/* DB3FF0 80241D30 E6080088 */ swc1 $f8, 0x88($s0) -/* DB3FF4 80241D34 8E420014 */ lw $v0, 0x14($s2) -/* DB3FF8 80241D38 AE220074 */ sw $v0, 0x74($s1) -/* DB3FFC 80241D3C 8E0200B0 */ lw $v0, 0xb0($s0) -/* DB4000 80241D40 34420010 */ ori $v0, $v0, 0x10 -/* DB4004 80241D44 AE0200B0 */ sw $v0, 0xb0($s0) -/* DB4008 80241D48 8FBF0034 */ lw $ra, 0x34($sp) -/* DB400C 80241D4C 8FB20030 */ lw $s2, 0x30($sp) -/* DB4010 80241D50 8FB1002C */ lw $s1, 0x2c($sp) -/* DB4014 80241D54 8FB00028 */ lw $s0, 0x28($sp) -/* DB4018 80241D58 03E00008 */ jr $ra -/* DB401C 80241D5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index 24c1ebc770..7115338683 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -46,7 +46,7 @@ glabel func_80241D60_DB4020 /* DB40C4 80241E04 02A0202D */ daddu $a0, $s5, $zero /* DB40C8 80241E08 0240282D */ daddu $a1, $s2, $zero /* DB40CC 80241E0C 0280302D */ daddu $a2, $s4, $zero -/* DB40D0 80241E10 0C09070F */ jal func_80241C3C_DB3EFC +/* DB40D0 80241E10 0C09070F */ jal omo_05_UnkFunc5 /* DB40D4 80241E14 0200382D */ daddu $a3, $s0, $zero .L80241E18: /* DB40D8 80241E18 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241E94_DB4154 glabel L80241EA4_DB4164 /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero -/* DB416C 80241EAC 0C0904BB */ jal func_802412EC_DB35AC +/* DB416C 80241EAC 0C0904BB */ jal omo_05_UnkFunc4 /* DB4170 80241EB0 0260302D */ daddu $a2, $s3, $zero /* DB4174 80241EB4 080907CA */ j .L80241F28 /* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241EFC_DB41BC glabel L80241F14_DB41D4 /* DB41D4 80241F14 0280202D */ daddu $a0, $s4, $zero /* DB41D8 80241F18 0200282D */ daddu $a1, $s0, $zero -/* DB41DC 80241F1C 0C09062B */ jal func_802418AC_DB3B6C +/* DB41DC 80241F1C 0C09062B */ jal omo_05_UnkFunc6 /* DB41E0 80241F20 0260302D */ daddu $a2, $s3, $zero glabel L80241F24_DB41E4 /* DB41E4 80241F24 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s deleted file mode 100644 index 50b6a78f5c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802406C4_DBD974.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4_DBD974 -/* DBD974 802406C4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* DBD978 802406C8 AFB20038 */ sw $s2, 0x38($sp) -/* DBD97C 802406CC 0080902D */ daddu $s2, $a0, $zero -/* DBD980 802406D0 AFBF0044 */ sw $ra, 0x44($sp) -/* DBD984 802406D4 AFB40040 */ sw $s4, 0x40($sp) -/* DBD988 802406D8 AFB3003C */ sw $s3, 0x3c($sp) -/* DBD98C 802406DC AFB10034 */ sw $s1, 0x34($sp) -/* DBD990 802406E0 AFB00030 */ sw $s0, 0x30($sp) -/* DBD994 802406E4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DBD998 802406E8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DBD99C 802406EC 8E510148 */ lw $s1, 0x148($s2) -/* DBD9A0 802406F0 00A0982D */ daddu $s3, $a1, $zero -/* DBD9A4 802406F4 86240008 */ lh $a0, 8($s1) -/* DBD9A8 802406F8 0C00EABB */ jal get_npc_unsafe -/* DBD9AC 802406FC 00C0A02D */ daddu $s4, $a2, $zero -/* DBD9B0 80240700 8E630014 */ lw $v1, 0x14($s3) -/* DBD9B4 80240704 04600030 */ bltz $v1, .L802407C8 -/* DBD9B8 80240708 0040802D */ daddu $s0, $v0, $zero -/* DBD9BC 8024070C 8E420074 */ lw $v0, 0x74($s2) -/* DBD9C0 80240710 1C40002C */ bgtz $v0, .L802407C4 -/* DBD9C4 80240714 2442FFFF */ addiu $v0, $v0, -1 -/* DBD9C8 80240718 0280202D */ daddu $a0, $s4, $zero -/* DBD9CC 8024071C AE430074 */ sw $v1, 0x74($s2) -/* DBD9D0 80240720 AFA00010 */ sw $zero, 0x10($sp) -/* DBD9D4 80240724 8E66000C */ lw $a2, 0xc($s3) -/* DBD9D8 80240728 8E670010 */ lw $a3, 0x10($s3) -/* DBD9DC 8024072C 0C01242D */ jal func_800490B4 -/* DBD9E0 80240730 0220282D */ daddu $a1, $s1, $zero -/* DBD9E4 80240734 10400021 */ beqz $v0, .L802407BC -/* DBD9E8 80240738 0000202D */ daddu $a0, $zero, $zero -/* DBD9EC 8024073C 0200282D */ daddu $a1, $s0, $zero -/* DBD9F0 80240740 0000302D */ daddu $a2, $zero, $zero -/* DBD9F4 80240744 860300A8 */ lh $v1, 0xa8($s0) -/* DBD9F8 80240748 3C013F80 */ lui $at, 0x3f80 -/* DBD9FC 8024074C 44810000 */ mtc1 $at, $f0 -/* DBDA00 80240750 3C014000 */ lui $at, 0x4000 -/* DBDA04 80240754 44811000 */ mtc1 $at, $f2 -/* DBDA08 80240758 3C01C1A0 */ lui $at, 0xc1a0 -/* DBDA0C 8024075C 44812000 */ mtc1 $at, $f4 -/* DBDA10 80240760 2402000F */ addiu $v0, $zero, 0xf -/* DBDA14 80240764 AFA2001C */ sw $v0, 0x1c($sp) -/* DBDA18 80240768 44833000 */ mtc1 $v1, $f6 -/* DBDA1C 8024076C 00000000 */ nop -/* DBDA20 80240770 468031A0 */ cvt.s.w $f6, $f6 -/* DBDA24 80240774 44073000 */ mfc1 $a3, $f6 -/* DBDA28 80240778 27A20028 */ addiu $v0, $sp, 0x28 -/* DBDA2C 8024077C AFA20020 */ sw $v0, 0x20($sp) -/* DBDA30 80240780 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBDA34 80240784 E7A20014 */ swc1 $f2, 0x14($sp) -/* DBDA38 80240788 0C01BFA4 */ jal fx_emote -/* DBDA3C 8024078C E7A40018 */ swc1 $f4, 0x18($sp) -/* DBDA40 80240790 0200202D */ daddu $a0, $s0, $zero -/* DBDA44 80240794 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBDA48 80240798 0C012530 */ jal func_800494C0 -/* DBDA4C 8024079C 3C060020 */ lui $a2, 0x20 -/* DBDA50 802407A0 8E220018 */ lw $v0, 0x18($s1) -/* DBDA54 802407A4 9442002A */ lhu $v0, 0x2a($v0) -/* DBDA58 802407A8 30420001 */ andi $v0, $v0, 1 -/* DBDA5C 802407AC 14400064 */ bnez $v0, .L80240940 -/* DBDA60 802407B0 2402000A */ addiu $v0, $zero, 0xa -/* DBDA64 802407B4 08090250 */ j .L80240940 -/* DBDA68 802407B8 2402000C */ addiu $v0, $zero, 0xc -.L802407BC: -/* DBDA6C 802407BC 8E420074 */ lw $v0, 0x74($s2) -/* DBDA70 802407C0 2442FFFF */ addiu $v0, $v0, -1 -.L802407C4: -/* DBDA74 802407C4 AE420074 */ sw $v0, 0x74($s2) -.L802407C8: -/* DBDA78 802407C8 8602008C */ lh $v0, 0x8c($s0) -/* DBDA7C 802407CC 1440005D */ bnez $v0, .L80240944 -/* DBDA80 802407D0 00000000 */ nop -/* DBDA84 802407D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBDA88 802407D8 3C014010 */ lui $at, 0x4010 -/* DBDA8C 802407DC 44811800 */ mtc1 $at, $f3 -/* DBDA90 802407E0 44801000 */ mtc1 $zero, $f2 -/* DBDA94 802407E4 46000021 */ cvt.d.s $f0, $f0 -/* DBDA98 802407E8 4622003C */ c.lt.d $f0, $f2 -/* DBDA9C 802407EC 00000000 */ nop -/* DBDAA0 802407F0 45000003 */ bc1f .L80240800 -/* DBDAA4 802407F4 0200202D */ daddu $a0, $s0, $zero -/* DBDAA8 802407F8 08090201 */ j .L80240804 -/* DBDAAC 802407FC 0000282D */ daddu $a1, $zero, $zero -.L80240800: -/* DBDAB0 80240800 24050001 */ addiu $a1, $zero, 1 -.L80240804: -/* DBDAB4 80240804 0C00F598 */ jal func_8003D660 -/* DBDAB8 80240808 00000000 */ nop -/* DBDABC 8024080C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBDAC0 80240810 8E430078 */ lw $v1, 0x78($s2) -/* DBDAC4 80240814 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBDAC8 80240818 00031040 */ sll $v0, $v1, 1 -/* DBDACC 8024081C 00431021 */ addu $v0, $v0, $v1 -/* DBDAD0 80240820 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBDAD4 80240824 00021080 */ sll $v0, $v0, 2 -/* DBDAD8 80240828 00431021 */ addu $v0, $v0, $v1 -/* DBDADC 8024082C C4560004 */ lwc1 $f22, 4($v0) -/* DBDAE0 80240830 4680B5A0 */ cvt.s.w $f22, $f22 -/* DBDAE4 80240834 C454000C */ lwc1 $f20, 0xc($v0) -/* DBDAE8 80240838 4680A520 */ cvt.s.w $f20, $f20 -/* DBDAEC 8024083C 4406B000 */ mfc1 $a2, $f22 -/* DBDAF0 80240840 4407A000 */ mfc1 $a3, $f20 -/* DBDAF4 80240844 0C00A720 */ jal atan2 -/* DBDAF8 80240848 00000000 */ nop -/* DBDAFC 8024084C 8E050018 */ lw $a1, 0x18($s0) -/* DBDB00 80240850 44060000 */ mfc1 $a2, $f0 -/* DBDB04 80240854 0200202D */ daddu $a0, $s0, $zero -/* DBDB08 80240858 0C00EA95 */ jal npc_move_heading -/* DBDB0C 8024085C AE06000C */ sw $a2, 0xc($s0) -/* DBDB10 80240860 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBDB14 80240864 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBDB18 80240868 4406B000 */ mfc1 $a2, $f22 -/* DBDB1C 8024086C 4407A000 */ mfc1 $a3, $f20 -/* DBDB20 80240870 0C00A7B5 */ jal dist2D -/* DBDB24 80240874 00000000 */ nop -/* DBDB28 80240878 C6020018 */ lwc1 $f2, 0x18($s0) -/* DBDB2C 8024087C 4602003E */ c.le.s $f0, $f2 -/* DBDB30 80240880 00000000 */ nop -/* DBDB34 80240884 4500002F */ bc1f .L80240944 -/* DBDB38 80240888 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DBDB3C 8024088C 24020002 */ addiu $v0, $zero, 2 -/* DBDB40 80240890 0C00A67F */ jal rand_int -/* DBDB44 80240894 AE420070 */ sw $v0, 0x70($s2) -/* DBDB48 80240898 3C035555 */ lui $v1, 0x5555 -/* DBDB4C 8024089C 34635556 */ ori $v1, $v1, 0x5556 -/* DBDB50 802408A0 00430018 */ mult $v0, $v1 -/* DBDB54 802408A4 000227C3 */ sra $a0, $v0, 0x1f -/* DBDB58 802408A8 00004010 */ mfhi $t0 -/* DBDB5C 802408AC 01042023 */ subu $a0, $t0, $a0 -/* DBDB60 802408B0 00041840 */ sll $v1, $a0, 1 -/* DBDB64 802408B4 00641821 */ addu $v1, $v1, $a0 -/* DBDB68 802408B8 00431023 */ subu $v0, $v0, $v1 -/* DBDB6C 802408BC 24430002 */ addiu $v1, $v0, 2 -/* DBDB70 802408C0 AE430074 */ sw $v1, 0x74($s2) -/* DBDB74 802408C4 8E62002C */ lw $v0, 0x2c($s3) -/* DBDB78 802408C8 18400009 */ blez $v0, .L802408F0 -/* DBDB7C 802408CC 24020004 */ addiu $v0, $zero, 4 -/* DBDB80 802408D0 8E620004 */ lw $v0, 4($s3) -/* DBDB84 802408D4 18400006 */ blez $v0, .L802408F0 -/* DBDB88 802408D8 24020004 */ addiu $v0, $zero, 4 -/* DBDB8C 802408DC 8E620008 */ lw $v0, 8($s3) -/* DBDB90 802408E0 18400003 */ blez $v0, .L802408F0 -/* DBDB94 802408E4 24020004 */ addiu $v0, $zero, 4 -/* DBDB98 802408E8 14600002 */ bnez $v1, .L802408F4 -/* DBDB9C 802408EC 00000000 */ nop -.L802408F0: -/* DBDBA0 802408F0 AE420070 */ sw $v0, 0x70($s2) -.L802408F4: -/* DBDBA4 802408F4 0C00A67F */ jal rand_int -/* DBDBA8 802408F8 24042710 */ addiu $a0, $zero, 0x2710 -/* DBDBAC 802408FC 3C0351EB */ lui $v1, 0x51eb -/* DBDBB0 80240900 3463851F */ ori $v1, $v1, 0x851f -/* DBDBB4 80240904 00430018 */ mult $v0, $v1 -/* DBDBB8 80240908 00021FC3 */ sra $v1, $v0, 0x1f -/* DBDBBC 8024090C 00004010 */ mfhi $t0 -/* DBDBC0 80240910 00082143 */ sra $a0, $t0, 5 -/* DBDBC4 80240914 00832023 */ subu $a0, $a0, $v1 -/* DBDBC8 80240918 00041840 */ sll $v1, $a0, 1 -/* DBDBCC 8024091C 00641821 */ addu $v1, $v1, $a0 -/* DBDBD0 80240920 000318C0 */ sll $v1, $v1, 3 -/* DBDBD4 80240924 00641821 */ addu $v1, $v1, $a0 -/* DBDBD8 80240928 00031880 */ sll $v1, $v1, 2 -/* DBDBDC 8024092C 8E640004 */ lw $a0, 4($s3) -/* DBDBE0 80240930 00431023 */ subu $v0, $v0, $v1 -/* DBDBE4 80240934 0044102A */ slt $v0, $v0, $a0 -/* DBDBE8 80240938 10400002 */ beqz $v0, .L80240944 -/* DBDBEC 8024093C 24020004 */ addiu $v0, $zero, 4 -.L80240940: -/* DBDBF0 80240940 AE420070 */ sw $v0, 0x70($s2) -.L80240944: -/* DBDBF4 80240944 8FBF0044 */ lw $ra, 0x44($sp) -/* DBDBF8 80240948 8FB40040 */ lw $s4, 0x40($sp) -/* DBDBFC 8024094C 8FB3003C */ lw $s3, 0x3c($sp) -/* DBDC00 80240950 8FB20038 */ lw $s2, 0x38($sp) -/* DBDC04 80240954 8FB10034 */ lw $s1, 0x34($sp) -/* DBDC08 80240958 8FB00030 */ lw $s0, 0x30($sp) -/* DBDC0C 8024095C D7B60050 */ ldc1 $f22, 0x50($sp) -/* DBDC10 80240960 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DBDC14 80240964 03E00008 */ jr $ra -/* DBDC18 80240968 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s deleted file mode 100644 index fd23ce1378..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240A2C_DBDCDC.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A2C_DBDCDC -/* DBDCDC 80240A2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DBDCE0 80240A30 AFB40040 */ sw $s4, 0x40($sp) -/* DBDCE4 80240A34 0080A02D */ daddu $s4, $a0, $zero -/* DBDCE8 80240A38 AFBF0044 */ sw $ra, 0x44($sp) -/* DBDCEC 80240A3C AFB3003C */ sw $s3, 0x3c($sp) -/* DBDCF0 80240A40 AFB20038 */ sw $s2, 0x38($sp) -/* DBDCF4 80240A44 AFB10034 */ sw $s1, 0x34($sp) -/* DBDCF8 80240A48 AFB00030 */ sw $s0, 0x30($sp) -/* DBDCFC 80240A4C 8E910148 */ lw $s1, 0x148($s4) -/* DBDD00 80240A50 00A0902D */ daddu $s2, $a1, $zero -/* DBDD04 80240A54 86240008 */ lh $a0, 8($s1) -/* DBDD08 80240A58 0C00EABB */ jal get_npc_unsafe -/* DBDD0C 80240A5C 00C0982D */ daddu $s3, $a2, $zero -/* DBDD10 80240A60 8E430014 */ lw $v1, 0x14($s2) -/* DBDD14 80240A64 04600031 */ bltz $v1, .L80240B2C -/* DBDD18 80240A68 0040802D */ daddu $s0, $v0, $zero -/* DBDD1C 80240A6C 0260202D */ daddu $a0, $s3, $zero -/* DBDD20 80240A70 AFA00010 */ sw $zero, 0x10($sp) -/* DBDD24 80240A74 8E460024 */ lw $a2, 0x24($s2) -/* DBDD28 80240A78 8E470028 */ lw $a3, 0x28($s2) -/* DBDD2C 80240A7C 0C01242D */ jal func_800490B4 -/* DBDD30 80240A80 0220282D */ daddu $a1, $s1, $zero -/* DBDD34 80240A84 10400029 */ beqz $v0, .L80240B2C -/* DBDD38 80240A88 0000202D */ daddu $a0, $zero, $zero -/* DBDD3C 80240A8C 0200282D */ daddu $a1, $s0, $zero -/* DBDD40 80240A90 0000302D */ daddu $a2, $zero, $zero -/* DBDD44 80240A94 860300A8 */ lh $v1, 0xa8($s0) -/* DBDD48 80240A98 3C013F80 */ lui $at, 0x3f80 -/* DBDD4C 80240A9C 44810000 */ mtc1 $at, $f0 -/* DBDD50 80240AA0 3C014000 */ lui $at, 0x4000 -/* DBDD54 80240AA4 44811000 */ mtc1 $at, $f2 -/* DBDD58 80240AA8 3C01C1A0 */ lui $at, 0xc1a0 -/* DBDD5C 80240AAC 44812000 */ mtc1 $at, $f4 -/* DBDD60 80240AB0 2402000F */ addiu $v0, $zero, 0xf -/* DBDD64 80240AB4 AFA2001C */ sw $v0, 0x1c($sp) -/* DBDD68 80240AB8 44833000 */ mtc1 $v1, $f6 -/* DBDD6C 80240ABC 00000000 */ nop -/* DBDD70 80240AC0 468031A0 */ cvt.s.w $f6, $f6 -/* DBDD74 80240AC4 44073000 */ mfc1 $a3, $f6 -/* DBDD78 80240AC8 27A20028 */ addiu $v0, $sp, 0x28 -/* DBDD7C 80240ACC AFA20020 */ sw $v0, 0x20($sp) -/* DBDD80 80240AD0 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBDD84 80240AD4 E7A20014 */ swc1 $f2, 0x14($sp) -/* DBDD88 80240AD8 0C01BFA4 */ jal fx_emote -/* DBDD8C 80240ADC E7A40018 */ swc1 $f4, 0x18($sp) -/* DBDD90 80240AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBDD94 80240AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBDD98 80240AE8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBDD9C 80240AEC C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBDDA0 80240AF0 8C460028 */ lw $a2, 0x28($v0) -/* DBDDA4 80240AF4 0C00A720 */ jal atan2 -/* DBDDA8 80240AF8 8C470030 */ lw $a3, 0x30($v0) -/* DBDDAC 80240AFC 0200202D */ daddu $a0, $s0, $zero -/* DBDDB0 80240B00 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBDDB4 80240B04 3C060020 */ lui $a2, 0x20 -/* DBDDB8 80240B08 0C012530 */ jal func_800494C0 -/* DBDDBC 80240B0C E480000C */ swc1 $f0, 0xc($a0) -/* DBDDC0 80240B10 8E220018 */ lw $v0, 0x18($s1) -/* DBDDC4 80240B14 9442002A */ lhu $v0, 0x2a($v0) -/* DBDDC8 80240B18 30420001 */ andi $v0, $v0, 1 -/* DBDDCC 80240B1C 14400029 */ bnez $v0, .L80240BC4 -/* DBDDD0 80240B20 2402000A */ addiu $v0, $zero, 0xa -/* DBDDD4 80240B24 080902F1 */ j .L80240BC4 -/* DBDDD8 80240B28 2402000C */ addiu $v0, $zero, 0xc -.L80240B2C: -/* DBDDDC 80240B2C 8602008C */ lh $v0, 0x8c($s0) -/* DBDDE0 80240B30 14400025 */ bnez $v0, .L80240BC8 -/* DBDDE4 80240B34 00000000 */ nop -/* DBDDE8 80240B38 9602008E */ lhu $v0, 0x8e($s0) -/* DBDDEC 80240B3C 2442FFFF */ addiu $v0, $v0, -1 -/* DBDDF0 80240B40 A602008E */ sh $v0, 0x8e($s0) -/* DBDDF4 80240B44 00021400 */ sll $v0, $v0, 0x10 -/* DBDDF8 80240B48 1440001F */ bnez $v0, .L80240BC8 -/* DBDDFC 80240B4C 00000000 */ nop -/* DBDE00 80240B50 8E820074 */ lw $v0, 0x74($s4) -/* DBDE04 80240B54 2442FFFF */ addiu $v0, $v0, -1 -/* DBDE08 80240B58 10400019 */ beqz $v0, .L80240BC0 -/* DBDE0C 80240B5C AE820074 */ sw $v0, 0x74($s4) -/* DBDE10 80240B60 8E220018 */ lw $v0, 0x18($s1) -/* DBDE14 80240B64 9442002A */ lhu $v0, 0x2a($v0) -/* DBDE18 80240B68 30420010 */ andi $v0, $v0, 0x10 -/* DBDE1C 80240B6C 14400007 */ bnez $v0, .L80240B8C -/* DBDE20 80240B70 00000000 */ nop -/* DBDE24 80240B74 C600000C */ lwc1 $f0, 0xc($s0) -/* DBDE28 80240B78 3C014334 */ lui $at, 0x4334 -/* DBDE2C 80240B7C 44816000 */ mtc1 $at, $f12 -/* DBDE30 80240B80 0C00A6C9 */ jal clamp_angle -/* DBDE34 80240B84 460C0300 */ add.s $f12, $f0, $f12 -/* DBDE38 80240B88 E600000C */ swc1 $f0, 0xc($s0) -.L80240B8C: -/* DBDE3C 80240B8C 8E440008 */ lw $a0, 8($s2) -/* DBDE40 80240B90 000417C2 */ srl $v0, $a0, 0x1f -/* DBDE44 80240B94 00822021 */ addu $a0, $a0, $v0 -/* DBDE48 80240B98 00042043 */ sra $a0, $a0, 1 -/* DBDE4C 80240B9C 0C00A67F */ jal rand_int -/* DBDE50 80240BA0 24840001 */ addiu $a0, $a0, 1 -/* DBDE54 80240BA4 8E430008 */ lw $v1, 8($s2) -/* DBDE58 80240BA8 000327C2 */ srl $a0, $v1, 0x1f -/* DBDE5C 80240BAC 00641821 */ addu $v1, $v1, $a0 -/* DBDE60 80240BB0 00031843 */ sra $v1, $v1, 1 -/* DBDE64 80240BB4 00621821 */ addu $v1, $v1, $v0 -/* DBDE68 80240BB8 080902F2 */ j .L80240BC8 -/* DBDE6C 80240BBC A603008E */ sh $v1, 0x8e($s0) -.L80240BC0: -/* DBDE70 80240BC0 24020004 */ addiu $v0, $zero, 4 -.L80240BC4: -/* DBDE74 80240BC4 AE820070 */ sw $v0, 0x70($s4) -.L80240BC8: -/* DBDE78 80240BC8 8FBF0044 */ lw $ra, 0x44($sp) -/* DBDE7C 80240BCC 8FB40040 */ lw $s4, 0x40($sp) -/* DBDE80 80240BD0 8FB3003C */ lw $s3, 0x3c($sp) -/* DBDE84 80240BD4 8FB20038 */ lw $s2, 0x38($sp) -/* DBDE88 80240BD8 8FB10034 */ lw $s1, 0x34($sp) -/* DBDE8C 80240BDC 8FB00030 */ lw $s0, 0x30($sp) -/* DBDE90 80240BE0 03E00008 */ jr $ra -/* DBDE94 80240BE4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s deleted file mode 100644 index e0a587f689..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240EB8_DBE168.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_DBE168 -/* DBE168 80240EB8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DBE16C 80240EBC AFB3003C */ sw $s3, 0x3c($sp) -/* DBE170 80240EC0 0080982D */ daddu $s3, $a0, $zero -/* DBE174 80240EC4 AFBF0040 */ sw $ra, 0x40($sp) -/* DBE178 80240EC8 AFB20038 */ sw $s2, 0x38($sp) -/* DBE17C 80240ECC AFB10034 */ sw $s1, 0x34($sp) -/* DBE180 80240ED0 AFB00030 */ sw $s0, 0x30($sp) -/* DBE184 80240ED4 8E720148 */ lw $s2, 0x148($s3) -/* DBE188 80240ED8 00A0882D */ daddu $s1, $a1, $zero -/* DBE18C 80240EDC 86440008 */ lh $a0, 8($s2) -/* DBE190 80240EE0 0C00EABB */ jal get_npc_unsafe -/* DBE194 80240EE4 00C0802D */ daddu $s0, $a2, $zero -/* DBE198 80240EE8 0200202D */ daddu $a0, $s0, $zero -/* DBE19C 80240EEC 0240282D */ daddu $a1, $s2, $zero -/* DBE1A0 80240EF0 24030001 */ addiu $v1, $zero, 1 -/* DBE1A4 80240EF4 AFA30010 */ sw $v1, 0x10($sp) -/* DBE1A8 80240EF8 8E260024 */ lw $a2, 0x24($s1) -/* DBE1AC 80240EFC 8E270028 */ lw $a3, 0x28($s1) -/* DBE1B0 80240F00 0C01242D */ jal func_800490B4 -/* DBE1B4 80240F04 0040802D */ daddu $s0, $v0, $zero -/* DBE1B8 80240F08 1440001E */ bnez $v0, .L80240F84 -/* DBE1BC 80240F0C 0200202D */ daddu $a0, $s0, $zero -/* DBE1C0 80240F10 24040002 */ addiu $a0, $zero, 2 -/* DBE1C4 80240F14 0200282D */ daddu $a1, $s0, $zero -/* DBE1C8 80240F18 0000302D */ daddu $a2, $zero, $zero -/* DBE1CC 80240F1C 860300A8 */ lh $v1, 0xa8($s0) -/* DBE1D0 80240F20 3C013F80 */ lui $at, 0x3f80 -/* DBE1D4 80240F24 44810000 */ mtc1 $at, $f0 -/* DBE1D8 80240F28 3C014000 */ lui $at, 0x4000 -/* DBE1DC 80240F2C 44811000 */ mtc1 $at, $f2 -/* DBE1E0 80240F30 3C01C1A0 */ lui $at, 0xc1a0 -/* DBE1E4 80240F34 44812000 */ mtc1 $at, $f4 -/* DBE1E8 80240F38 2402000F */ addiu $v0, $zero, 0xf -/* DBE1EC 80240F3C AFA2001C */ sw $v0, 0x1c($sp) -/* DBE1F0 80240F40 44833000 */ mtc1 $v1, $f6 -/* DBE1F4 80240F44 00000000 */ nop -/* DBE1F8 80240F48 468031A0 */ cvt.s.w $f6, $f6 -/* DBE1FC 80240F4C 44073000 */ mfc1 $a3, $f6 -/* DBE200 80240F50 27A20028 */ addiu $v0, $sp, 0x28 -/* DBE204 80240F54 AFA20020 */ sw $v0, 0x20($sp) -/* DBE208 80240F58 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBE20C 80240F5C E7A20014 */ swc1 $f2, 0x14($sp) -/* DBE210 80240F60 0C01BFA4 */ jal fx_emote -/* DBE214 80240F64 E7A40018 */ swc1 $f4, 0x18($sp) -/* DBE218 80240F68 8E4200CC */ lw $v0, 0xcc($s2) -/* DBE21C 80240F6C 8C430000 */ lw $v1, ($v0) -/* DBE220 80240F70 24020019 */ addiu $v0, $zero, 0x19 -/* DBE224 80240F74 A602008E */ sh $v0, 0x8e($s0) -/* DBE228 80240F78 2402000E */ addiu $v0, $zero, 0xe -/* DBE22C 80240F7C 080903EE */ j .L80240FB8 -/* DBE230 80240F80 AE030028 */ sw $v1, 0x28($s0) -.L80240F84: -/* DBE234 80240F84 0C00F598 */ jal func_8003D660 -/* DBE238 80240F88 24050001 */ addiu $a1, $zero, 1 -/* DBE23C 80240F8C 8E050018 */ lw $a1, 0x18($s0) -/* DBE240 80240F90 8E06000C */ lw $a2, 0xc($s0) -/* DBE244 80240F94 0C00EA95 */ jal npc_move_heading -/* DBE248 80240F98 0200202D */ daddu $a0, $s0, $zero -/* DBE24C 80240F9C 8602008E */ lh $v0, 0x8e($s0) -/* DBE250 80240FA0 9603008E */ lhu $v1, 0x8e($s0) -/* DBE254 80240FA4 18400003 */ blez $v0, .L80240FB4 -/* DBE258 80240FA8 2462FFFF */ addiu $v0, $v1, -1 -/* DBE25C 80240FAC 080903EF */ j .L80240FBC -/* DBE260 80240FB0 A602008E */ sh $v0, 0x8e($s0) -.L80240FB4: -/* DBE264 80240FB4 2402000C */ addiu $v0, $zero, 0xc -.L80240FB8: -/* DBE268 80240FB8 AE620070 */ sw $v0, 0x70($s3) -.L80240FBC: -/* DBE26C 80240FBC 8FBF0040 */ lw $ra, 0x40($sp) -/* DBE270 80240FC0 8FB3003C */ lw $s3, 0x3c($sp) -/* DBE274 80240FC4 8FB20038 */ lw $s2, 0x38($sp) -/* DBE278 80240FC8 8FB10034 */ lw $s1, 0x34($sp) -/* DBE27C 80240FCC 8FB00030 */ lw $s0, 0x30($sp) -/* DBE280 80240FD0 03E00008 */ jr $ra -/* DBE284 80240FD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s deleted file mode 100644 index 92c5499a14..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241040_DBE2F0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241040_DBE2F0 -/* DBE2F0 80241040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBE2F4 80241044 AFB10014 */ sw $s1, 0x14($sp) -/* DBE2F8 80241048 0080882D */ daddu $s1, $a0, $zero -/* DBE2FC 8024104C AFBF001C */ sw $ra, 0x1c($sp) -/* DBE300 80241050 AFB20018 */ sw $s2, 0x18($sp) -/* DBE304 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* DBE308 80241058 8E300148 */ lw $s0, 0x148($s1) -/* DBE30C 8024105C 86040008 */ lh $a0, 8($s0) -/* DBE310 80241060 0C00EABB */ jal get_npc_unsafe -/* DBE314 80241064 00A0902D */ daddu $s2, $a1, $zero -/* DBE318 80241068 8E0300D0 */ lw $v1, 0xd0($s0) -/* DBE31C 8024106C 8E240078 */ lw $a0, 0x78($s1) -/* DBE320 80241070 8C630000 */ lw $v1, ($v1) -/* DBE324 80241074 0083182A */ slt $v1, $a0, $v1 -/* DBE328 80241078 10600013 */ beqz $v1, .L802410C8 -/* DBE32C 8024107C 0040302D */ daddu $a2, $v0, $zero -/* DBE330 80241080 00041040 */ sll $v0, $a0, 1 -/* DBE334 80241084 00441021 */ addu $v0, $v0, $a0 -/* DBE338 80241088 00022880 */ sll $a1, $v0, 2 -.L8024108C: -/* DBE33C 8024108C 8E0300D0 */ lw $v1, 0xd0($s0) -/* DBE340 80241090 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* DBE344 80241094 00A31021 */ addu $v0, $a1, $v1 -/* DBE348 80241098 C4400008 */ lwc1 $f0, 8($v0) -/* DBE34C 8024109C 46800020 */ cvt.s.w $f0, $f0 -/* DBE350 802410A0 4602003E */ c.le.s $f0, $f2 -/* DBE354 802410A4 00000000 */ nop -/* DBE358 802410A8 45020003 */ bc1fl .L802410B8 -/* DBE35C 802410AC 24840001 */ addiu $a0, $a0, 1 -/* DBE360 802410B0 08090432 */ j .L802410C8 -/* DBE364 802410B4 AE240078 */ sw $a0, 0x78($s1) -.L802410B8: -/* DBE368 802410B8 8C620000 */ lw $v0, ($v1) -/* DBE36C 802410BC 0082102A */ slt $v0, $a0, $v0 -/* DBE370 802410C0 1440FFF2 */ bnez $v0, .L8024108C -/* DBE374 802410C4 24A5000C */ addiu $a1, $a1, 0xc -.L802410C8: -/* DBE378 802410C8 C6400000 */ lwc1 $f0, ($s2) -/* DBE37C 802410CC E4C00018 */ swc1 $f0, 0x18($a2) -/* DBE380 802410D0 8E0200CC */ lw $v0, 0xcc($s0) -/* DBE384 802410D4 8C420004 */ lw $v0, 4($v0) -/* DBE388 802410D8 ACC20028 */ sw $v0, 0x28($a2) -/* DBE38C 802410DC 24020001 */ addiu $v0, $zero, 1 -/* DBE390 802410E0 AE200074 */ sw $zero, 0x74($s1) -/* DBE394 802410E4 AE220070 */ sw $v0, 0x70($s1) -/* DBE398 802410E8 8FBF001C */ lw $ra, 0x1c($sp) -/* DBE39C 802410EC 8FB20018 */ lw $s2, 0x18($sp) -/* DBE3A0 802410F0 8FB10014 */ lw $s1, 0x14($sp) -/* DBE3A4 802410F4 8FB00010 */ lw $s0, 0x10($sp) -/* DBE3A8 802410F8 03E00008 */ jr $ra -/* DBE3AC 802410FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index d5a3318971..c5ff632718 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -137,7 +137,7 @@ glabel L802412E4_DBE594 glabel L802412F4_DBE5A4 /* DBE5A4 802412F4 0280202D */ daddu $a0, $s4, $zero /* DBE5A8 802412F8 0260282D */ daddu $a1, $s3, $zero -/* DBE5AC 802412FC 0C0901B1 */ jal func_802406C4_DBD974 +/* DBE5AC 802412FC 0C0901B1 */ jal omo_07_UnkFunc13 /* DBE5B0 80241300 02A0302D */ daddu $a2, $s5, $zero /* DBE5B4 80241304 080904F5 */ j L802413D4_DBE684 /* DBE5B8 80241308 00000000 */ nop @@ -149,7 +149,7 @@ glabel L8024130C_DBE5BC glabel L8024131C_DBE5CC /* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero -/* DBE5D4 80241324 0C09028B */ jal func_80240A2C_DBDCDC +/* DBE5D4 80241324 0C09028B */ jal omo_07_UnkFunc14 /* DBE5D8 80241328 02A0302D */ daddu $a2, $s5, $zero /* DBE5DC 8024132C 080904F5 */ j L802413D4_DBE684 /* DBE5E0 80241330 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241374_DBE624 glabel L80241384_DBE634 /* DBE634 80241384 0280202D */ daddu $a0, $s4, $zero /* DBE638 80241388 0260282D */ daddu $a1, $s3, $zero -/* DBE63C 8024138C 0C0903AE */ jal func_80240EB8_DBE168 +/* DBE63C 8024138C 0C0903AE */ jal omo_07_UnkFunc15 /* DBE640 80241390 02A0302D */ daddu $a2, $s5, $zero /* DBE644 80241394 080904F5 */ j L802413D4_DBE684 /* DBE648 80241398 00000000 */ nop @@ -194,7 +194,7 @@ glabel L8024139C_DBE64C glabel L802413B4_DBE664 /* DBE664 802413B4 0280202D */ daddu $a0, $s4, $zero /* DBE668 802413B8 0260282D */ daddu $a1, $s3, $zero -/* DBE66C 802413BC 0C090410 */ jal func_80241040_DBE2F0 +/* DBE66C 802413BC 0C090410 */ jal omo_07_UnkFunc16 /* DBE670 802413C0 02A0302D */ daddu $a2, $s5, $zero /* DBE674 802413C4 080904F5 */ j L802413D4_DBE684 /* DBE678 802413C8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 1766a1e7f8..c686815214 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -137,7 +137,7 @@ glabel L80241818_DBEAC8 glabel L80241828_DBEAD8 /* DBEAD8 80241828 0260202D */ daddu $a0, $s3, $zero /* DBEADC 8024182C 0280282D */ daddu $a1, $s4, $zero -/* DBEAE0 80241830 0C0901B1 */ jal func_802406C4_DBD974 +/* DBEAE0 80241830 0C0901B1 */ jal omo_07_UnkFunc13 /* DBEAE4 80241834 02A0302D */ daddu $a2, $s5, $zero /* DBEAE8 80241838 08090654 */ j L80241950_DBEC00 /* DBEAEC 8024183C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241840_DBEAF0 glabel L80241850_DBEB00 /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero -/* DBEB08 80241858 0C09028B */ jal func_80240A2C_DBDCDC +/* DBEB08 80241858 0C09028B */ jal omo_07_UnkFunc14 /* DBEB0C 8024185C 02A0302D */ daddu $a2, $s5, $zero /* DBEB10 80241860 08090654 */ j L80241950_DBEC00 /* DBEB14 80241864 00000000 */ nop @@ -180,7 +180,7 @@ glabel L802418A8_DBEB58 glabel L802418B8_DBEB68 /* DBEB68 802418B8 0260202D */ daddu $a0, $s3, $zero /* DBEB6C 802418BC 0280282D */ daddu $a1, $s4, $zero -/* DBEB70 802418C0 0C0903AE */ jal func_80240EB8_DBE168 +/* DBEB70 802418C0 0C0903AE */ jal omo_07_UnkFunc15 /* DBEB74 802418C4 02A0302D */ daddu $a2, $s5, $zero /* DBEB78 802418C8 08090654 */ j L80241950_DBEC00 /* DBEB7C 802418CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s deleted file mode 100644 index 715826e6ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242210_DBF4C0 -/* DBF4C0 80242210 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DBF4C4 80242214 AFB3004C */ sw $s3, 0x4c($sp) -/* DBF4C8 80242218 0080982D */ daddu $s3, $a0, $zero -/* DBF4CC 8024221C AFBF0054 */ sw $ra, 0x54($sp) -/* DBF4D0 80242220 AFB40050 */ sw $s4, 0x50($sp) -/* DBF4D4 80242224 AFB20048 */ sw $s2, 0x48($sp) -/* DBF4D8 80242228 AFB10044 */ sw $s1, 0x44($sp) -/* DBF4DC 8024222C AFB00040 */ sw $s0, 0x40($sp) -/* DBF4E0 80242230 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DBF4E4 80242234 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DBF4E8 80242238 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DBF4EC 8024223C F7B40058 */ sdc1 $f20, 0x58($sp) -/* DBF4F0 80242240 8E710148 */ lw $s1, 0x148($s3) -/* DBF4F4 80242244 00A0902D */ daddu $s2, $a1, $zero -/* DBF4F8 80242248 86240008 */ lh $a0, 8($s1) -/* DBF4FC 8024224C 0C00EABB */ jal get_npc_unsafe -/* DBF500 80242250 00C0A02D */ daddu $s4, $a2, $zero -/* DBF504 80242254 0040802D */ daddu $s0, $v0, $zero -/* DBF508 80242258 C6200078 */ lwc1 $f0, 0x78($s1) -/* DBF50C 8024225C 46800020 */ cvt.s.w $f0, $f0 -/* DBF510 80242260 46000021 */ cvt.d.s $f0, $f0 -/* DBF514 80242264 3C014059 */ lui $at, 0x4059 -/* DBF518 80242268 44811800 */ mtc1 $at, $f3 -/* DBF51C 8024226C 44801000 */ mtc1 $zero, $f2 -/* DBF520 80242270 8602008E */ lh $v0, 0x8e($s0) -/* DBF524 80242274 9603008E */ lhu $v1, 0x8e($s0) -/* DBF528 80242278 46220003 */ div.d $f0, $f0, $f2 -/* DBF52C 8024227C 46200620 */ cvt.s.d $f24, $f0 -/* DBF530 80242280 C6200088 */ lwc1 $f0, 0x88($s1) -/* DBF534 80242284 46800020 */ cvt.s.w $f0, $f0 -/* DBF538 80242288 46000021 */ cvt.d.s $f0, $f0 -/* DBF53C 8024228C 46220003 */ div.d $f0, $f0, $f2 -/* DBF540 80242290 46200020 */ cvt.s.d $f0, $f0 -/* DBF544 80242294 18400003 */ blez $v0, .L802422A4 -/* DBF548 80242298 4600C680 */ add.s $f26, $f24, $f0 -/* DBF54C 8024229C 2462FFFF */ addiu $v0, $v1, -1 -/* DBF550 802422A0 A602008E */ sh $v0, 0x8e($s0) -.L802422A4: -/* DBF554 802422A4 8E220070 */ lw $v0, 0x70($s1) -/* DBF558 802422A8 18400034 */ blez $v0, .L8024237C -/* DBF55C 802422AC 00000000 */ nop -/* DBF560 802422B0 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DBF564 802422B4 46806320 */ cvt.s.w $f12, $f12 -/* DBF568 802422B8 44820000 */ mtc1 $v0, $f0 -/* DBF56C 802422BC 00000000 */ nop -/* DBF570 802422C0 46800020 */ cvt.s.w $f0, $f0 -/* DBF574 802422C4 46000021 */ cvt.d.s $f0, $f0 -/* DBF578 802422C8 46220003 */ div.d $f0, $f0, $f2 -/* DBF57C 802422CC 0C00A8BB */ jal sin_deg -/* DBF580 802422D0 462005A0 */ cvt.s.d $f22, $f0 -/* DBF584 802422D4 8E020000 */ lw $v0, ($s0) -/* DBF588 802422D8 30420008 */ andi $v0, $v0, 8 -/* DBF58C 802422DC 10400003 */ beqz $v0, .L802422EC -/* DBF590 802422E0 46000506 */ mov.s $f20, $f0 -/* DBF594 802422E4 080908CB */ j .L8024232C -/* DBF598 802422E8 0000102D */ daddu $v0, $zero, $zero -.L802422EC: -/* DBF59C 802422EC 27A50028 */ addiu $a1, $sp, 0x28 -/* DBF5A0 802422F0 27A6002C */ addiu $a2, $sp, 0x2c -/* DBF5A4 802422F4 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBF5A8 802422F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBF5AC 802422FC C6040040 */ lwc1 $f4, 0x40($s0) -/* DBF5B0 80242300 3C01447A */ lui $at, 0x447a -/* DBF5B4 80242304 44813000 */ mtc1 $at, $f6 -/* DBF5B8 80242308 27A20034 */ addiu $v0, $sp, 0x34 -/* DBF5BC 8024230C E7A00028 */ swc1 $f0, 0x28($sp) -/* DBF5C0 80242310 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DBF5C4 80242314 E7A40030 */ swc1 $f4, 0x30($sp) -/* DBF5C8 80242318 E7A60034 */ swc1 $f6, 0x34($sp) -/* DBF5CC 8024231C AFA20010 */ sw $v0, 0x10($sp) -/* DBF5D0 80242320 8E040080 */ lw $a0, 0x80($s0) -/* DBF5D4 80242324 0C0372DF */ jal func_800DCB7C -/* DBF5D8 80242328 27A70030 */ addiu $a3, $sp, 0x30 -.L8024232C: -/* DBF5DC 8024232C 10400007 */ beqz $v0, .L8024234C -/* DBF5E0 80242330 00000000 */ nop -/* DBF5E4 80242334 4616A082 */ mul.s $f2, $f20, $f22 -/* DBF5E8 80242338 00000000 */ nop -/* DBF5EC 8024233C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DBF5F0 80242340 46180000 */ add.s $f0, $f0, $f24 -/* DBF5F4 80242344 080908D6 */ j .L80242358 -/* DBF5F8 80242348 46020000 */ add.s $f0, $f0, $f2 -.L8024234C: -/* DBF5FC 8024234C 4616A002 */ mul.s $f0, $f20, $f22 -/* DBF600 80242350 00000000 */ nop -/* DBF604 80242354 4600D000 */ add.s $f0, $f26, $f0 -.L80242358: -/* DBF608 80242358 E600003C */ swc1 $f0, 0x3c($s0) -/* DBF60C 8024235C 8E220074 */ lw $v0, 0x74($s1) -/* DBF610 80242360 2442000A */ addiu $v0, $v0, 0xa -/* DBF614 80242364 44826000 */ mtc1 $v0, $f12 -/* DBF618 80242368 00000000 */ nop -/* DBF61C 8024236C 0C00A6C9 */ jal clamp_angle -/* DBF620 80242370 46806320 */ cvt.s.w $f12, $f12 -/* DBF624 80242374 4600020D */ trunc.w.s $f8, $f0 -/* DBF628 80242378 E6280074 */ swc1 $f8, 0x74($s1) -.L8024237C: -/* DBF62C 8024237C 8E220090 */ lw $v0, 0x90($s1) -/* DBF630 80242380 1C400040 */ bgtz $v0, .L80242484 -/* DBF634 80242384 2442FFFF */ addiu $v0, $v0, -1 -/* DBF638 80242388 860200A8 */ lh $v0, 0xa8($s0) -/* DBF63C 8024238C C600003C */ lwc1 $f0, 0x3c($s0) -/* DBF640 80242390 44821000 */ mtc1 $v0, $f2 -/* DBF644 80242394 00000000 */ nop -/* DBF648 80242398 468010A0 */ cvt.s.w $f2, $f2 -/* DBF64C 8024239C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF650 802423A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF654 802423A4 46020000 */ add.s $f0, $f0, $f2 -/* DBF658 802423A8 3C014024 */ lui $at, 0x4024 -/* DBF65C 802423AC 44812800 */ mtc1 $at, $f5 -/* DBF660 802423B0 44802000 */ mtc1 $zero, $f4 -/* DBF664 802423B4 C442002C */ lwc1 $f2, 0x2c($v0) -/* DBF668 802423B8 46000021 */ cvt.d.s $f0, $f0 -/* DBF66C 802423BC 46240000 */ add.d $f0, $f0, $f4 -/* DBF670 802423C0 460010A1 */ cvt.d.s $f2, $f2 -/* DBF674 802423C4 4620103C */ c.lt.d $f2, $f0 -/* DBF678 802423C8 00000000 */ nop -/* DBF67C 802423CC 4500002E */ bc1f .L80242488 -/* DBF680 802423D0 0280202D */ daddu $a0, $s4, $zero -/* DBF684 802423D4 24020001 */ addiu $v0, $zero, 1 -/* DBF688 802423D8 AFA20010 */ sw $v0, 0x10($sp) -/* DBF68C 802423DC 8E460024 */ lw $a2, 0x24($s2) -/* DBF690 802423E0 8E470028 */ lw $a3, 0x28($s2) -/* DBF694 802423E4 0C01242D */ jal func_800490B4 -/* DBF698 802423E8 0220282D */ daddu $a1, $s1, $zero -/* DBF69C 802423EC 10400026 */ beqz $v0, .L80242488 -/* DBF6A0 802423F0 0000202D */ daddu $a0, $zero, $zero -/* DBF6A4 802423F4 0200282D */ daddu $a1, $s0, $zero -/* DBF6A8 802423F8 0000302D */ daddu $a2, $zero, $zero -/* DBF6AC 802423FC 2412000C */ addiu $s2, $zero, 0xc -/* DBF6B0 80242400 860300A8 */ lh $v1, 0xa8($s0) -/* DBF6B4 80242404 3C013F80 */ lui $at, 0x3f80 -/* DBF6B8 80242408 44810000 */ mtc1 $at, $f0 -/* DBF6BC 8024240C 3C014000 */ lui $at, 0x4000 -/* DBF6C0 80242410 44811000 */ mtc1 $at, $f2 -/* DBF6C4 80242414 3C01C1A0 */ lui $at, 0xc1a0 -/* DBF6C8 80242418 44812000 */ mtc1 $at, $f4 -/* DBF6CC 8024241C 44834000 */ mtc1 $v1, $f8 -/* DBF6D0 80242420 00000000 */ nop -/* DBF6D4 80242424 46804220 */ cvt.s.w $f8, $f8 -/* DBF6D8 80242428 44074000 */ mfc1 $a3, $f8 -/* DBF6DC 8024242C 27A20038 */ addiu $v0, $sp, 0x38 -/* DBF6E0 80242430 AFB2001C */ sw $s2, 0x1c($sp) -/* DBF6E4 80242434 AFA20020 */ sw $v0, 0x20($sp) -/* DBF6E8 80242438 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBF6EC 8024243C E7A20014 */ swc1 $f2, 0x14($sp) -/* DBF6F0 80242440 0C01BFA4 */ jal fx_emote -/* DBF6F4 80242444 E7A40018 */ swc1 $f4, 0x18($sp) -/* DBF6F8 80242448 0200202D */ daddu $a0, $s0, $zero -/* DBF6FC 8024244C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBF700 80242450 C480003C */ lwc1 $f0, 0x3c($a0) -/* DBF704 80242454 3C060020 */ lui $a2, 0x20 -/* DBF708 80242458 0C012530 */ jal func_800494C0 -/* DBF70C 8024245C E4800064 */ swc1 $f0, 0x64($a0) -/* DBF710 80242460 8E220018 */ lw $v0, 0x18($s1) -/* DBF714 80242464 9442002A */ lhu $v0, 0x2a($v0) -/* DBF718 80242468 30420001 */ andi $v0, $v0, 1 -/* DBF71C 8024246C 10400003 */ beqz $v0, .L8024247C -/* DBF720 80242470 2402000A */ addiu $v0, $zero, 0xa -/* DBF724 80242474 08090949 */ j .L80242524 -/* DBF728 80242478 AE620070 */ sw $v0, 0x70($s3) -.L8024247C: -/* DBF72C 8024247C 08090949 */ j .L80242524 -/* DBF730 80242480 AE720070 */ sw $s2, 0x70($s3) -.L80242484: -/* DBF734 80242484 AE220090 */ sw $v0, 0x90($s1) -.L80242488: -/* DBF738 80242488 8602008C */ lh $v0, 0x8c($s0) -/* DBF73C 8024248C 14400025 */ bnez $v0, .L80242524 -/* DBF740 80242490 00000000 */ nop -/* DBF744 80242494 8602008E */ lh $v0, 0x8e($s0) -/* DBF748 80242498 1C400022 */ bgtz $v0, .L80242524 -/* DBF74C 8024249C 00000000 */ nop -/* DBF750 802424A0 8E620074 */ lw $v0, 0x74($s3) -/* DBF754 802424A4 2442FFFF */ addiu $v0, $v0, -1 -/* DBF758 802424A8 1840001D */ blez $v0, .L80242520 -/* DBF75C 802424AC AE620074 */ sw $v0, 0x74($s3) -/* DBF760 802424B0 8E220018 */ lw $v0, 0x18($s1) -/* DBF764 802424B4 9442002A */ lhu $v0, 0x2a($v0) -/* DBF768 802424B8 30420010 */ andi $v0, $v0, 0x10 -/* DBF76C 802424BC 14400007 */ bnez $v0, .L802424DC -/* DBF770 802424C0 00000000 */ nop -/* DBF774 802424C4 C600000C */ lwc1 $f0, 0xc($s0) -/* DBF778 802424C8 3C014334 */ lui $at, 0x4334 -/* DBF77C 802424CC 44816000 */ mtc1 $at, $f12 -/* DBF780 802424D0 0C00A6C9 */ jal clamp_angle -/* DBF784 802424D4 460C0300 */ add.s $f12, $f0, $f12 -/* DBF788 802424D8 E600000C */ swc1 $f0, 0xc($s0) -.L802424DC: -/* DBF78C 802424DC 0C00A67F */ jal rand_int -/* DBF790 802424E0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DBF794 802424E4 3C032E8B */ lui $v1, 0x2e8b -/* DBF798 802424E8 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DBF79C 802424EC 00430018 */ mult $v0, $v1 -/* DBF7A0 802424F0 00021FC3 */ sra $v1, $v0, 0x1f -/* DBF7A4 802424F4 00004010 */ mfhi $t0 -/* DBF7A8 802424F8 00082043 */ sra $a0, $t0, 1 -/* DBF7AC 802424FC 00832023 */ subu $a0, $a0, $v1 -/* DBF7B0 80242500 00041840 */ sll $v1, $a0, 1 -/* DBF7B4 80242504 00641821 */ addu $v1, $v1, $a0 -/* DBF7B8 80242508 00031880 */ sll $v1, $v1, 2 -/* DBF7BC 8024250C 00641823 */ subu $v1, $v1, $a0 -/* DBF7C0 80242510 00431023 */ subu $v0, $v0, $v1 -/* DBF7C4 80242514 24420005 */ addiu $v0, $v0, 5 -/* DBF7C8 80242518 08090949 */ j .L80242524 -/* DBF7CC 8024251C A602008E */ sh $v0, 0x8e($s0) -.L80242520: -/* DBF7D0 80242520 AE600070 */ sw $zero, 0x70($s3) -.L80242524: -/* DBF7D4 80242524 8FBF0054 */ lw $ra, 0x54($sp) -/* DBF7D8 80242528 8FB40050 */ lw $s4, 0x50($sp) -/* DBF7DC 8024252C 8FB3004C */ lw $s3, 0x4c($sp) -/* DBF7E0 80242530 8FB20048 */ lw $s2, 0x48($sp) -/* DBF7E4 80242534 8FB10044 */ lw $s1, 0x44($sp) -/* DBF7E8 80242538 8FB00040 */ lw $s0, 0x40($sp) -/* DBF7EC 8024253C D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DBF7F0 80242540 D7B80068 */ ldc1 $f24, 0x68($sp) -/* DBF7F4 80242544 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DBF7F8 80242548 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DBF7FC 8024254C 03E00008 */ jr $ra -/* DBF800 80242550 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s deleted file mode 100644 index 87f3ff5a91..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802427D0_DBFA80.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427D0_DBFA80 -/* DBFA80 802427D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DBFA84 802427D4 AFB20030 */ sw $s2, 0x30($sp) -/* DBFA88 802427D8 0080902D */ daddu $s2, $a0, $zero -/* DBFA8C 802427DC AFBF0038 */ sw $ra, 0x38($sp) -/* DBFA90 802427E0 AFB30034 */ sw $s3, 0x34($sp) -/* DBFA94 802427E4 AFB1002C */ sw $s1, 0x2c($sp) -/* DBFA98 802427E8 AFB00028 */ sw $s0, 0x28($sp) -/* DBFA9C 802427EC F7B60048 */ sdc1 $f22, 0x48($sp) -/* DBFAA0 802427F0 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DBFAA4 802427F4 8E510148 */ lw $s1, 0x148($s2) -/* DBFAA8 802427F8 86240008 */ lh $a0, 8($s1) -/* DBFAAC 802427FC 0C00EABB */ jal get_npc_unsafe -/* DBFAB0 80242800 00A0982D */ daddu $s3, $a1, $zero -/* DBFAB4 80242804 0040802D */ daddu $s0, $v0, $zero -/* DBFAB8 80242808 0200202D */ daddu $a0, $s0, $zero -/* DBFABC 8024280C C6220088 */ lwc1 $f2, 0x88($s1) -/* DBFAC0 80242810 468010A0 */ cvt.s.w $f2, $f2 -/* DBFAC4 80242814 460010A1 */ cvt.d.s $f2, $f2 -/* DBFAC8 80242818 C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFACC 8024281C C6000014 */ lwc1 $f0, 0x14($s0) -/* DBFAD0 80242820 8E050018 */ lw $a1, 0x18($s0) -/* DBFAD4 80242824 46002100 */ add.s $f4, $f4, $f0 -/* DBFAD8 80242828 8E06000C */ lw $a2, 0xc($s0) -/* DBFADC 8024282C C6200078 */ lwc1 $f0, 0x78($s1) -/* DBFAE0 80242830 46800020 */ cvt.s.w $f0, $f0 -/* DBFAE4 80242834 E604001C */ swc1 $f4, 0x1c($s0) -/* DBFAE8 80242838 3C014059 */ lui $at, 0x4059 -/* DBFAEC 8024283C 44812800 */ mtc1 $at, $f5 -/* DBFAF0 80242840 44802000 */ mtc1 $zero, $f4 -/* DBFAF4 80242844 46000021 */ cvt.d.s $f0, $f0 -/* DBFAF8 80242848 46240003 */ div.d $f0, $f0, $f4 -/* DBFAFC 8024284C 46200520 */ cvt.s.d $f20, $f0 -/* DBFB00 80242850 46241083 */ div.d $f2, $f2, $f4 -/* DBFB04 80242854 0C00EA95 */ jal npc_move_heading -/* DBFB08 80242858 462015A0 */ cvt.s.d $f22, $f2 -/* DBFB0C 8024285C C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFB10 80242860 44801000 */ mtc1 $zero, $f2 -/* DBFB14 80242864 44801800 */ mtc1 $zero, $f3 -/* DBFB18 80242868 46002021 */ cvt.d.s $f0, $f4 -/* DBFB1C 8024286C 4620103E */ c.le.d $f2, $f0 -/* DBFB20 80242870 00000000 */ nop -/* DBFB24 80242874 45000030 */ bc1f .L80242938 -/* DBFB28 80242878 00000000 */ nop -/* DBFB2C 8024287C C600003C */ lwc1 $f0, 0x3c($s0) -/* DBFB30 80242880 46040000 */ add.s $f0, $f0, $f4 -/* DBFB34 80242884 E600003C */ swc1 $f0, 0x3c($s0) -/* DBFB38 80242888 8E2200CC */ lw $v0, 0xcc($s1) -/* DBFB3C 8024288C 8C420024 */ lw $v0, 0x24($v0) -/* DBFB40 80242890 AE020028 */ sw $v0, 0x28($s0) -/* DBFB44 80242894 A2200007 */ sb $zero, 7($s1) -/* DBFB48 80242898 8E020000 */ lw $v0, ($s0) -/* DBFB4C 8024289C 30420008 */ andi $v0, $v0, 8 -/* DBFB50 802428A0 14400011 */ bnez $v0, .L802428E8 -/* DBFB54 802428A4 0000102D */ daddu $v0, $zero, $zero -/* DBFB58 802428A8 27A50018 */ addiu $a1, $sp, 0x18 -/* DBFB5C 802428AC 27A6001C */ addiu $a2, $sp, 0x1c -/* DBFB60 802428B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBFB64 802428B4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBFB68 802428B8 C6040040 */ lwc1 $f4, 0x40($s0) -/* DBFB6C 802428BC 3C01447A */ lui $at, 0x447a -/* DBFB70 802428C0 44813000 */ mtc1 $at, $f6 -/* DBFB74 802428C4 27A20024 */ addiu $v0, $sp, 0x24 -/* DBFB78 802428C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBFB7C 802428CC E7A2001C */ swc1 $f2, 0x1c($sp) -/* DBFB80 802428D0 E7A40020 */ swc1 $f4, 0x20($sp) -/* DBFB84 802428D4 E7A60024 */ swc1 $f6, 0x24($sp) -/* DBFB88 802428D8 AFA20010 */ sw $v0, 0x10($sp) -/* DBFB8C 802428DC 8E040080 */ lw $a0, 0x80($s0) -/* DBFB90 802428E0 0C0372DF */ jal func_800DCB7C -/* DBFB94 802428E4 27A70020 */ addiu $a3, $sp, 0x20 -.L802428E8: -/* DBFB98 802428E8 1040000B */ beqz $v0, .L80242918 -/* DBFB9C 802428EC 00000000 */ nop -/* DBFBA0 802428F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DBFBA4 802428F4 46140080 */ add.s $f2, $f0, $f20 -/* DBFBA8 802428F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBFBAC 802428FC 4600103E */ c.le.s $f2, $f0 -/* DBFBB0 80242900 00000000 */ nop -/* DBFBB4 80242904 4500008D */ bc1f .L80242B3C -/* DBFBB8 80242908 00000000 */ nop -/* DBFBBC 8024290C E602003C */ swc1 $f2, 0x3c($s0) -/* DBFBC0 80242910 08090ACF */ j .L80242B3C -/* DBFBC4 80242914 AE400070 */ sw $zero, 0x70($s2) -.L80242918: -/* DBFBC8 80242918 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBFBCC 8024291C C6000064 */ lwc1 $f0, 0x64($s0) -/* DBFBD0 80242920 4602003E */ c.le.s $f0, $f2 -/* DBFBD4 80242924 00000000 */ nop -/* DBFBD8 80242928 45030084 */ bc1tl .L80242B3C -/* DBFBDC 8024292C AE400070 */ sw $zero, 0x70($s2) -/* DBFBE0 80242930 08090ACF */ j .L80242B3C -/* DBFBE4 80242934 00000000 */ nop -.L80242938: -/* DBFBE8 80242938 4622003C */ c.lt.d $f0, $f2 -/* DBFBEC 8024293C 00000000 */ nop -/* DBFBF0 80242940 4500007E */ bc1f .L80242B3C -/* DBFBF4 80242944 00000000 */ nop -/* DBFBF8 80242948 9602008E */ lhu $v0, 0x8e($s0) -/* DBFBFC 8024294C 24420001 */ addiu $v0, $v0, 1 -/* DBFC00 80242950 A602008E */ sh $v0, 0x8e($s0) -/* DBFC04 80242954 00021400 */ sll $v0, $v0, 0x10 -/* DBFC08 80242958 8E630020 */ lw $v1, 0x20($s3) -/* DBFC0C 8024295C 00021403 */ sra $v0, $v0, 0x10 -/* DBFC10 80242960 0043102A */ slt $v0, $v0, $v1 -/* DBFC14 80242964 14400026 */ bnez $v0, .L80242A00 -/* DBFC18 80242968 00000000 */ nop -/* DBFC1C 8024296C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBFC20 80242970 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBFC24 80242974 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBFC28 80242978 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBFC2C 8024297C A600008E */ sh $zero, 0x8e($s0) -/* DBFC30 80242980 8C460028 */ lw $a2, 0x28($v0) -/* DBFC34 80242984 0C00A720 */ jal atan2 -/* DBFC38 80242988 8C470030 */ lw $a3, 0x30($v0) -/* DBFC3C 8024298C 46000506 */ mov.s $f20, $f0 -/* DBFC40 80242990 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBFC44 80242994 0C00A70A */ jal get_clamped_angle_diff -/* DBFC48 80242998 4600A386 */ mov.s $f14, $f20 -/* DBFC4C 8024299C 46000086 */ mov.s $f2, $f0 -/* DBFC50 802429A0 8E62001C */ lw $v0, 0x1c($s3) -/* DBFC54 802429A4 46001005 */ abs.s $f0, $f2 -/* DBFC58 802429A8 44822000 */ mtc1 $v0, $f4 -/* DBFC5C 802429AC 00000000 */ nop -/* DBFC60 802429B0 46802120 */ cvt.s.w $f4, $f4 -/* DBFC64 802429B4 4600203C */ c.lt.s $f4, $f0 -/* DBFC68 802429B8 00000000 */ nop -/* DBFC6C 802429BC 4500000D */ bc1f .L802429F4 -/* DBFC70 802429C0 00000000 */ nop -/* DBFC74 802429C4 44800000 */ mtc1 $zero, $f0 -/* DBFC78 802429C8 C614000C */ lwc1 $f20, 0xc($s0) -/* DBFC7C 802429CC 4600103C */ c.lt.s $f2, $f0 -/* DBFC80 802429D0 00000000 */ nop -/* DBFC84 802429D4 45000006 */ bc1f .L802429F0 -/* DBFC88 802429D8 00021023 */ negu $v0, $v0 -/* DBFC8C 802429DC 44820000 */ mtc1 $v0, $f0 -/* DBFC90 802429E0 00000000 */ nop -/* DBFC94 802429E4 46800020 */ cvt.s.w $f0, $f0 -/* DBFC98 802429E8 08090A7D */ j .L802429F4 -/* DBFC9C 802429EC 4600A500 */ add.s $f20, $f20, $f0 -.L802429F0: -/* DBFCA0 802429F0 4604A500 */ add.s $f20, $f20, $f4 -.L802429F4: -/* DBFCA4 802429F4 0C00A6C9 */ jal clamp_angle -/* DBFCA8 802429F8 4600A306 */ mov.s $f12, $f20 -/* DBFCAC 802429FC E600000C */ swc1 $f0, 0xc($s0) -.L80242A00: -/* DBFCB0 80242A00 8E020000 */ lw $v0, ($s0) -/* DBFCB4 80242A04 30420008 */ andi $v0, $v0, 8 -/* DBFCB8 80242A08 1040000A */ beqz $v0, .L80242A34 -/* DBFCBC 80242A0C 27A50018 */ addiu $a1, $sp, 0x18 -/* DBFCC0 80242A10 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBFCC4 80242A14 C600001C */ lwc1 $f0, 0x1c($s0) -/* DBFCC8 80242A18 46001080 */ add.s $f2, $f2, $f0 -/* DBFCCC 80242A1C 4616103C */ c.lt.s $f2, $f22 -/* DBFCD0 80242A20 00000000 */ nop -/* DBFCD4 80242A24 45020045 */ bc1fl .L80242B3C -/* DBFCD8 80242A28 E602003C */ swc1 $f2, 0x3c($s0) -/* DBFCDC 80242A2C 08090ACE */ j .L80242B38 -/* DBFCE0 80242A30 E616003C */ swc1 $f22, 0x3c($s0) -.L80242A34: -/* DBFCE4 80242A34 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBFCE8 80242A38 27A6001C */ addiu $a2, $sp, 0x1c -/* DBFCEC 80242A3C E7A00018 */ swc1 $f0, 0x18($sp) -/* DBFCF0 80242A40 860200A8 */ lh $v0, 0xa8($s0) -/* DBFCF4 80242A44 C600001C */ lwc1 $f0, 0x1c($s0) -/* DBFCF8 80242A48 C604003C */ lwc1 $f4, 0x3c($s0) -/* DBFCFC 80242A4C 44821000 */ mtc1 $v0, $f2 -/* DBFD00 80242A50 00000000 */ nop -/* DBFD04 80242A54 468010A0 */ cvt.s.w $f2, $f2 -/* DBFD08 80242A58 46000005 */ abs.s $f0, $f0 -/* DBFD0C 80242A5C 46020000 */ add.s $f0, $f0, $f2 -/* DBFD10 80242A60 C6060040 */ lwc1 $f6, 0x40($s0) -/* DBFD14 80242A64 27A20024 */ addiu $v0, $sp, 0x24 -/* DBFD18 80242A68 46022100 */ add.s $f4, $f4, $f2 -/* DBFD1C 80242A6C 3C014024 */ lui $at, 0x4024 -/* DBFD20 80242A70 44811800 */ mtc1 $at, $f3 -/* DBFD24 80242A74 44801000 */ mtc1 $zero, $f2 -/* DBFD28 80242A78 46000021 */ cvt.d.s $f0, $f0 -/* DBFD2C 80242A7C 46220000 */ add.d $f0, $f0, $f2 -/* DBFD30 80242A80 E7A60020 */ swc1 $f6, 0x20($sp) -/* DBFD34 80242A84 E7A4001C */ swc1 $f4, 0x1c($sp) -/* DBFD38 80242A88 46200020 */ cvt.s.d $f0, $f0 -/* DBFD3C 80242A8C E7A00024 */ swc1 $f0, 0x24($sp) -/* DBFD40 80242A90 AFA20010 */ sw $v0, 0x10($sp) -/* DBFD44 80242A94 8E040080 */ lw $a0, 0x80($s0) -/* DBFD48 80242A98 0C0372DF */ jal func_800DCB7C -/* DBFD4C 80242A9C 27A70020 */ addiu $a3, $sp, 0x20 -/* DBFD50 80242AA0 10400015 */ beqz $v0, .L80242AF8 -/* DBFD54 80242AA4 00000000 */ nop -/* DBFD58 80242AA8 860200A8 */ lh $v0, 0xa8($s0) -/* DBFD5C 80242AAC C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFD60 80242AB0 44820000 */ mtc1 $v0, $f0 -/* DBFD64 80242AB4 00000000 */ nop -/* DBFD68 80242AB8 46800020 */ cvt.s.w $f0, $f0 -/* DBFD6C 80242ABC 46002085 */ abs.s $f2, $f4 -/* DBFD70 80242AC0 46020000 */ add.s $f0, $f0, $f2 -/* DBFD74 80242AC4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DBFD78 80242AC8 4600103E */ c.le.s $f2, $f0 -/* DBFD7C 80242ACC 00000000 */ nop -/* DBFD80 80242AD0 45000005 */ bc1f .L80242AE8 -/* DBFD84 80242AD4 00000000 */ nop -/* DBFD88 80242AD8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DBFD8C 80242ADC AE00001C */ sw $zero, 0x1c($s0) -/* DBFD90 80242AE0 08090ACF */ j .L80242B3C -/* DBFD94 80242AE4 E600003C */ swc1 $f0, 0x3c($s0) -.L80242AE8: -/* DBFD98 80242AE8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBFD9C 80242AEC 46040000 */ add.s $f0, $f0, $f4 -/* DBFDA0 80242AF0 08090ACF */ j .L80242B3C -/* DBFDA4 80242AF4 E600003C */ swc1 $f0, 0x3c($s0) -.L80242AF8: -/* DBFDA8 80242AF8 C606003C */ lwc1 $f6, 0x3c($s0) -/* DBFDAC 80242AFC 860200A8 */ lh $v0, 0xa8($s0) -/* DBFDB0 80242B00 46163081 */ sub.s $f2, $f6, $f22 -/* DBFDB4 80242B04 44820000 */ mtc1 $v0, $f0 -/* DBFDB8 80242B08 00000000 */ nop -/* DBFDBC 80242B0C 46800020 */ cvt.s.w $f0, $f0 -/* DBFDC0 80242B10 46001080 */ add.s $f2, $f2, $f0 -/* DBFDC4 80242B14 C604001C */ lwc1 $f4, 0x1c($s0) -/* DBFDC8 80242B18 46002005 */ abs.s $f0, $f4 -/* DBFDCC 80242B1C 4602003C */ c.lt.s $f0, $f2 -/* DBFDD0 80242B20 00000000 */ nop -/* DBFDD4 80242B24 45020005 */ bc1fl .L80242B3C -/* DBFDD8 80242B28 AE00001C */ sw $zero, 0x1c($s0) -/* DBFDDC 80242B2C 46043000 */ add.s $f0, $f6, $f4 -/* DBFDE0 80242B30 08090ACF */ j .L80242B3C -/* DBFDE4 80242B34 E600003C */ swc1 $f0, 0x3c($s0) -.L80242B38: -/* DBFDE8 80242B38 AE00001C */ sw $zero, 0x1c($s0) -.L80242B3C: -/* DBFDEC 80242B3C 8FBF0038 */ lw $ra, 0x38($sp) -/* DBFDF0 80242B40 8FB30034 */ lw $s3, 0x34($sp) -/* DBFDF4 80242B44 8FB20030 */ lw $s2, 0x30($sp) -/* DBFDF8 80242B48 8FB1002C */ lw $s1, 0x2c($sp) -/* DBFDFC 80242B4C 8FB00028 */ lw $s0, 0x28($sp) -/* DBFE00 80242B50 D7B60048 */ ldc1 $f22, 0x48($sp) -/* DBFE04 80242B54 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DBFE08 80242B58 03E00008 */ jr $ra -/* DBFE0C 80242B5C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s deleted file mode 100644 index 89e3db960f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B60_DBFE10 -/* DBFE10 80242B60 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DBFE14 80242B64 AFB00028 */ sw $s0, 0x28($sp) -/* DBFE18 80242B68 00A0802D */ daddu $s0, $a1, $zero -/* DBFE1C 80242B6C AFB1002C */ sw $s1, 0x2c($sp) -/* DBFE20 80242B70 00C0882D */ daddu $s1, $a2, $zero -/* DBFE24 80242B74 AFBF0034 */ sw $ra, 0x34($sp) -/* DBFE28 80242B78 AFB20030 */ sw $s2, 0x30($sp) -/* DBFE2C 80242B7C AE200070 */ sw $zero, 0x70($s1) -/* DBFE30 80242B80 8C830000 */ lw $v1, ($a0) -/* DBFE34 80242B84 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBFE38 80242B88 A480008E */ sh $zero, 0x8e($a0) -/* DBFE3C 80242B8C 00621824 */ and $v1, $v1, $v0 -/* DBFE40 80242B90 34650800 */ ori $a1, $v1, 0x800 -/* DBFE44 80242B94 AC850000 */ sw $a1, ($a0) -/* DBFE48 80242B98 8E0200D0 */ lw $v0, 0xd0($s0) -/* DBFE4C 80242B9C 8C420034 */ lw $v0, 0x34($v0) -/* DBFE50 80242BA0 10400003 */ beqz $v0, .L80242BB0 -/* DBFE54 80242BA4 00E0902D */ daddu $s2, $a3, $zero -/* DBFE58 80242BA8 08090AEE */ j .L80242BB8 -/* DBFE5C 80242BAC 34620808 */ ori $v0, $v1, 0x808 -.L80242BB0: -/* DBFE60 80242BB0 2402FFF7 */ addiu $v0, $zero, -9 -/* DBFE64 80242BB4 00A21024 */ and $v0, $a1, $v0 -.L80242BB8: -/* DBFE68 80242BB8 AC820000 */ sw $v0, ($a0) -/* DBFE6C 80242BBC 27A20024 */ addiu $v0, $sp, 0x24 -/* DBFE70 80242BC0 27A50018 */ addiu $a1, $sp, 0x18 -/* DBFE74 80242BC4 C4800038 */ lwc1 $f0, 0x38($a0) -/* DBFE78 80242BC8 C482003C */ lwc1 $f2, 0x3c($a0) -/* DBFE7C 80242BCC C4840040 */ lwc1 $f4, 0x40($a0) -/* DBFE80 80242BD0 3C01447A */ lui $at, 0x447a -/* DBFE84 80242BD4 44813000 */ mtc1 $at, $f6 -/* DBFE88 80242BD8 27A6001C */ addiu $a2, $sp, 0x1c -/* DBFE8C 80242BDC E7A00018 */ swc1 $f0, 0x18($sp) -/* DBFE90 80242BE0 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DBFE94 80242BE4 E7A40020 */ swc1 $f4, 0x20($sp) -/* DBFE98 80242BE8 E7A60024 */ swc1 $f6, 0x24($sp) -/* DBFE9C 80242BEC AFA20010 */ sw $v0, 0x10($sp) -/* DBFEA0 80242BF0 8C840080 */ lw $a0, 0x80($a0) -/* DBFEA4 80242BF4 0C0372DF */ jal func_800DCB7C -/* DBFEA8 80242BF8 27A70020 */ addiu $a3, $sp, 0x20 -/* DBFEAC 80242BFC C7A20024 */ lwc1 $f2, 0x24($sp) -/* DBFEB0 80242C00 3C014059 */ lui $at, 0x4059 -/* DBFEB4 80242C04 44812800 */ mtc1 $at, $f5 -/* DBFEB8 80242C08 44802000 */ mtc1 $zero, $f4 -/* DBFEBC 80242C0C 460010A1 */ cvt.d.s $f2, $f2 -/* DBFEC0 80242C10 46241082 */ mul.d $f2, $f2, $f4 -/* DBFEC4 80242C14 00000000 */ nop -/* DBFEC8 80242C18 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DBFECC 80242C1C 46000021 */ cvt.d.s $f0, $f0 -/* DBFED0 80242C20 46240002 */ mul.d $f0, $f0, $f4 -/* DBFED4 80242C24 00000000 */ nop -/* DBFED8 80242C28 3C013FE0 */ lui $at, 0x3fe0 -/* DBFEDC 80242C2C 44812800 */ mtc1 $at, $f5 -/* DBFEE0 80242C30 44802000 */ mtc1 $zero, $f4 -/* DBFEE4 80242C34 00000000 */ nop -/* DBFEE8 80242C38 46241080 */ add.d $f2, $f2, $f4 -/* DBFEEC 80242C3C AE000074 */ sw $zero, 0x74($s0) -/* DBFEF0 80242C40 46240000 */ add.d $f0, $f0, $f4 -/* DBFEF4 80242C44 AE000090 */ sw $zero, 0x90($s0) -/* DBFEF8 80242C48 4620120D */ trunc.w.d $f8, $f2 -/* DBFEFC 80242C4C E6080078 */ swc1 $f8, 0x78($s0) -/* DBFF00 80242C50 4620020D */ trunc.w.d $f8, $f0 -/* DBFF04 80242C54 E6080088 */ swc1 $f8, 0x88($s0) -/* DBFF08 80242C58 8E420014 */ lw $v0, 0x14($s2) -/* DBFF0C 80242C5C AE220074 */ sw $v0, 0x74($s1) -/* DBFF10 80242C60 8E0200B0 */ lw $v0, 0xb0($s0) -/* DBFF14 80242C64 34420010 */ ori $v0, $v0, 0x10 -/* DBFF18 80242C68 AE0200B0 */ sw $v0, 0xb0($s0) -/* DBFF1C 80242C6C 8FBF0034 */ lw $ra, 0x34($sp) -/* DBFF20 80242C70 8FB20030 */ lw $s2, 0x30($sp) -/* DBFF24 80242C74 8FB1002C */ lw $s1, 0x2c($sp) -/* DBFF28 80242C78 8FB00028 */ lw $s0, 0x28($sp) -/* DBFF2C 80242C7C 03E00008 */ jr $ra -/* DBFF30 80242C80 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 4fef74fa92..9d177a9c6c 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -46,7 +46,7 @@ glabel func_80242C84_DBFF34 /* DBFFD8 80242D28 02A0202D */ daddu $a0, $s5, $zero /* DBFFDC 80242D2C 0240282D */ daddu $a1, $s2, $zero /* DBFFE0 80242D30 0280302D */ daddu $a2, $s4, $zero -/* DBFFE4 80242D34 0C090AD8 */ jal func_80242B60_DBFE10 +/* DBFFE4 80242D34 0C090AD8 */ jal omo_07_UnkFunc5 /* DBFFE8 80242D38 0200382D */ daddu $a3, $s0, $zero .L80242D3C: /* DBFFEC 80242D3C 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80242DB8_DC0068 glabel L80242DC8_DC0078 /* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero /* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero -/* DC0080 80242DD0 0C090884 */ jal func_80242210_DBF4C0 +/* DC0080 80242DD0 0C090884 */ jal omo_07_UnkFunc4 /* DC0084 80242DD4 0260302D */ daddu $a2, $s3, $zero /* DC0088 80242DD8 08090B93 */ j .L80242E4C /* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80242E20_DC00D0 glabel L80242E38_DC00E8 /* DC00E8 80242E38 0280202D */ daddu $a0, $s4, $zero /* DC00EC 80242E3C 0200282D */ daddu $a1, $s0, $zero -/* DC00F0 80242E40 0C0909F4 */ jal func_802427D0_DBFA80 +/* DC00F0 80242E40 0C0909F4 */ jal omo_07_UnkFunc6 /* DC00F4 80242E44 0260302D */ daddu $a2, $s3, $zero glabel L80242E48_DC00F8 /* DC00F8 80242E48 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s deleted file mode 100644 index 33805e67b8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802410A4_DCDD74.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4_DCDD74 -/* DCDD74 802410A4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* DCDD78 802410A8 AFB20038 */ sw $s2, 0x38($sp) -/* DCDD7C 802410AC 0080902D */ daddu $s2, $a0, $zero -/* DCDD80 802410B0 AFBF0044 */ sw $ra, 0x44($sp) -/* DCDD84 802410B4 AFB40040 */ sw $s4, 0x40($sp) -/* DCDD88 802410B8 AFB3003C */ sw $s3, 0x3c($sp) -/* DCDD8C 802410BC AFB10034 */ sw $s1, 0x34($sp) -/* DCDD90 802410C0 AFB00030 */ sw $s0, 0x30($sp) -/* DCDD94 802410C4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DCDD98 802410C8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DCDD9C 802410CC 8E510148 */ lw $s1, 0x148($s2) -/* DCDDA0 802410D0 00A0982D */ daddu $s3, $a1, $zero -/* DCDDA4 802410D4 86240008 */ lh $a0, 8($s1) -/* DCDDA8 802410D8 0C00EABB */ jal get_npc_unsafe -/* DCDDAC 802410DC 00C0A02D */ daddu $s4, $a2, $zero -/* DCDDB0 802410E0 8E630014 */ lw $v1, 0x14($s3) -/* DCDDB4 802410E4 04600030 */ bltz $v1, .L802411A8 -/* DCDDB8 802410E8 0040802D */ daddu $s0, $v0, $zero -/* DCDDBC 802410EC 8E420074 */ lw $v0, 0x74($s2) -/* DCDDC0 802410F0 1C40002C */ bgtz $v0, .L802411A4 -/* DCDDC4 802410F4 2442FFFF */ addiu $v0, $v0, -1 -/* DCDDC8 802410F8 0280202D */ daddu $a0, $s4, $zero -/* DCDDCC 802410FC AE430074 */ sw $v1, 0x74($s2) -/* DCDDD0 80241100 AFA00010 */ sw $zero, 0x10($sp) -/* DCDDD4 80241104 8E66000C */ lw $a2, 0xc($s3) -/* DCDDD8 80241108 8E670010 */ lw $a3, 0x10($s3) -/* DCDDDC 8024110C 0C01242D */ jal func_800490B4 -/* DCDDE0 80241110 0220282D */ daddu $a1, $s1, $zero -/* DCDDE4 80241114 10400021 */ beqz $v0, .L8024119C -/* DCDDE8 80241118 0000202D */ daddu $a0, $zero, $zero -/* DCDDEC 8024111C 0200282D */ daddu $a1, $s0, $zero -/* DCDDF0 80241120 0000302D */ daddu $a2, $zero, $zero -/* DCDDF4 80241124 860300A8 */ lh $v1, 0xa8($s0) -/* DCDDF8 80241128 3C013F80 */ lui $at, 0x3f80 -/* DCDDFC 8024112C 44810000 */ mtc1 $at, $f0 -/* DCDE00 80241130 3C014000 */ lui $at, 0x4000 -/* DCDE04 80241134 44811000 */ mtc1 $at, $f2 -/* DCDE08 80241138 3C01C1A0 */ lui $at, 0xc1a0 -/* DCDE0C 8024113C 44812000 */ mtc1 $at, $f4 -/* DCDE10 80241140 2402000F */ addiu $v0, $zero, 0xf -/* DCDE14 80241144 AFA2001C */ sw $v0, 0x1c($sp) -/* DCDE18 80241148 44833000 */ mtc1 $v1, $f6 -/* DCDE1C 8024114C 00000000 */ nop -/* DCDE20 80241150 468031A0 */ cvt.s.w $f6, $f6 -/* DCDE24 80241154 44073000 */ mfc1 $a3, $f6 -/* DCDE28 80241158 27A20028 */ addiu $v0, $sp, 0x28 -/* DCDE2C 8024115C AFA20020 */ sw $v0, 0x20($sp) -/* DCDE30 80241160 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCDE34 80241164 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCDE38 80241168 0C01BFA4 */ jal fx_emote -/* DCDE3C 8024116C E7A40018 */ swc1 $f4, 0x18($sp) -/* DCDE40 80241170 0200202D */ daddu $a0, $s0, $zero -/* DCDE44 80241174 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DCDE48 80241178 0C012530 */ jal func_800494C0 -/* DCDE4C 8024117C 3C060020 */ lui $a2, 0x20 -/* DCDE50 80241180 8E220018 */ lw $v0, 0x18($s1) -/* DCDE54 80241184 9442002A */ lhu $v0, 0x2a($v0) -/* DCDE58 80241188 30420001 */ andi $v0, $v0, 1 -/* DCDE5C 8024118C 14400064 */ bnez $v0, .L80241320 -/* DCDE60 80241190 2402000A */ addiu $v0, $zero, 0xa -/* DCDE64 80241194 080904C8 */ j .L80241320 -/* DCDE68 80241198 2402000C */ addiu $v0, $zero, 0xc -.L8024119C: -/* DCDE6C 8024119C 8E420074 */ lw $v0, 0x74($s2) -/* DCDE70 802411A0 2442FFFF */ addiu $v0, $v0, -1 -.L802411A4: -/* DCDE74 802411A4 AE420074 */ sw $v0, 0x74($s2) -.L802411A8: -/* DCDE78 802411A8 8602008C */ lh $v0, 0x8c($s0) -/* DCDE7C 802411AC 1440005D */ bnez $v0, .L80241324 -/* DCDE80 802411B0 00000000 */ nop -/* DCDE84 802411B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DCDE88 802411B8 3C014010 */ lui $at, 0x4010 -/* DCDE8C 802411BC 44811800 */ mtc1 $at, $f3 -/* DCDE90 802411C0 44801000 */ mtc1 $zero, $f2 -/* DCDE94 802411C4 46000021 */ cvt.d.s $f0, $f0 -/* DCDE98 802411C8 4622003C */ c.lt.d $f0, $f2 -/* DCDE9C 802411CC 00000000 */ nop -/* DCDEA0 802411D0 45000003 */ bc1f .L802411E0 -/* DCDEA4 802411D4 0200202D */ daddu $a0, $s0, $zero -/* DCDEA8 802411D8 08090479 */ j .L802411E4 -/* DCDEAC 802411DC 0000282D */ daddu $a1, $zero, $zero -.L802411E0: -/* DCDEB0 802411E0 24050001 */ addiu $a1, $zero, 1 -.L802411E4: -/* DCDEB4 802411E4 0C00F598 */ jal func_8003D660 -/* DCDEB8 802411E8 00000000 */ nop -/* DCDEBC 802411EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCDEC0 802411F0 8E430078 */ lw $v1, 0x78($s2) -/* DCDEC4 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCDEC8 802411F8 00031040 */ sll $v0, $v1, 1 -/* DCDECC 802411FC 00431021 */ addu $v0, $v0, $v1 -/* DCDED0 80241200 8E2300D0 */ lw $v1, 0xd0($s1) -/* DCDED4 80241204 00021080 */ sll $v0, $v0, 2 -/* DCDED8 80241208 00431021 */ addu $v0, $v0, $v1 -/* DCDEDC 8024120C C4560004 */ lwc1 $f22, 4($v0) -/* DCDEE0 80241210 4680B5A0 */ cvt.s.w $f22, $f22 -/* DCDEE4 80241214 C454000C */ lwc1 $f20, 0xc($v0) -/* DCDEE8 80241218 4680A520 */ cvt.s.w $f20, $f20 -/* DCDEEC 8024121C 4406B000 */ mfc1 $a2, $f22 -/* DCDEF0 80241220 4407A000 */ mfc1 $a3, $f20 -/* DCDEF4 80241224 0C00A720 */ jal atan2 -/* DCDEF8 80241228 00000000 */ nop -/* DCDEFC 8024122C 8E050018 */ lw $a1, 0x18($s0) -/* DCDF00 80241230 44060000 */ mfc1 $a2, $f0 -/* DCDF04 80241234 0200202D */ daddu $a0, $s0, $zero -/* DCDF08 80241238 0C00EA95 */ jal npc_move_heading -/* DCDF0C 8024123C AE06000C */ sw $a2, 0xc($s0) -/* DCDF10 80241240 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCDF14 80241244 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCDF18 80241248 4406B000 */ mfc1 $a2, $f22 -/* DCDF1C 8024124C 4407A000 */ mfc1 $a3, $f20 -/* DCDF20 80241250 0C00A7B5 */ jal dist2D -/* DCDF24 80241254 00000000 */ nop -/* DCDF28 80241258 C6020018 */ lwc1 $f2, 0x18($s0) -/* DCDF2C 8024125C 4602003E */ c.le.s $f0, $f2 -/* DCDF30 80241260 00000000 */ nop -/* DCDF34 80241264 4500002F */ bc1f .L80241324 -/* DCDF38 80241268 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DCDF3C 8024126C 24020002 */ addiu $v0, $zero, 2 -/* DCDF40 80241270 0C00A67F */ jal rand_int -/* DCDF44 80241274 AE420070 */ sw $v0, 0x70($s2) -/* DCDF48 80241278 3C035555 */ lui $v1, 0x5555 -/* DCDF4C 8024127C 34635556 */ ori $v1, $v1, 0x5556 -/* DCDF50 80241280 00430018 */ mult $v0, $v1 -/* DCDF54 80241284 000227C3 */ sra $a0, $v0, 0x1f -/* DCDF58 80241288 00004010 */ mfhi $t0 -/* DCDF5C 8024128C 01042023 */ subu $a0, $t0, $a0 -/* DCDF60 80241290 00041840 */ sll $v1, $a0, 1 -/* DCDF64 80241294 00641821 */ addu $v1, $v1, $a0 -/* DCDF68 80241298 00431023 */ subu $v0, $v0, $v1 -/* DCDF6C 8024129C 24430002 */ addiu $v1, $v0, 2 -/* DCDF70 802412A0 AE430074 */ sw $v1, 0x74($s2) -/* DCDF74 802412A4 8E62002C */ lw $v0, 0x2c($s3) -/* DCDF78 802412A8 18400009 */ blez $v0, .L802412D0 -/* DCDF7C 802412AC 24020004 */ addiu $v0, $zero, 4 -/* DCDF80 802412B0 8E620004 */ lw $v0, 4($s3) -/* DCDF84 802412B4 18400006 */ blez $v0, .L802412D0 -/* DCDF88 802412B8 24020004 */ addiu $v0, $zero, 4 -/* DCDF8C 802412BC 8E620008 */ lw $v0, 8($s3) -/* DCDF90 802412C0 18400003 */ blez $v0, .L802412D0 -/* DCDF94 802412C4 24020004 */ addiu $v0, $zero, 4 -/* DCDF98 802412C8 14600002 */ bnez $v1, .L802412D4 -/* DCDF9C 802412CC 00000000 */ nop -.L802412D0: -/* DCDFA0 802412D0 AE420070 */ sw $v0, 0x70($s2) -.L802412D4: -/* DCDFA4 802412D4 0C00A67F */ jal rand_int -/* DCDFA8 802412D8 24042710 */ addiu $a0, $zero, 0x2710 -/* DCDFAC 802412DC 3C0351EB */ lui $v1, 0x51eb -/* DCDFB0 802412E0 3463851F */ ori $v1, $v1, 0x851f -/* DCDFB4 802412E4 00430018 */ mult $v0, $v1 -/* DCDFB8 802412E8 00021FC3 */ sra $v1, $v0, 0x1f -/* DCDFBC 802412EC 00004010 */ mfhi $t0 -/* DCDFC0 802412F0 00082143 */ sra $a0, $t0, 5 -/* DCDFC4 802412F4 00832023 */ subu $a0, $a0, $v1 -/* DCDFC8 802412F8 00041840 */ sll $v1, $a0, 1 -/* DCDFCC 802412FC 00641821 */ addu $v1, $v1, $a0 -/* DCDFD0 80241300 000318C0 */ sll $v1, $v1, 3 -/* DCDFD4 80241304 00641821 */ addu $v1, $v1, $a0 -/* DCDFD8 80241308 00031880 */ sll $v1, $v1, 2 -/* DCDFDC 8024130C 8E640004 */ lw $a0, 4($s3) -/* DCDFE0 80241310 00431023 */ subu $v0, $v0, $v1 -/* DCDFE4 80241314 0044102A */ slt $v0, $v0, $a0 -/* DCDFE8 80241318 10400002 */ beqz $v0, .L80241324 -/* DCDFEC 8024131C 24020004 */ addiu $v0, $zero, 4 -.L80241320: -/* DCDFF0 80241320 AE420070 */ sw $v0, 0x70($s2) -.L80241324: -/* DCDFF4 80241324 8FBF0044 */ lw $ra, 0x44($sp) -/* DCDFF8 80241328 8FB40040 */ lw $s4, 0x40($sp) -/* DCDFFC 8024132C 8FB3003C */ lw $s3, 0x3c($sp) -/* DCE000 80241330 8FB20038 */ lw $s2, 0x38($sp) -/* DCE004 80241334 8FB10034 */ lw $s1, 0x34($sp) -/* DCE008 80241338 8FB00030 */ lw $s0, 0x30($sp) -/* DCE00C 8024133C D7B60050 */ ldc1 $f22, 0x50($sp) -/* DCE010 80241340 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DCE014 80241344 03E00008 */ jr $ra -/* DCE018 80241348 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s deleted file mode 100644 index 5b4cf74ea4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024140C_DCE0DC.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024140C_DCE0DC -/* DCE0DC 8024140C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DCE0E0 80241410 AFB40040 */ sw $s4, 0x40($sp) -/* DCE0E4 80241414 0080A02D */ daddu $s4, $a0, $zero -/* DCE0E8 80241418 AFBF0044 */ sw $ra, 0x44($sp) -/* DCE0EC 8024141C AFB3003C */ sw $s3, 0x3c($sp) -/* DCE0F0 80241420 AFB20038 */ sw $s2, 0x38($sp) -/* DCE0F4 80241424 AFB10034 */ sw $s1, 0x34($sp) -/* DCE0F8 80241428 AFB00030 */ sw $s0, 0x30($sp) -/* DCE0FC 8024142C 8E910148 */ lw $s1, 0x148($s4) -/* DCE100 80241430 00A0902D */ daddu $s2, $a1, $zero -/* DCE104 80241434 86240008 */ lh $a0, 8($s1) -/* DCE108 80241438 0C00EABB */ jal get_npc_unsafe -/* DCE10C 8024143C 00C0982D */ daddu $s3, $a2, $zero -/* DCE110 80241440 8E430014 */ lw $v1, 0x14($s2) -/* DCE114 80241444 04600031 */ bltz $v1, .L8024150C -/* DCE118 80241448 0040802D */ daddu $s0, $v0, $zero -/* DCE11C 8024144C 0260202D */ daddu $a0, $s3, $zero -/* DCE120 80241450 AFA00010 */ sw $zero, 0x10($sp) -/* DCE124 80241454 8E460024 */ lw $a2, 0x24($s2) -/* DCE128 80241458 8E470028 */ lw $a3, 0x28($s2) -/* DCE12C 8024145C 0C01242D */ jal func_800490B4 -/* DCE130 80241460 0220282D */ daddu $a1, $s1, $zero -/* DCE134 80241464 10400029 */ beqz $v0, .L8024150C -/* DCE138 80241468 0000202D */ daddu $a0, $zero, $zero -/* DCE13C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* DCE140 80241470 0000302D */ daddu $a2, $zero, $zero -/* DCE144 80241474 860300A8 */ lh $v1, 0xa8($s0) -/* DCE148 80241478 3C013F80 */ lui $at, 0x3f80 -/* DCE14C 8024147C 44810000 */ mtc1 $at, $f0 -/* DCE150 80241480 3C014000 */ lui $at, 0x4000 -/* DCE154 80241484 44811000 */ mtc1 $at, $f2 -/* DCE158 80241488 3C01C1A0 */ lui $at, 0xc1a0 -/* DCE15C 8024148C 44812000 */ mtc1 $at, $f4 -/* DCE160 80241490 2402000F */ addiu $v0, $zero, 0xf -/* DCE164 80241494 AFA2001C */ sw $v0, 0x1c($sp) -/* DCE168 80241498 44833000 */ mtc1 $v1, $f6 -/* DCE16C 8024149C 00000000 */ nop -/* DCE170 802414A0 468031A0 */ cvt.s.w $f6, $f6 -/* DCE174 802414A4 44073000 */ mfc1 $a3, $f6 -/* DCE178 802414A8 27A20028 */ addiu $v0, $sp, 0x28 -/* DCE17C 802414AC AFA20020 */ sw $v0, 0x20($sp) -/* DCE180 802414B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCE184 802414B4 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCE188 802414B8 0C01BFA4 */ jal fx_emote -/* DCE18C 802414BC E7A40018 */ swc1 $f4, 0x18($sp) -/* DCE190 802414C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DCE194 802414C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DCE198 802414C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCE19C 802414CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCE1A0 802414D0 8C460028 */ lw $a2, 0x28($v0) -/* DCE1A4 802414D4 0C00A720 */ jal atan2 -/* DCE1A8 802414D8 8C470030 */ lw $a3, 0x30($v0) -/* DCE1AC 802414DC 0200202D */ daddu $a0, $s0, $zero -/* DCE1B0 802414E0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DCE1B4 802414E4 3C060020 */ lui $a2, 0x20 -/* DCE1B8 802414E8 0C012530 */ jal func_800494C0 -/* DCE1BC 802414EC E480000C */ swc1 $f0, 0xc($a0) -/* DCE1C0 802414F0 8E220018 */ lw $v0, 0x18($s1) -/* DCE1C4 802414F4 9442002A */ lhu $v0, 0x2a($v0) -/* DCE1C8 802414F8 30420001 */ andi $v0, $v0, 1 -/* DCE1CC 802414FC 14400029 */ bnez $v0, .L802415A4 -/* DCE1D0 80241500 2402000A */ addiu $v0, $zero, 0xa -/* DCE1D4 80241504 08090569 */ j .L802415A4 -/* DCE1D8 80241508 2402000C */ addiu $v0, $zero, 0xc -.L8024150C: -/* DCE1DC 8024150C 8602008C */ lh $v0, 0x8c($s0) -/* DCE1E0 80241510 14400025 */ bnez $v0, .L802415A8 -/* DCE1E4 80241514 00000000 */ nop -/* DCE1E8 80241518 9602008E */ lhu $v0, 0x8e($s0) -/* DCE1EC 8024151C 2442FFFF */ addiu $v0, $v0, -1 -/* DCE1F0 80241520 A602008E */ sh $v0, 0x8e($s0) -/* DCE1F4 80241524 00021400 */ sll $v0, $v0, 0x10 -/* DCE1F8 80241528 1440001F */ bnez $v0, .L802415A8 -/* DCE1FC 8024152C 00000000 */ nop -/* DCE200 80241530 8E820074 */ lw $v0, 0x74($s4) -/* DCE204 80241534 2442FFFF */ addiu $v0, $v0, -1 -/* DCE208 80241538 10400019 */ beqz $v0, .L802415A0 -/* DCE20C 8024153C AE820074 */ sw $v0, 0x74($s4) -/* DCE210 80241540 8E220018 */ lw $v0, 0x18($s1) -/* DCE214 80241544 9442002A */ lhu $v0, 0x2a($v0) -/* DCE218 80241548 30420010 */ andi $v0, $v0, 0x10 -/* DCE21C 8024154C 14400007 */ bnez $v0, .L8024156C -/* DCE220 80241550 00000000 */ nop -/* DCE224 80241554 C600000C */ lwc1 $f0, 0xc($s0) -/* DCE228 80241558 3C014334 */ lui $at, 0x4334 -/* DCE22C 8024155C 44816000 */ mtc1 $at, $f12 -/* DCE230 80241560 0C00A6C9 */ jal clamp_angle -/* DCE234 80241564 460C0300 */ add.s $f12, $f0, $f12 -/* DCE238 80241568 E600000C */ swc1 $f0, 0xc($s0) -.L8024156C: -/* DCE23C 8024156C 8E440008 */ lw $a0, 8($s2) -/* DCE240 80241570 000417C2 */ srl $v0, $a0, 0x1f -/* DCE244 80241574 00822021 */ addu $a0, $a0, $v0 -/* DCE248 80241578 00042043 */ sra $a0, $a0, 1 -/* DCE24C 8024157C 0C00A67F */ jal rand_int -/* DCE250 80241580 24840001 */ addiu $a0, $a0, 1 -/* DCE254 80241584 8E430008 */ lw $v1, 8($s2) -/* DCE258 80241588 000327C2 */ srl $a0, $v1, 0x1f -/* DCE25C 8024158C 00641821 */ addu $v1, $v1, $a0 -/* DCE260 80241590 00031843 */ sra $v1, $v1, 1 -/* DCE264 80241594 00621821 */ addu $v1, $v1, $v0 -/* DCE268 80241598 0809056A */ j .L802415A8 -/* DCE26C 8024159C A603008E */ sh $v1, 0x8e($s0) -.L802415A0: -/* DCE270 802415A0 24020004 */ addiu $v0, $zero, 4 -.L802415A4: -/* DCE274 802415A4 AE820070 */ sw $v0, 0x70($s4) -.L802415A8: -/* DCE278 802415A8 8FBF0044 */ lw $ra, 0x44($sp) -/* DCE27C 802415AC 8FB40040 */ lw $s4, 0x40($sp) -/* DCE280 802415B0 8FB3003C */ lw $s3, 0x3c($sp) -/* DCE284 802415B4 8FB20038 */ lw $s2, 0x38($sp) -/* DCE288 802415B8 8FB10034 */ lw $s1, 0x34($sp) -/* DCE28C 802415BC 8FB00030 */ lw $s0, 0x30($sp) -/* DCE290 802415C0 03E00008 */ jr $ra -/* DCE294 802415C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s deleted file mode 100644 index b4699e10aa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241898_DCE568.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_DCE568 -/* DCE568 80241898 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DCE56C 8024189C AFB3003C */ sw $s3, 0x3c($sp) -/* DCE570 802418A0 0080982D */ daddu $s3, $a0, $zero -/* DCE574 802418A4 AFBF0040 */ sw $ra, 0x40($sp) -/* DCE578 802418A8 AFB20038 */ sw $s2, 0x38($sp) -/* DCE57C 802418AC AFB10034 */ sw $s1, 0x34($sp) -/* DCE580 802418B0 AFB00030 */ sw $s0, 0x30($sp) -/* DCE584 802418B4 8E720148 */ lw $s2, 0x148($s3) -/* DCE588 802418B8 00A0882D */ daddu $s1, $a1, $zero -/* DCE58C 802418BC 86440008 */ lh $a0, 8($s2) -/* DCE590 802418C0 0C00EABB */ jal get_npc_unsafe -/* DCE594 802418C4 00C0802D */ daddu $s0, $a2, $zero -/* DCE598 802418C8 0200202D */ daddu $a0, $s0, $zero -/* DCE59C 802418CC 0240282D */ daddu $a1, $s2, $zero -/* DCE5A0 802418D0 24030001 */ addiu $v1, $zero, 1 -/* DCE5A4 802418D4 AFA30010 */ sw $v1, 0x10($sp) -/* DCE5A8 802418D8 8E260024 */ lw $a2, 0x24($s1) -/* DCE5AC 802418DC 8E270028 */ lw $a3, 0x28($s1) -/* DCE5B0 802418E0 0C01242D */ jal func_800490B4 -/* DCE5B4 802418E4 0040802D */ daddu $s0, $v0, $zero -/* DCE5B8 802418E8 1440001E */ bnez $v0, .L80241964 -/* DCE5BC 802418EC 0200202D */ daddu $a0, $s0, $zero -/* DCE5C0 802418F0 24040002 */ addiu $a0, $zero, 2 -/* DCE5C4 802418F4 0200282D */ daddu $a1, $s0, $zero -/* DCE5C8 802418F8 0000302D */ daddu $a2, $zero, $zero -/* DCE5CC 802418FC 860300A8 */ lh $v1, 0xa8($s0) -/* DCE5D0 80241900 3C013F80 */ lui $at, 0x3f80 -/* DCE5D4 80241904 44810000 */ mtc1 $at, $f0 -/* DCE5D8 80241908 3C014000 */ lui $at, 0x4000 -/* DCE5DC 8024190C 44811000 */ mtc1 $at, $f2 -/* DCE5E0 80241910 3C01C1A0 */ lui $at, 0xc1a0 -/* DCE5E4 80241914 44812000 */ mtc1 $at, $f4 -/* DCE5E8 80241918 2402000F */ addiu $v0, $zero, 0xf -/* DCE5EC 8024191C AFA2001C */ sw $v0, 0x1c($sp) -/* DCE5F0 80241920 44833000 */ mtc1 $v1, $f6 -/* DCE5F4 80241924 00000000 */ nop -/* DCE5F8 80241928 468031A0 */ cvt.s.w $f6, $f6 -/* DCE5FC 8024192C 44073000 */ mfc1 $a3, $f6 -/* DCE600 80241930 27A20028 */ addiu $v0, $sp, 0x28 -/* DCE604 80241934 AFA20020 */ sw $v0, 0x20($sp) -/* DCE608 80241938 E7A00010 */ swc1 $f0, 0x10($sp) -/* DCE60C 8024193C E7A20014 */ swc1 $f2, 0x14($sp) -/* DCE610 80241940 0C01BFA4 */ jal fx_emote -/* DCE614 80241944 E7A40018 */ swc1 $f4, 0x18($sp) -/* DCE618 80241948 8E4200CC */ lw $v0, 0xcc($s2) -/* DCE61C 8024194C 8C430000 */ lw $v1, ($v0) -/* DCE620 80241950 24020019 */ addiu $v0, $zero, 0x19 -/* DCE624 80241954 A602008E */ sh $v0, 0x8e($s0) -/* DCE628 80241958 2402000E */ addiu $v0, $zero, 0xe -/* DCE62C 8024195C 08090666 */ j .L80241998 -/* DCE630 80241960 AE030028 */ sw $v1, 0x28($s0) -.L80241964: -/* DCE634 80241964 0C00F598 */ jal func_8003D660 -/* DCE638 80241968 24050001 */ addiu $a1, $zero, 1 -/* DCE63C 8024196C 8E050018 */ lw $a1, 0x18($s0) -/* DCE640 80241970 8E06000C */ lw $a2, 0xc($s0) -/* DCE644 80241974 0C00EA95 */ jal npc_move_heading -/* DCE648 80241978 0200202D */ daddu $a0, $s0, $zero -/* DCE64C 8024197C 8602008E */ lh $v0, 0x8e($s0) -/* DCE650 80241980 9603008E */ lhu $v1, 0x8e($s0) -/* DCE654 80241984 18400003 */ blez $v0, .L80241994 -/* DCE658 80241988 2462FFFF */ addiu $v0, $v1, -1 -/* DCE65C 8024198C 08090667 */ j .L8024199C -/* DCE660 80241990 A602008E */ sh $v0, 0x8e($s0) -.L80241994: -/* DCE664 80241994 2402000C */ addiu $v0, $zero, 0xc -.L80241998: -/* DCE668 80241998 AE620070 */ sw $v0, 0x70($s3) -.L8024199C: -/* DCE66C 8024199C 8FBF0040 */ lw $ra, 0x40($sp) -/* DCE670 802419A0 8FB3003C */ lw $s3, 0x3c($sp) -/* DCE674 802419A4 8FB20038 */ lw $s2, 0x38($sp) -/* DCE678 802419A8 8FB10034 */ lw $s1, 0x34($sp) -/* DCE67C 802419AC 8FB00030 */ lw $s0, 0x30($sp) -/* DCE680 802419B0 03E00008 */ jr $ra -/* DCE684 802419B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s deleted file mode 100644 index 28f7ff9e98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A20_DCE6F0 -/* DCE6F0 80241A20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE6F4 80241A24 AFB10014 */ sw $s1, 0x14($sp) -/* DCE6F8 80241A28 0080882D */ daddu $s1, $a0, $zero -/* DCE6FC 80241A2C AFBF001C */ sw $ra, 0x1c($sp) -/* DCE700 80241A30 AFB20018 */ sw $s2, 0x18($sp) -/* DCE704 80241A34 AFB00010 */ sw $s0, 0x10($sp) -/* DCE708 80241A38 8E300148 */ lw $s0, 0x148($s1) -/* DCE70C 80241A3C 86040008 */ lh $a0, 8($s0) -/* DCE710 80241A40 0C00EABB */ jal get_npc_unsafe -/* DCE714 80241A44 00A0902D */ daddu $s2, $a1, $zero -/* DCE718 80241A48 8E0300D0 */ lw $v1, 0xd0($s0) -/* DCE71C 80241A4C 8E240078 */ lw $a0, 0x78($s1) -/* DCE720 80241A50 8C630000 */ lw $v1, ($v1) -/* DCE724 80241A54 0083182A */ slt $v1, $a0, $v1 -/* DCE728 80241A58 10600013 */ beqz $v1, .L80241AA8 -/* DCE72C 80241A5C 0040302D */ daddu $a2, $v0, $zero -/* DCE730 80241A60 00041040 */ sll $v0, $a0, 1 -/* DCE734 80241A64 00441021 */ addu $v0, $v0, $a0 -/* DCE738 80241A68 00022880 */ sll $a1, $v0, 2 -.L80241A6C: -/* DCE73C 80241A6C 8E0300D0 */ lw $v1, 0xd0($s0) -/* DCE740 80241A70 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* DCE744 80241A74 00A31021 */ addu $v0, $a1, $v1 -/* DCE748 80241A78 C4400008 */ lwc1 $f0, 8($v0) -/* DCE74C 80241A7C 46800020 */ cvt.s.w $f0, $f0 -/* DCE750 80241A80 4602003E */ c.le.s $f0, $f2 -/* DCE754 80241A84 00000000 */ nop -/* DCE758 80241A88 45020003 */ bc1fl .L80241A98 -/* DCE75C 80241A8C 24840001 */ addiu $a0, $a0, 1 -/* DCE760 80241A90 080906AA */ j .L80241AA8 -/* DCE764 80241A94 AE240078 */ sw $a0, 0x78($s1) -.L80241A98: -/* DCE768 80241A98 8C620000 */ lw $v0, ($v1) -/* DCE76C 80241A9C 0082102A */ slt $v0, $a0, $v0 -/* DCE770 80241AA0 1440FFF2 */ bnez $v0, .L80241A6C -/* DCE774 80241AA4 24A5000C */ addiu $a1, $a1, 0xc -.L80241AA8: -/* DCE778 80241AA8 C6400000 */ lwc1 $f0, ($s2) -/* DCE77C 80241AAC E4C00018 */ swc1 $f0, 0x18($a2) -/* DCE780 80241AB0 8E0200CC */ lw $v0, 0xcc($s0) -/* DCE784 80241AB4 8C420004 */ lw $v0, 4($v0) -/* DCE788 80241AB8 ACC20028 */ sw $v0, 0x28($a2) -/* DCE78C 80241ABC 24020001 */ addiu $v0, $zero, 1 -/* DCE790 80241AC0 AE200074 */ sw $zero, 0x74($s1) -/* DCE794 80241AC4 AE220070 */ sw $v0, 0x70($s1) -/* DCE798 80241AC8 8FBF001C */ lw $ra, 0x1c($sp) -/* DCE79C 80241ACC 8FB20018 */ lw $s2, 0x18($sp) -/* DCE7A0 80241AD0 8FB10014 */ lw $s1, 0x14($sp) -/* DCE7A4 80241AD4 8FB00010 */ lw $s0, 0x10($sp) -/* DCE7A8 80241AD8 03E00008 */ jr $ra -/* DCE7AC 80241ADC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 37c7032f23..e9b19e7672 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -137,7 +137,7 @@ glabel L80241CC4_DCE994 glabel L80241CD4_DCE9A4 /* DCE9A4 80241CD4 0280202D */ daddu $a0, $s4, $zero /* DCE9A8 80241CD8 0260282D */ daddu $a1, $s3, $zero -/* DCE9AC 80241CDC 0C090429 */ jal func_802410A4_DCDD74 +/* DCE9AC 80241CDC 0C090429 */ jal omo_09_UnkFunc13 /* DCE9B0 80241CE0 02A0302D */ daddu $a2, $s5, $zero /* DCE9B4 80241CE4 0809076D */ j L80241DB4_DCEA84 /* DCE9B8 80241CE8 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241CEC_DCE9BC glabel L80241CFC_DCE9CC /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero -/* DCE9D4 80241D04 0C090503 */ jal func_8024140C_DCE0DC +/* DCE9D4 80241D04 0C090503 */ jal omo_09_UnkFunc14 /* DCE9D8 80241D08 02A0302D */ daddu $a2, $s5, $zero /* DCE9DC 80241D0C 0809076D */ j L80241DB4_DCEA84 /* DCE9E0 80241D10 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241D54_DCEA24 glabel L80241D64_DCEA34 /* DCEA34 80241D64 0280202D */ daddu $a0, $s4, $zero /* DCEA38 80241D68 0260282D */ daddu $a1, $s3, $zero -/* DCEA3C 80241D6C 0C090626 */ jal func_80241898_DCE568 +/* DCEA3C 80241D6C 0C090626 */ jal omo_09_UnkFunc15 /* DCEA40 80241D70 02A0302D */ daddu $a2, $s5, $zero /* DCEA44 80241D74 0809076D */ j L80241DB4_DCEA84 /* DCEA48 80241D78 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241D7C_DCEA4C glabel L80241D94_DCEA64 /* DCEA64 80241D94 0280202D */ daddu $a0, $s4, $zero /* DCEA68 80241D98 0260282D */ daddu $a1, $s3, $zero -/* DCEA6C 80241D9C 0C090688 */ jal func_80241A20_DCE6F0 +/* DCEA6C 80241D9C 0C090688 */ jal omo_09_UnkFunc16 /* DCEA70 80241DA0 02A0302D */ daddu $a2, $s5, $zero /* DCEA74 80241DA4 0809076D */ j L80241DB4_DCEA84 /* DCEA78 80241DA8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 5c1a5b4697..c50656cd3a 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -137,7 +137,7 @@ glabel L802421F8_DCEEC8 glabel L80242208_DCEED8 /* DCEED8 80242208 0260202D */ daddu $a0, $s3, $zero /* DCEEDC 8024220C 0280282D */ daddu $a1, $s4, $zero -/* DCEEE0 80242210 0C090429 */ jal func_802410A4_DCDD74 +/* DCEEE0 80242210 0C090429 */ jal omo_09_UnkFunc13 /* DCEEE4 80242214 02A0302D */ daddu $a2, $s5, $zero /* DCEEE8 80242218 080908CC */ j L80242330_DCF000 /* DCEEEC 8024221C 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80242220_DCEEF0 glabel L80242230_DCEF00 /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero -/* DCEF08 80242238 0C090503 */ jal func_8024140C_DCE0DC +/* DCEF08 80242238 0C090503 */ jal omo_09_UnkFunc14 /* DCEF0C 8024223C 02A0302D */ daddu $a2, $s5, $zero /* DCEF10 80242240 080908CC */ j L80242330_DCF000 /* DCEF14 80242244 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80242288_DCEF58 glabel L80242298_DCEF68 /* DCEF68 80242298 0260202D */ daddu $a0, $s3, $zero /* DCEF6C 8024229C 0280282D */ daddu $a1, $s4, $zero -/* DCEF70 802422A0 0C090626 */ jal func_80241898_DCE568 +/* DCEF70 802422A0 0C090626 */ jal omo_09_UnkFunc15 /* DCEF74 802422A4 02A0302D */ daddu $a2, $s5, $zero /* DCEF78 802422A8 080908CC */ j L80242330_DCF000 /* DCEF7C 802422AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407AC_DDCFDC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407AC_DDCFDC.s deleted file mode 100644 index 6634e6a891..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407AC_DDCFDC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407AC_DDCFDC -/* DDCFDC 802407AC 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* DDCFE0 802407B0 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* DDCFE4 802407B4 8C430000 */ lw $v1, ($v0) -/* DDCFE8 802407B8 2404FFBF */ addiu $a0, $zero, -0x41 -/* DDCFEC 802407BC 00641824 */ and $v1, $v1, $a0 -/* DDCFF0 802407C0 AC430000 */ sw $v1, ($v0) -/* DDCFF4 802407C4 03E00008 */ jr $ra -/* DDCFF8 802407C8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s deleted file mode 100644 index 71bf6cf93b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F8_DDD028 -/* DDD028 802407F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDD02C 802407FC AFB00010 */ sw $s0, 0x10($sp) -/* DDD030 80240800 0080802D */ daddu $s0, $a0, $zero -/* DDD034 80240804 AFBF0018 */ sw $ra, 0x18($sp) -/* DDD038 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* DDD03C 8024080C 8E11000C */ lw $s1, 0xc($s0) -/* DDD040 80240810 8E250000 */ lw $a1, ($s1) -/* DDD044 80240814 0C0B1EAF */ jal get_variable -/* DDD048 80240818 26310004 */ addiu $s1, $s1, 4 -/* DDD04C 8024081C 0200202D */ daddu $a0, $s0, $zero -/* DDD050 80240820 3C038011 */ lui $v1, %hi(gPlayerData) -/* DDD054 80240824 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* DDD058 80240828 000210C0 */ sll $v0, $v0, 3 -/* DDD05C 8024082C 00431021 */ addu $v0, $v0, $v1 -/* DDD060 80240830 90460015 */ lbu $a2, 0x15($v0) -/* DDD064 80240834 8E250000 */ lw $a1, ($s1) -/* DDD068 80240838 24C60001 */ addiu $a2, $a2, 1 -/* DDD06C 8024083C A0460015 */ sb $a2, 0x15($v0) -/* DDD070 80240840 00063600 */ sll $a2, $a2, 0x18 -/* DDD074 80240844 0C0B2026 */ jal set_variable -/* DDD078 80240848 00063603 */ sra $a2, $a2, 0x18 -/* DDD07C 8024084C 8FBF0018 */ lw $ra, 0x18($sp) -/* DDD080 80240850 8FB10014 */ lw $s1, 0x14($sp) -/* DDD084 80240854 8FB00010 */ lw $s0, 0x10($sp) -/* DDD088 80240858 24020002 */ addiu $v0, $zero, 2 -/* DDD08C 8024085C 03E00008 */ jr $ra -/* DDD090 80240860 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s deleted file mode 100644 index 379be05431..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD8_DDD408 -/* DDD408 80240BD8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* DDD40C 80240BDC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* DDD410 80240BE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD414 80240BE4 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD418 80240BE8 00021100 */ sll $v0, $v0, 4 -/* DDD41C 80240BEC 3C048009 */ lui $a0, %hi(D_8008EF20) -/* DDD420 80240BF0 00822021 */ addu $a0, $a0, $v0 -/* DDD424 80240BF4 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* DDD428 80240BF8 0C0496CF */ jal set_message_string -/* DDD42C 80240BFC 0000282D */ daddu $a1, $zero, $zero -/* DDD430 80240C00 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD434 80240C04 24020002 */ addiu $v0, $zero, 2 -/* DDD438 80240C08 03E00008 */ jr $ra -/* DDD43C 80240C0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240C10_DDD440.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240C10_DDD440.s deleted file mode 100644 index 7b1ec1fbfa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240C10_DDD440.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10_DDD440 -/* DDD440 80240C10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DDD444 80240C14 AFB1001C */ sw $s1, 0x1c($sp) -/* DDD448 80240C18 0080882D */ daddu $s1, $a0, $zero -/* DDD44C 80240C1C AFBF0020 */ sw $ra, 0x20($sp) -/* DDD450 80240C20 AFB00018 */ sw $s0, 0x18($sp) -/* DDD454 80240C24 8E30000C */ lw $s0, 0xc($s1) -/* DDD458 80240C28 8E050000 */ lw $a1, ($s0) -/* DDD45C 80240C2C 0C0B1EAF */ jal get_variable -/* DDD460 80240C30 26100004 */ addiu $s0, $s0, 4 -/* DDD464 80240C34 0C04417A */ jal get_entity_by_index -/* DDD468 80240C38 0040202D */ daddu $a0, $v0, $zero -/* DDD46C 80240C3C 8E100000 */ lw $s0, ($s0) -/* DDD470 80240C40 C444004C */ lwc1 $f4, 0x4c($v0) -/* DDD474 80240C44 3C014148 */ lui $at, 0x4148 -/* DDD478 80240C48 44810000 */ mtc1 $at, $f0 -/* DDD47C 80240C4C 3C013F33 */ lui $at, 0x3f33 -/* DDD480 80240C50 34213333 */ ori $at, $at, 0x3333 -/* DDD484 80240C54 44811000 */ mtc1 $at, $f2 -/* DDD488 80240C58 AFA00014 */ sw $zero, 0x14($sp) -/* DDD48C 80240C5C 46002100 */ add.s $f4, $f4, $f0 -/* DDD490 80240C60 E7A20010 */ swc1 $f2, 0x10($sp) -/* DDD494 80240C64 8C450048 */ lw $a1, 0x48($v0) -/* DDD498 80240C68 8C470050 */ lw $a3, 0x50($v0) -/* DDD49C 80240C6C 44062000 */ mfc1 $a2, $f4 -/* DDD4A0 80240C70 0C01C5D4 */ jal func_80071750 -/* DDD4A4 80240C74 0000202D */ daddu $a0, $zero, $zero -/* DDD4A8 80240C78 0220202D */ daddu $a0, $s1, $zero -/* DDD4AC 80240C7C 0200282D */ daddu $a1, $s0, $zero -/* DDD4B0 80240C80 0C0B2026 */ jal set_variable -/* DDD4B4 80240C84 0040302D */ daddu $a2, $v0, $zero -/* DDD4B8 80240C88 8FBF0020 */ lw $ra, 0x20($sp) -/* DDD4BC 80240C8C 8FB1001C */ lw $s1, 0x1c($sp) -/* DDD4C0 80240C90 8FB00018 */ lw $s0, 0x18($sp) -/* DDD4C4 80240C94 24020002 */ addiu $v0, $zero, 2 -/* DDD4C8 80240C98 03E00008 */ jr $ra -/* DDD4CC 80240C9C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CD4_DDD504.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CD4_DDD504.s deleted file mode 100644 index 66337b265a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240CD4_DDD504.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4_DDD504 -/* DDD504 80240CD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDD508 80240CD8 AFBF0018 */ sw $ra, 0x18($sp) -/* DDD50C 80240CDC 8C82000C */ lw $v0, 0xc($a0) -/* DDD510 80240CE0 0C0B1EAF */ jal get_variable -/* DDD514 80240CE4 8C450000 */ lw $a1, ($v0) -/* DDD518 80240CE8 0C04417A */ jal get_entity_by_index -/* DDD51C 80240CEC 0040202D */ daddu $a0, $v0, $zero -/* DDD520 80240CF0 3C013F80 */ lui $at, 0x3f80 -/* DDD524 80240CF4 44810000 */ mtc1 $at, $f0 -/* DDD528 80240CF8 C442004C */ lwc1 $f2, 0x4c($v0) -/* DDD52C 80240CFC E7A00010 */ swc1 $f0, 0x10($sp) -/* DDD530 80240D00 3C014148 */ lui $at, 0x4148 -/* DDD534 80240D04 44810000 */ mtc1 $at, $f0 -/* DDD538 80240D08 2403004B */ addiu $v1, $zero, 0x4b -/* DDD53C 80240D0C AFA30014 */ sw $v1, 0x14($sp) -/* DDD540 80240D10 46001080 */ add.s $f2, $f2, $f0 -/* DDD544 80240D14 8C450048 */ lw $a1, 0x48($v0) -/* DDD548 80240D18 8C470050 */ lw $a3, 0x50($v0) -/* DDD54C 80240D1C 44061000 */ mfc1 $a2, $f2 -/* DDD550 80240D20 0C01C2EC */ jal func_80070BB0 -/* DDD554 80240D24 24040004 */ addiu $a0, $zero, 4 -/* DDD558 80240D28 8FBF0018 */ lw $ra, 0x18($sp) -/* DDD55C 80240D2C 24020002 */ addiu $v0, $zero, 2 -/* DDD560 80240D30 03E00008 */ jr $ra -/* DDD564 80240D34 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D38_DDD568.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D38_DDD568.s deleted file mode 100644 index eaf9871e80..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D38_DDD568.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D38_DDD568 -/* DDD568 80240D38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDD56C 80240D3C AFBF0018 */ sw $ra, 0x18($sp) -/* DDD570 80240D40 0C00EAD2 */ jal get_npc_safe -/* DDD574 80240D44 2404FFFC */ addiu $a0, $zero, -4 -/* DDD578 80240D48 C444003C */ lwc1 $f4, 0x3c($v0) -/* DDD57C 80240D4C 3C014148 */ lui $at, 0x4148 -/* DDD580 80240D50 44811000 */ mtc1 $at, $f2 -/* DDD584 80240D54 3C013F80 */ lui $at, 0x3f80 -/* DDD588 80240D58 44810000 */ mtc1 $at, $f0 -/* DDD58C 80240D5C 2403001E */ addiu $v1, $zero, 0x1e -/* DDD590 80240D60 AFA30014 */ sw $v1, 0x14($sp) -/* DDD594 80240D64 46022100 */ add.s $f4, $f4, $f2 -/* DDD598 80240D68 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDD59C 80240D6C 8C450038 */ lw $a1, 0x38($v0) -/* DDD5A0 80240D70 8C470040 */ lw $a3, 0x40($v0) -/* DDD5A4 80240D74 44062000 */ mfc1 $a2, $f4 -/* DDD5A8 80240D78 0C01C2EC */ jal func_80070BB0 -/* DDD5AC 80240D7C 24040009 */ addiu $a0, $zero, 9 -/* DDD5B0 80240D80 8FBF0018 */ lw $ra, 0x18($sp) -/* DDD5B4 80240D84 24020002 */ addiu $v0, $zero, 2 -/* DDD5B8 80240D88 03E00008 */ jr $ra -/* DDD5BC 80240D8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s deleted file mode 100644 index bdffd0bf8c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802412C8_DDDAF8.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C8_DDDAF8 -/* DDDAF8 802412C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDDAFC 802412CC AFB10014 */ sw $s1, 0x14($sp) -/* DDDB00 802412D0 0080882D */ daddu $s1, $a0, $zero -/* DDDB04 802412D4 AFB20018 */ sw $s2, 0x18($sp) -/* DDDB08 802412D8 AFBF001C */ sw $ra, 0x1c($sp) -/* DDDB0C 802412DC AFB00010 */ sw $s0, 0x10($sp) -/* DDDB10 802412E0 8E30000C */ lw $s0, 0xc($s1) -/* DDDB14 802412E4 10A00010 */ beqz $a1, .L80241328 -/* DDDB18 802412E8 0000902D */ daddu $s2, $zero, $zero -/* DDDB1C 802412EC 8E050000 */ lw $a1, ($s0) -/* DDDB20 802412F0 0C0B1EAF */ jal get_variable -/* DDDB24 802412F4 26100004 */ addiu $s0, $s0, 4 -/* DDDB28 802412F8 AE220084 */ sw $v0, 0x84($s1) -/* DDDB2C 802412FC 8E050000 */ lw $a1, ($s0) -/* DDDB30 80241300 0C0B1EAF */ jal get_variable -/* DDDB34 80241304 0220202D */ daddu $a0, $s1, $zero -/* DDDB38 80241308 0240202D */ daddu $a0, $s2, $zero -/* DDDB3C 8024130C 240500D0 */ addiu $a1, $zero, 0xd0 -/* DDDB40 80241310 00A0302D */ daddu $a2, $a1, $zero -/* DDDB44 80241314 00A0382D */ daddu $a3, $a1, $zero -/* DDDB48 80241318 AE220088 */ sw $v0, 0x88($s1) -/* DDDB4C 8024131C AE200070 */ sw $zero, 0x70($s1) -/* DDDB50 80241320 0C04DF84 */ jal set_transition_stencil_color -/* DDDB54 80241324 AE200074 */ sw $zero, 0x74($s1) -.L80241328: -/* DDDB58 80241328 8E230070 */ lw $v1, 0x70($s1) -/* DDDB5C 8024132C 24040001 */ addiu $a0, $zero, 1 -/* DDDB60 80241330 10640019 */ beq $v1, $a0, .L80241398 -/* DDDB64 80241334 28620002 */ slti $v0, $v1, 2 -/* DDDB68 80241338 10400005 */ beqz $v0, .L80241350 -/* DDDB6C 8024133C 24020002 */ addiu $v0, $zero, 2 -/* DDDB70 80241340 10600007 */ beqz $v1, .L80241360 -/* DDDB74 80241344 240500FF */ addiu $a1, $zero, 0xff -/* DDDB78 80241348 080904F6 */ j .L802413D8 -/* DDDB7C 8024134C 00000000 */ nop -.L80241350: -/* DDDB80 80241350 10620019 */ beq $v1, $v0, .L802413B8 -/* DDDB84 80241354 00000000 */ nop -/* DDDB88 80241358 080904F6 */ j .L802413D8 -/* DDDB8C 8024135C 00000000 */ nop -.L80241360: -/* DDDB90 80241360 8E220074 */ lw $v0, 0x74($s1) -/* DDDB94 80241364 14450004 */ bne $v0, $a1, .L80241378 -/* DDDB98 80241368 00000000 */ nop -/* DDDB9C 8024136C AE240070 */ sw $a0, 0x70($s1) -/* DDDBA0 80241370 AE200078 */ sw $zero, 0x78($s1) -/* DDDBA4 80241374 8E220074 */ lw $v0, 0x74($s1) -.L80241378: -/* DDDBA8 80241378 8E230084 */ lw $v1, 0x84($s1) -/* DDDBAC 8024137C 00431021 */ addu $v0, $v0, $v1 -/* DDDBB0 80241380 AE220074 */ sw $v0, 0x74($s1) -/* DDDBB4 80241384 28420100 */ slti $v0, $v0, 0x100 -/* DDDBB8 80241388 50400013 */ beql $v0, $zero, .L802413D8 -/* DDDBBC 8024138C AE250074 */ sw $a1, 0x74($s1) -/* DDDBC0 80241390 080904F6 */ j .L802413D8 -/* DDDBC4 80241394 00000000 */ nop -.L80241398: -/* DDDBC8 80241398 8E220078 */ lw $v0, 0x78($s1) -/* DDDBCC 8024139C 24420001 */ addiu $v0, $v0, 1 -/* DDDBD0 802413A0 AE220078 */ sw $v0, 0x78($s1) -/* DDDBD4 802413A4 28420002 */ slti $v0, $v0, 2 -/* DDDBD8 802413A8 1440000B */ bnez $v0, .L802413D8 -/* DDDBDC 802413AC 24020002 */ addiu $v0, $zero, 2 -/* DDDBE0 802413B0 080904F6 */ j .L802413D8 -/* DDDBE4 802413B4 AE220070 */ sw $v0, 0x70($s1) -.L802413B8: -/* DDDBE8 802413B8 8E230074 */ lw $v1, 0x74($s1) -/* DDDBEC 802413BC 50600001 */ beql $v1, $zero, .L802413C4 -/* DDDBF0 802413C0 24120001 */ addiu $s2, $zero, 1 -.L802413C4: -/* DDDBF4 802413C4 8E220088 */ lw $v0, 0x88($s1) -/* DDDBF8 802413C8 00621023 */ subu $v0, $v1, $v0 -/* DDDBFC 802413CC 04410002 */ bgez $v0, .L802413D8 -/* DDDC00 802413D0 AE220074 */ sw $v0, 0x74($s1) -/* DDDC04 802413D4 AE200074 */ sw $zero, 0x74($s1) -.L802413D8: -/* DDDC08 802413D8 C6200074 */ lwc1 $f0, 0x74($s1) -/* DDDC0C 802413DC 46800020 */ cvt.s.w $f0, $f0 -/* DDDC10 802413E0 44050000 */ mfc1 $a1, $f0 -/* DDDC14 802413E4 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* DDDC18 802413E8 24040001 */ addiu $a0, $zero, 1 -/* DDDC1C 802413EC 0240102D */ daddu $v0, $s2, $zero -/* DDDC20 802413F0 8FBF001C */ lw $ra, 0x1c($sp) -/* DDDC24 802413F4 8FB20018 */ lw $s2, 0x18($sp) -/* DDDC28 802413F8 8FB10014 */ lw $s1, 0x14($sp) -/* DDDC2C 802413FC 8FB00010 */ lw $s0, 0x10($sp) -/* DDDC30 80241400 03E00008 */ jr $ra -/* DDDC34 80241404 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s deleted file mode 100644 index f92049e052..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024184C_DF06EC -/* DF06EC 8024184C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DF06F0 80241850 AFB3004C */ sw $s3, 0x4c($sp) -/* DF06F4 80241854 0080982D */ daddu $s3, $a0, $zero -/* DF06F8 80241858 AFBF0054 */ sw $ra, 0x54($sp) -/* DF06FC 8024185C AFB40050 */ sw $s4, 0x50($sp) -/* DF0700 80241860 AFB20048 */ sw $s2, 0x48($sp) -/* DF0704 80241864 AFB10044 */ sw $s1, 0x44($sp) -/* DF0708 80241868 AFB00040 */ sw $s0, 0x40($sp) -/* DF070C 8024186C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DF0710 80241870 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DF0714 80241874 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DF0718 80241878 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DF071C 8024187C 8E710148 */ lw $s1, 0x148($s3) -/* DF0720 80241880 00A0902D */ daddu $s2, $a1, $zero -/* DF0724 80241884 86240008 */ lh $a0, 8($s1) -/* DF0728 80241888 0C00EABB */ jal get_npc_unsafe -/* DF072C 8024188C 00C0A02D */ daddu $s4, $a2, $zero -/* DF0730 80241890 0040802D */ daddu $s0, $v0, $zero -/* DF0734 80241894 C6200078 */ lwc1 $f0, 0x78($s1) -/* DF0738 80241898 46800020 */ cvt.s.w $f0, $f0 -/* DF073C 8024189C 46000021 */ cvt.d.s $f0, $f0 -/* DF0740 802418A0 3C014059 */ lui $at, 0x4059 -/* DF0744 802418A4 44811800 */ mtc1 $at, $f3 -/* DF0748 802418A8 44801000 */ mtc1 $zero, $f2 -/* DF074C 802418AC 8602008E */ lh $v0, 0x8e($s0) -/* DF0750 802418B0 9603008E */ lhu $v1, 0x8e($s0) -/* DF0754 802418B4 46220003 */ div.d $f0, $f0, $f2 -/* DF0758 802418B8 46200620 */ cvt.s.d $f24, $f0 -/* DF075C 802418BC C6200088 */ lwc1 $f0, 0x88($s1) -/* DF0760 802418C0 46800020 */ cvt.s.w $f0, $f0 -/* DF0764 802418C4 46000021 */ cvt.d.s $f0, $f0 -/* DF0768 802418C8 46220003 */ div.d $f0, $f0, $f2 -/* DF076C 802418CC 46200020 */ cvt.s.d $f0, $f0 -/* DF0770 802418D0 18400003 */ blez $v0, .L802418E0 -/* DF0774 802418D4 4600C680 */ add.s $f26, $f24, $f0 -/* DF0778 802418D8 2462FFFF */ addiu $v0, $v1, -1 -/* DF077C 802418DC A602008E */ sh $v0, 0x8e($s0) -.L802418E0: -/* DF0780 802418E0 8E220070 */ lw $v0, 0x70($s1) -/* DF0784 802418E4 18400034 */ blez $v0, .L802419B8 -/* DF0788 802418E8 00000000 */ nop -/* DF078C 802418EC C62C0074 */ lwc1 $f12, 0x74($s1) -/* DF0790 802418F0 46806320 */ cvt.s.w $f12, $f12 -/* DF0794 802418F4 44820000 */ mtc1 $v0, $f0 -/* DF0798 802418F8 00000000 */ nop -/* DF079C 802418FC 46800020 */ cvt.s.w $f0, $f0 -/* DF07A0 80241900 46000021 */ cvt.d.s $f0, $f0 -/* DF07A4 80241904 46220003 */ div.d $f0, $f0, $f2 -/* DF07A8 80241908 0C00A8BB */ jal sin_deg -/* DF07AC 8024190C 462005A0 */ cvt.s.d $f22, $f0 -/* DF07B0 80241910 8E020000 */ lw $v0, ($s0) -/* DF07B4 80241914 30420008 */ andi $v0, $v0, 8 -/* DF07B8 80241918 10400003 */ beqz $v0, .L80241928 -/* DF07BC 8024191C 46000506 */ mov.s $f20, $f0 -/* DF07C0 80241920 0809065A */ j .L80241968 -/* DF07C4 80241924 0000102D */ daddu $v0, $zero, $zero -.L80241928: -/* DF07C8 80241928 27A50028 */ addiu $a1, $sp, 0x28 -/* DF07CC 8024192C 27A6002C */ addiu $a2, $sp, 0x2c -/* DF07D0 80241930 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF07D4 80241934 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF07D8 80241938 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF07DC 8024193C 3C01447A */ lui $at, 0x447a -/* DF07E0 80241940 44813000 */ mtc1 $at, $f6 -/* DF07E4 80241944 27A20034 */ addiu $v0, $sp, 0x34 -/* DF07E8 80241948 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF07EC 8024194C E7A2002C */ swc1 $f2, 0x2c($sp) -/* DF07F0 80241950 E7A40030 */ swc1 $f4, 0x30($sp) -/* DF07F4 80241954 E7A60034 */ swc1 $f6, 0x34($sp) -/* DF07F8 80241958 AFA20010 */ sw $v0, 0x10($sp) -/* DF07FC 8024195C 8E040080 */ lw $a0, 0x80($s0) -/* DF0800 80241960 0C0372DF */ jal func_800DCB7C -/* DF0804 80241964 27A70030 */ addiu $a3, $sp, 0x30 -.L80241968: -/* DF0808 80241968 10400007 */ beqz $v0, .L80241988 -/* DF080C 8024196C 00000000 */ nop -/* DF0810 80241970 4616A082 */ mul.s $f2, $f20, $f22 -/* DF0814 80241974 00000000 */ nop -/* DF0818 80241978 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DF081C 8024197C 46180000 */ add.s $f0, $f0, $f24 -/* DF0820 80241980 08090665 */ j .L80241994 -/* DF0824 80241984 46020000 */ add.s $f0, $f0, $f2 -.L80241988: -/* DF0828 80241988 4616A002 */ mul.s $f0, $f20, $f22 -/* DF082C 8024198C 00000000 */ nop -/* DF0830 80241990 4600D000 */ add.s $f0, $f26, $f0 -.L80241994: -/* DF0834 80241994 E600003C */ swc1 $f0, 0x3c($s0) -/* DF0838 80241998 8E220074 */ lw $v0, 0x74($s1) -/* DF083C 8024199C 2442000A */ addiu $v0, $v0, 0xa -/* DF0840 802419A0 44826000 */ mtc1 $v0, $f12 -/* DF0844 802419A4 00000000 */ nop -/* DF0848 802419A8 0C00A6C9 */ jal clamp_angle -/* DF084C 802419AC 46806320 */ cvt.s.w $f12, $f12 -/* DF0850 802419B0 4600020D */ trunc.w.s $f8, $f0 -/* DF0854 802419B4 E6280074 */ swc1 $f8, 0x74($s1) -.L802419B8: -/* DF0858 802419B8 8E220090 */ lw $v0, 0x90($s1) -/* DF085C 802419BC 1C400040 */ bgtz $v0, .L80241AC0 -/* DF0860 802419C0 2442FFFF */ addiu $v0, $v0, -1 -/* DF0864 802419C4 860200A8 */ lh $v0, 0xa8($s0) -/* DF0868 802419C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF086C 802419CC 44821000 */ mtc1 $v0, $f2 -/* DF0870 802419D0 00000000 */ nop -/* DF0874 802419D4 468010A0 */ cvt.s.w $f2, $f2 -/* DF0878 802419D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF087C 802419DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0880 802419E0 46020000 */ add.s $f0, $f0, $f2 -/* DF0884 802419E4 3C014024 */ lui $at, 0x4024 -/* DF0888 802419E8 44812800 */ mtc1 $at, $f5 -/* DF088C 802419EC 44802000 */ mtc1 $zero, $f4 -/* DF0890 802419F0 C442002C */ lwc1 $f2, 0x2c($v0) -/* DF0894 802419F4 46000021 */ cvt.d.s $f0, $f0 -/* DF0898 802419F8 46240000 */ add.d $f0, $f0, $f4 -/* DF089C 802419FC 460010A1 */ cvt.d.s $f2, $f2 -/* DF08A0 80241A00 4620103C */ c.lt.d $f2, $f0 -/* DF08A4 80241A04 00000000 */ nop -/* DF08A8 80241A08 4500002E */ bc1f .L80241AC4 -/* DF08AC 80241A0C 0280202D */ daddu $a0, $s4, $zero -/* DF08B0 80241A10 24020001 */ addiu $v0, $zero, 1 -/* DF08B4 80241A14 AFA20010 */ sw $v0, 0x10($sp) -/* DF08B8 80241A18 8E460024 */ lw $a2, 0x24($s2) -/* DF08BC 80241A1C 8E470028 */ lw $a3, 0x28($s2) -/* DF08C0 80241A20 0C01242D */ jal func_800490B4 -/* DF08C4 80241A24 0220282D */ daddu $a1, $s1, $zero -/* DF08C8 80241A28 10400026 */ beqz $v0, .L80241AC4 -/* DF08CC 80241A2C 0000202D */ daddu $a0, $zero, $zero -/* DF08D0 80241A30 0200282D */ daddu $a1, $s0, $zero -/* DF08D4 80241A34 0000302D */ daddu $a2, $zero, $zero -/* DF08D8 80241A38 2412000C */ addiu $s2, $zero, 0xc -/* DF08DC 80241A3C 860300A8 */ lh $v1, 0xa8($s0) -/* DF08E0 80241A40 3C013F80 */ lui $at, 0x3f80 -/* DF08E4 80241A44 44810000 */ mtc1 $at, $f0 -/* DF08E8 80241A48 3C014000 */ lui $at, 0x4000 -/* DF08EC 80241A4C 44811000 */ mtc1 $at, $f2 -/* DF08F0 80241A50 3C01C1A0 */ lui $at, 0xc1a0 -/* DF08F4 80241A54 44812000 */ mtc1 $at, $f4 -/* DF08F8 80241A58 44834000 */ mtc1 $v1, $f8 -/* DF08FC 80241A5C 00000000 */ nop -/* DF0900 80241A60 46804220 */ cvt.s.w $f8, $f8 -/* DF0904 80241A64 44074000 */ mfc1 $a3, $f8 -/* DF0908 80241A68 27A20038 */ addiu $v0, $sp, 0x38 -/* DF090C 80241A6C AFB2001C */ sw $s2, 0x1c($sp) -/* DF0910 80241A70 AFA20020 */ sw $v0, 0x20($sp) -/* DF0914 80241A74 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF0918 80241A78 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF091C 80241A7C 0C01BFA4 */ jal fx_emote -/* DF0920 80241A80 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF0924 80241A84 0200202D */ daddu $a0, $s0, $zero -/* DF0928 80241A88 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DF092C 80241A8C C480003C */ lwc1 $f0, 0x3c($a0) -/* DF0930 80241A90 3C060020 */ lui $a2, 0x20 -/* DF0934 80241A94 0C012530 */ jal func_800494C0 -/* DF0938 80241A98 E4800064 */ swc1 $f0, 0x64($a0) -/* DF093C 80241A9C 8E220018 */ lw $v0, 0x18($s1) -/* DF0940 80241AA0 9442002A */ lhu $v0, 0x2a($v0) -/* DF0944 80241AA4 30420001 */ andi $v0, $v0, 1 -/* DF0948 80241AA8 10400003 */ beqz $v0, .L80241AB8 -/* DF094C 80241AAC 2402000A */ addiu $v0, $zero, 0xa -/* DF0950 80241AB0 080906D8 */ j .L80241B60 -/* DF0954 80241AB4 AE620070 */ sw $v0, 0x70($s3) -.L80241AB8: -/* DF0958 80241AB8 080906D8 */ j .L80241B60 -/* DF095C 80241ABC AE720070 */ sw $s2, 0x70($s3) -.L80241AC0: -/* DF0960 80241AC0 AE220090 */ sw $v0, 0x90($s1) -.L80241AC4: -/* DF0964 80241AC4 8602008C */ lh $v0, 0x8c($s0) -/* DF0968 80241AC8 14400025 */ bnez $v0, .L80241B60 -/* DF096C 80241ACC 00000000 */ nop -/* DF0970 80241AD0 8602008E */ lh $v0, 0x8e($s0) -/* DF0974 80241AD4 1C400022 */ bgtz $v0, .L80241B60 -/* DF0978 80241AD8 00000000 */ nop -/* DF097C 80241ADC 8E620074 */ lw $v0, 0x74($s3) -/* DF0980 80241AE0 2442FFFF */ addiu $v0, $v0, -1 -/* DF0984 80241AE4 1840001D */ blez $v0, .L80241B5C -/* DF0988 80241AE8 AE620074 */ sw $v0, 0x74($s3) -/* DF098C 80241AEC 8E220018 */ lw $v0, 0x18($s1) -/* DF0990 80241AF0 9442002A */ lhu $v0, 0x2a($v0) -/* DF0994 80241AF4 30420010 */ andi $v0, $v0, 0x10 -/* DF0998 80241AF8 14400007 */ bnez $v0, .L80241B18 -/* DF099C 80241AFC 00000000 */ nop -/* DF09A0 80241B00 C600000C */ lwc1 $f0, 0xc($s0) -/* DF09A4 80241B04 3C014334 */ lui $at, 0x4334 -/* DF09A8 80241B08 44816000 */ mtc1 $at, $f12 -/* DF09AC 80241B0C 0C00A6C9 */ jal clamp_angle -/* DF09B0 80241B10 460C0300 */ add.s $f12, $f0, $f12 -/* DF09B4 80241B14 E600000C */ swc1 $f0, 0xc($s0) -.L80241B18: -/* DF09B8 80241B18 0C00A67F */ jal rand_int -/* DF09BC 80241B1C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DF09C0 80241B20 3C032E8B */ lui $v1, 0x2e8b -/* DF09C4 80241B24 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DF09C8 80241B28 00430018 */ mult $v0, $v1 -/* DF09CC 80241B2C 00021FC3 */ sra $v1, $v0, 0x1f -/* DF09D0 80241B30 00004010 */ mfhi $t0 -/* DF09D4 80241B34 00082043 */ sra $a0, $t0, 1 -/* DF09D8 80241B38 00832023 */ subu $a0, $a0, $v1 -/* DF09DC 80241B3C 00041840 */ sll $v1, $a0, 1 -/* DF09E0 80241B40 00641821 */ addu $v1, $v1, $a0 -/* DF09E4 80241B44 00031880 */ sll $v1, $v1, 2 -/* DF09E8 80241B48 00641823 */ subu $v1, $v1, $a0 -/* DF09EC 80241B4C 00431023 */ subu $v0, $v0, $v1 -/* DF09F0 80241B50 24420005 */ addiu $v0, $v0, 5 -/* DF09F4 80241B54 080906D8 */ j .L80241B60 -/* DF09F8 80241B58 A602008E */ sh $v0, 0x8e($s0) -.L80241B5C: -/* DF09FC 80241B5C AE600070 */ sw $zero, 0x70($s3) -.L80241B60: -/* DF0A00 80241B60 8FBF0054 */ lw $ra, 0x54($sp) -/* DF0A04 80241B64 8FB40050 */ lw $s4, 0x50($sp) -/* DF0A08 80241B68 8FB3004C */ lw $s3, 0x4c($sp) -/* DF0A0C 80241B6C 8FB20048 */ lw $s2, 0x48($sp) -/* DF0A10 80241B70 8FB10044 */ lw $s1, 0x44($sp) -/* DF0A14 80241B74 8FB00040 */ lw $s0, 0x40($sp) -/* DF0A18 80241B78 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DF0A1C 80241B7C D7B80068 */ ldc1 $f24, 0x68($sp) -/* DF0A20 80241B80 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DF0A24 80241B84 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DF0A28 80241B88 03E00008 */ jr $ra -/* DF0A2C 80241B8C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s deleted file mode 100644 index 0eea4a589a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E0C_DF0CAC -/* DF0CAC 80241E0C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF0CB0 80241E10 AFB20030 */ sw $s2, 0x30($sp) -/* DF0CB4 80241E14 0080902D */ daddu $s2, $a0, $zero -/* DF0CB8 80241E18 AFBF0038 */ sw $ra, 0x38($sp) -/* DF0CBC 80241E1C AFB30034 */ sw $s3, 0x34($sp) -/* DF0CC0 80241E20 AFB1002C */ sw $s1, 0x2c($sp) -/* DF0CC4 80241E24 AFB00028 */ sw $s0, 0x28($sp) -/* DF0CC8 80241E28 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DF0CCC 80241E2C F7B40040 */ sdc1 $f20, 0x40($sp) -/* DF0CD0 80241E30 8E510148 */ lw $s1, 0x148($s2) -/* DF0CD4 80241E34 86240008 */ lh $a0, 8($s1) -/* DF0CD8 80241E38 0C00EABB */ jal get_npc_unsafe -/* DF0CDC 80241E3C 00A0982D */ daddu $s3, $a1, $zero -/* DF0CE0 80241E40 0040802D */ daddu $s0, $v0, $zero -/* DF0CE4 80241E44 0200202D */ daddu $a0, $s0, $zero -/* DF0CE8 80241E48 C6220088 */ lwc1 $f2, 0x88($s1) -/* DF0CEC 80241E4C 468010A0 */ cvt.s.w $f2, $f2 -/* DF0CF0 80241E50 460010A1 */ cvt.d.s $f2, $f2 -/* DF0CF4 80241E54 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0CF8 80241E58 C6000014 */ lwc1 $f0, 0x14($s0) -/* DF0CFC 80241E5C 8E050018 */ lw $a1, 0x18($s0) -/* DF0D00 80241E60 46002100 */ add.s $f4, $f4, $f0 -/* DF0D04 80241E64 8E06000C */ lw $a2, 0xc($s0) -/* DF0D08 80241E68 C6200078 */ lwc1 $f0, 0x78($s1) -/* DF0D0C 80241E6C 46800020 */ cvt.s.w $f0, $f0 -/* DF0D10 80241E70 E604001C */ swc1 $f4, 0x1c($s0) -/* DF0D14 80241E74 3C014059 */ lui $at, 0x4059 -/* DF0D18 80241E78 44812800 */ mtc1 $at, $f5 -/* DF0D1C 80241E7C 44802000 */ mtc1 $zero, $f4 -/* DF0D20 80241E80 46000021 */ cvt.d.s $f0, $f0 -/* DF0D24 80241E84 46240003 */ div.d $f0, $f0, $f4 -/* DF0D28 80241E88 46200520 */ cvt.s.d $f20, $f0 -/* DF0D2C 80241E8C 46241083 */ div.d $f2, $f2, $f4 -/* DF0D30 80241E90 0C00EA95 */ jal npc_move_heading -/* DF0D34 80241E94 462015A0 */ cvt.s.d $f22, $f2 -/* DF0D38 80241E98 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0D3C 80241E9C 44801000 */ mtc1 $zero, $f2 -/* DF0D40 80241EA0 44801800 */ mtc1 $zero, $f3 -/* DF0D44 80241EA4 46002021 */ cvt.d.s $f0, $f4 -/* DF0D48 80241EA8 4620103E */ c.le.d $f2, $f0 -/* DF0D4C 80241EAC 00000000 */ nop -/* DF0D50 80241EB0 45000030 */ bc1f .L80241F74 -/* DF0D54 80241EB4 00000000 */ nop -/* DF0D58 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0D5C 80241EBC 46040000 */ add.s $f0, $f0, $f4 -/* DF0D60 80241EC0 E600003C */ swc1 $f0, 0x3c($s0) -/* DF0D64 80241EC4 8E2200CC */ lw $v0, 0xcc($s1) -/* DF0D68 80241EC8 8C420024 */ lw $v0, 0x24($v0) -/* DF0D6C 80241ECC AE020028 */ sw $v0, 0x28($s0) -/* DF0D70 80241ED0 A2200007 */ sb $zero, 7($s1) -/* DF0D74 80241ED4 8E020000 */ lw $v0, ($s0) -/* DF0D78 80241ED8 30420008 */ andi $v0, $v0, 8 -/* DF0D7C 80241EDC 14400011 */ bnez $v0, .L80241F24 -/* DF0D80 80241EE0 0000102D */ daddu $v0, $zero, $zero -/* DF0D84 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 -/* DF0D88 80241EE8 27A6001C */ addiu $a2, $sp, 0x1c -/* DF0D8C 80241EEC C6000038 */ lwc1 $f0, 0x38($s0) -/* DF0D90 80241EF0 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0D94 80241EF4 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF0D98 80241EF8 3C01447A */ lui $at, 0x447a -/* DF0D9C 80241EFC 44813000 */ mtc1 $at, $f6 -/* DF0DA0 80241F00 27A20024 */ addiu $v0, $sp, 0x24 -/* DF0DA4 80241F04 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF0DA8 80241F08 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DF0DAC 80241F0C E7A40020 */ swc1 $f4, 0x20($sp) -/* DF0DB0 80241F10 E7A60024 */ swc1 $f6, 0x24($sp) -/* DF0DB4 80241F14 AFA20010 */ sw $v0, 0x10($sp) -/* DF0DB8 80241F18 8E040080 */ lw $a0, 0x80($s0) -/* DF0DBC 80241F1C 0C0372DF */ jal func_800DCB7C -/* DF0DC0 80241F20 27A70020 */ addiu $a3, $sp, 0x20 -.L80241F24: -/* DF0DC4 80241F24 1040000B */ beqz $v0, .L80241F54 -/* DF0DC8 80241F28 00000000 */ nop -/* DF0DCC 80241F2C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DF0DD0 80241F30 46140080 */ add.s $f2, $f0, $f20 -/* DF0DD4 80241F34 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0DD8 80241F38 4600103E */ c.le.s $f2, $f0 -/* DF0DDC 80241F3C 00000000 */ nop -/* DF0DE0 80241F40 4500008D */ bc1f .L80242178 -/* DF0DE4 80241F44 00000000 */ nop -/* DF0DE8 80241F48 E602003C */ swc1 $f2, 0x3c($s0) -/* DF0DEC 80241F4C 0809085E */ j .L80242178 -/* DF0DF0 80241F50 AE400070 */ sw $zero, 0x70($s2) -.L80241F54: -/* DF0DF4 80241F54 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0DF8 80241F58 C6000064 */ lwc1 $f0, 0x64($s0) -/* DF0DFC 80241F5C 4602003E */ c.le.s $f0, $f2 -/* DF0E00 80241F60 00000000 */ nop -/* DF0E04 80241F64 45030084 */ bc1tl .L80242178 -/* DF0E08 80241F68 AE400070 */ sw $zero, 0x70($s2) -/* DF0E0C 80241F6C 0809085E */ j .L80242178 -/* DF0E10 80241F70 00000000 */ nop -.L80241F74: -/* DF0E14 80241F74 4622003C */ c.lt.d $f0, $f2 -/* DF0E18 80241F78 00000000 */ nop -/* DF0E1C 80241F7C 4500007E */ bc1f .L80242178 -/* DF0E20 80241F80 00000000 */ nop -/* DF0E24 80241F84 9602008E */ lhu $v0, 0x8e($s0) -/* DF0E28 80241F88 24420001 */ addiu $v0, $v0, 1 -/* DF0E2C 80241F8C A602008E */ sh $v0, 0x8e($s0) -/* DF0E30 80241F90 00021400 */ sll $v0, $v0, 0x10 -/* DF0E34 80241F94 8E630020 */ lw $v1, 0x20($s3) -/* DF0E38 80241F98 00021403 */ sra $v0, $v0, 0x10 -/* DF0E3C 80241F9C 0043102A */ slt $v0, $v0, $v1 -/* DF0E40 80241FA0 14400026 */ bnez $v0, .L8024203C -/* DF0E44 80241FA4 00000000 */ nop -/* DF0E48 80241FA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF0E4C 80241FAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF0E50 80241FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0E54 80241FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0E58 80241FB8 A600008E */ sh $zero, 0x8e($s0) -/* DF0E5C 80241FBC 8C460028 */ lw $a2, 0x28($v0) -/* DF0E60 80241FC0 0C00A720 */ jal atan2 -/* DF0E64 80241FC4 8C470030 */ lw $a3, 0x30($v0) -/* DF0E68 80241FC8 46000506 */ mov.s $f20, $f0 -/* DF0E6C 80241FCC C60C000C */ lwc1 $f12, 0xc($s0) -/* DF0E70 80241FD0 0C00A70A */ jal get_clamped_angle_diff -/* DF0E74 80241FD4 4600A386 */ mov.s $f14, $f20 -/* DF0E78 80241FD8 46000086 */ mov.s $f2, $f0 -/* DF0E7C 80241FDC 8E62001C */ lw $v0, 0x1c($s3) -/* DF0E80 80241FE0 46001005 */ abs.s $f0, $f2 -/* DF0E84 80241FE4 44822000 */ mtc1 $v0, $f4 -/* DF0E88 80241FE8 00000000 */ nop -/* DF0E8C 80241FEC 46802120 */ cvt.s.w $f4, $f4 -/* DF0E90 80241FF0 4600203C */ c.lt.s $f4, $f0 -/* DF0E94 80241FF4 00000000 */ nop -/* DF0E98 80241FF8 4500000D */ bc1f .L80242030 -/* DF0E9C 80241FFC 00000000 */ nop -/* DF0EA0 80242000 44800000 */ mtc1 $zero, $f0 -/* DF0EA4 80242004 C614000C */ lwc1 $f20, 0xc($s0) -/* DF0EA8 80242008 4600103C */ c.lt.s $f2, $f0 -/* DF0EAC 8024200C 00000000 */ nop -/* DF0EB0 80242010 45000006 */ bc1f .L8024202C -/* DF0EB4 80242014 00021023 */ negu $v0, $v0 -/* DF0EB8 80242018 44820000 */ mtc1 $v0, $f0 -/* DF0EBC 8024201C 00000000 */ nop -/* DF0EC0 80242020 46800020 */ cvt.s.w $f0, $f0 -/* DF0EC4 80242024 0809080C */ j .L80242030 -/* DF0EC8 80242028 4600A500 */ add.s $f20, $f20, $f0 -.L8024202C: -/* DF0ECC 8024202C 4604A500 */ add.s $f20, $f20, $f4 -.L80242030: -/* DF0ED0 80242030 0C00A6C9 */ jal clamp_angle -/* DF0ED4 80242034 4600A306 */ mov.s $f12, $f20 -/* DF0ED8 80242038 E600000C */ swc1 $f0, 0xc($s0) -.L8024203C: -/* DF0EDC 8024203C 8E020000 */ lw $v0, ($s0) -/* DF0EE0 80242040 30420008 */ andi $v0, $v0, 8 -/* DF0EE4 80242044 1040000A */ beqz $v0, .L80242070 -/* DF0EE8 80242048 27A50018 */ addiu $a1, $sp, 0x18 -/* DF0EEC 8024204C C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0EF0 80242050 C600001C */ lwc1 $f0, 0x1c($s0) -/* DF0EF4 80242054 46001080 */ add.s $f2, $f2, $f0 -/* DF0EF8 80242058 4616103C */ c.lt.s $f2, $f22 -/* DF0EFC 8024205C 00000000 */ nop -/* DF0F00 80242060 45020045 */ bc1fl .L80242178 -/* DF0F04 80242064 E602003C */ swc1 $f2, 0x3c($s0) -/* DF0F08 80242068 0809085D */ j .L80242174 -/* DF0F0C 8024206C E616003C */ swc1 $f22, 0x3c($s0) -.L80242070: -/* DF0F10 80242070 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF0F14 80242074 27A6001C */ addiu $a2, $sp, 0x1c -/* DF0F18 80242078 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF0F1C 8024207C 860200A8 */ lh $v0, 0xa8($s0) -/* DF0F20 80242080 C600001C */ lwc1 $f0, 0x1c($s0) -/* DF0F24 80242084 C604003C */ lwc1 $f4, 0x3c($s0) -/* DF0F28 80242088 44821000 */ mtc1 $v0, $f2 -/* DF0F2C 8024208C 00000000 */ nop -/* DF0F30 80242090 468010A0 */ cvt.s.w $f2, $f2 -/* DF0F34 80242094 46000005 */ abs.s $f0, $f0 -/* DF0F38 80242098 46020000 */ add.s $f0, $f0, $f2 -/* DF0F3C 8024209C C6060040 */ lwc1 $f6, 0x40($s0) -/* DF0F40 802420A0 27A20024 */ addiu $v0, $sp, 0x24 -/* DF0F44 802420A4 46022100 */ add.s $f4, $f4, $f2 -/* DF0F48 802420A8 3C014024 */ lui $at, 0x4024 -/* DF0F4C 802420AC 44811800 */ mtc1 $at, $f3 -/* DF0F50 802420B0 44801000 */ mtc1 $zero, $f2 -/* DF0F54 802420B4 46000021 */ cvt.d.s $f0, $f0 -/* DF0F58 802420B8 46220000 */ add.d $f0, $f0, $f2 -/* DF0F5C 802420BC E7A60020 */ swc1 $f6, 0x20($sp) -/* DF0F60 802420C0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* DF0F64 802420C4 46200020 */ cvt.s.d $f0, $f0 -/* DF0F68 802420C8 E7A00024 */ swc1 $f0, 0x24($sp) -/* DF0F6C 802420CC AFA20010 */ sw $v0, 0x10($sp) -/* DF0F70 802420D0 8E040080 */ lw $a0, 0x80($s0) -/* DF0F74 802420D4 0C0372DF */ jal func_800DCB7C -/* DF0F78 802420D8 27A70020 */ addiu $a3, $sp, 0x20 -/* DF0F7C 802420DC 10400015 */ beqz $v0, .L80242134 -/* DF0F80 802420E0 00000000 */ nop -/* DF0F84 802420E4 860200A8 */ lh $v0, 0xa8($s0) -/* DF0F88 802420E8 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0F8C 802420EC 44820000 */ mtc1 $v0, $f0 -/* DF0F90 802420F0 00000000 */ nop -/* DF0F94 802420F4 46800020 */ cvt.s.w $f0, $f0 -/* DF0F98 802420F8 46002085 */ abs.s $f2, $f4 -/* DF0F9C 802420FC 46020000 */ add.s $f0, $f0, $f2 -/* DF0FA0 80242100 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DF0FA4 80242104 4600103E */ c.le.s $f2, $f0 -/* DF0FA8 80242108 00000000 */ nop -/* DF0FAC 8024210C 45000005 */ bc1f .L80242124 -/* DF0FB0 80242110 00000000 */ nop -/* DF0FB4 80242114 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DF0FB8 80242118 AE00001C */ sw $zero, 0x1c($s0) -/* DF0FBC 8024211C 0809085E */ j .L80242178 -/* DF0FC0 80242120 E600003C */ swc1 $f0, 0x3c($s0) -.L80242124: -/* DF0FC4 80242124 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0FC8 80242128 46040000 */ add.s $f0, $f0, $f4 -/* DF0FCC 8024212C 0809085E */ j .L80242178 -/* DF0FD0 80242130 E600003C */ swc1 $f0, 0x3c($s0) -.L80242134: -/* DF0FD4 80242134 C606003C */ lwc1 $f6, 0x3c($s0) -/* DF0FD8 80242138 860200A8 */ lh $v0, 0xa8($s0) -/* DF0FDC 8024213C 46163081 */ sub.s $f2, $f6, $f22 -/* DF0FE0 80242140 44820000 */ mtc1 $v0, $f0 -/* DF0FE4 80242144 00000000 */ nop -/* DF0FE8 80242148 46800020 */ cvt.s.w $f0, $f0 -/* DF0FEC 8024214C 46001080 */ add.s $f2, $f2, $f0 -/* DF0FF0 80242150 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0FF4 80242154 46002005 */ abs.s $f0, $f4 -/* DF0FF8 80242158 4602003C */ c.lt.s $f0, $f2 -/* DF0FFC 8024215C 00000000 */ nop -/* DF1000 80242160 45020005 */ bc1fl .L80242178 -/* DF1004 80242164 AE00001C */ sw $zero, 0x1c($s0) -/* DF1008 80242168 46043000 */ add.s $f0, $f6, $f4 -/* DF100C 8024216C 0809085E */ j .L80242178 -/* DF1010 80242170 E600003C */ swc1 $f0, 0x3c($s0) -.L80242174: -/* DF1014 80242174 AE00001C */ sw $zero, 0x1c($s0) -.L80242178: -/* DF1018 80242178 8FBF0038 */ lw $ra, 0x38($sp) -/* DF101C 8024217C 8FB30034 */ lw $s3, 0x34($sp) -/* DF1020 80242180 8FB20030 */ lw $s2, 0x30($sp) -/* DF1024 80242184 8FB1002C */ lw $s1, 0x2c($sp) -/* DF1028 80242188 8FB00028 */ lw $s0, 0x28($sp) -/* DF102C 8024218C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DF1030 80242190 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DF1034 80242194 03E00008 */ jr $ra -/* DF1038 80242198 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s deleted file mode 100644 index 69d900b8e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024219C_DF103C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024219C_DF103C -/* DF103C 8024219C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DF1040 802421A0 AFB00028 */ sw $s0, 0x28($sp) -/* DF1044 802421A4 00A0802D */ daddu $s0, $a1, $zero -/* DF1048 802421A8 AFB1002C */ sw $s1, 0x2c($sp) -/* DF104C 802421AC 00C0882D */ daddu $s1, $a2, $zero -/* DF1050 802421B0 AFBF0034 */ sw $ra, 0x34($sp) -/* DF1054 802421B4 AFB20030 */ sw $s2, 0x30($sp) -/* DF1058 802421B8 AE200070 */ sw $zero, 0x70($s1) -/* DF105C 802421BC 8C830000 */ lw $v1, ($a0) -/* DF1060 802421C0 2402FDFF */ addiu $v0, $zero, -0x201 -/* DF1064 802421C4 A480008E */ sh $zero, 0x8e($a0) -/* DF1068 802421C8 00621824 */ and $v1, $v1, $v0 -/* DF106C 802421CC 34650800 */ ori $a1, $v1, 0x800 -/* DF1070 802421D0 AC850000 */ sw $a1, ($a0) -/* DF1074 802421D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* DF1078 802421D8 8C420034 */ lw $v0, 0x34($v0) -/* DF107C 802421DC 10400003 */ beqz $v0, .L802421EC -/* DF1080 802421E0 00E0902D */ daddu $s2, $a3, $zero -/* DF1084 802421E4 0809087D */ j .L802421F4 -/* DF1088 802421E8 34620808 */ ori $v0, $v1, 0x808 -.L802421EC: -/* DF108C 802421EC 2402FFF7 */ addiu $v0, $zero, -9 -/* DF1090 802421F0 00A21024 */ and $v0, $a1, $v0 -.L802421F4: -/* DF1094 802421F4 AC820000 */ sw $v0, ($a0) -/* DF1098 802421F8 27A20024 */ addiu $v0, $sp, 0x24 -/* DF109C 802421FC 27A50018 */ addiu $a1, $sp, 0x18 -/* DF10A0 80242200 C4800038 */ lwc1 $f0, 0x38($a0) -/* DF10A4 80242204 C482003C */ lwc1 $f2, 0x3c($a0) -/* DF10A8 80242208 C4840040 */ lwc1 $f4, 0x40($a0) -/* DF10AC 8024220C 3C01447A */ lui $at, 0x447a -/* DF10B0 80242210 44813000 */ mtc1 $at, $f6 -/* DF10B4 80242214 27A6001C */ addiu $a2, $sp, 0x1c -/* DF10B8 80242218 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF10BC 8024221C E7A2001C */ swc1 $f2, 0x1c($sp) -/* DF10C0 80242220 E7A40020 */ swc1 $f4, 0x20($sp) -/* DF10C4 80242224 E7A60024 */ swc1 $f6, 0x24($sp) -/* DF10C8 80242228 AFA20010 */ sw $v0, 0x10($sp) -/* DF10CC 8024222C 8C840080 */ lw $a0, 0x80($a0) -/* DF10D0 80242230 0C0372DF */ jal func_800DCB7C -/* DF10D4 80242234 27A70020 */ addiu $a3, $sp, 0x20 -/* DF10D8 80242238 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DF10DC 8024223C 3C014059 */ lui $at, 0x4059 -/* DF10E0 80242240 44812800 */ mtc1 $at, $f5 -/* DF10E4 80242244 44802000 */ mtc1 $zero, $f4 -/* DF10E8 80242248 460010A1 */ cvt.d.s $f2, $f2 -/* DF10EC 8024224C 46241082 */ mul.d $f2, $f2, $f4 -/* DF10F0 80242250 00000000 */ nop -/* DF10F4 80242254 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DF10F8 80242258 46000021 */ cvt.d.s $f0, $f0 -/* DF10FC 8024225C 46240002 */ mul.d $f0, $f0, $f4 -/* DF1100 80242260 00000000 */ nop -/* DF1104 80242264 3C013FE0 */ lui $at, 0x3fe0 -/* DF1108 80242268 44812800 */ mtc1 $at, $f5 -/* DF110C 8024226C 44802000 */ mtc1 $zero, $f4 -/* DF1110 80242270 00000000 */ nop -/* DF1114 80242274 46241080 */ add.d $f2, $f2, $f4 -/* DF1118 80242278 AE000074 */ sw $zero, 0x74($s0) -/* DF111C 8024227C 46240000 */ add.d $f0, $f0, $f4 -/* DF1120 80242280 AE000090 */ sw $zero, 0x90($s0) -/* DF1124 80242284 4620120D */ trunc.w.d $f8, $f2 -/* DF1128 80242288 E6080078 */ swc1 $f8, 0x78($s0) -/* DF112C 8024228C 4620020D */ trunc.w.d $f8, $f0 -/* DF1130 80242290 E6080088 */ swc1 $f8, 0x88($s0) -/* DF1134 80242294 8E420014 */ lw $v0, 0x14($s2) -/* DF1138 80242298 AE220074 */ sw $v0, 0x74($s1) -/* DF113C 8024229C 8E0200B0 */ lw $v0, 0xb0($s0) -/* DF1140 802422A0 34420010 */ ori $v0, $v0, 0x10 -/* DF1144 802422A4 AE0200B0 */ sw $v0, 0xb0($s0) -/* DF1148 802422A8 8FBF0034 */ lw $ra, 0x34($sp) -/* DF114C 802422AC 8FB20030 */ lw $s2, 0x30($sp) -/* DF1150 802422B0 8FB1002C */ lw $s1, 0x2c($sp) -/* DF1154 802422B4 8FB00028 */ lw $s0, 0x28($sp) -/* DF1158 802422B8 03E00008 */ jr $ra -/* DF115C 802422BC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 690c18bc5f..a93827445f 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -46,7 +46,7 @@ glabel func_802422C0_DF1160 /* DF1204 80242364 02A0202D */ daddu $a0, $s5, $zero /* DF1208 80242368 0240282D */ daddu $a1, $s2, $zero /* DF120C 8024236C 0280302D */ daddu $a2, $s4, $zero -/* DF1210 80242370 0C090867 */ jal func_8024219C_DF103C +/* DF1210 80242370 0C090867 */ jal omo_17_UnkFunc5 /* DF1214 80242374 0200382D */ daddu $a3, $s0, $zero .L80242378: /* DF1218 80242378 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L802423F4_DF1294 glabel L80242404_DF12A4 /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero -/* DF12AC 8024240C 0C090613 */ jal func_8024184C_DF06EC +/* DF12AC 8024240C 0C090613 */ jal omo_17_UnkFunc4 /* DF12B0 80242410 0260302D */ daddu $a2, $s3, $zero /* DF12B4 80242414 08090922 */ j .L80242488 /* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L8024245C_DF12FC glabel L80242474_DF1314 /* DF1314 80242474 0280202D */ daddu $a0, $s4, $zero /* DF1318 80242478 0200282D */ daddu $a1, $s0, $zero -/* DF131C 8024247C 0C090783 */ jal func_80241E0C_DF0CAC +/* DF131C 8024247C 0C090783 */ jal omo_17_UnkFunc6 /* DF1320 80242480 0260302D */ daddu $a2, $s3, $zero glabel L80242484_DF1324 /* DF1324 80242484 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s deleted file mode 100644 index 26549d6d18..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_22/D788A0/func_80240020_D788A0.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D788A0 -/* D788A0 80240020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D788A4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* D788A8 80240028 0080802D */ daddu $s0, $a0, $zero -/* D788AC 8024002C AFBF0014 */ sw $ra, 0x14($sp) -/* D788B0 80240030 8E02000C */ lw $v0, 0xc($s0) -/* D788B4 80240034 0C0B1EAF */ jal get_variable -/* D788B8 80240038 8C450000 */ lw $a1, ($v0) -/* D788BC 8024003C 0040302D */ daddu $a2, $v0, $zero -/* D788C0 80240040 3C058016 */ lui $a1, %hi(gCollisionStatus) -/* D788C4 80240044 84A5A550 */ lh $a1, %lo(gCollisionStatus)($a1) -/* D788C8 80240048 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* D788CC 8024004C 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* D788D0 80240050 10A60004 */ beq $a1, $a2, .L80240064 -/* D788D4 80240054 24020014 */ addiu $v0, $zero, 0x14 -/* D788D8 80240058 808300B4 */ lb $v1, 0xb4($a0) -/* D788DC 8024005C 10620006 */ beq $v1, $v0, .L80240078 -/* D788E0 80240060 00000000 */ nop -.L80240064: -/* D788E4 80240064 8C820014 */ lw $v0, 0x14($a0) -/* D788E8 80240068 3C03FFFF */ lui $v1, 0xffff -/* D788EC 8024006C 00431024 */ and $v0, $v0, $v1 -/* D788F0 80240070 10400005 */ beqz $v0, .L80240088 -/* D788F4 80240074 00000000 */ nop -.L80240078: -/* D788F8 80240078 0C039769 */ jal set_action_state -/* D788FC 8024007C 0000202D */ daddu $a0, $zero, $zero -/* D78900 80240080 08090032 */ j .L802400C8 -/* D78904 80240084 AE000084 */ sw $zero, 0x84($s0) -.L80240088: -/* D78908 80240088 54A6000F */ bnel $a1, $a2, .L802400C8 -/* D7890C 8024008C AE000084 */ sw $zero, 0x84($s0) -/* D78910 80240090 808300B4 */ lb $v1, 0xb4($a0) -/* D78914 80240094 24020014 */ addiu $v0, $zero, 0x14 -/* D78918 80240098 10620005 */ beq $v1, $v0, .L802400B0 -/* D7891C 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D78920 802400A0 10620003 */ beq $v1, $v0, .L802400B0 -/* D78924 802400A4 24020002 */ addiu $v0, $zero, 2 -/* D78928 802400A8 54620008 */ bnel $v1, $v0, .L802400CC -/* D7892C 802400AC AE000084 */ sw $zero, 0x84($s0) -.L802400B0: -/* D78930 802400B0 8C820004 */ lw $v0, 4($a0) -/* D78934 802400B4 30420001 */ andi $v0, $v0, 1 -/* D78938 802400B8 54400003 */ bnel $v0, $zero, .L802400C8 -/* D7893C 802400BC AE000084 */ sw $zero, 0x84($s0) -/* D78940 802400C0 24020001 */ addiu $v0, $zero, 1 -/* D78944 802400C4 AE020084 */ sw $v0, 0x84($s0) -.L802400C8: -/* D78948 802400C8 24020002 */ addiu $v0, $zero, 2 -.L802400CC: -/* D7894C 802400CC 8FBF0014 */ lw $ra, 0x14($sp) -/* D78950 802400D0 8FB00010 */ lw $s0, 0x10($sp) -/* D78954 802400D4 03E00008 */ jr $ra -/* D78958 802400D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s deleted file mode 100644 index 071babf26c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DBC_D7FB1C -/* D7FB1C 80240DBC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D7FB20 80240DC0 AFBF002C */ sw $ra, 0x2c($sp) -/* D7FB24 80240DC4 AFB00028 */ sw $s0, 0x28($sp) -/* D7FB28 80240DC8 8C820098 */ lw $v0, 0x98($a0) -/* D7FB2C 80240DCC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7FB30 80240DD0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7FB34 80240DD4 14400005 */ bnez $v0, .L80240DEC -/* D7FB38 80240DD8 00000000 */ nop -/* D7FB3C 80240DDC C4800084 */ lwc1 $f0, 0x84($a0) -/* D7FB40 80240DE0 46800020 */ cvt.s.w $f0, $f0 -/* D7FB44 80240DE4 0809037E */ j .L80240DF8 -/* D7FB48 80240DE8 E6000028 */ swc1 $f0, 0x28($s0) -.L80240DEC: -/* D7FB4C 80240DEC C4800084 */ lwc1 $f0, 0x84($a0) -/* D7FB50 80240DF0 46800020 */ cvt.s.w $f0, $f0 -/* D7FB54 80240DF4 E6000030 */ swc1 $f0, 0x30($s0) -.L80240DF8: -/* D7FB58 80240DF8 27A20024 */ addiu $v0, $sp, 0x24 -/* D7FB5C 80240DFC 0000202D */ daddu $a0, $zero, $zero -/* D7FB60 80240E00 27A50018 */ addiu $a1, $sp, 0x18 -/* D7FB64 80240E04 27A6001C */ addiu $a2, $sp, 0x1c -/* D7FB68 80240E08 C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FB6C 80240E0C 3C014120 */ lui $at, 0x4120 -/* D7FB70 80240E10 44811000 */ mtc1 $at, $f2 -/* D7FB74 80240E14 3C014220 */ lui $at, 0x4220 -/* D7FB78 80240E18 44813000 */ mtc1 $at, $f6 -/* D7FB7C 80240E1C 27A70020 */ addiu $a3, $sp, 0x20 -/* D7FB80 80240E20 E7A00018 */ swc1 $f0, 0x18($sp) -/* D7FB84 80240E24 C600002C */ lwc1 $f0, 0x2c($s0) -/* D7FB88 80240E28 C6040030 */ lwc1 $f4, 0x30($s0) -/* D7FB8C 80240E2C 46020000 */ add.s $f0, $f0, $f2 -/* D7FB90 80240E30 E7A60024 */ swc1 $f6, 0x24($sp) -/* D7FB94 80240E34 E7A40020 */ swc1 $f4, 0x20($sp) -/* D7FB98 80240E38 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D7FB9C 80240E3C 0C0372DF */ jal func_800DCB7C -/* D7FBA0 80240E40 AFA20010 */ sw $v0, 0x10($sp) -/* D7FBA4 80240E44 C7A00018 */ lwc1 $f0, 0x18($sp) -/* D7FBA8 80240E48 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* D7FBAC 80240E4C C7A40020 */ lwc1 $f4, 0x20($sp) -/* D7FBB0 80240E50 E6000028 */ swc1 $f0, 0x28($s0) -/* D7FBB4 80240E54 E602002C */ swc1 $f2, 0x2c($s0) -/* D7FBB8 80240E58 E6040030 */ swc1 $f4, 0x30($s0) -/* D7FBBC 80240E5C 8FBF002C */ lw $ra, 0x2c($sp) -/* D7FBC0 80240E60 8FB00028 */ lw $s0, 0x28($sp) -/* D7FBC4 80240E64 24020002 */ addiu $v0, $zero, 2 -/* D7FBC8 80240E68 03E00008 */ jr $ra -/* D7FBCC 80240E6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s deleted file mode 100644 index fbf45a3051..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241078_D8E2C8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241078_D8E2C8 -/* D8E2C8 80241078 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* D8E2CC 8024107C AFB20038 */ sw $s2, 0x38($sp) -/* D8E2D0 80241080 0080902D */ daddu $s2, $a0, $zero -/* D8E2D4 80241084 AFBF0044 */ sw $ra, 0x44($sp) -/* D8E2D8 80241088 AFB40040 */ sw $s4, 0x40($sp) -/* D8E2DC 8024108C AFB3003C */ sw $s3, 0x3c($sp) -/* D8E2E0 80241090 AFB10034 */ sw $s1, 0x34($sp) -/* D8E2E4 80241094 AFB00030 */ sw $s0, 0x30($sp) -/* D8E2E8 80241098 F7B60050 */ sdc1 $f22, 0x50($sp) -/* D8E2EC 8024109C F7B40048 */ sdc1 $f20, 0x48($sp) -/* D8E2F0 802410A0 8E510148 */ lw $s1, 0x148($s2) -/* D8E2F4 802410A4 00A0982D */ daddu $s3, $a1, $zero -/* D8E2F8 802410A8 86240008 */ lh $a0, 8($s1) -/* D8E2FC 802410AC 0C00EABB */ jal get_npc_unsafe -/* D8E300 802410B0 00C0A02D */ daddu $s4, $a2, $zero -/* D8E304 802410B4 8E630014 */ lw $v1, 0x14($s3) -/* D8E308 802410B8 04600030 */ bltz $v1, .L8024117C -/* D8E30C 802410BC 0040802D */ daddu $s0, $v0, $zero -/* D8E310 802410C0 8E420074 */ lw $v0, 0x74($s2) -/* D8E314 802410C4 1C40002C */ bgtz $v0, .L80241178 -/* D8E318 802410C8 2442FFFF */ addiu $v0, $v0, -1 -/* D8E31C 802410CC 0280202D */ daddu $a0, $s4, $zero -/* D8E320 802410D0 AE430074 */ sw $v1, 0x74($s2) -/* D8E324 802410D4 AFA00010 */ sw $zero, 0x10($sp) -/* D8E328 802410D8 8E66000C */ lw $a2, 0xc($s3) -/* D8E32C 802410DC 8E670010 */ lw $a3, 0x10($s3) -/* D8E330 802410E0 0C01242D */ jal func_800490B4 -/* D8E334 802410E4 0220282D */ daddu $a1, $s1, $zero -/* D8E338 802410E8 10400021 */ beqz $v0, .L80241170 -/* D8E33C 802410EC 0000202D */ daddu $a0, $zero, $zero -/* D8E340 802410F0 0200282D */ daddu $a1, $s0, $zero -/* D8E344 802410F4 0000302D */ daddu $a2, $zero, $zero -/* D8E348 802410F8 860300A8 */ lh $v1, 0xa8($s0) -/* D8E34C 802410FC 3C013F80 */ lui $at, 0x3f80 -/* D8E350 80241100 44810000 */ mtc1 $at, $f0 -/* D8E354 80241104 3C014000 */ lui $at, 0x4000 -/* D8E358 80241108 44811000 */ mtc1 $at, $f2 -/* D8E35C 8024110C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8E360 80241110 44812000 */ mtc1 $at, $f4 -/* D8E364 80241114 2402000F */ addiu $v0, $zero, 0xf -/* D8E368 80241118 AFA2001C */ sw $v0, 0x1c($sp) -/* D8E36C 8024111C 44833000 */ mtc1 $v1, $f6 -/* D8E370 80241120 00000000 */ nop -/* D8E374 80241124 468031A0 */ cvt.s.w $f6, $f6 -/* D8E378 80241128 44073000 */ mfc1 $a3, $f6 -/* D8E37C 8024112C 27A20028 */ addiu $v0, $sp, 0x28 -/* D8E380 80241130 AFA20020 */ sw $v0, 0x20($sp) -/* D8E384 80241134 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8E388 80241138 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8E38C 8024113C 0C01BFA4 */ jal fx_emote -/* D8E390 80241140 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8E394 80241144 0200202D */ daddu $a0, $s0, $zero -/* D8E398 80241148 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D8E39C 8024114C 0C012530 */ jal func_800494C0 -/* D8E3A0 80241150 3C060020 */ lui $a2, 0x20 -/* D8E3A4 80241154 8E220018 */ lw $v0, 0x18($s1) -/* D8E3A8 80241158 9442002A */ lhu $v0, 0x2a($v0) -/* D8E3AC 8024115C 30420001 */ andi $v0, $v0, 1 -/* D8E3B0 80241160 14400064 */ bnez $v0, .L802412F4 -/* D8E3B4 80241164 2402000A */ addiu $v0, $zero, 0xa -/* D8E3B8 80241168 080904BD */ j .L802412F4 -/* D8E3BC 8024116C 2402000C */ addiu $v0, $zero, 0xc -.L80241170: -/* D8E3C0 80241170 8E420074 */ lw $v0, 0x74($s2) -/* D8E3C4 80241174 2442FFFF */ addiu $v0, $v0, -1 -.L80241178: -/* D8E3C8 80241178 AE420074 */ sw $v0, 0x74($s2) -.L8024117C: -/* D8E3CC 8024117C 8602008C */ lh $v0, 0x8c($s0) -/* D8E3D0 80241180 1440005D */ bnez $v0, .L802412F8 -/* D8E3D4 80241184 00000000 */ nop -/* D8E3D8 80241188 C6000018 */ lwc1 $f0, 0x18($s0) -/* D8E3DC 8024118C 3C014010 */ lui $at, 0x4010 -/* D8E3E0 80241190 44811800 */ mtc1 $at, $f3 -/* D8E3E4 80241194 44801000 */ mtc1 $zero, $f2 -/* D8E3E8 80241198 46000021 */ cvt.d.s $f0, $f0 -/* D8E3EC 8024119C 4622003C */ c.lt.d $f0, $f2 -/* D8E3F0 802411A0 00000000 */ nop -/* D8E3F4 802411A4 45000003 */ bc1f .L802411B4 -/* D8E3F8 802411A8 0200202D */ daddu $a0, $s0, $zero -/* D8E3FC 802411AC 0809046E */ j .L802411B8 -/* D8E400 802411B0 0000282D */ daddu $a1, $zero, $zero -.L802411B4: -/* D8E404 802411B4 24050001 */ addiu $a1, $zero, 1 -.L802411B8: -/* D8E408 802411B8 0C00F598 */ jal func_8003D660 -/* D8E40C 802411BC 00000000 */ nop -/* D8E410 802411C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8E414 802411C4 8E430078 */ lw $v1, 0x78($s2) -/* D8E418 802411C8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8E41C 802411CC 00031040 */ sll $v0, $v1, 1 -/* D8E420 802411D0 00431021 */ addu $v0, $v0, $v1 -/* D8E424 802411D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8E428 802411D8 00021080 */ sll $v0, $v0, 2 -/* D8E42C 802411DC 00431021 */ addu $v0, $v0, $v1 -/* D8E430 802411E0 C4560004 */ lwc1 $f22, 4($v0) -/* D8E434 802411E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* D8E438 802411E8 C454000C */ lwc1 $f20, 0xc($v0) -/* D8E43C 802411EC 4680A520 */ cvt.s.w $f20, $f20 -/* D8E440 802411F0 4406B000 */ mfc1 $a2, $f22 -/* D8E444 802411F4 4407A000 */ mfc1 $a3, $f20 -/* D8E448 802411F8 0C00A720 */ jal atan2 -/* D8E44C 802411FC 00000000 */ nop -/* D8E450 80241200 8E050018 */ lw $a1, 0x18($s0) -/* D8E454 80241204 44060000 */ mfc1 $a2, $f0 -/* D8E458 80241208 0200202D */ daddu $a0, $s0, $zero -/* D8E45C 8024120C 0C00EA95 */ jal npc_move_heading -/* D8E460 80241210 AE06000C */ sw $a2, 0xc($s0) -/* D8E464 80241214 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8E468 80241218 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8E46C 8024121C 4406B000 */ mfc1 $a2, $f22 -/* D8E470 80241220 4407A000 */ mfc1 $a3, $f20 -/* D8E474 80241224 0C00A7B5 */ jal dist2D -/* D8E478 80241228 00000000 */ nop -/* D8E47C 8024122C C6020018 */ lwc1 $f2, 0x18($s0) -/* D8E480 80241230 4602003E */ c.le.s $f0, $f2 -/* D8E484 80241234 00000000 */ nop -/* D8E488 80241238 4500002F */ bc1f .L802412F8 -/* D8E48C 8024123C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* D8E490 80241240 24020002 */ addiu $v0, $zero, 2 -/* D8E494 80241244 0C00A67F */ jal rand_int -/* D8E498 80241248 AE420070 */ sw $v0, 0x70($s2) -/* D8E49C 8024124C 3C035555 */ lui $v1, 0x5555 -/* D8E4A0 80241250 34635556 */ ori $v1, $v1, 0x5556 -/* D8E4A4 80241254 00430018 */ mult $v0, $v1 -/* D8E4A8 80241258 000227C3 */ sra $a0, $v0, 0x1f -/* D8E4AC 8024125C 00004010 */ mfhi $t0 -/* D8E4B0 80241260 01042023 */ subu $a0, $t0, $a0 -/* D8E4B4 80241264 00041840 */ sll $v1, $a0, 1 -/* D8E4B8 80241268 00641821 */ addu $v1, $v1, $a0 -/* D8E4BC 8024126C 00431023 */ subu $v0, $v0, $v1 -/* D8E4C0 80241270 24430002 */ addiu $v1, $v0, 2 -/* D8E4C4 80241274 AE430074 */ sw $v1, 0x74($s2) -/* D8E4C8 80241278 8E62002C */ lw $v0, 0x2c($s3) -/* D8E4CC 8024127C 18400009 */ blez $v0, .L802412A4 -/* D8E4D0 80241280 24020004 */ addiu $v0, $zero, 4 -/* D8E4D4 80241284 8E620004 */ lw $v0, 4($s3) -/* D8E4D8 80241288 18400006 */ blez $v0, .L802412A4 -/* D8E4DC 8024128C 24020004 */ addiu $v0, $zero, 4 -/* D8E4E0 80241290 8E620008 */ lw $v0, 8($s3) -/* D8E4E4 80241294 18400003 */ blez $v0, .L802412A4 -/* D8E4E8 80241298 24020004 */ addiu $v0, $zero, 4 -/* D8E4EC 8024129C 14600002 */ bnez $v1, .L802412A8 -/* D8E4F0 802412A0 00000000 */ nop -.L802412A4: -/* D8E4F4 802412A4 AE420070 */ sw $v0, 0x70($s2) -.L802412A8: -/* D8E4F8 802412A8 0C00A67F */ jal rand_int -/* D8E4FC 802412AC 24042710 */ addiu $a0, $zero, 0x2710 -/* D8E500 802412B0 3C0351EB */ lui $v1, 0x51eb -/* D8E504 802412B4 3463851F */ ori $v1, $v1, 0x851f -/* D8E508 802412B8 00430018 */ mult $v0, $v1 -/* D8E50C 802412BC 00021FC3 */ sra $v1, $v0, 0x1f -/* D8E510 802412C0 00004010 */ mfhi $t0 -/* D8E514 802412C4 00082143 */ sra $a0, $t0, 5 -/* D8E518 802412C8 00832023 */ subu $a0, $a0, $v1 -/* D8E51C 802412CC 00041840 */ sll $v1, $a0, 1 -/* D8E520 802412D0 00641821 */ addu $v1, $v1, $a0 -/* D8E524 802412D4 000318C0 */ sll $v1, $v1, 3 -/* D8E528 802412D8 00641821 */ addu $v1, $v1, $a0 -/* D8E52C 802412DC 00031880 */ sll $v1, $v1, 2 -/* D8E530 802412E0 8E640004 */ lw $a0, 4($s3) -/* D8E534 802412E4 00431023 */ subu $v0, $v0, $v1 -/* D8E538 802412E8 0044102A */ slt $v0, $v0, $a0 -/* D8E53C 802412EC 10400002 */ beqz $v0, .L802412F8 -/* D8E540 802412F0 24020004 */ addiu $v0, $zero, 4 -.L802412F4: -/* D8E544 802412F4 AE420070 */ sw $v0, 0x70($s2) -.L802412F8: -/* D8E548 802412F8 8FBF0044 */ lw $ra, 0x44($sp) -/* D8E54C 802412FC 8FB40040 */ lw $s4, 0x40($sp) -/* D8E550 80241300 8FB3003C */ lw $s3, 0x3c($sp) -/* D8E554 80241304 8FB20038 */ lw $s2, 0x38($sp) -/* D8E558 80241308 8FB10034 */ lw $s1, 0x34($sp) -/* D8E55C 8024130C 8FB00030 */ lw $s0, 0x30($sp) -/* D8E560 80241310 D7B60050 */ ldc1 $f22, 0x50($sp) -/* D8E564 80241314 D7B40048 */ ldc1 $f20, 0x48($sp) -/* D8E568 80241318 03E00008 */ jr $ra -/* D8E56C 8024131C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s deleted file mode 100644 index f4d9e78ce5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802413E0_D8E630.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413E0_D8E630 -/* D8E630 802413E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D8E634 802413E4 AFB40040 */ sw $s4, 0x40($sp) -/* D8E638 802413E8 0080A02D */ daddu $s4, $a0, $zero -/* D8E63C 802413EC AFBF0044 */ sw $ra, 0x44($sp) -/* D8E640 802413F0 AFB3003C */ sw $s3, 0x3c($sp) -/* D8E644 802413F4 AFB20038 */ sw $s2, 0x38($sp) -/* D8E648 802413F8 AFB10034 */ sw $s1, 0x34($sp) -/* D8E64C 802413FC AFB00030 */ sw $s0, 0x30($sp) -/* D8E650 80241400 8E910148 */ lw $s1, 0x148($s4) -/* D8E654 80241404 00A0902D */ daddu $s2, $a1, $zero -/* D8E658 80241408 86240008 */ lh $a0, 8($s1) -/* D8E65C 8024140C 0C00EABB */ jal get_npc_unsafe -/* D8E660 80241410 00C0982D */ daddu $s3, $a2, $zero -/* D8E664 80241414 8E430014 */ lw $v1, 0x14($s2) -/* D8E668 80241418 04600031 */ bltz $v1, .L802414E0 -/* D8E66C 8024141C 0040802D */ daddu $s0, $v0, $zero -/* D8E670 80241420 0260202D */ daddu $a0, $s3, $zero -/* D8E674 80241424 AFA00010 */ sw $zero, 0x10($sp) -/* D8E678 80241428 8E460024 */ lw $a2, 0x24($s2) -/* D8E67C 8024142C 8E470028 */ lw $a3, 0x28($s2) -/* D8E680 80241430 0C01242D */ jal func_800490B4 -/* D8E684 80241434 0220282D */ daddu $a1, $s1, $zero -/* D8E688 80241438 10400029 */ beqz $v0, .L802414E0 -/* D8E68C 8024143C 0000202D */ daddu $a0, $zero, $zero -/* D8E690 80241440 0200282D */ daddu $a1, $s0, $zero -/* D8E694 80241444 0000302D */ daddu $a2, $zero, $zero -/* D8E698 80241448 860300A8 */ lh $v1, 0xa8($s0) -/* D8E69C 8024144C 3C013F80 */ lui $at, 0x3f80 -/* D8E6A0 80241450 44810000 */ mtc1 $at, $f0 -/* D8E6A4 80241454 3C014000 */ lui $at, 0x4000 -/* D8E6A8 80241458 44811000 */ mtc1 $at, $f2 -/* D8E6AC 8024145C 3C01C1A0 */ lui $at, 0xc1a0 -/* D8E6B0 80241460 44812000 */ mtc1 $at, $f4 -/* D8E6B4 80241464 2402000F */ addiu $v0, $zero, 0xf -/* D8E6B8 80241468 AFA2001C */ sw $v0, 0x1c($sp) -/* D8E6BC 8024146C 44833000 */ mtc1 $v1, $f6 -/* D8E6C0 80241470 00000000 */ nop -/* D8E6C4 80241474 468031A0 */ cvt.s.w $f6, $f6 -/* D8E6C8 80241478 44073000 */ mfc1 $a3, $f6 -/* D8E6CC 8024147C 27A20028 */ addiu $v0, $sp, 0x28 -/* D8E6D0 80241480 AFA20020 */ sw $v0, 0x20($sp) -/* D8E6D4 80241484 E7A00010 */ swc1 $f0, 0x10($sp) -/* D8E6D8 80241488 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8E6DC 8024148C 0C01BFA4 */ jal fx_emote -/* D8E6E0 80241490 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8E6E4 80241494 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D8E6E8 80241498 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D8E6EC 8024149C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8E6F0 802414A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8E6F4 802414A4 8C460028 */ lw $a2, 0x28($v0) -/* D8E6F8 802414A8 0C00A720 */ jal atan2 -/* D8E6FC 802414AC 8C470030 */ lw $a3, 0x30($v0) -/* D8E700 802414B0 0200202D */ daddu $a0, $s0, $zero -/* D8E704 802414B4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D8E708 802414B8 3C060020 */ lui $a2, 0x20 -/* D8E70C 802414BC 0C012530 */ jal func_800494C0 -/* D8E710 802414C0 E480000C */ swc1 $f0, 0xc($a0) -/* D8E714 802414C4 8E220018 */ lw $v0, 0x18($s1) -/* D8E718 802414C8 9442002A */ lhu $v0, 0x2a($v0) -/* D8E71C 802414CC 30420001 */ andi $v0, $v0, 1 -/* D8E720 802414D0 14400029 */ bnez $v0, .L80241578 -/* D8E724 802414D4 2402000A */ addiu $v0, $zero, 0xa -/* D8E728 802414D8 0809055E */ j .L80241578 -/* D8E72C 802414DC 2402000C */ addiu $v0, $zero, 0xc -.L802414E0: -/* D8E730 802414E0 8602008C */ lh $v0, 0x8c($s0) -/* D8E734 802414E4 14400025 */ bnez $v0, .L8024157C -/* D8E738 802414E8 00000000 */ nop -/* D8E73C 802414EC 9602008E */ lhu $v0, 0x8e($s0) -/* D8E740 802414F0 2442FFFF */ addiu $v0, $v0, -1 -/* D8E744 802414F4 A602008E */ sh $v0, 0x8e($s0) -/* D8E748 802414F8 00021400 */ sll $v0, $v0, 0x10 -/* D8E74C 802414FC 1440001F */ bnez $v0, .L8024157C -/* D8E750 80241500 00000000 */ nop -/* D8E754 80241504 8E820074 */ lw $v0, 0x74($s4) -/* D8E758 80241508 2442FFFF */ addiu $v0, $v0, -1 -/* D8E75C 8024150C 10400019 */ beqz $v0, .L80241574 -/* D8E760 80241510 AE820074 */ sw $v0, 0x74($s4) -/* D8E764 80241514 8E220018 */ lw $v0, 0x18($s1) -/* D8E768 80241518 9442002A */ lhu $v0, 0x2a($v0) -/* D8E76C 8024151C 30420010 */ andi $v0, $v0, 0x10 -/* D8E770 80241520 14400007 */ bnez $v0, .L80241540 -/* D8E774 80241524 00000000 */ nop -/* D8E778 80241528 C600000C */ lwc1 $f0, 0xc($s0) -/* D8E77C 8024152C 3C014334 */ lui $at, 0x4334 -/* D8E780 80241530 44816000 */ mtc1 $at, $f12 -/* D8E784 80241534 0C00A6C9 */ jal clamp_angle -/* D8E788 80241538 460C0300 */ add.s $f12, $f0, $f12 -/* D8E78C 8024153C E600000C */ swc1 $f0, 0xc($s0) -.L80241540: -/* D8E790 80241540 8E440008 */ lw $a0, 8($s2) -/* D8E794 80241544 000417C2 */ srl $v0, $a0, 0x1f -/* D8E798 80241548 00822021 */ addu $a0, $a0, $v0 -/* D8E79C 8024154C 00042043 */ sra $a0, $a0, 1 -/* D8E7A0 80241550 0C00A67F */ jal rand_int -/* D8E7A4 80241554 24840001 */ addiu $a0, $a0, 1 -/* D8E7A8 80241558 8E430008 */ lw $v1, 8($s2) -/* D8E7AC 8024155C 000327C2 */ srl $a0, $v1, 0x1f -/* D8E7B0 80241560 00641821 */ addu $v1, $v1, $a0 -/* D8E7B4 80241564 00031843 */ sra $v1, $v1, 1 -/* D8E7B8 80241568 00621821 */ addu $v1, $v1, $v0 -/* D8E7BC 8024156C 0809055F */ j .L8024157C -/* D8E7C0 80241570 A603008E */ sh $v1, 0x8e($s0) -.L80241574: -/* D8E7C4 80241574 24020004 */ addiu $v0, $zero, 4 -.L80241578: -/* D8E7C8 80241578 AE820070 */ sw $v0, 0x70($s4) -.L8024157C: -/* D8E7CC 8024157C 8FBF0044 */ lw $ra, 0x44($sp) -/* D8E7D0 80241580 8FB40040 */ lw $s4, 0x40($sp) -/* D8E7D4 80241584 8FB3003C */ lw $s3, 0x3c($sp) -/* D8E7D8 80241588 8FB20038 */ lw $s2, 0x38($sp) -/* D8E7DC 8024158C 8FB10034 */ lw $s1, 0x34($sp) -/* D8E7E0 80241590 8FB00030 */ lw $s0, 0x30($sp) -/* D8E7E4 80241594 03E00008 */ jr $ra -/* D8E7E8 80241598 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s deleted file mode 100644 index fa3516226d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024186C_D8EABC -/* D8EABC 8024186C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D8EAC0 80241870 AFB3003C */ sw $s3, 0x3c($sp) -/* D8EAC4 80241874 0080982D */ daddu $s3, $a0, $zero -/* D8EAC8 80241878 AFBF0040 */ sw $ra, 0x40($sp) -/* D8EACC 8024187C AFB20038 */ sw $s2, 0x38($sp) -/* D8EAD0 80241880 AFB10034 */ sw $s1, 0x34($sp) -/* D8EAD4 80241884 AFB00030 */ sw $s0, 0x30($sp) -/* D8EAD8 80241888 8E720148 */ lw $s2, 0x148($s3) -/* D8EADC 8024188C 00A0882D */ daddu $s1, $a1, $zero -/* D8EAE0 80241890 86440008 */ lh $a0, 8($s2) -/* D8EAE4 80241894 0C00EABB */ jal get_npc_unsafe -/* D8EAE8 80241898 00C0802D */ daddu $s0, $a2, $zero -/* D8EAEC 8024189C 0200202D */ daddu $a0, $s0, $zero -/* D8EAF0 802418A0 0240282D */ daddu $a1, $s2, $zero -/* D8EAF4 802418A4 24030001 */ addiu $v1, $zero, 1 -/* D8EAF8 802418A8 AFA30010 */ sw $v1, 0x10($sp) -/* D8EAFC 802418AC 8E260024 */ lw $a2, 0x24($s1) -/* D8EB00 802418B0 8E270028 */ lw $a3, 0x28($s1) -/* D8EB04 802418B4 0C01242D */ jal func_800490B4 -/* D8EB08 802418B8 0040802D */ daddu $s0, $v0, $zero -/* D8EB0C 802418BC 1440001E */ bnez $v0, .L80241938 -/* D8EB10 802418C0 0200202D */ daddu $a0, $s0, $zero -/* D8EB14 802418C4 24040002 */ addiu $a0, $zero, 2 -/* D8EB18 802418C8 0200282D */ daddu $a1, $s0, $zero -/* D8EB1C 802418CC 0000302D */ daddu $a2, $zero, $zero -/* D8EB20 802418D0 860300A8 */ lh $v1, 0xa8($s0) -/* D8EB24 802418D4 3C013F80 */ lui $at, 0x3f80 -/* D8EB28 802418D8 44810000 */ mtc1 $at, $f0 -/* D8EB2C 802418DC 3C014000 */ lui $at, 0x4000 -/* D8EB30 802418E0 44811000 */ mtc1 $at, $f2 -/* D8EB34 802418E4 3C01C1A0 */ lui $at, 0xc1a0 -/* D8EB38 802418E8 44812000 */ mtc1 $at, $f4 -/* D8EB3C 802418EC 2402000F */ addiu $v0, $zero, 0xf -/* D8EB40 802418F0 AFA2001C */ sw $v0, 0x1c($sp) -/* D8EB44 802418F4 44833000 */ mtc1 $v1, $f6 -/* D8EB48 802418F8 00000000 */ nop -/* D8EB4C 802418FC 468031A0 */ cvt.s.w $f6, $f6 -/* D8EB50 80241900 44073000 */ mfc1 $a3, $f6 -/* D8EB54 80241904 27A20028 */ addiu $v0, $sp, 0x28 -/* D8EB58 80241908 AFA20020 */ sw $v0, 0x20($sp) -/* D8EB5C 8024190C E7A00010 */ swc1 $f0, 0x10($sp) -/* D8EB60 80241910 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8EB64 80241914 0C01BFA4 */ jal fx_emote -/* D8EB68 80241918 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8EB6C 8024191C 8E4200CC */ lw $v0, 0xcc($s2) -/* D8EB70 80241920 8C430000 */ lw $v1, ($v0) -/* D8EB74 80241924 24020019 */ addiu $v0, $zero, 0x19 -/* D8EB78 80241928 A602008E */ sh $v0, 0x8e($s0) -/* D8EB7C 8024192C 2402000E */ addiu $v0, $zero, 0xe -/* D8EB80 80241930 0809065B */ j .L8024196C -/* D8EB84 80241934 AE030028 */ sw $v1, 0x28($s0) -.L80241938: -/* D8EB88 80241938 0C00F598 */ jal func_8003D660 -/* D8EB8C 8024193C 24050001 */ addiu $a1, $zero, 1 -/* D8EB90 80241940 8E050018 */ lw $a1, 0x18($s0) -/* D8EB94 80241944 8E06000C */ lw $a2, 0xc($s0) -/* D8EB98 80241948 0C00EA95 */ jal npc_move_heading -/* D8EB9C 8024194C 0200202D */ daddu $a0, $s0, $zero -/* D8EBA0 80241950 8602008E */ lh $v0, 0x8e($s0) -/* D8EBA4 80241954 9603008E */ lhu $v1, 0x8e($s0) -/* D8EBA8 80241958 18400003 */ blez $v0, .L80241968 -/* D8EBAC 8024195C 2462FFFF */ addiu $v0, $v1, -1 -/* D8EBB0 80241960 0809065C */ j .L80241970 -/* D8EBB4 80241964 A602008E */ sh $v0, 0x8e($s0) -.L80241968: -/* D8EBB8 80241968 2402000C */ addiu $v0, $zero, 0xc -.L8024196C: -/* D8EBBC 8024196C AE620070 */ sw $v0, 0x70($s3) -.L80241970: -/* D8EBC0 80241970 8FBF0040 */ lw $ra, 0x40($sp) -/* D8EBC4 80241974 8FB3003C */ lw $s3, 0x3c($sp) -/* D8EBC8 80241978 8FB20038 */ lw $s2, 0x38($sp) -/* D8EBCC 8024197C 8FB10034 */ lw $s1, 0x34($sp) -/* D8EBD0 80241980 8FB00030 */ lw $s0, 0x30($sp) -/* D8EBD4 80241984 03E00008 */ jr $ra -/* D8EBD8 80241988 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s deleted file mode 100644 index 980068bf1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802419F4_D8EC44.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419F4_D8EC44 -/* D8EC44 802419F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8EC48 802419F8 AFB10014 */ sw $s1, 0x14($sp) -/* D8EC4C 802419FC 0080882D */ daddu $s1, $a0, $zero -/* D8EC50 80241A00 AFBF001C */ sw $ra, 0x1c($sp) -/* D8EC54 80241A04 AFB20018 */ sw $s2, 0x18($sp) -/* D8EC58 80241A08 AFB00010 */ sw $s0, 0x10($sp) -/* D8EC5C 80241A0C 8E300148 */ lw $s0, 0x148($s1) -/* D8EC60 80241A10 86040008 */ lh $a0, 8($s0) -/* D8EC64 80241A14 0C00EABB */ jal get_npc_unsafe -/* D8EC68 80241A18 00A0902D */ daddu $s2, $a1, $zero -/* D8EC6C 80241A1C 8E0300D0 */ lw $v1, 0xd0($s0) -/* D8EC70 80241A20 8E240078 */ lw $a0, 0x78($s1) -/* D8EC74 80241A24 8C630000 */ lw $v1, ($v1) -/* D8EC78 80241A28 0083182A */ slt $v1, $a0, $v1 -/* D8EC7C 80241A2C 10600013 */ beqz $v1, .L80241A7C -/* D8EC80 80241A30 0040302D */ daddu $a2, $v0, $zero -/* D8EC84 80241A34 00041040 */ sll $v0, $a0, 1 -/* D8EC88 80241A38 00441021 */ addu $v0, $v0, $a0 -/* D8EC8C 80241A3C 00022880 */ sll $a1, $v0, 2 -.L80241A40: -/* D8EC90 80241A40 8E0300D0 */ lw $v1, 0xd0($s0) -/* D8EC94 80241A44 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* D8EC98 80241A48 00A31021 */ addu $v0, $a1, $v1 -/* D8EC9C 80241A4C C4400008 */ lwc1 $f0, 8($v0) -/* D8ECA0 80241A50 46800020 */ cvt.s.w $f0, $f0 -/* D8ECA4 80241A54 4602003E */ c.le.s $f0, $f2 -/* D8ECA8 80241A58 00000000 */ nop -/* D8ECAC 80241A5C 45020003 */ bc1fl .L80241A6C -/* D8ECB0 80241A60 24840001 */ addiu $a0, $a0, 1 -/* D8ECB4 80241A64 0809069F */ j .L80241A7C -/* D8ECB8 80241A68 AE240078 */ sw $a0, 0x78($s1) -.L80241A6C: -/* D8ECBC 80241A6C 8C620000 */ lw $v0, ($v1) -/* D8ECC0 80241A70 0082102A */ slt $v0, $a0, $v0 -/* D8ECC4 80241A74 1440FFF2 */ bnez $v0, .L80241A40 -/* D8ECC8 80241A78 24A5000C */ addiu $a1, $a1, 0xc -.L80241A7C: -/* D8ECCC 80241A7C C6400000 */ lwc1 $f0, ($s2) -/* D8ECD0 80241A80 E4C00018 */ swc1 $f0, 0x18($a2) -/* D8ECD4 80241A84 8E0200CC */ lw $v0, 0xcc($s0) -/* D8ECD8 80241A88 8C420004 */ lw $v0, 4($v0) -/* D8ECDC 80241A8C ACC20028 */ sw $v0, 0x28($a2) -/* D8ECE0 80241A90 24020001 */ addiu $v0, $zero, 1 -/* D8ECE4 80241A94 AE200074 */ sw $zero, 0x74($s1) -/* D8ECE8 80241A98 AE220070 */ sw $v0, 0x70($s1) -/* D8ECEC 80241A9C 8FBF001C */ lw $ra, 0x1c($sp) -/* D8ECF0 80241AA0 8FB20018 */ lw $s2, 0x18($sp) -/* D8ECF4 80241AA4 8FB10014 */ lw $s1, 0x14($sp) -/* D8ECF8 80241AA8 8FB00010 */ lw $s0, 0x10($sp) -/* D8ECFC 80241AAC 03E00008 */ jr $ra -/* D8ED00 80241AB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index dd82092336..761c891063 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -137,7 +137,7 @@ glabel L80241C98_D8EEE8 glabel L80241CA8_D8EEF8 /* D8EEF8 80241CA8 0280202D */ daddu $a0, $s4, $zero /* D8EEFC 80241CAC 0260282D */ daddu $a1, $s3, $zero -/* D8EF00 80241CB0 0C09041E */ jal func_80241078_D8E2C8 +/* D8EF00 80241CB0 0C09041E */ jal pra_35_UnkFunc13 /* D8EF04 80241CB4 02A0302D */ daddu $a2, $s5, $zero /* D8EF08 80241CB8 08090762 */ j L80241D88_D8EFD8 /* D8EF0C 80241CBC 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241CC0_D8EF10 glabel L80241CD0_D8EF20 /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero -/* D8EF28 80241CD8 0C0904F8 */ jal func_802413E0_D8E630 +/* D8EF28 80241CD8 0C0904F8 */ jal pra_35_UnkFunc14 /* D8EF2C 80241CDC 02A0302D */ daddu $a2, $s5, $zero /* D8EF30 80241CE0 08090762 */ j L80241D88_D8EFD8 /* D8EF34 80241CE4 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241D28_D8EF78 glabel L80241D38_D8EF88 /* D8EF88 80241D38 0280202D */ daddu $a0, $s4, $zero /* D8EF8C 80241D3C 0260282D */ daddu $a1, $s3, $zero -/* D8EF90 80241D40 0C09061B */ jal func_8024186C_D8EABC +/* D8EF90 80241D40 0C09061B */ jal pra_35_UnkFunc15 /* D8EF94 80241D44 02A0302D */ daddu $a2, $s5, $zero /* D8EF98 80241D48 08090762 */ j L80241D88_D8EFD8 /* D8EF9C 80241D4C 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241D50_D8EFA0 glabel L80241D68_D8EFB8 /* D8EFB8 80241D68 0280202D */ daddu $a0, $s4, $zero /* D8EFBC 80241D6C 0260282D */ daddu $a1, $s3, $zero -/* D8EFC0 80241D70 0C09067D */ jal func_802419F4_D8EC44 +/* D8EFC0 80241D70 0C09067D */ jal pra_35_UnkFunc16 /* D8EFC4 80241D74 02A0302D */ daddu $a2, $s5, $zero /* D8EFC8 80241D78 08090762 */ j L80241D88_D8EFD8 /* D8EFCC 80241D7C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s deleted file mode 100644 index d4ae0a256d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024216C_D8F3BC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024216C_D8F3BC -/* D8F3BC 8024216C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D8F3C0 80242170 AFB40028 */ sw $s4, 0x28($sp) -/* D8F3C4 80242174 0080A02D */ daddu $s4, $a0, $zero -/* D8F3C8 80242178 AFBF002C */ sw $ra, 0x2c($sp) -/* D8F3CC 8024217C AFB30024 */ sw $s3, 0x24($sp) -/* D8F3D0 80242180 AFB20020 */ sw $s2, 0x20($sp) -/* D8F3D4 80242184 AFB1001C */ sw $s1, 0x1c($sp) -/* D8F3D8 80242188 AFB00018 */ sw $s0, 0x18($sp) -/* D8F3DC 8024218C 8E910148 */ lw $s1, 0x148($s4) -/* D8F3E0 80242190 86240008 */ lh $a0, 8($s1) -/* D8F3E4 80242194 0C00EABB */ jal get_npc_unsafe -/* D8F3E8 80242198 00A0802D */ daddu $s0, $a1, $zero -/* D8F3EC 8024219C 16000005 */ bnez $s0, .L802421B4 -/* D8F3F0 802421A0 0040902D */ daddu $s2, $v0, $zero -/* D8F3F4 802421A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F3F8 802421A8 30420004 */ andi $v0, $v0, 4 -/* D8F3FC 802421AC 10400015 */ beqz $v0, .L80242204 -/* D8F400 802421B0 00000000 */ nop -.L802421B4: -/* D8F404 802421B4 AE800070 */ sw $zero, 0x70($s4) -/* D8F408 802421B8 8E420000 */ lw $v0, ($s2) -/* D8F40C 802421BC 3C031F30 */ lui $v1, 0x1f30 -/* D8F410 802421C0 A640008E */ sh $zero, 0x8e($s2) -/* D8F414 802421C4 34420102 */ ori $v0, $v0, 0x102 -/* D8F418 802421C8 AE420000 */ sw $v0, ($s2) -/* D8F41C 802421CC 8E220000 */ lw $v0, ($s1) -/* D8F420 802421D0 3C01C47A */ lui $at, 0xc47a -/* D8F424 802421D4 44810000 */ mtc1 $at, $f0 -/* D8F428 802421D8 00431025 */ or $v0, $v0, $v1 -/* D8F42C 802421DC AE220000 */ sw $v0, ($s1) -/* D8F430 802421E0 AE400038 */ sw $zero, 0x38($s2) -/* D8F434 802421E4 E640003C */ swc1 $f0, 0x3c($s2) -/* D8F438 802421E8 AE400040 */ sw $zero, 0x40($s2) -/* D8F43C 802421EC 8E2300B0 */ lw $v1, 0xb0($s1) -/* D8F440 802421F0 30620004 */ andi $v0, $v1, 4 -/* D8F444 802421F4 10400003 */ beqz $v0, .L80242204 -/* D8F448 802421F8 2402FFFB */ addiu $v0, $zero, -5 -/* D8F44C 802421FC 00621024 */ and $v0, $v1, $v0 -/* D8F450 80242200 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242204: -/* D8F454 80242204 8E930070 */ lw $s3, 0x70($s4) -/* D8F458 80242208 12600005 */ beqz $s3, .L80242220 -/* D8F45C 8024220C 24020001 */ addiu $v0, $zero, 1 -/* D8F460 80242210 12620048 */ beq $s3, $v0, .L80242334 -/* D8F464 80242214 00000000 */ nop -/* D8F468 80242218 080908EA */ j .L802423A8 -/* D8F46C 8024221C 00000000 */ nop -.L80242220: -/* D8F470 80242220 86240008 */ lh $a0, 8($s1) -/* D8F474 80242224 0C00FB3A */ jal get_enemy -/* D8F478 80242228 2484FFFF */ addiu $a0, $a0, -1 -/* D8F47C 8024222C 0040802D */ daddu $s0, $v0, $zero -/* D8F480 80242230 0C00EABB */ jal get_npc_unsafe -/* D8F484 80242234 86040008 */ lh $a0, 8($s0) -/* D8F488 80242238 24030001 */ addiu $v1, $zero, 1 -/* D8F48C 8024223C 0040982D */ daddu $s3, $v0, $zero -/* D8F490 80242240 A2230007 */ sb $v1, 7($s1) -/* D8F494 80242244 8E03006C */ lw $v1, 0x6c($s0) -/* D8F498 80242248 24020003 */ addiu $v0, $zero, 3 -/* D8F49C 8024224C 14620056 */ bne $v1, $v0, .L802423A8 -/* D8F4A0 80242250 00000000 */ nop -/* D8F4A4 80242254 8E2500A8 */ lw $a1, 0xa8($s1) -/* D8F4A8 80242258 10A00003 */ beqz $a1, .L80242268 -/* D8F4AC 8024225C 0260202D */ daddu $a0, $s3, $zero -/* D8F4B0 80242260 0C012530 */ jal func_800494C0 -/* D8F4B4 80242264 0000302D */ daddu $a2, $zero, $zero -.L80242268: -/* D8F4B8 80242268 27A40010 */ addiu $a0, $sp, 0x10 -/* D8F4BC 8024226C C6280070 */ lwc1 $f8, 0x70($s1) -/* D8F4C0 80242270 46804220 */ cvt.s.w $f8, $f8 -/* D8F4C4 80242274 C6620034 */ lwc1 $f2, 0x34($s3) -/* D8F4C8 80242278 3C014387 */ lui $at, 0x4387 -/* D8F4CC 8024227C 44810000 */ mtc1 $at, $f0 -/* D8F4D0 80242280 44064000 */ mfc1 $a2, $f8 -/* D8F4D4 80242284 46020001 */ sub.s $f0, $f0, $f2 -/* D8F4D8 80242288 C6660038 */ lwc1 $f6, 0x38($s3) -/* D8F4DC 8024228C C6640040 */ lwc1 $f4, 0x40($s3) -/* D8F4E0 80242290 44070000 */ mfc1 $a3, $f0 -/* D8F4E4 80242294 27A50014 */ addiu $a1, $sp, 0x14 -/* D8F4E8 80242298 E7A60010 */ swc1 $f6, 0x10($sp) -/* D8F4EC 8024229C 0C00A7E7 */ jal add_vec2D_polar -/* D8F4F0 802422A0 E7A40014 */ swc1 $f4, 0x14($sp) -/* D8F4F4 802422A4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D8F4F8 802422A8 4600020D */ trunc.w.s $f8, $f0 -/* D8F4FC 802422AC 44024000 */ mfc1 $v0, $f8 -/* D8F500 802422B0 E6400038 */ swc1 $f0, 0x38($s2) -/* D8F504 802422B4 A6220010 */ sh $v0, 0x10($s1) -/* D8F508 802422B8 C660003C */ lwc1 $f0, 0x3c($s3) -/* D8F50C 802422BC C622006C */ lwc1 $f2, 0x6c($s1) -/* D8F510 802422C0 468010A0 */ cvt.s.w $f2, $f2 -/* D8F514 802422C4 46020000 */ add.s $f0, $f0, $f2 -/* D8F518 802422C8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D8F51C 802422CC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D8F520 802422D0 E640003C */ swc1 $f0, 0x3c($s2) -/* D8F524 802422D4 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D8F528 802422D8 4600020D */ trunc.w.s $f8, $f0 -/* D8F52C 802422DC 44024000 */ mfc1 $v0, $f8 -/* D8F530 802422E0 00000000 */ nop -/* D8F534 802422E4 A6220012 */ sh $v0, 0x12($s1) -/* D8F538 802422E8 4600120D */ trunc.w.s $f8, $f2 -/* D8F53C 802422EC 44024000 */ mfc1 $v0, $f8 -/* D8F540 802422F0 E6420040 */ swc1 $f2, 0x40($s2) -/* D8F544 802422F4 A6220014 */ sh $v0, 0x14($s1) -/* D8F548 802422F8 8C660028 */ lw $a2, 0x28($v1) -/* D8F54C 802422FC 8C670030 */ lw $a3, 0x30($v1) -/* D8F550 80242300 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D8F554 80242304 0C00A720 */ jal atan2 -/* D8F558 80242308 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D8F55C 8024230C 3C03E0EF */ lui $v1, 0xe0ef -/* D8F560 80242310 E640000C */ swc1 $f0, 0xc($s2) -/* D8F564 80242314 8E220000 */ lw $v0, ($s1) -/* D8F568 80242318 3463FFFF */ ori $v1, $v1, 0xffff -/* D8F56C 8024231C 00431024 */ and $v0, $v0, $v1 -/* D8F570 80242320 AE220000 */ sw $v0, ($s1) -/* D8F574 80242324 24020001 */ addiu $v0, $zero, 1 -/* D8F578 80242328 A640008E */ sh $zero, 0x8e($s2) -/* D8F57C 8024232C 080908EA */ j .L802423A8 -/* D8F580 80242330 AE820070 */ sw $v0, 0x70($s4) -.L80242334: -/* D8F584 80242334 86240008 */ lh $a0, 8($s1) -/* D8F588 80242338 0C00FB3A */ jal get_enemy -/* D8F58C 8024233C 2484FFFF */ addiu $a0, $a0, -1 -/* D8F590 80242340 0040802D */ daddu $s0, $v0, $zero -/* D8F594 80242344 0C00EABB */ jal get_npc_unsafe -/* D8F598 80242348 86040008 */ lh $a0, 8($s0) -/* D8F59C 8024234C 9642008E */ lhu $v0, 0x8e($s2) -/* D8F5A0 80242350 24420001 */ addiu $v0, $v0, 1 -/* D8F5A4 80242354 A642008E */ sh $v0, 0x8e($s2) -/* D8F5A8 80242358 00021400 */ sll $v0, $v0, 0x10 -/* D8F5AC 8024235C 8E23007C */ lw $v1, 0x7c($s1) -/* D8F5B0 80242360 00021403 */ sra $v0, $v0, 0x10 -/* D8F5B4 80242364 0043102A */ slt $v0, $v0, $v1 -/* D8F5B8 80242368 50400001 */ beql $v0, $zero, .L80242370 -/* D8F5BC 8024236C A2200007 */ sb $zero, 7($s1) -.L80242370: -/* D8F5C0 80242370 8E03006C */ lw $v1, 0x6c($s0) -/* D8F5C4 80242374 24020004 */ addiu $v0, $zero, 4 -/* D8F5C8 80242378 1462000B */ bne $v1, $v0, .L802423A8 -/* D8F5CC 8024237C 3C021F10 */ lui $v0, 0x1f10 -/* D8F5D0 80242380 8E230000 */ lw $v1, ($s1) -/* D8F5D4 80242384 3C01C47A */ lui $at, 0xc47a -/* D8F5D8 80242388 44810000 */ mtc1 $at, $f0 -/* D8F5DC 8024238C 00621825 */ or $v1, $v1, $v0 -/* D8F5E0 80242390 AE230000 */ sw $v1, ($s1) -/* D8F5E4 80242394 AE400038 */ sw $zero, 0x38($s2) -/* D8F5E8 80242398 E640003C */ swc1 $f0, 0x3c($s2) -/* D8F5EC 8024239C AE400040 */ sw $zero, 0x40($s2) -/* D8F5F0 802423A0 A2330007 */ sb $s3, 7($s1) -/* D8F5F4 802423A4 AE800070 */ sw $zero, 0x70($s4) -.L802423A8: -/* D8F5F8 802423A8 8FBF002C */ lw $ra, 0x2c($sp) -/* D8F5FC 802423AC 8FB40028 */ lw $s4, 0x28($sp) -/* D8F600 802423B0 8FB30024 */ lw $s3, 0x24($sp) -/* D8F604 802423B4 8FB20020 */ lw $s2, 0x20($sp) -/* D8F608 802423B8 8FB1001C */ lw $s1, 0x1c($sp) -/* D8F60C 802423BC 8FB00018 */ lw $s0, 0x18($sp) -/* D8F610 802423C0 0000102D */ daddu $v0, $zero, $zero -/* D8F614 802423C4 03E00008 */ jr $ra -/* D8F618 802423C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 38eac10123..da00fa0554 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -113,7 +113,7 @@ glabel L80242550_D8F7A0 glabel L80242560_D8F7B0 /* D8F7B0 80242560 0240202D */ daddu $a0, $s2, $zero /* D8F7B4 80242564 0260282D */ daddu $a1, $s3, $zero -/* D8F7B8 80242568 0C09041E */ jal func_80241078_D8E2C8 +/* D8F7B8 80242568 0C09041E */ jal pra_35_UnkFunc13 /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero /* D8F7C0 80242570 0809099C */ j L80242670_D8F8C0 /* D8F7C4 80242574 00000000 */ nop @@ -125,7 +125,7 @@ glabel L80242578_D8F7C8 glabel L80242588_D8F7D8 /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero -/* D8F7E0 80242590 0C0904F8 */ jal func_802413E0_D8E630 +/* D8F7E0 80242590 0C0904F8 */ jal pra_35_UnkFunc14 /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero /* D8F7E8 80242598 0809099C */ j L80242670_D8F8C0 /* D8F7EC 8024259C 00000000 */ nop @@ -156,7 +156,7 @@ glabel L802425E0_D8F830 glabel L802425F0_D8F840 /* D8F840 802425F0 0240202D */ daddu $a0, $s2, $zero /* D8F844 802425F4 0260282D */ daddu $a1, $s3, $zero -/* D8F848 802425F8 0C09061B */ jal func_8024186C_D8EABC +/* D8F848 802425F8 0C09061B */ jal pra_35_UnkFunc15 /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero /* D8F850 80242600 0809099C */ j L80242670_D8F8C0 /* D8F854 80242604 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s deleted file mode 100644 index d52efc7ba0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024130C_D9424C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_D9424C -/* D9424C 8024130C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D94250 80241310 AFB40028 */ sw $s4, 0x28($sp) -/* D94254 80241314 0080A02D */ daddu $s4, $a0, $zero -/* D94258 80241318 AFBF002C */ sw $ra, 0x2c($sp) -/* D9425C 8024131C AFB30024 */ sw $s3, 0x24($sp) -/* D94260 80241320 AFB20020 */ sw $s2, 0x20($sp) -/* D94264 80241324 AFB1001C */ sw $s1, 0x1c($sp) -/* D94268 80241328 AFB00018 */ sw $s0, 0x18($sp) -/* D9426C 8024132C 8E910148 */ lw $s1, 0x148($s4) -/* D94270 80241330 86240008 */ lh $a0, 8($s1) -/* D94274 80241334 0C00EABB */ jal get_npc_unsafe -/* D94278 80241338 00A0802D */ daddu $s0, $a1, $zero -/* D9427C 8024133C 16000005 */ bnez $s0, .L80241354 -/* D94280 80241340 0040902D */ daddu $s2, $v0, $zero -/* D94284 80241344 8E2200B0 */ lw $v0, 0xb0($s1) -/* D94288 80241348 30420004 */ andi $v0, $v0, 4 -/* D9428C 8024134C 10400015 */ beqz $v0, .L802413A4 -/* D94290 80241350 00000000 */ nop -.L80241354: -/* D94294 80241354 AE800070 */ sw $zero, 0x70($s4) -/* D94298 80241358 8E420000 */ lw $v0, ($s2) -/* D9429C 8024135C 3C031F30 */ lui $v1, 0x1f30 -/* D942A0 80241360 A640008E */ sh $zero, 0x8e($s2) -/* D942A4 80241364 34420102 */ ori $v0, $v0, 0x102 -/* D942A8 80241368 AE420000 */ sw $v0, ($s2) -/* D942AC 8024136C 8E220000 */ lw $v0, ($s1) -/* D942B0 80241370 3C01C47A */ lui $at, 0xc47a -/* D942B4 80241374 44810000 */ mtc1 $at, $f0 -/* D942B8 80241378 00431025 */ or $v0, $v0, $v1 -/* D942BC 8024137C AE220000 */ sw $v0, ($s1) -/* D942C0 80241380 AE400038 */ sw $zero, 0x38($s2) -/* D942C4 80241384 E640003C */ swc1 $f0, 0x3c($s2) -/* D942C8 80241388 AE400040 */ sw $zero, 0x40($s2) -/* D942CC 8024138C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D942D0 80241390 30620004 */ andi $v0, $v1, 4 -/* D942D4 80241394 10400003 */ beqz $v0, .L802413A4 -/* D942D8 80241398 2402FFFB */ addiu $v0, $zero, -5 -/* D942DC 8024139C 00621024 */ and $v0, $v1, $v0 -/* D942E0 802413A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802413A4: -/* D942E4 802413A4 8E930070 */ lw $s3, 0x70($s4) -/* D942E8 802413A8 12600005 */ beqz $s3, .L802413C0 -/* D942EC 802413AC 24020001 */ addiu $v0, $zero, 1 -/* D942F0 802413B0 12620048 */ beq $s3, $v0, .L802414D4 -/* D942F4 802413B4 00000000 */ nop -/* D942F8 802413B8 08090552 */ j .L80241548 -/* D942FC 802413BC 00000000 */ nop -.L802413C0: -/* D94300 802413C0 86240008 */ lh $a0, 8($s1) -/* D94304 802413C4 0C00FB3A */ jal get_enemy -/* D94308 802413C8 2484FFFF */ addiu $a0, $a0, -1 -/* D9430C 802413CC 0040802D */ daddu $s0, $v0, $zero -/* D94310 802413D0 0C00EABB */ jal get_npc_unsafe -/* D94314 802413D4 86040008 */ lh $a0, 8($s0) -/* D94318 802413D8 24030001 */ addiu $v1, $zero, 1 -/* D9431C 802413DC 0040982D */ daddu $s3, $v0, $zero -/* D94320 802413E0 A2230007 */ sb $v1, 7($s1) -/* D94324 802413E4 8E03006C */ lw $v1, 0x6c($s0) -/* D94328 802413E8 24020003 */ addiu $v0, $zero, 3 -/* D9432C 802413EC 14620056 */ bne $v1, $v0, .L80241548 -/* D94330 802413F0 00000000 */ nop -/* D94334 802413F4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D94338 802413F8 10A00003 */ beqz $a1, .L80241408 -/* D9433C 802413FC 0260202D */ daddu $a0, $s3, $zero -/* D94340 80241400 0C012530 */ jal func_800494C0 -/* D94344 80241404 0000302D */ daddu $a2, $zero, $zero -.L80241408: -/* D94348 80241408 27A40010 */ addiu $a0, $sp, 0x10 -/* D9434C 8024140C C6280070 */ lwc1 $f8, 0x70($s1) -/* D94350 80241410 46804220 */ cvt.s.w $f8, $f8 -/* D94354 80241414 C6620034 */ lwc1 $f2, 0x34($s3) -/* D94358 80241418 3C014387 */ lui $at, 0x4387 -/* D9435C 8024141C 44810000 */ mtc1 $at, $f0 -/* D94360 80241420 44064000 */ mfc1 $a2, $f8 -/* D94364 80241424 46020001 */ sub.s $f0, $f0, $f2 -/* D94368 80241428 C6660038 */ lwc1 $f6, 0x38($s3) -/* D9436C 8024142C C6640040 */ lwc1 $f4, 0x40($s3) -/* D94370 80241430 44070000 */ mfc1 $a3, $f0 -/* D94374 80241434 27A50014 */ addiu $a1, $sp, 0x14 -/* D94378 80241438 E7A60010 */ swc1 $f6, 0x10($sp) -/* D9437C 8024143C 0C00A7E7 */ jal add_vec2D_polar -/* D94380 80241440 E7A40014 */ swc1 $f4, 0x14($sp) -/* D94384 80241444 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D94388 80241448 4600020D */ trunc.w.s $f8, $f0 -/* D9438C 8024144C 44024000 */ mfc1 $v0, $f8 -/* D94390 80241450 E6400038 */ swc1 $f0, 0x38($s2) -/* D94394 80241454 A6220010 */ sh $v0, 0x10($s1) -/* D94398 80241458 C660003C */ lwc1 $f0, 0x3c($s3) -/* D9439C 8024145C C622006C */ lwc1 $f2, 0x6c($s1) -/* D943A0 80241460 468010A0 */ cvt.s.w $f2, $f2 -/* D943A4 80241464 46020000 */ add.s $f0, $f0, $f2 -/* D943A8 80241468 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D943AC 8024146C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D943B0 80241470 E640003C */ swc1 $f0, 0x3c($s2) -/* D943B4 80241474 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D943B8 80241478 4600020D */ trunc.w.s $f8, $f0 -/* D943BC 8024147C 44024000 */ mfc1 $v0, $f8 -/* D943C0 80241480 00000000 */ nop -/* D943C4 80241484 A6220012 */ sh $v0, 0x12($s1) -/* D943C8 80241488 4600120D */ trunc.w.s $f8, $f2 -/* D943CC 8024148C 44024000 */ mfc1 $v0, $f8 -/* D943D0 80241490 E6420040 */ swc1 $f2, 0x40($s2) -/* D943D4 80241494 A6220014 */ sh $v0, 0x14($s1) -/* D943D8 80241498 8C660028 */ lw $a2, 0x28($v1) -/* D943DC 8024149C 8C670030 */ lw $a3, 0x30($v1) -/* D943E0 802414A0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D943E4 802414A4 0C00A720 */ jal atan2 -/* D943E8 802414A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D943EC 802414AC 3C03E0EF */ lui $v1, 0xe0ef -/* D943F0 802414B0 E640000C */ swc1 $f0, 0xc($s2) -/* D943F4 802414B4 8E220000 */ lw $v0, ($s1) -/* D943F8 802414B8 3463FFFF */ ori $v1, $v1, 0xffff -/* D943FC 802414BC 00431024 */ and $v0, $v0, $v1 -/* D94400 802414C0 AE220000 */ sw $v0, ($s1) -/* D94404 802414C4 24020001 */ addiu $v0, $zero, 1 -/* D94408 802414C8 A640008E */ sh $zero, 0x8e($s2) -/* D9440C 802414CC 08090552 */ j .L80241548 -/* D94410 802414D0 AE820070 */ sw $v0, 0x70($s4) -.L802414D4: -/* D94414 802414D4 86240008 */ lh $a0, 8($s1) -/* D94418 802414D8 0C00FB3A */ jal get_enemy -/* D9441C 802414DC 2484FFFF */ addiu $a0, $a0, -1 -/* D94420 802414E0 0040802D */ daddu $s0, $v0, $zero -/* D94424 802414E4 0C00EABB */ jal get_npc_unsafe -/* D94428 802414E8 86040008 */ lh $a0, 8($s0) -/* D9442C 802414EC 9642008E */ lhu $v0, 0x8e($s2) -/* D94430 802414F0 24420001 */ addiu $v0, $v0, 1 -/* D94434 802414F4 A642008E */ sh $v0, 0x8e($s2) -/* D94438 802414F8 00021400 */ sll $v0, $v0, 0x10 -/* D9443C 802414FC 8E23007C */ lw $v1, 0x7c($s1) -/* D94440 80241500 00021403 */ sra $v0, $v0, 0x10 -/* D94444 80241504 0043102A */ slt $v0, $v0, $v1 -/* D94448 80241508 50400001 */ beql $v0, $zero, .L80241510 -/* D9444C 8024150C A2200007 */ sb $zero, 7($s1) -.L80241510: -/* D94450 80241510 8E03006C */ lw $v1, 0x6c($s0) -/* D94454 80241514 24020004 */ addiu $v0, $zero, 4 -/* D94458 80241518 1462000B */ bne $v1, $v0, .L80241548 -/* D9445C 8024151C 3C021F10 */ lui $v0, 0x1f10 -/* D94460 80241520 8E230000 */ lw $v1, ($s1) -/* D94464 80241524 3C01C47A */ lui $at, 0xc47a -/* D94468 80241528 44810000 */ mtc1 $at, $f0 -/* D9446C 8024152C 00621825 */ or $v1, $v1, $v0 -/* D94470 80241530 AE230000 */ sw $v1, ($s1) -/* D94474 80241534 AE400038 */ sw $zero, 0x38($s2) -/* D94478 80241538 E640003C */ swc1 $f0, 0x3c($s2) -/* D9447C 8024153C AE400040 */ sw $zero, 0x40($s2) -/* D94480 80241540 A2330007 */ sb $s3, 7($s1) -/* D94484 80241544 AE800070 */ sw $zero, 0x70($s4) -.L80241548: -/* D94488 80241548 8FBF002C */ lw $ra, 0x2c($sp) -/* D9448C 8024154C 8FB40028 */ lw $s4, 0x28($sp) -/* D94490 80241550 8FB30024 */ lw $s3, 0x24($sp) -/* D94494 80241554 8FB20020 */ lw $s2, 0x20($sp) -/* D94498 80241558 8FB1001C */ lw $s1, 0x1c($sp) -/* D9449C 8024155C 8FB00018 */ lw $s0, 0x18($sp) -/* D944A0 80241560 0000102D */ daddu $v0, $zero, $zero -/* D944A4 80241564 03E00008 */ jr $ra -/* D944A8 80241568 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s deleted file mode 100644 index 1682d391a3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024040C_D114CC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024040C_D114CC -/* D114CC 8024040C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D114D0 80240410 AFB40028 */ sw $s4, 0x28($sp) -/* D114D4 80240414 0080A02D */ daddu $s4, $a0, $zero -/* D114D8 80240418 AFBF002C */ sw $ra, 0x2c($sp) -/* D114DC 8024041C AFB30024 */ sw $s3, 0x24($sp) -/* D114E0 80240420 AFB20020 */ sw $s2, 0x20($sp) -/* D114E4 80240424 AFB1001C */ sw $s1, 0x1c($sp) -/* D114E8 80240428 AFB00018 */ sw $s0, 0x18($sp) -/* D114EC 8024042C 8E910148 */ lw $s1, 0x148($s4) -/* D114F0 80240430 86240008 */ lh $a0, 8($s1) -/* D114F4 80240434 0C00EABB */ jal get_npc_unsafe -/* D114F8 80240438 00A0802D */ daddu $s0, $a1, $zero -/* D114FC 8024043C 16000005 */ bnez $s0, .L80240454 -/* D11500 80240440 0040902D */ daddu $s2, $v0, $zero -/* D11504 80240444 8E2200B0 */ lw $v0, 0xb0($s1) -/* D11508 80240448 30420004 */ andi $v0, $v0, 4 -/* D1150C 8024044C 10400015 */ beqz $v0, .L802404A4 -/* D11510 80240450 00000000 */ nop -.L80240454: -/* D11514 80240454 AE800070 */ sw $zero, 0x70($s4) -/* D11518 80240458 8E420000 */ lw $v0, ($s2) -/* D1151C 8024045C 3C031F30 */ lui $v1, 0x1f30 -/* D11520 80240460 A640008E */ sh $zero, 0x8e($s2) -/* D11524 80240464 34420102 */ ori $v0, $v0, 0x102 -/* D11528 80240468 AE420000 */ sw $v0, ($s2) -/* D1152C 8024046C 8E220000 */ lw $v0, ($s1) -/* D11530 80240470 3C01C47A */ lui $at, 0xc47a -/* D11534 80240474 44810000 */ mtc1 $at, $f0 -/* D11538 80240478 00431025 */ or $v0, $v0, $v1 -/* D1153C 8024047C AE220000 */ sw $v0, ($s1) -/* D11540 80240480 AE400038 */ sw $zero, 0x38($s2) -/* D11544 80240484 E640003C */ swc1 $f0, 0x3c($s2) -/* D11548 80240488 AE400040 */ sw $zero, 0x40($s2) -/* D1154C 8024048C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D11550 80240490 30620004 */ andi $v0, $v1, 4 -/* D11554 80240494 10400003 */ beqz $v0, .L802404A4 -/* D11558 80240498 2402FFFB */ addiu $v0, $zero, -5 -/* D1155C 8024049C 00621024 */ and $v0, $v1, $v0 -/* D11560 802404A0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802404A4: -/* D11564 802404A4 8E930070 */ lw $s3, 0x70($s4) -/* D11568 802404A8 12600005 */ beqz $s3, .L802404C0 -/* D1156C 802404AC 24020001 */ addiu $v0, $zero, 1 -/* D11570 802404B0 12620048 */ beq $s3, $v0, .L802405D4 -/* D11574 802404B4 00000000 */ nop -/* D11578 802404B8 08090192 */ j .L80240648 -/* D1157C 802404BC 00000000 */ nop -.L802404C0: -/* D11580 802404C0 86240008 */ lh $a0, 8($s1) -/* D11584 802404C4 0C00FB3A */ jal get_enemy -/* D11588 802404C8 2484FFFF */ addiu $a0, $a0, -1 -/* D1158C 802404CC 0040802D */ daddu $s0, $v0, $zero -/* D11590 802404D0 0C00EABB */ jal get_npc_unsafe -/* D11594 802404D4 86040008 */ lh $a0, 8($s0) -/* D11598 802404D8 24030001 */ addiu $v1, $zero, 1 -/* D1159C 802404DC 0040982D */ daddu $s3, $v0, $zero -/* D115A0 802404E0 A2230007 */ sb $v1, 7($s1) -/* D115A4 802404E4 8E03006C */ lw $v1, 0x6c($s0) -/* D115A8 802404E8 24020003 */ addiu $v0, $zero, 3 -/* D115AC 802404EC 14620056 */ bne $v1, $v0, .L80240648 -/* D115B0 802404F0 00000000 */ nop -/* D115B4 802404F4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D115B8 802404F8 10A00003 */ beqz $a1, .L80240508 -/* D115BC 802404FC 0260202D */ daddu $a0, $s3, $zero -/* D115C0 80240500 0C012530 */ jal func_800494C0 -/* D115C4 80240504 0000302D */ daddu $a2, $zero, $zero -.L80240508: -/* D115C8 80240508 27A40010 */ addiu $a0, $sp, 0x10 -/* D115CC 8024050C C6280070 */ lwc1 $f8, 0x70($s1) -/* D115D0 80240510 46804220 */ cvt.s.w $f8, $f8 -/* D115D4 80240514 C6620034 */ lwc1 $f2, 0x34($s3) -/* D115D8 80240518 3C014387 */ lui $at, 0x4387 -/* D115DC 8024051C 44810000 */ mtc1 $at, $f0 -/* D115E0 80240520 44064000 */ mfc1 $a2, $f8 -/* D115E4 80240524 46020001 */ sub.s $f0, $f0, $f2 -/* D115E8 80240528 C6660038 */ lwc1 $f6, 0x38($s3) -/* D115EC 8024052C C6640040 */ lwc1 $f4, 0x40($s3) -/* D115F0 80240530 44070000 */ mfc1 $a3, $f0 -/* D115F4 80240534 27A50014 */ addiu $a1, $sp, 0x14 -/* D115F8 80240538 E7A60010 */ swc1 $f6, 0x10($sp) -/* D115FC 8024053C 0C00A7E7 */ jal add_vec2D_polar -/* D11600 80240540 E7A40014 */ swc1 $f4, 0x14($sp) -/* D11604 80240544 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D11608 80240548 4600020D */ trunc.w.s $f8, $f0 -/* D1160C 8024054C 44024000 */ mfc1 $v0, $f8 -/* D11610 80240550 E6400038 */ swc1 $f0, 0x38($s2) -/* D11614 80240554 A6220010 */ sh $v0, 0x10($s1) -/* D11618 80240558 C660003C */ lwc1 $f0, 0x3c($s3) -/* D1161C 8024055C C622006C */ lwc1 $f2, 0x6c($s1) -/* D11620 80240560 468010A0 */ cvt.s.w $f2, $f2 -/* D11624 80240564 46020000 */ add.s $f0, $f0, $f2 -/* D11628 80240568 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D1162C 8024056C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D11630 80240570 E640003C */ swc1 $f0, 0x3c($s2) -/* D11634 80240574 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D11638 80240578 4600020D */ trunc.w.s $f8, $f0 -/* D1163C 8024057C 44024000 */ mfc1 $v0, $f8 -/* D11640 80240580 00000000 */ nop -/* D11644 80240584 A6220012 */ sh $v0, 0x12($s1) -/* D11648 80240588 4600120D */ trunc.w.s $f8, $f2 -/* D1164C 8024058C 44024000 */ mfc1 $v0, $f8 -/* D11650 80240590 E6420040 */ swc1 $f2, 0x40($s2) -/* D11654 80240594 A6220014 */ sh $v0, 0x14($s1) -/* D11658 80240598 8C660028 */ lw $a2, 0x28($v1) -/* D1165C 8024059C 8C670030 */ lw $a3, 0x30($v1) -/* D11660 802405A0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D11664 802405A4 0C00A720 */ jal atan2 -/* D11668 802405A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D1166C 802405AC 3C03E0EF */ lui $v1, 0xe0ef -/* D11670 802405B0 E640000C */ swc1 $f0, 0xc($s2) -/* D11674 802405B4 8E220000 */ lw $v0, ($s1) -/* D11678 802405B8 3463FFFF */ ori $v1, $v1, 0xffff -/* D1167C 802405BC 00431024 */ and $v0, $v0, $v1 -/* D11680 802405C0 AE220000 */ sw $v0, ($s1) -/* D11684 802405C4 24020001 */ addiu $v0, $zero, 1 -/* D11688 802405C8 A640008E */ sh $zero, 0x8e($s2) -/* D1168C 802405CC 08090192 */ j .L80240648 -/* D11690 802405D0 AE820070 */ sw $v0, 0x70($s4) -.L802405D4: -/* D11694 802405D4 86240008 */ lh $a0, 8($s1) -/* D11698 802405D8 0C00FB3A */ jal get_enemy -/* D1169C 802405DC 2484FFFF */ addiu $a0, $a0, -1 -/* D116A0 802405E0 0040802D */ daddu $s0, $v0, $zero -/* D116A4 802405E4 0C00EABB */ jal get_npc_unsafe -/* D116A8 802405E8 86040008 */ lh $a0, 8($s0) -/* D116AC 802405EC 9642008E */ lhu $v0, 0x8e($s2) -/* D116B0 802405F0 24420001 */ addiu $v0, $v0, 1 -/* D116B4 802405F4 A642008E */ sh $v0, 0x8e($s2) -/* D116B8 802405F8 00021400 */ sll $v0, $v0, 0x10 -/* D116BC 802405FC 8E23007C */ lw $v1, 0x7c($s1) -/* D116C0 80240600 00021403 */ sra $v0, $v0, 0x10 -/* D116C4 80240604 0043102A */ slt $v0, $v0, $v1 -/* D116C8 80240608 50400001 */ beql $v0, $zero, .L80240610 -/* D116CC 8024060C A2200007 */ sb $zero, 7($s1) -.L80240610: -/* D116D0 80240610 8E03006C */ lw $v1, 0x6c($s0) -/* D116D4 80240614 24020004 */ addiu $v0, $zero, 4 -/* D116D8 80240618 1462000B */ bne $v1, $v0, .L80240648 -/* D116DC 8024061C 3C021F10 */ lui $v0, 0x1f10 -/* D116E0 80240620 8E230000 */ lw $v1, ($s1) -/* D116E4 80240624 3C01C47A */ lui $at, 0xc47a -/* D116E8 80240628 44810000 */ mtc1 $at, $f0 -/* D116EC 8024062C 00621825 */ or $v1, $v1, $v0 -/* D116F0 80240630 AE230000 */ sw $v1, ($s1) -/* D116F4 80240634 AE400038 */ sw $zero, 0x38($s2) -/* D116F8 80240638 E640003C */ swc1 $f0, 0x3c($s2) -/* D116FC 8024063C AE400040 */ sw $zero, 0x40($s2) -/* D11700 80240640 A2330007 */ sb $s3, 7($s1) -/* D11704 80240644 AE800070 */ sw $zero, 0x70($s4) -.L80240648: -/* D11708 80240648 8FBF002C */ lw $ra, 0x2c($sp) -/* D1170C 8024064C 8FB40028 */ lw $s4, 0x28($sp) -/* D11710 80240650 8FB30024 */ lw $s3, 0x24($sp) -/* D11714 80240654 8FB20020 */ lw $s2, 0x20($sp) -/* D11718 80240658 8FB1001C */ lw $s1, 0x1c($sp) -/* D1171C 8024065C 8FB00018 */ lw $s0, 0x18($sp) -/* D11720 80240660 0000102D */ daddu $v0, $zero, $zero -/* D11724 80240664 03E00008 */ jr $ra -/* D11728 80240668 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s deleted file mode 100644 index 30bc8ef92b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/update_starpoints_display_D18B9C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel update_starpoints_display_D18B9C -/* D18B9C 802403BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D18BA0 802403C0 AFB40028 */ sw $s4, 0x28($sp) -/* D18BA4 802403C4 0080A02D */ daddu $s4, $a0, $zero -/* D18BA8 802403C8 AFBF002C */ sw $ra, 0x2c($sp) -/* D18BAC 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* D18BB0 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* D18BB4 802403D4 AFB1001C */ sw $s1, 0x1c($sp) -/* D18BB8 802403D8 AFB00018 */ sw $s0, 0x18($sp) -/* D18BBC 802403DC 8E910148 */ lw $s1, 0x148($s4) -/* D18BC0 802403E0 86240008 */ lh $a0, 8($s1) -/* D18BC4 802403E4 0C00EABB */ jal get_npc_unsafe -/* D18BC8 802403E8 00A0802D */ daddu $s0, $a1, $zero -/* D18BCC 802403EC 16000005 */ bnez $s0, .L80240404 -/* D18BD0 802403F0 0040902D */ daddu $s2, $v0, $zero -/* D18BD4 802403F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D18BD8 802403F8 30420004 */ andi $v0, $v0, 4 -/* D18BDC 802403FC 10400015 */ beqz $v0, .L80240454 -/* D18BE0 80240400 00000000 */ nop -.L80240404: -/* D18BE4 80240404 AE800070 */ sw $zero, 0x70($s4) -/* D18BE8 80240408 8E420000 */ lw $v0, ($s2) -/* D18BEC 8024040C 3C031F30 */ lui $v1, 0x1f30 -/* D18BF0 80240410 A640008E */ sh $zero, 0x8e($s2) -/* D18BF4 80240414 34420102 */ ori $v0, $v0, 0x102 -/* D18BF8 80240418 AE420000 */ sw $v0, ($s2) -/* D18BFC 8024041C 8E220000 */ lw $v0, ($s1) -/* D18C00 80240420 3C01C47A */ lui $at, 0xc47a -/* D18C04 80240424 44810000 */ mtc1 $at, $f0 -/* D18C08 80240428 00431025 */ or $v0, $v0, $v1 -/* D18C0C 8024042C AE220000 */ sw $v0, ($s1) -/* D18C10 80240430 AE400038 */ sw $zero, 0x38($s2) -/* D18C14 80240434 E640003C */ swc1 $f0, 0x3c($s2) -/* D18C18 80240438 AE400040 */ sw $zero, 0x40($s2) -/* D18C1C 8024043C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D18C20 80240440 30620004 */ andi $v0, $v1, 4 -/* D18C24 80240444 10400003 */ beqz $v0, .L80240454 -/* D18C28 80240448 2402FFFB */ addiu $v0, $zero, -5 -/* D18C2C 8024044C 00621024 */ and $v0, $v1, $v0 -/* D18C30 80240450 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240454: -/* D18C34 80240454 8E930070 */ lw $s3, 0x70($s4) -/* D18C38 80240458 12600005 */ beqz $s3, .L80240470 -/* D18C3C 8024045C 24020001 */ addiu $v0, $zero, 1 -/* D18C40 80240460 12620048 */ beq $s3, $v0, .L80240584 -/* D18C44 80240464 00000000 */ nop -/* D18C48 80240468 0809017E */ j .L802405F8 -/* D18C4C 8024046C 00000000 */ nop -.L80240470: -/* D18C50 80240470 86240008 */ lh $a0, 8($s1) -/* D18C54 80240474 0C00FB3A */ jal get_enemy -/* D18C58 80240478 2484FFFF */ addiu $a0, $a0, -1 -/* D18C5C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* D18C60 80240480 0C00EABB */ jal get_npc_unsafe -/* D18C64 80240484 86040008 */ lh $a0, 8($s0) -/* D18C68 80240488 24030001 */ addiu $v1, $zero, 1 -/* D18C6C 8024048C 0040982D */ daddu $s3, $v0, $zero -/* D18C70 80240490 A2230007 */ sb $v1, 7($s1) -/* D18C74 80240494 8E03006C */ lw $v1, 0x6c($s0) -/* D18C78 80240498 24020003 */ addiu $v0, $zero, 3 -/* D18C7C 8024049C 14620056 */ bne $v1, $v0, .L802405F8 -/* D18C80 802404A0 00000000 */ nop -/* D18C84 802404A4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D18C88 802404A8 10A00003 */ beqz $a1, .L802404B8 -/* D18C8C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* D18C90 802404B0 0C012530 */ jal func_800494C0 -/* D18C94 802404B4 0000302D */ daddu $a2, $zero, $zero -.L802404B8: -/* D18C98 802404B8 27A40010 */ addiu $a0, $sp, 0x10 -/* D18C9C 802404BC C6280070 */ lwc1 $f8, 0x70($s1) -/* D18CA0 802404C0 46804220 */ cvt.s.w $f8, $f8 -/* D18CA4 802404C4 C6620034 */ lwc1 $f2, 0x34($s3) -/* D18CA8 802404C8 3C014387 */ lui $at, 0x4387 -/* D18CAC 802404CC 44810000 */ mtc1 $at, $f0 -/* D18CB0 802404D0 44064000 */ mfc1 $a2, $f8 -/* D18CB4 802404D4 46020001 */ sub.s $f0, $f0, $f2 -/* D18CB8 802404D8 C6660038 */ lwc1 $f6, 0x38($s3) -/* D18CBC 802404DC C6640040 */ lwc1 $f4, 0x40($s3) -/* D18CC0 802404E0 44070000 */ mfc1 $a3, $f0 -/* D18CC4 802404E4 27A50014 */ addiu $a1, $sp, 0x14 -/* D18CC8 802404E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* D18CCC 802404EC 0C00A7E7 */ jal add_vec2D_polar -/* D18CD0 802404F0 E7A40014 */ swc1 $f4, 0x14($sp) -/* D18CD4 802404F4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D18CD8 802404F8 4600020D */ trunc.w.s $f8, $f0 -/* D18CDC 802404FC 44024000 */ mfc1 $v0, $f8 -/* D18CE0 80240500 E6400038 */ swc1 $f0, 0x38($s2) -/* D18CE4 80240504 A6220010 */ sh $v0, 0x10($s1) -/* D18CE8 80240508 C660003C */ lwc1 $f0, 0x3c($s3) -/* D18CEC 8024050C C622006C */ lwc1 $f2, 0x6c($s1) -/* D18CF0 80240510 468010A0 */ cvt.s.w $f2, $f2 -/* D18CF4 80240514 46020000 */ add.s $f0, $f0, $f2 -/* D18CF8 80240518 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D18CFC 8024051C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D18D00 80240520 E640003C */ swc1 $f0, 0x3c($s2) -/* D18D04 80240524 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D18D08 80240528 4600020D */ trunc.w.s $f8, $f0 -/* D18D0C 8024052C 44024000 */ mfc1 $v0, $f8 -/* D18D10 80240530 00000000 */ nop -/* D18D14 80240534 A6220012 */ sh $v0, 0x12($s1) -/* D18D18 80240538 4600120D */ trunc.w.s $f8, $f2 -/* D18D1C 8024053C 44024000 */ mfc1 $v0, $f8 -/* D18D20 80240540 E6420040 */ swc1 $f2, 0x40($s2) -/* D18D24 80240544 A6220014 */ sh $v0, 0x14($s1) -/* D18D28 80240548 8C660028 */ lw $a2, 0x28($v1) -/* D18D2C 8024054C 8C670030 */ lw $a3, 0x30($v1) -/* D18D30 80240550 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D18D34 80240554 0C00A720 */ jal atan2 -/* D18D38 80240558 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D18D3C 8024055C 3C03E0EF */ lui $v1, 0xe0ef -/* D18D40 80240560 E640000C */ swc1 $f0, 0xc($s2) -/* D18D44 80240564 8E220000 */ lw $v0, ($s1) -/* D18D48 80240568 3463FFFF */ ori $v1, $v1, 0xffff -/* D18D4C 8024056C 00431024 */ and $v0, $v0, $v1 -/* D18D50 80240570 AE220000 */ sw $v0, ($s1) -/* D18D54 80240574 24020001 */ addiu $v0, $zero, 1 -/* D18D58 80240578 A640008E */ sh $zero, 0x8e($s2) -/* D18D5C 8024057C 0809017E */ j .L802405F8 -/* D18D60 80240580 AE820070 */ sw $v0, 0x70($s4) -.L80240584: -/* D18D64 80240584 86240008 */ lh $a0, 8($s1) -/* D18D68 80240588 0C00FB3A */ jal get_enemy -/* D18D6C 8024058C 2484FFFF */ addiu $a0, $a0, -1 -/* D18D70 80240590 0040802D */ daddu $s0, $v0, $zero -/* D18D74 80240594 0C00EABB */ jal get_npc_unsafe -/* D18D78 80240598 86040008 */ lh $a0, 8($s0) -/* D18D7C 8024059C 9642008E */ lhu $v0, 0x8e($s2) -/* D18D80 802405A0 24420001 */ addiu $v0, $v0, 1 -/* D18D84 802405A4 A642008E */ sh $v0, 0x8e($s2) -/* D18D88 802405A8 00021400 */ sll $v0, $v0, 0x10 -/* D18D8C 802405AC 8E23007C */ lw $v1, 0x7c($s1) -/* D18D90 802405B0 00021403 */ sra $v0, $v0, 0x10 -/* D18D94 802405B4 0043102A */ slt $v0, $v0, $v1 -/* D18D98 802405B8 50400001 */ beql $v0, $zero, .L802405C0 -/* D18D9C 802405BC A2200007 */ sb $zero, 7($s1) -.L802405C0: -/* D18DA0 802405C0 8E03006C */ lw $v1, 0x6c($s0) -/* D18DA4 802405C4 24020004 */ addiu $v0, $zero, 4 -/* D18DA8 802405C8 1462000B */ bne $v1, $v0, .L802405F8 -/* D18DAC 802405CC 3C021F10 */ lui $v0, 0x1f10 -/* D18DB0 802405D0 8E230000 */ lw $v1, ($s1) -/* D18DB4 802405D4 3C01C47A */ lui $at, 0xc47a -/* D18DB8 802405D8 44810000 */ mtc1 $at, $f0 -/* D18DBC 802405DC 00621825 */ or $v1, $v1, $v0 -/* D18DC0 802405E0 AE230000 */ sw $v1, ($s1) -/* D18DC4 802405E4 AE400038 */ sw $zero, 0x38($s2) -/* D18DC8 802405E8 E640003C */ swc1 $f0, 0x3c($s2) -/* D18DCC 802405EC AE400040 */ sw $zero, 0x40($s2) -/* D18DD0 802405F0 A2330007 */ sb $s3, 7($s1) -/* D18DD4 802405F4 AE800070 */ sw $zero, 0x70($s4) -.L802405F8: -/* D18DD8 802405F8 8FBF002C */ lw $ra, 0x2c($sp) -/* D18DDC 802405FC 8FB40028 */ lw $s4, 0x28($sp) -/* D18DE0 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* D18DE4 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* D18DE8 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* D18DEC 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* D18DF0 80240610 0000102D */ daddu $v0, $zero, $zero -/* D18DF4 80240614 03E00008 */ jr $ra -/* D18DF8 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s deleted file mode 100644 index 1b60e1ceac..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240DE8_D20C78.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8_D20C78 -/* D20C78 80240DE8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* D20C7C 80240DEC AFB3004C */ sw $s3, 0x4c($sp) -/* D20C80 80240DF0 0080982D */ daddu $s3, $a0, $zero -/* D20C84 80240DF4 AFBF0054 */ sw $ra, 0x54($sp) -/* D20C88 80240DF8 AFB40050 */ sw $s4, 0x50($sp) -/* D20C8C 80240DFC AFB20048 */ sw $s2, 0x48($sp) -/* D20C90 80240E00 AFB10044 */ sw $s1, 0x44($sp) -/* D20C94 80240E04 AFB00040 */ sw $s0, 0x40($sp) -/* D20C98 80240E08 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* D20C9C 80240E0C F7B80068 */ sdc1 $f24, 0x68($sp) -/* D20CA0 80240E10 F7B60060 */ sdc1 $f22, 0x60($sp) -/* D20CA4 80240E14 F7B40058 */ sdc1 $f20, 0x58($sp) -/* D20CA8 80240E18 8E710148 */ lw $s1, 0x148($s3) -/* D20CAC 80240E1C 00A0902D */ daddu $s2, $a1, $zero -/* D20CB0 80240E20 86240008 */ lh $a0, 8($s1) -/* D20CB4 80240E24 0C00EABB */ jal get_npc_unsafe -/* D20CB8 80240E28 00C0A02D */ daddu $s4, $a2, $zero -/* D20CBC 80240E2C 0040802D */ daddu $s0, $v0, $zero -/* D20CC0 80240E30 C6200078 */ lwc1 $f0, 0x78($s1) -/* D20CC4 80240E34 46800020 */ cvt.s.w $f0, $f0 -/* D20CC8 80240E38 46000021 */ cvt.d.s $f0, $f0 -/* D20CCC 80240E3C 3C014059 */ lui $at, 0x4059 -/* D20CD0 80240E40 44811800 */ mtc1 $at, $f3 -/* D20CD4 80240E44 44801000 */ mtc1 $zero, $f2 -/* D20CD8 80240E48 8602008E */ lh $v0, 0x8e($s0) -/* D20CDC 80240E4C 9603008E */ lhu $v1, 0x8e($s0) -/* D20CE0 80240E50 46220003 */ div.d $f0, $f0, $f2 -/* D20CE4 80240E54 46200620 */ cvt.s.d $f24, $f0 -/* D20CE8 80240E58 C6200088 */ lwc1 $f0, 0x88($s1) -/* D20CEC 80240E5C 46800020 */ cvt.s.w $f0, $f0 -/* D20CF0 80240E60 46000021 */ cvt.d.s $f0, $f0 -/* D20CF4 80240E64 46220003 */ div.d $f0, $f0, $f2 -/* D20CF8 80240E68 46200020 */ cvt.s.d $f0, $f0 -/* D20CFC 80240E6C 18400003 */ blez $v0, .L80240E7C -/* D20D00 80240E70 4600C680 */ add.s $f26, $f24, $f0 -/* D20D04 80240E74 2462FFFF */ addiu $v0, $v1, -1 -/* D20D08 80240E78 A602008E */ sh $v0, 0x8e($s0) -.L80240E7C: -/* D20D0C 80240E7C 8E220070 */ lw $v0, 0x70($s1) -/* D20D10 80240E80 18400034 */ blez $v0, .L80240F54 -/* D20D14 80240E84 00000000 */ nop -/* D20D18 80240E88 C62C0074 */ lwc1 $f12, 0x74($s1) -/* D20D1C 80240E8C 46806320 */ cvt.s.w $f12, $f12 -/* D20D20 80240E90 44820000 */ mtc1 $v0, $f0 -/* D20D24 80240E94 00000000 */ nop -/* D20D28 80240E98 46800020 */ cvt.s.w $f0, $f0 -/* D20D2C 80240E9C 46000021 */ cvt.d.s $f0, $f0 -/* D20D30 80240EA0 46220003 */ div.d $f0, $f0, $f2 -/* D20D34 80240EA4 0C00A8BB */ jal sin_deg -/* D20D38 80240EA8 462005A0 */ cvt.s.d $f22, $f0 -/* D20D3C 80240EAC 8E020000 */ lw $v0, ($s0) -/* D20D40 80240EB0 30420008 */ andi $v0, $v0, 8 -/* D20D44 80240EB4 10400003 */ beqz $v0, .L80240EC4 -/* D20D48 80240EB8 46000506 */ mov.s $f20, $f0 -/* D20D4C 80240EBC 080903C1 */ j .L80240F04 -/* D20D50 80240EC0 0000102D */ daddu $v0, $zero, $zero -.L80240EC4: -/* D20D54 80240EC4 27A50028 */ addiu $a1, $sp, 0x28 -/* D20D58 80240EC8 27A6002C */ addiu $a2, $sp, 0x2c -/* D20D5C 80240ECC C6000038 */ lwc1 $f0, 0x38($s0) -/* D20D60 80240ED0 C602003C */ lwc1 $f2, 0x3c($s0) -/* D20D64 80240ED4 C6040040 */ lwc1 $f4, 0x40($s0) -/* D20D68 80240ED8 3C01447A */ lui $at, 0x447a -/* D20D6C 80240EDC 44813000 */ mtc1 $at, $f6 -/* D20D70 80240EE0 27A20034 */ addiu $v0, $sp, 0x34 -/* D20D74 80240EE4 E7A00028 */ swc1 $f0, 0x28($sp) -/* D20D78 80240EE8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* D20D7C 80240EEC E7A40030 */ swc1 $f4, 0x30($sp) -/* D20D80 80240EF0 E7A60034 */ swc1 $f6, 0x34($sp) -/* D20D84 80240EF4 AFA20010 */ sw $v0, 0x10($sp) -/* D20D88 80240EF8 8E040080 */ lw $a0, 0x80($s0) -/* D20D8C 80240EFC 0C0372DF */ jal func_800DCB7C -/* D20D90 80240F00 27A70030 */ addiu $a3, $sp, 0x30 -.L80240F04: -/* D20D94 80240F04 10400007 */ beqz $v0, .L80240F24 -/* D20D98 80240F08 00000000 */ nop -/* D20D9C 80240F0C 4616A082 */ mul.s $f2, $f20, $f22 -/* D20DA0 80240F10 00000000 */ nop -/* D20DA4 80240F14 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* D20DA8 80240F18 46180000 */ add.s $f0, $f0, $f24 -/* D20DAC 80240F1C 080903CC */ j .L80240F30 -/* D20DB0 80240F20 46020000 */ add.s $f0, $f0, $f2 -.L80240F24: -/* D20DB4 80240F24 4616A002 */ mul.s $f0, $f20, $f22 -/* D20DB8 80240F28 00000000 */ nop -/* D20DBC 80240F2C 4600D000 */ add.s $f0, $f26, $f0 -.L80240F30: -/* D20DC0 80240F30 E600003C */ swc1 $f0, 0x3c($s0) -/* D20DC4 80240F34 8E220074 */ lw $v0, 0x74($s1) -/* D20DC8 80240F38 2442000A */ addiu $v0, $v0, 0xa -/* D20DCC 80240F3C 44826000 */ mtc1 $v0, $f12 -/* D20DD0 80240F40 00000000 */ nop -/* D20DD4 80240F44 0C00A6C9 */ jal clamp_angle -/* D20DD8 80240F48 46806320 */ cvt.s.w $f12, $f12 -/* D20DDC 80240F4C 4600020D */ trunc.w.s $f8, $f0 -/* D20DE0 80240F50 E6280074 */ swc1 $f8, 0x74($s1) -.L80240F54: -/* D20DE4 80240F54 8E220090 */ lw $v0, 0x90($s1) -/* D20DE8 80240F58 1C400040 */ bgtz $v0, .L8024105C -/* D20DEC 80240F5C 2442FFFF */ addiu $v0, $v0, -1 -/* D20DF0 80240F60 860200A8 */ lh $v0, 0xa8($s0) -/* D20DF4 80240F64 C600003C */ lwc1 $f0, 0x3c($s0) -/* D20DF8 80240F68 44821000 */ mtc1 $v0, $f2 -/* D20DFC 80240F6C 00000000 */ nop -/* D20E00 80240F70 468010A0 */ cvt.s.w $f2, $f2 -/* D20E04 80240F74 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D20E08 80240F78 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D20E0C 80240F7C 46020000 */ add.s $f0, $f0, $f2 -/* D20E10 80240F80 3C014024 */ lui $at, 0x4024 -/* D20E14 80240F84 44812800 */ mtc1 $at, $f5 -/* D20E18 80240F88 44802000 */ mtc1 $zero, $f4 -/* D20E1C 80240F8C C442002C */ lwc1 $f2, 0x2c($v0) -/* D20E20 80240F90 46000021 */ cvt.d.s $f0, $f0 -/* D20E24 80240F94 46240000 */ add.d $f0, $f0, $f4 -/* D20E28 80240F98 460010A1 */ cvt.d.s $f2, $f2 -/* D20E2C 80240F9C 4620103C */ c.lt.d $f2, $f0 -/* D20E30 80240FA0 00000000 */ nop -/* D20E34 80240FA4 4500002E */ bc1f .L80241060 -/* D20E38 80240FA8 0280202D */ daddu $a0, $s4, $zero -/* D20E3C 80240FAC 24020001 */ addiu $v0, $zero, 1 -/* D20E40 80240FB0 AFA20010 */ sw $v0, 0x10($sp) -/* D20E44 80240FB4 8E460024 */ lw $a2, 0x24($s2) -/* D20E48 80240FB8 8E470028 */ lw $a3, 0x28($s2) -/* D20E4C 80240FBC 0C01242D */ jal func_800490B4 -/* D20E50 80240FC0 0220282D */ daddu $a1, $s1, $zero -/* D20E54 80240FC4 10400026 */ beqz $v0, .L80241060 -/* D20E58 80240FC8 0000202D */ daddu $a0, $zero, $zero -/* D20E5C 80240FCC 0200282D */ daddu $a1, $s0, $zero -/* D20E60 80240FD0 0000302D */ daddu $a2, $zero, $zero -/* D20E64 80240FD4 2412000C */ addiu $s2, $zero, 0xc -/* D20E68 80240FD8 860300A8 */ lh $v1, 0xa8($s0) -/* D20E6C 80240FDC 3C013F80 */ lui $at, 0x3f80 -/* D20E70 80240FE0 44810000 */ mtc1 $at, $f0 -/* D20E74 80240FE4 3C014000 */ lui $at, 0x4000 -/* D20E78 80240FE8 44811000 */ mtc1 $at, $f2 -/* D20E7C 80240FEC 3C01C1A0 */ lui $at, 0xc1a0 -/* D20E80 80240FF0 44812000 */ mtc1 $at, $f4 -/* D20E84 80240FF4 44834000 */ mtc1 $v1, $f8 -/* D20E88 80240FF8 00000000 */ nop -/* D20E8C 80240FFC 46804220 */ cvt.s.w $f8, $f8 -/* D20E90 80241000 44074000 */ mfc1 $a3, $f8 -/* D20E94 80241004 27A20038 */ addiu $v0, $sp, 0x38 -/* D20E98 80241008 AFB2001C */ sw $s2, 0x1c($sp) -/* D20E9C 8024100C AFA20020 */ sw $v0, 0x20($sp) -/* D20EA0 80241010 E7A00010 */ swc1 $f0, 0x10($sp) -/* D20EA4 80241014 E7A20014 */ swc1 $f2, 0x14($sp) -/* D20EA8 80241018 0C01BFA4 */ jal fx_emote -/* D20EAC 8024101C E7A40018 */ swc1 $f4, 0x18($sp) -/* D20EB0 80241020 0200202D */ daddu $a0, $s0, $zero -/* D20EB4 80241024 240502F4 */ addiu $a1, $zero, 0x2f4 -/* D20EB8 80241028 C480003C */ lwc1 $f0, 0x3c($a0) -/* D20EBC 8024102C 3C060020 */ lui $a2, 0x20 -/* D20EC0 80241030 0C012530 */ jal func_800494C0 -/* D20EC4 80241034 E4800064 */ swc1 $f0, 0x64($a0) -/* D20EC8 80241038 8E220018 */ lw $v0, 0x18($s1) -/* D20ECC 8024103C 9442002A */ lhu $v0, 0x2a($v0) -/* D20ED0 80241040 30420001 */ andi $v0, $v0, 1 -/* D20ED4 80241044 10400003 */ beqz $v0, .L80241054 -/* D20ED8 80241048 2402000A */ addiu $v0, $zero, 0xa -/* D20EDC 8024104C 0809043F */ j .L802410FC -/* D20EE0 80241050 AE620070 */ sw $v0, 0x70($s3) -.L80241054: -/* D20EE4 80241054 0809043F */ j .L802410FC -/* D20EE8 80241058 AE720070 */ sw $s2, 0x70($s3) -.L8024105C: -/* D20EEC 8024105C AE220090 */ sw $v0, 0x90($s1) -.L80241060: -/* D20EF0 80241060 8602008C */ lh $v0, 0x8c($s0) -/* D20EF4 80241064 14400025 */ bnez $v0, .L802410FC -/* D20EF8 80241068 00000000 */ nop -/* D20EFC 8024106C 8602008E */ lh $v0, 0x8e($s0) -/* D20F00 80241070 1C400022 */ bgtz $v0, .L802410FC -/* D20F04 80241074 00000000 */ nop -/* D20F08 80241078 8E620074 */ lw $v0, 0x74($s3) -/* D20F0C 8024107C 2442FFFF */ addiu $v0, $v0, -1 -/* D20F10 80241080 1840001D */ blez $v0, .L802410F8 -/* D20F14 80241084 AE620074 */ sw $v0, 0x74($s3) -/* D20F18 80241088 8E220018 */ lw $v0, 0x18($s1) -/* D20F1C 8024108C 9442002A */ lhu $v0, 0x2a($v0) -/* D20F20 80241090 30420010 */ andi $v0, $v0, 0x10 -/* D20F24 80241094 14400007 */ bnez $v0, .L802410B4 -/* D20F28 80241098 00000000 */ nop -/* D20F2C 8024109C C600000C */ lwc1 $f0, 0xc($s0) -/* D20F30 802410A0 3C014334 */ lui $at, 0x4334 -/* D20F34 802410A4 44816000 */ mtc1 $at, $f12 -/* D20F38 802410A8 0C00A6C9 */ jal clamp_angle -/* D20F3C 802410AC 460C0300 */ add.s $f12, $f0, $f12 -/* D20F40 802410B0 E600000C */ swc1 $f0, 0xc($s0) -.L802410B4: -/* D20F44 802410B4 0C00A67F */ jal rand_int -/* D20F48 802410B8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* D20F4C 802410BC 3C032E8B */ lui $v1, 0x2e8b -/* D20F50 802410C0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* D20F54 802410C4 00430018 */ mult $v0, $v1 -/* D20F58 802410C8 00021FC3 */ sra $v1, $v0, 0x1f -/* D20F5C 802410CC 00004010 */ mfhi $t0 -/* D20F60 802410D0 00082043 */ sra $a0, $t0, 1 -/* D20F64 802410D4 00832023 */ subu $a0, $a0, $v1 -/* D20F68 802410D8 00041840 */ sll $v1, $a0, 1 -/* D20F6C 802410DC 00641821 */ addu $v1, $v1, $a0 -/* D20F70 802410E0 00031880 */ sll $v1, $v1, 2 -/* D20F74 802410E4 00641823 */ subu $v1, $v1, $a0 -/* D20F78 802410E8 00431023 */ subu $v0, $v0, $v1 -/* D20F7C 802410EC 24420005 */ addiu $v0, $v0, 5 -/* D20F80 802410F0 0809043F */ j .L802410FC -/* D20F84 802410F4 A602008E */ sh $v0, 0x8e($s0) -.L802410F8: -/* D20F88 802410F8 AE600070 */ sw $zero, 0x70($s3) -.L802410FC: -/* D20F8C 802410FC 8FBF0054 */ lw $ra, 0x54($sp) -/* D20F90 80241100 8FB40050 */ lw $s4, 0x50($sp) -/* D20F94 80241104 8FB3004C */ lw $s3, 0x4c($sp) -/* D20F98 80241108 8FB20048 */ lw $s2, 0x48($sp) -/* D20F9C 8024110C 8FB10044 */ lw $s1, 0x44($sp) -/* D20FA0 80241110 8FB00040 */ lw $s0, 0x40($sp) -/* D20FA4 80241114 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* D20FA8 80241118 D7B80068 */ ldc1 $f24, 0x68($sp) -/* D20FAC 8024111C D7B60060 */ ldc1 $f22, 0x60($sp) -/* D20FB0 80241120 D7B40058 */ ldc1 $f20, 0x58($sp) -/* D20FB4 80241124 03E00008 */ jr $ra -/* D20FB8 80241128 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s deleted file mode 100644 index 48a1660f12..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802413A8_D21238.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A8_D21238 -/* D21238 802413A8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D2123C 802413AC AFB20030 */ sw $s2, 0x30($sp) -/* D21240 802413B0 0080902D */ daddu $s2, $a0, $zero -/* D21244 802413B4 AFBF0038 */ sw $ra, 0x38($sp) -/* D21248 802413B8 AFB30034 */ sw $s3, 0x34($sp) -/* D2124C 802413BC AFB1002C */ sw $s1, 0x2c($sp) -/* D21250 802413C0 AFB00028 */ sw $s0, 0x28($sp) -/* D21254 802413C4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* D21258 802413C8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* D2125C 802413CC 8E510148 */ lw $s1, 0x148($s2) -/* D21260 802413D0 86240008 */ lh $a0, 8($s1) -/* D21264 802413D4 0C00EABB */ jal get_npc_unsafe -/* D21268 802413D8 00A0982D */ daddu $s3, $a1, $zero -/* D2126C 802413DC 0040802D */ daddu $s0, $v0, $zero -/* D21270 802413E0 0200202D */ daddu $a0, $s0, $zero -/* D21274 802413E4 C6220088 */ lwc1 $f2, 0x88($s1) -/* D21278 802413E8 468010A0 */ cvt.s.w $f2, $f2 -/* D2127C 802413EC 460010A1 */ cvt.d.s $f2, $f2 -/* D21280 802413F0 C604001C */ lwc1 $f4, 0x1c($s0) -/* D21284 802413F4 C6000014 */ lwc1 $f0, 0x14($s0) -/* D21288 802413F8 8E050018 */ lw $a1, 0x18($s0) -/* D2128C 802413FC 46002100 */ add.s $f4, $f4, $f0 -/* D21290 80241400 8E06000C */ lw $a2, 0xc($s0) -/* D21294 80241404 C6200078 */ lwc1 $f0, 0x78($s1) -/* D21298 80241408 46800020 */ cvt.s.w $f0, $f0 -/* D2129C 8024140C E604001C */ swc1 $f4, 0x1c($s0) -/* D212A0 80241410 3C014059 */ lui $at, 0x4059 -/* D212A4 80241414 44812800 */ mtc1 $at, $f5 -/* D212A8 80241418 44802000 */ mtc1 $zero, $f4 -/* D212AC 8024141C 46000021 */ cvt.d.s $f0, $f0 -/* D212B0 80241420 46240003 */ div.d $f0, $f0, $f4 -/* D212B4 80241424 46200520 */ cvt.s.d $f20, $f0 -/* D212B8 80241428 46241083 */ div.d $f2, $f2, $f4 -/* D212BC 8024142C 0C00EA95 */ jal npc_move_heading -/* D212C0 80241430 462015A0 */ cvt.s.d $f22, $f2 -/* D212C4 80241434 C604001C */ lwc1 $f4, 0x1c($s0) -/* D212C8 80241438 44801000 */ mtc1 $zero, $f2 -/* D212CC 8024143C 44801800 */ mtc1 $zero, $f3 -/* D212D0 80241440 46002021 */ cvt.d.s $f0, $f4 -/* D212D4 80241444 4620103E */ c.le.d $f2, $f0 -/* D212D8 80241448 00000000 */ nop -/* D212DC 8024144C 45000030 */ bc1f .L80241510 -/* D212E0 80241450 00000000 */ nop -/* D212E4 80241454 C600003C */ lwc1 $f0, 0x3c($s0) -/* D212E8 80241458 46040000 */ add.s $f0, $f0, $f4 -/* D212EC 8024145C E600003C */ swc1 $f0, 0x3c($s0) -/* D212F0 80241460 8E2200CC */ lw $v0, 0xcc($s1) -/* D212F4 80241464 8C420024 */ lw $v0, 0x24($v0) -/* D212F8 80241468 AE020028 */ sw $v0, 0x28($s0) -/* D212FC 8024146C A2200007 */ sb $zero, 7($s1) -/* D21300 80241470 8E020000 */ lw $v0, ($s0) -/* D21304 80241474 30420008 */ andi $v0, $v0, 8 -/* D21308 80241478 14400011 */ bnez $v0, .L802414C0 -/* D2130C 8024147C 0000102D */ daddu $v0, $zero, $zero -/* D21310 80241480 27A50018 */ addiu $a1, $sp, 0x18 -/* D21314 80241484 27A6001C */ addiu $a2, $sp, 0x1c -/* D21318 80241488 C6000038 */ lwc1 $f0, 0x38($s0) -/* D2131C 8024148C C602003C */ lwc1 $f2, 0x3c($s0) -/* D21320 80241490 C6040040 */ lwc1 $f4, 0x40($s0) -/* D21324 80241494 3C01447A */ lui $at, 0x447a -/* D21328 80241498 44813000 */ mtc1 $at, $f6 -/* D2132C 8024149C 27A20024 */ addiu $v0, $sp, 0x24 -/* D21330 802414A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D21334 802414A4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* D21338 802414A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* D2133C 802414AC E7A60024 */ swc1 $f6, 0x24($sp) -/* D21340 802414B0 AFA20010 */ sw $v0, 0x10($sp) -/* D21344 802414B4 8E040080 */ lw $a0, 0x80($s0) -/* D21348 802414B8 0C0372DF */ jal func_800DCB7C -/* D2134C 802414BC 27A70020 */ addiu $a3, $sp, 0x20 -.L802414C0: -/* D21350 802414C0 1040000B */ beqz $v0, .L802414F0 -/* D21354 802414C4 00000000 */ nop -/* D21358 802414C8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* D2135C 802414CC 46140080 */ add.s $f2, $f0, $f20 -/* D21360 802414D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* D21364 802414D4 4600103E */ c.le.s $f2, $f0 -/* D21368 802414D8 00000000 */ nop -/* D2136C 802414DC 4500008D */ bc1f .L80241714 -/* D21370 802414E0 00000000 */ nop -/* D21374 802414E4 E602003C */ swc1 $f2, 0x3c($s0) -/* D21378 802414E8 080905C5 */ j .L80241714 -/* D2137C 802414EC AE400070 */ sw $zero, 0x70($s2) -.L802414F0: -/* D21380 802414F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* D21384 802414F4 C6000064 */ lwc1 $f0, 0x64($s0) -/* D21388 802414F8 4602003E */ c.le.s $f0, $f2 -/* D2138C 802414FC 00000000 */ nop -/* D21390 80241500 45030084 */ bc1tl .L80241714 -/* D21394 80241504 AE400070 */ sw $zero, 0x70($s2) -/* D21398 80241508 080905C5 */ j .L80241714 -/* D2139C 8024150C 00000000 */ nop -.L80241510: -/* D213A0 80241510 4622003C */ c.lt.d $f0, $f2 -/* D213A4 80241514 00000000 */ nop -/* D213A8 80241518 4500007E */ bc1f .L80241714 -/* D213AC 8024151C 00000000 */ nop -/* D213B0 80241520 9602008E */ lhu $v0, 0x8e($s0) -/* D213B4 80241524 24420001 */ addiu $v0, $v0, 1 -/* D213B8 80241528 A602008E */ sh $v0, 0x8e($s0) -/* D213BC 8024152C 00021400 */ sll $v0, $v0, 0x10 -/* D213C0 80241530 8E630020 */ lw $v1, 0x20($s3) -/* D213C4 80241534 00021403 */ sra $v0, $v0, 0x10 -/* D213C8 80241538 0043102A */ slt $v0, $v0, $v1 -/* D213CC 8024153C 14400026 */ bnez $v0, .L802415D8 -/* D213D0 80241540 00000000 */ nop -/* D213D4 80241544 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D213D8 80241548 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D213DC 8024154C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D213E0 80241550 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D213E4 80241554 A600008E */ sh $zero, 0x8e($s0) -/* D213E8 80241558 8C460028 */ lw $a2, 0x28($v0) -/* D213EC 8024155C 0C00A720 */ jal atan2 -/* D213F0 80241560 8C470030 */ lw $a3, 0x30($v0) -/* D213F4 80241564 46000506 */ mov.s $f20, $f0 -/* D213F8 80241568 C60C000C */ lwc1 $f12, 0xc($s0) -/* D213FC 8024156C 0C00A70A */ jal get_clamped_angle_diff -/* D21400 80241570 4600A386 */ mov.s $f14, $f20 -/* D21404 80241574 46000086 */ mov.s $f2, $f0 -/* D21408 80241578 8E62001C */ lw $v0, 0x1c($s3) -/* D2140C 8024157C 46001005 */ abs.s $f0, $f2 -/* D21410 80241580 44822000 */ mtc1 $v0, $f4 -/* D21414 80241584 00000000 */ nop -/* D21418 80241588 46802120 */ cvt.s.w $f4, $f4 -/* D2141C 8024158C 4600203C */ c.lt.s $f4, $f0 -/* D21420 80241590 00000000 */ nop -/* D21424 80241594 4500000D */ bc1f .L802415CC -/* D21428 80241598 00000000 */ nop -/* D2142C 8024159C 44800000 */ mtc1 $zero, $f0 -/* D21430 802415A0 C614000C */ lwc1 $f20, 0xc($s0) -/* D21434 802415A4 4600103C */ c.lt.s $f2, $f0 -/* D21438 802415A8 00000000 */ nop -/* D2143C 802415AC 45000006 */ bc1f .L802415C8 -/* D21440 802415B0 00021023 */ negu $v0, $v0 -/* D21444 802415B4 44820000 */ mtc1 $v0, $f0 -/* D21448 802415B8 00000000 */ nop -/* D2144C 802415BC 46800020 */ cvt.s.w $f0, $f0 -/* D21450 802415C0 08090573 */ j .L802415CC -/* D21454 802415C4 4600A500 */ add.s $f20, $f20, $f0 -.L802415C8: -/* D21458 802415C8 4604A500 */ add.s $f20, $f20, $f4 -.L802415CC: -/* D2145C 802415CC 0C00A6C9 */ jal clamp_angle -/* D21460 802415D0 4600A306 */ mov.s $f12, $f20 -/* D21464 802415D4 E600000C */ swc1 $f0, 0xc($s0) -.L802415D8: -/* D21468 802415D8 8E020000 */ lw $v0, ($s0) -/* D2146C 802415DC 30420008 */ andi $v0, $v0, 8 -/* D21470 802415E0 1040000A */ beqz $v0, .L8024160C -/* D21474 802415E4 27A50018 */ addiu $a1, $sp, 0x18 -/* D21478 802415E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* D2147C 802415EC C600001C */ lwc1 $f0, 0x1c($s0) -/* D21480 802415F0 46001080 */ add.s $f2, $f2, $f0 -/* D21484 802415F4 4616103C */ c.lt.s $f2, $f22 -/* D21488 802415F8 00000000 */ nop -/* D2148C 802415FC 45020045 */ bc1fl .L80241714 -/* D21490 80241600 E602003C */ swc1 $f2, 0x3c($s0) -/* D21494 80241604 080905C4 */ j .L80241710 -/* D21498 80241608 E616003C */ swc1 $f22, 0x3c($s0) -.L8024160C: -/* D2149C 8024160C C6000038 */ lwc1 $f0, 0x38($s0) -/* D214A0 80241610 27A6001C */ addiu $a2, $sp, 0x1c -/* D214A4 80241614 E7A00018 */ swc1 $f0, 0x18($sp) -/* D214A8 80241618 860200A8 */ lh $v0, 0xa8($s0) -/* D214AC 8024161C C600001C */ lwc1 $f0, 0x1c($s0) -/* D214B0 80241620 C604003C */ lwc1 $f4, 0x3c($s0) -/* D214B4 80241624 44821000 */ mtc1 $v0, $f2 -/* D214B8 80241628 00000000 */ nop -/* D214BC 8024162C 468010A0 */ cvt.s.w $f2, $f2 -/* D214C0 80241630 46000005 */ abs.s $f0, $f0 -/* D214C4 80241634 46020000 */ add.s $f0, $f0, $f2 -/* D214C8 80241638 C6060040 */ lwc1 $f6, 0x40($s0) -/* D214CC 8024163C 27A20024 */ addiu $v0, $sp, 0x24 -/* D214D0 80241640 46022100 */ add.s $f4, $f4, $f2 -/* D214D4 80241644 3C014024 */ lui $at, 0x4024 -/* D214D8 80241648 44811800 */ mtc1 $at, $f3 -/* D214DC 8024164C 44801000 */ mtc1 $zero, $f2 -/* D214E0 80241650 46000021 */ cvt.d.s $f0, $f0 -/* D214E4 80241654 46220000 */ add.d $f0, $f0, $f2 -/* D214E8 80241658 E7A60020 */ swc1 $f6, 0x20($sp) -/* D214EC 8024165C E7A4001C */ swc1 $f4, 0x1c($sp) -/* D214F0 80241660 46200020 */ cvt.s.d $f0, $f0 -/* D214F4 80241664 E7A00024 */ swc1 $f0, 0x24($sp) -/* D214F8 80241668 AFA20010 */ sw $v0, 0x10($sp) -/* D214FC 8024166C 8E040080 */ lw $a0, 0x80($s0) -/* D21500 80241670 0C0372DF */ jal func_800DCB7C -/* D21504 80241674 27A70020 */ addiu $a3, $sp, 0x20 -/* D21508 80241678 10400015 */ beqz $v0, .L802416D0 -/* D2150C 8024167C 00000000 */ nop -/* D21510 80241680 860200A8 */ lh $v0, 0xa8($s0) -/* D21514 80241684 C604001C */ lwc1 $f4, 0x1c($s0) -/* D21518 80241688 44820000 */ mtc1 $v0, $f0 -/* D2151C 8024168C 00000000 */ nop -/* D21520 80241690 46800020 */ cvt.s.w $f0, $f0 -/* D21524 80241694 46002085 */ abs.s $f2, $f4 -/* D21528 80241698 46020000 */ add.s $f0, $f0, $f2 -/* D2152C 8024169C C7A20024 */ lwc1 $f2, 0x24($sp) -/* D21530 802416A0 4600103E */ c.le.s $f2, $f0 -/* D21534 802416A4 00000000 */ nop -/* D21538 802416A8 45000005 */ bc1f .L802416C0 -/* D2153C 802416AC 00000000 */ nop -/* D21540 802416B0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* D21544 802416B4 AE00001C */ sw $zero, 0x1c($s0) -/* D21548 802416B8 080905C5 */ j .L80241714 -/* D2154C 802416BC E600003C */ swc1 $f0, 0x3c($s0) -.L802416C0: -/* D21550 802416C0 C600003C */ lwc1 $f0, 0x3c($s0) -/* D21554 802416C4 46040000 */ add.s $f0, $f0, $f4 -/* D21558 802416C8 080905C5 */ j .L80241714 -/* D2155C 802416CC E600003C */ swc1 $f0, 0x3c($s0) -.L802416D0: -/* D21560 802416D0 C606003C */ lwc1 $f6, 0x3c($s0) -/* D21564 802416D4 860200A8 */ lh $v0, 0xa8($s0) -/* D21568 802416D8 46163081 */ sub.s $f2, $f6, $f22 -/* D2156C 802416DC 44820000 */ mtc1 $v0, $f0 -/* D21570 802416E0 00000000 */ nop -/* D21574 802416E4 46800020 */ cvt.s.w $f0, $f0 -/* D21578 802416E8 46001080 */ add.s $f2, $f2, $f0 -/* D2157C 802416EC C604001C */ lwc1 $f4, 0x1c($s0) -/* D21580 802416F0 46002005 */ abs.s $f0, $f4 -/* D21584 802416F4 4602003C */ c.lt.s $f0, $f2 -/* D21588 802416F8 00000000 */ nop -/* D2158C 802416FC 45020005 */ bc1fl .L80241714 -/* D21590 80241700 AE00001C */ sw $zero, 0x1c($s0) -/* D21594 80241704 46043000 */ add.s $f0, $f6, $f4 -/* D21598 80241708 080905C5 */ j .L80241714 -/* D2159C 8024170C E600003C */ swc1 $f0, 0x3c($s0) -.L80241710: -/* D215A0 80241710 AE00001C */ sw $zero, 0x1c($s0) -.L80241714: -/* D215A4 80241714 8FBF0038 */ lw $ra, 0x38($sp) -/* D215A8 80241718 8FB30034 */ lw $s3, 0x34($sp) -/* D215AC 8024171C 8FB20030 */ lw $s2, 0x30($sp) -/* D215B0 80241720 8FB1002C */ lw $s1, 0x2c($sp) -/* D215B4 80241724 8FB00028 */ lw $s0, 0x28($sp) -/* D215B8 80241728 D7B60048 */ ldc1 $f22, 0x48($sp) -/* D215BC 8024172C D7B40040 */ ldc1 $f20, 0x40($sp) -/* D215C0 80241730 03E00008 */ jr $ra -/* D215C4 80241734 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s deleted file mode 100644 index 03898c663f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241738_D215C8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241738_D215C8 -/* D215C8 80241738 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D215CC 8024173C AFB00028 */ sw $s0, 0x28($sp) -/* D215D0 80241740 00A0802D */ daddu $s0, $a1, $zero -/* D215D4 80241744 AFB1002C */ sw $s1, 0x2c($sp) -/* D215D8 80241748 00C0882D */ daddu $s1, $a2, $zero -/* D215DC 8024174C AFBF0034 */ sw $ra, 0x34($sp) -/* D215E0 80241750 AFB20030 */ sw $s2, 0x30($sp) -/* D215E4 80241754 AE200070 */ sw $zero, 0x70($s1) -/* D215E8 80241758 8C830000 */ lw $v1, ($a0) -/* D215EC 8024175C 2402FDFF */ addiu $v0, $zero, -0x201 -/* D215F0 80241760 A480008E */ sh $zero, 0x8e($a0) -/* D215F4 80241764 00621824 */ and $v1, $v1, $v0 -/* D215F8 80241768 34650800 */ ori $a1, $v1, 0x800 -/* D215FC 8024176C AC850000 */ sw $a1, ($a0) -/* D21600 80241770 8E0200D0 */ lw $v0, 0xd0($s0) -/* D21604 80241774 8C420034 */ lw $v0, 0x34($v0) -/* D21608 80241778 10400003 */ beqz $v0, .L80241788 -/* D2160C 8024177C 00E0902D */ daddu $s2, $a3, $zero -/* D21610 80241780 080905E4 */ j .L80241790 -/* D21614 80241784 34620808 */ ori $v0, $v1, 0x808 -.L80241788: -/* D21618 80241788 2402FFF7 */ addiu $v0, $zero, -9 -/* D2161C 8024178C 00A21024 */ and $v0, $a1, $v0 -.L80241790: -/* D21620 80241790 AC820000 */ sw $v0, ($a0) -/* D21624 80241794 27A20024 */ addiu $v0, $sp, 0x24 -/* D21628 80241798 27A50018 */ addiu $a1, $sp, 0x18 -/* D2162C 8024179C C4800038 */ lwc1 $f0, 0x38($a0) -/* D21630 802417A0 C482003C */ lwc1 $f2, 0x3c($a0) -/* D21634 802417A4 C4840040 */ lwc1 $f4, 0x40($a0) -/* D21638 802417A8 3C01447A */ lui $at, 0x447a -/* D2163C 802417AC 44813000 */ mtc1 $at, $f6 -/* D21640 802417B0 27A6001C */ addiu $a2, $sp, 0x1c -/* D21644 802417B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* D21648 802417B8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* D2164C 802417BC E7A40020 */ swc1 $f4, 0x20($sp) -/* D21650 802417C0 E7A60024 */ swc1 $f6, 0x24($sp) -/* D21654 802417C4 AFA20010 */ sw $v0, 0x10($sp) -/* D21658 802417C8 8C840080 */ lw $a0, 0x80($a0) -/* D2165C 802417CC 0C0372DF */ jal func_800DCB7C -/* D21660 802417D0 27A70020 */ addiu $a3, $sp, 0x20 -/* D21664 802417D4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* D21668 802417D8 3C014059 */ lui $at, 0x4059 -/* D2166C 802417DC 44812800 */ mtc1 $at, $f5 -/* D21670 802417E0 44802000 */ mtc1 $zero, $f4 -/* D21674 802417E4 460010A1 */ cvt.d.s $f2, $f2 -/* D21678 802417E8 46241082 */ mul.d $f2, $f2, $f4 -/* D2167C 802417EC 00000000 */ nop -/* D21680 802417F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* D21684 802417F4 46000021 */ cvt.d.s $f0, $f0 -/* D21688 802417F8 46240002 */ mul.d $f0, $f0, $f4 -/* D2168C 802417FC 00000000 */ nop -/* D21690 80241800 3C013FE0 */ lui $at, 0x3fe0 -/* D21694 80241804 44812800 */ mtc1 $at, $f5 -/* D21698 80241808 44802000 */ mtc1 $zero, $f4 -/* D2169C 8024180C 00000000 */ nop -/* D216A0 80241810 46241080 */ add.d $f2, $f2, $f4 -/* D216A4 80241814 AE000074 */ sw $zero, 0x74($s0) -/* D216A8 80241818 46240000 */ add.d $f0, $f0, $f4 -/* D216AC 8024181C AE000090 */ sw $zero, 0x90($s0) -/* D216B0 80241820 4620120D */ trunc.w.d $f8, $f2 -/* D216B4 80241824 E6080078 */ swc1 $f8, 0x78($s0) -/* D216B8 80241828 4620020D */ trunc.w.d $f8, $f0 -/* D216BC 8024182C E6080088 */ swc1 $f8, 0x88($s0) -/* D216C0 80241830 8E420014 */ lw $v0, 0x14($s2) -/* D216C4 80241834 AE220074 */ sw $v0, 0x74($s1) -/* D216C8 80241838 8E0200B0 */ lw $v0, 0xb0($s0) -/* D216CC 8024183C 34420010 */ ori $v0, $v0, 0x10 -/* D216D0 80241840 AE0200B0 */ sw $v0, 0xb0($s0) -/* D216D4 80241844 8FBF0034 */ lw $ra, 0x34($sp) -/* D216D8 80241848 8FB20030 */ lw $s2, 0x30($sp) -/* D216DC 8024184C 8FB1002C */ lw $s1, 0x2c($sp) -/* D216E0 80241850 8FB00028 */ lw $s0, 0x28($sp) -/* D216E4 80241854 03E00008 */ jr $ra -/* D216E8 80241858 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index d8ea21d0c4..9753f975b5 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -46,7 +46,7 @@ glabel func_8024185C_D216EC /* D21790 80241900 02A0202D */ daddu $a0, $s5, $zero /* D21794 80241904 0240282D */ daddu $a1, $s2, $zero /* D21798 80241908 0280302D */ daddu $a2, $s4, $zero -/* D2179C 8024190C 0C0905CE */ jal func_80241738_D215C8 +/* D2179C 8024190C 0C0905CE */ jal sam_06_UnkFunc5 /* D217A0 80241910 0200382D */ daddu $a3, $s0, $zero .L80241914: /* D217A4 80241914 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241990_D21820 glabel L802419A0_D21830 /* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero /* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero -/* D21838 802419A8 0C09037A */ jal func_80240DE8_D20C78 +/* D21838 802419A8 0C09037A */ jal sam_06_UnkFunc4 /* D2183C 802419AC 0260302D */ daddu $a2, $s3, $zero /* D21840 802419B0 08090689 */ j .L80241A24 /* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802419F8_D21888 glabel L80241A10_D218A0 /* D218A0 80241A10 0280202D */ daddu $a0, $s4, $zero /* D218A4 80241A14 0200282D */ daddu $a1, $s0, $zero -/* D218A8 80241A18 0C0904EA */ jal func_802413A8_D21238 +/* D218A8 80241A18 0C0904EA */ jal sam_06_UnkFunc6 /* D218AC 80241A1C 0260302D */ daddu $a2, $s3, $zero glabel L80241A20_D218B0 /* D218B0 80241A20 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s deleted file mode 100644 index 6c9e1afdb1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240A0C_D2C73C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A0C_D2C73C -/* D2C73C 80240A0C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D2C740 80240A10 AFB40028 */ sw $s4, 0x28($sp) -/* D2C744 80240A14 0080A02D */ daddu $s4, $a0, $zero -/* D2C748 80240A18 AFBF002C */ sw $ra, 0x2c($sp) -/* D2C74C 80240A1C AFB30024 */ sw $s3, 0x24($sp) -/* D2C750 80240A20 AFB20020 */ sw $s2, 0x20($sp) -/* D2C754 80240A24 AFB1001C */ sw $s1, 0x1c($sp) -/* D2C758 80240A28 AFB00018 */ sw $s0, 0x18($sp) -/* D2C75C 80240A2C 8E910148 */ lw $s1, 0x148($s4) -/* D2C760 80240A30 86240008 */ lh $a0, 8($s1) -/* D2C764 80240A34 0C00EABB */ jal get_npc_unsafe -/* D2C768 80240A38 00A0802D */ daddu $s0, $a1, $zero -/* D2C76C 80240A3C 16000005 */ bnez $s0, .L80240A54 -/* D2C770 80240A40 0040902D */ daddu $s2, $v0, $zero -/* D2C774 80240A44 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2C778 80240A48 30420004 */ andi $v0, $v0, 4 -/* D2C77C 80240A4C 10400015 */ beqz $v0, .L80240AA4 -/* D2C780 80240A50 00000000 */ nop -.L80240A54: -/* D2C784 80240A54 AE800070 */ sw $zero, 0x70($s4) -/* D2C788 80240A58 8E420000 */ lw $v0, ($s2) -/* D2C78C 80240A5C 3C031F30 */ lui $v1, 0x1f30 -/* D2C790 80240A60 A640008E */ sh $zero, 0x8e($s2) -/* D2C794 80240A64 34420102 */ ori $v0, $v0, 0x102 -/* D2C798 80240A68 AE420000 */ sw $v0, ($s2) -/* D2C79C 80240A6C 8E220000 */ lw $v0, ($s1) -/* D2C7A0 80240A70 3C01C47A */ lui $at, 0xc47a -/* D2C7A4 80240A74 44810000 */ mtc1 $at, $f0 -/* D2C7A8 80240A78 00431025 */ or $v0, $v0, $v1 -/* D2C7AC 80240A7C AE220000 */ sw $v0, ($s1) -/* D2C7B0 80240A80 AE400038 */ sw $zero, 0x38($s2) -/* D2C7B4 80240A84 E640003C */ swc1 $f0, 0x3c($s2) -/* D2C7B8 80240A88 AE400040 */ sw $zero, 0x40($s2) -/* D2C7BC 80240A8C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D2C7C0 80240A90 30620004 */ andi $v0, $v1, 4 -/* D2C7C4 80240A94 10400003 */ beqz $v0, .L80240AA4 -/* D2C7C8 80240A98 2402FFFB */ addiu $v0, $zero, -5 -/* D2C7CC 80240A9C 00621024 */ and $v0, $v1, $v0 -/* D2C7D0 80240AA0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240AA4: -/* D2C7D4 80240AA4 8E930070 */ lw $s3, 0x70($s4) -/* D2C7D8 80240AA8 12600005 */ beqz $s3, .L80240AC0 -/* D2C7DC 80240AAC 24020001 */ addiu $v0, $zero, 1 -/* D2C7E0 80240AB0 12620048 */ beq $s3, $v0, .L80240BD4 -/* D2C7E4 80240AB4 00000000 */ nop -/* D2C7E8 80240AB8 08090312 */ j .L80240C48 -/* D2C7EC 80240ABC 00000000 */ nop -.L80240AC0: -/* D2C7F0 80240AC0 86240008 */ lh $a0, 8($s1) -/* D2C7F4 80240AC4 0C00FB3A */ jal get_enemy -/* D2C7F8 80240AC8 2484FFFF */ addiu $a0, $a0, -1 -/* D2C7FC 80240ACC 0040802D */ daddu $s0, $v0, $zero -/* D2C800 80240AD0 0C00EABB */ jal get_npc_unsafe -/* D2C804 80240AD4 86040008 */ lh $a0, 8($s0) -/* D2C808 80240AD8 24030001 */ addiu $v1, $zero, 1 -/* D2C80C 80240ADC 0040982D */ daddu $s3, $v0, $zero -/* D2C810 80240AE0 A2230007 */ sb $v1, 7($s1) -/* D2C814 80240AE4 8E03006C */ lw $v1, 0x6c($s0) -/* D2C818 80240AE8 24020003 */ addiu $v0, $zero, 3 -/* D2C81C 80240AEC 14620056 */ bne $v1, $v0, .L80240C48 -/* D2C820 80240AF0 00000000 */ nop -/* D2C824 80240AF4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D2C828 80240AF8 10A00003 */ beqz $a1, .L80240B08 -/* D2C82C 80240AFC 0260202D */ daddu $a0, $s3, $zero -/* D2C830 80240B00 0C012530 */ jal func_800494C0 -/* D2C834 80240B04 0000302D */ daddu $a2, $zero, $zero -.L80240B08: -/* D2C838 80240B08 27A40010 */ addiu $a0, $sp, 0x10 -/* D2C83C 80240B0C C6280070 */ lwc1 $f8, 0x70($s1) -/* D2C840 80240B10 46804220 */ cvt.s.w $f8, $f8 -/* D2C844 80240B14 C6620034 */ lwc1 $f2, 0x34($s3) -/* D2C848 80240B18 3C014387 */ lui $at, 0x4387 -/* D2C84C 80240B1C 44810000 */ mtc1 $at, $f0 -/* D2C850 80240B20 44064000 */ mfc1 $a2, $f8 -/* D2C854 80240B24 46020001 */ sub.s $f0, $f0, $f2 -/* D2C858 80240B28 C6660038 */ lwc1 $f6, 0x38($s3) -/* D2C85C 80240B2C C6640040 */ lwc1 $f4, 0x40($s3) -/* D2C860 80240B30 44070000 */ mfc1 $a3, $f0 -/* D2C864 80240B34 27A50014 */ addiu $a1, $sp, 0x14 -/* D2C868 80240B38 E7A60010 */ swc1 $f6, 0x10($sp) -/* D2C86C 80240B3C 0C00A7E7 */ jal add_vec2D_polar -/* D2C870 80240B40 E7A40014 */ swc1 $f4, 0x14($sp) -/* D2C874 80240B44 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D2C878 80240B48 4600020D */ trunc.w.s $f8, $f0 -/* D2C87C 80240B4C 44024000 */ mfc1 $v0, $f8 -/* D2C880 80240B50 E6400038 */ swc1 $f0, 0x38($s2) -/* D2C884 80240B54 A6220010 */ sh $v0, 0x10($s1) -/* D2C888 80240B58 C660003C */ lwc1 $f0, 0x3c($s3) -/* D2C88C 80240B5C C622006C */ lwc1 $f2, 0x6c($s1) -/* D2C890 80240B60 468010A0 */ cvt.s.w $f2, $f2 -/* D2C894 80240B64 46020000 */ add.s $f0, $f0, $f2 -/* D2C898 80240B68 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D2C89C 80240B6C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D2C8A0 80240B70 E640003C */ swc1 $f0, 0x3c($s2) -/* D2C8A4 80240B74 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D2C8A8 80240B78 4600020D */ trunc.w.s $f8, $f0 -/* D2C8AC 80240B7C 44024000 */ mfc1 $v0, $f8 -/* D2C8B0 80240B80 00000000 */ nop -/* D2C8B4 80240B84 A6220012 */ sh $v0, 0x12($s1) -/* D2C8B8 80240B88 4600120D */ trunc.w.s $f8, $f2 -/* D2C8BC 80240B8C 44024000 */ mfc1 $v0, $f8 -/* D2C8C0 80240B90 E6420040 */ swc1 $f2, 0x40($s2) -/* D2C8C4 80240B94 A6220014 */ sh $v0, 0x14($s1) -/* D2C8C8 80240B98 8C660028 */ lw $a2, 0x28($v1) -/* D2C8CC 80240B9C 8C670030 */ lw $a3, 0x30($v1) -/* D2C8D0 80240BA0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D2C8D4 80240BA4 0C00A720 */ jal atan2 -/* D2C8D8 80240BA8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D2C8DC 80240BAC 3C03E0EF */ lui $v1, 0xe0ef -/* D2C8E0 80240BB0 E640000C */ swc1 $f0, 0xc($s2) -/* D2C8E4 80240BB4 8E220000 */ lw $v0, ($s1) -/* D2C8E8 80240BB8 3463FFFF */ ori $v1, $v1, 0xffff -/* D2C8EC 80240BBC 00431024 */ and $v0, $v0, $v1 -/* D2C8F0 80240BC0 AE220000 */ sw $v0, ($s1) -/* D2C8F4 80240BC4 24020001 */ addiu $v0, $zero, 1 -/* D2C8F8 80240BC8 A640008E */ sh $zero, 0x8e($s2) -/* D2C8FC 80240BCC 08090312 */ j .L80240C48 -/* D2C900 80240BD0 AE820070 */ sw $v0, 0x70($s4) -.L80240BD4: -/* D2C904 80240BD4 86240008 */ lh $a0, 8($s1) -/* D2C908 80240BD8 0C00FB3A */ jal get_enemy -/* D2C90C 80240BDC 2484FFFF */ addiu $a0, $a0, -1 -/* D2C910 80240BE0 0040802D */ daddu $s0, $v0, $zero -/* D2C914 80240BE4 0C00EABB */ jal get_npc_unsafe -/* D2C918 80240BE8 86040008 */ lh $a0, 8($s0) -/* D2C91C 80240BEC 9642008E */ lhu $v0, 0x8e($s2) -/* D2C920 80240BF0 24420001 */ addiu $v0, $v0, 1 -/* D2C924 80240BF4 A642008E */ sh $v0, 0x8e($s2) -/* D2C928 80240BF8 00021400 */ sll $v0, $v0, 0x10 -/* D2C92C 80240BFC 8E23007C */ lw $v1, 0x7c($s1) -/* D2C930 80240C00 00021403 */ sra $v0, $v0, 0x10 -/* D2C934 80240C04 0043102A */ slt $v0, $v0, $v1 -/* D2C938 80240C08 50400001 */ beql $v0, $zero, .L80240C10 -/* D2C93C 80240C0C A2200007 */ sb $zero, 7($s1) -.L80240C10: -/* D2C940 80240C10 8E03006C */ lw $v1, 0x6c($s0) -/* D2C944 80240C14 24020004 */ addiu $v0, $zero, 4 -/* D2C948 80240C18 1462000B */ bne $v1, $v0, .L80240C48 -/* D2C94C 80240C1C 3C021F10 */ lui $v0, 0x1f10 -/* D2C950 80240C20 8E230000 */ lw $v1, ($s1) -/* D2C954 80240C24 3C01C47A */ lui $at, 0xc47a -/* D2C958 80240C28 44810000 */ mtc1 $at, $f0 -/* D2C95C 80240C2C 00621825 */ or $v1, $v1, $v0 -/* D2C960 80240C30 AE230000 */ sw $v1, ($s1) -/* D2C964 80240C34 AE400038 */ sw $zero, 0x38($s2) -/* D2C968 80240C38 E640003C */ swc1 $f0, 0x3c($s2) -/* D2C96C 80240C3C AE400040 */ sw $zero, 0x40($s2) -/* D2C970 80240C40 A2330007 */ sb $s3, 7($s1) -/* D2C974 80240C44 AE800070 */ sw $zero, 0x70($s4) -.L80240C48: -/* D2C978 80240C48 8FBF002C */ lw $ra, 0x2c($sp) -/* D2C97C 80240C4C 8FB40028 */ lw $s4, 0x28($sp) -/* D2C980 80240C50 8FB30024 */ lw $s3, 0x24($sp) -/* D2C984 80240C54 8FB20020 */ lw $s2, 0x20($sp) -/* D2C988 80240C58 8FB1001C */ lw $s1, 0x1c($sp) -/* D2C98C 80240C5C 8FB00018 */ lw $s0, 0x18($sp) -/* D2C990 80240C60 0000102D */ daddu $v0, $zero, $zero -/* D2C994 80240C64 03E00008 */ jr $ra -/* D2C998 80240C68 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024001C_D2FC9C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024001C_D2FC9C.s deleted file mode 100644 index 6ad86c69c6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024001C_D2FC9C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_D2FC9C -/* D2FC9C 8024001C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* D2FCA0 80240020 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* D2FCA4 80240024 8C430000 */ lw $v1, ($v0) -/* D2FCA8 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* D2FCAC 8024002C 00641824 */ and $v1, $v1, $a0 -/* D2FCB0 80240030 AC430000 */ sw $v1, ($v0) -/* D2FCB4 80240034 03E00008 */ jr $ra -/* D2FCB8 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240068_D2FCE8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240068_D2FCE8.s deleted file mode 100644 index dd8cc93a60..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240068_D2FCE8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_D2FCE8 -/* D2FCE8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2FCEC 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* D2FCF0 80240070 0080802D */ daddu $s0, $a0, $zero -/* D2FCF4 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* D2FCF8 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* D2FCFC 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* D2FD00 80240080 8E250000 */ lw $a1, ($s1) -/* D2FD04 80240084 0C0B1EAF */ jal get_variable -/* D2FD08 80240088 26310004 */ addiu $s1, $s1, 4 -/* D2FD0C 8024008C 0200202D */ daddu $a0, $s0, $zero -/* D2FD10 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* D2FD14 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* D2FD18 80240098 000210C0 */ sll $v0, $v0, 3 -/* D2FD1C 8024009C 00431021 */ addu $v0, $v0, $v1 -/* D2FD20 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* D2FD24 802400A4 8E250000 */ lw $a1, ($s1) -/* D2FD28 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* D2FD2C 802400AC A0460015 */ sb $a2, 0x15($v0) -/* D2FD30 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* D2FD34 802400B4 0C0B2026 */ jal set_variable -/* D2FD38 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* D2FD3C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* D2FD40 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* D2FD44 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* D2FD48 802400C8 24020002 */ addiu $v0, $zero, 2 -/* D2FD4C 802400CC 03E00008 */ jr $ra -/* D2FD50 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s deleted file mode 100644 index 713cc736da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448_D300C8 -/* D300C8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* D300CC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* D300D0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D300D4 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* D300D8 80240458 00021100 */ sll $v0, $v0, 4 -/* D300DC 8024045C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* D300E0 80240460 00822021 */ addu $a0, $a0, $v0 -/* D300E4 80240464 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* D300E8 80240468 0C0496CF */ jal set_message_string -/* D300EC 8024046C 0000282D */ daddu $a1, $zero, $zero -/* D300F0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* D300F4 80240474 24020002 */ addiu $v0, $zero, 2 -/* D300F8 80240478 03E00008 */ jr $ra -/* D300FC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240480_D30100.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240480_D30100.s deleted file mode 100644 index fd0828cc3b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240480_D30100.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480_D30100 -/* D30100 80240480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D30104 80240484 AFB1001C */ sw $s1, 0x1c($sp) -/* D30108 80240488 0080882D */ daddu $s1, $a0, $zero -/* D3010C 8024048C AFBF0020 */ sw $ra, 0x20($sp) -/* D30110 80240490 AFB00018 */ sw $s0, 0x18($sp) -/* D30114 80240494 8E30000C */ lw $s0, 0xc($s1) -/* D30118 80240498 8E050000 */ lw $a1, ($s0) -/* D3011C 8024049C 0C0B1EAF */ jal get_variable -/* D30120 802404A0 26100004 */ addiu $s0, $s0, 4 -/* D30124 802404A4 0C04417A */ jal get_entity_by_index -/* D30128 802404A8 0040202D */ daddu $a0, $v0, $zero -/* D3012C 802404AC 8E100000 */ lw $s0, ($s0) -/* D30130 802404B0 C444004C */ lwc1 $f4, 0x4c($v0) -/* D30134 802404B4 3C014148 */ lui $at, 0x4148 -/* D30138 802404B8 44810000 */ mtc1 $at, $f0 -/* D3013C 802404BC 3C013F33 */ lui $at, 0x3f33 -/* D30140 802404C0 34213333 */ ori $at, $at, 0x3333 -/* D30144 802404C4 44811000 */ mtc1 $at, $f2 -/* D30148 802404C8 AFA00014 */ sw $zero, 0x14($sp) -/* D3014C 802404CC 46002100 */ add.s $f4, $f4, $f0 -/* D30150 802404D0 E7A20010 */ swc1 $f2, 0x10($sp) -/* D30154 802404D4 8C450048 */ lw $a1, 0x48($v0) -/* D30158 802404D8 8C470050 */ lw $a3, 0x50($v0) -/* D3015C 802404DC 44062000 */ mfc1 $a2, $f4 -/* D30160 802404E0 0C01C5D4 */ jal func_80071750 -/* D30164 802404E4 0000202D */ daddu $a0, $zero, $zero -/* D30168 802404E8 0220202D */ daddu $a0, $s1, $zero -/* D3016C 802404EC 0200282D */ daddu $a1, $s0, $zero -/* D30170 802404F0 0C0B2026 */ jal set_variable -/* D30174 802404F4 0040302D */ daddu $a2, $v0, $zero -/* D30178 802404F8 8FBF0020 */ lw $ra, 0x20($sp) -/* D3017C 802404FC 8FB1001C */ lw $s1, 0x1c($sp) -/* D30180 80240500 8FB00018 */ lw $s0, 0x18($sp) -/* D30184 80240504 24020002 */ addiu $v0, $zero, 2 -/* D30188 80240508 03E00008 */ jr $ra -/* D3018C 8024050C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240544_D301C4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240544_D301C4.s deleted file mode 100644 index 6c7021ba2a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240544_D301C4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544_D301C4 -/* D301C4 80240544 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D301C8 80240548 AFBF0018 */ sw $ra, 0x18($sp) -/* D301CC 8024054C 8C82000C */ lw $v0, 0xc($a0) -/* D301D0 80240550 0C0B1EAF */ jal get_variable -/* D301D4 80240554 8C450000 */ lw $a1, ($v0) -/* D301D8 80240558 0C04417A */ jal get_entity_by_index -/* D301DC 8024055C 0040202D */ daddu $a0, $v0, $zero -/* D301E0 80240560 3C013F80 */ lui $at, 0x3f80 -/* D301E4 80240564 44810000 */ mtc1 $at, $f0 -/* D301E8 80240568 C442004C */ lwc1 $f2, 0x4c($v0) -/* D301EC 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* D301F0 80240570 3C014148 */ lui $at, 0x4148 -/* D301F4 80240574 44810000 */ mtc1 $at, $f0 -/* D301F8 80240578 2403004B */ addiu $v1, $zero, 0x4b -/* D301FC 8024057C AFA30014 */ sw $v1, 0x14($sp) -/* D30200 80240580 46001080 */ add.s $f2, $f2, $f0 -/* D30204 80240584 8C450048 */ lw $a1, 0x48($v0) -/* D30208 80240588 8C470050 */ lw $a3, 0x50($v0) -/* D3020C 8024058C 44061000 */ mfc1 $a2, $f2 -/* D30210 80240590 0C01C2EC */ jal func_80070BB0 -/* D30214 80240594 24040004 */ addiu $a0, $zero, 4 -/* D30218 80240598 8FBF0018 */ lw $ra, 0x18($sp) -/* D3021C 8024059C 24020002 */ addiu $v0, $zero, 2 -/* D30220 802405A0 03E00008 */ jr $ra -/* D30224 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802405A8_D30228.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802405A8_D30228.s deleted file mode 100644 index ee60f09b60..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802405A8_D30228.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8_D30228 -/* D30228 802405A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3022C 802405AC AFBF0018 */ sw $ra, 0x18($sp) -/* D30230 802405B0 0C00EAD2 */ jal get_npc_safe -/* D30234 802405B4 2404FFFC */ addiu $a0, $zero, -4 -/* D30238 802405B8 C444003C */ lwc1 $f4, 0x3c($v0) -/* D3023C 802405BC 3C014148 */ lui $at, 0x4148 -/* D30240 802405C0 44811000 */ mtc1 $at, $f2 -/* D30244 802405C4 3C013F80 */ lui $at, 0x3f80 -/* D30248 802405C8 44810000 */ mtc1 $at, $f0 -/* D3024C 802405CC 2403001E */ addiu $v1, $zero, 0x1e -/* D30250 802405D0 AFA30014 */ sw $v1, 0x14($sp) -/* D30254 802405D4 46022100 */ add.s $f4, $f4, $f2 -/* D30258 802405D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* D3025C 802405DC 8C450038 */ lw $a1, 0x38($v0) -/* D30260 802405E0 8C470040 */ lw $a3, 0x40($v0) -/* D30264 802405E4 44062000 */ mfc1 $a2, $f4 -/* D30268 802405E8 0C01C2EC */ jal func_80070BB0 -/* D3026C 802405EC 24040009 */ addiu $a0, $zero, 9 -/* D30270 802405F0 8FBF0018 */ lw $ra, 0x18($sp) -/* D30274 802405F4 24020002 */ addiu $v0, $zero, 2 -/* D30278 802405F8 03E00008 */ jr $ra -/* D3027C 802405FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s deleted file mode 100644 index 9ee2e1fc62..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240B38_D307B8.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38_D307B8 -/* D307B8 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D307BC 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* D307C0 80240B40 0080882D */ daddu $s1, $a0, $zero -/* D307C4 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* D307C8 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* D307CC 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* D307D0 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* D307D4 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* D307D8 80240B58 0000902D */ daddu $s2, $zero, $zero -/* D307DC 80240B5C 8E050000 */ lw $a1, ($s0) -/* D307E0 80240B60 0C0B1EAF */ jal get_variable -/* D307E4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* D307E8 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* D307EC 80240B6C 8E050000 */ lw $a1, ($s0) -/* D307F0 80240B70 0C0B1EAF */ jal get_variable -/* D307F4 80240B74 0220202D */ daddu $a0, $s1, $zero -/* D307F8 80240B78 0240202D */ daddu $a0, $s2, $zero -/* D307FC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* D30800 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* D30804 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* D30808 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* D3080C 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* D30810 80240B90 0C04DF84 */ jal set_transition_stencil_color -/* D30814 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* D30818 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* D3081C 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* D30820 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* D30824 80240BA4 28620002 */ slti $v0, $v1, 2 -/* D30828 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* D3082C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* D30830 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* D30834 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* D30838 80240BB8 08090312 */ j .L80240C48 -/* D3083C 80240BBC 00000000 */ nop -.L80240BC0: -/* D30840 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* D30844 80240BC4 00000000 */ nop -/* D30848 80240BC8 08090312 */ j .L80240C48 -/* D3084C 80240BCC 00000000 */ nop -.L80240BD0: -/* D30850 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* D30854 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* D30858 80240BD8 00000000 */ nop -/* D3085C 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* D30860 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* D30864 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* D30868 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* D3086C 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* D30870 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* D30874 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* D30878 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* D3087C 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* D30880 80240C00 08090312 */ j .L80240C48 -/* D30884 80240C04 00000000 */ nop -.L80240C08: -/* D30888 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* D3088C 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* D30890 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* D30894 80240C14 28420002 */ slti $v0, $v0, 2 -/* D30898 80240C18 1440000B */ bnez $v0, .L80240C48 -/* D3089C 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* D308A0 80240C20 08090312 */ j .L80240C48 -/* D308A4 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* D308A8 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* D308AC 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* D308B0 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* D308B4 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* D308B8 80240C38 00621023 */ subu $v0, $v1, $v0 -/* D308BC 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* D308C0 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* D308C4 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* D308C8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* D308CC 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* D308D0 80240C50 44050000 */ mfc1 $a1, $f0 -/* D308D4 80240C54 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* D308D8 80240C58 24040001 */ addiu $a0, $zero, 1 -/* D308DC 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* D308E0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* D308E4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* D308E8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* D308EC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* D308F0 80240C70 03E00008 */ jr $ra -/* D308F4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s deleted file mode 100644 index b0c2e2df2b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_802410FC_D30D7C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410FC_D30D7C -/* D30D7C 802410FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D30D80 80241100 AFB40028 */ sw $s4, 0x28($sp) -/* D30D84 80241104 0080A02D */ daddu $s4, $a0, $zero -/* D30D88 80241108 AFBF002C */ sw $ra, 0x2c($sp) -/* D30D8C 8024110C AFB30024 */ sw $s3, 0x24($sp) -/* D30D90 80241110 AFB20020 */ sw $s2, 0x20($sp) -/* D30D94 80241114 AFB1001C */ sw $s1, 0x1c($sp) -/* D30D98 80241118 AFB00018 */ sw $s0, 0x18($sp) -/* D30D9C 8024111C 8E910148 */ lw $s1, 0x148($s4) -/* D30DA0 80241120 86240008 */ lh $a0, 8($s1) -/* D30DA4 80241124 0C00EABB */ jal get_npc_unsafe -/* D30DA8 80241128 00A0802D */ daddu $s0, $a1, $zero -/* D30DAC 8024112C 16000005 */ bnez $s0, .L80241144 -/* D30DB0 80241130 0040902D */ daddu $s2, $v0, $zero -/* D30DB4 80241134 8E2200B0 */ lw $v0, 0xb0($s1) -/* D30DB8 80241138 30420004 */ andi $v0, $v0, 4 -/* D30DBC 8024113C 10400015 */ beqz $v0, .L80241194 -/* D30DC0 80241140 00000000 */ nop -.L80241144: -/* D30DC4 80241144 AE800070 */ sw $zero, 0x70($s4) -/* D30DC8 80241148 8E420000 */ lw $v0, ($s2) -/* D30DCC 8024114C 3C031F30 */ lui $v1, 0x1f30 -/* D30DD0 80241150 A640008E */ sh $zero, 0x8e($s2) -/* D30DD4 80241154 34420102 */ ori $v0, $v0, 0x102 -/* D30DD8 80241158 AE420000 */ sw $v0, ($s2) -/* D30DDC 8024115C 8E220000 */ lw $v0, ($s1) -/* D30DE0 80241160 3C01C47A */ lui $at, 0xc47a -/* D30DE4 80241164 44810000 */ mtc1 $at, $f0 -/* D30DE8 80241168 00431025 */ or $v0, $v0, $v1 -/* D30DEC 8024116C AE220000 */ sw $v0, ($s1) -/* D30DF0 80241170 AE400038 */ sw $zero, 0x38($s2) -/* D30DF4 80241174 E640003C */ swc1 $f0, 0x3c($s2) -/* D30DF8 80241178 AE400040 */ sw $zero, 0x40($s2) -/* D30DFC 8024117C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D30E00 80241180 30620004 */ andi $v0, $v1, 4 -/* D30E04 80241184 10400003 */ beqz $v0, .L80241194 -/* D30E08 80241188 2402FFFB */ addiu $v0, $zero, -5 -/* D30E0C 8024118C 00621024 */ and $v0, $v1, $v0 -/* D30E10 80241190 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241194: -/* D30E14 80241194 8E930070 */ lw $s3, 0x70($s4) -/* D30E18 80241198 12600005 */ beqz $s3, .L802411B0 -/* D30E1C 8024119C 24020001 */ addiu $v0, $zero, 1 -/* D30E20 802411A0 12620048 */ beq $s3, $v0, .L802412C4 -/* D30E24 802411A4 00000000 */ nop -/* D30E28 802411A8 080904CE */ j .L80241338 -/* D30E2C 802411AC 00000000 */ nop -.L802411B0: -/* D30E30 802411B0 86240008 */ lh $a0, 8($s1) -/* D30E34 802411B4 0C00FB3A */ jal get_enemy -/* D30E38 802411B8 2484FFFF */ addiu $a0, $a0, -1 -/* D30E3C 802411BC 0040802D */ daddu $s0, $v0, $zero -/* D30E40 802411C0 0C00EABB */ jal get_npc_unsafe -/* D30E44 802411C4 86040008 */ lh $a0, 8($s0) -/* D30E48 802411C8 24030001 */ addiu $v1, $zero, 1 -/* D30E4C 802411CC 0040982D */ daddu $s3, $v0, $zero -/* D30E50 802411D0 A2230007 */ sb $v1, 7($s1) -/* D30E54 802411D4 8E03006C */ lw $v1, 0x6c($s0) -/* D30E58 802411D8 24020003 */ addiu $v0, $zero, 3 -/* D30E5C 802411DC 14620056 */ bne $v1, $v0, .L80241338 -/* D30E60 802411E0 00000000 */ nop -/* D30E64 802411E4 8E2500A8 */ lw $a1, 0xa8($s1) -/* D30E68 802411E8 10A00003 */ beqz $a1, .L802411F8 -/* D30E6C 802411EC 0260202D */ daddu $a0, $s3, $zero -/* D30E70 802411F0 0C012530 */ jal func_800494C0 -/* D30E74 802411F4 0000302D */ daddu $a2, $zero, $zero -.L802411F8: -/* D30E78 802411F8 27A40010 */ addiu $a0, $sp, 0x10 -/* D30E7C 802411FC C6280070 */ lwc1 $f8, 0x70($s1) -/* D30E80 80241200 46804220 */ cvt.s.w $f8, $f8 -/* D30E84 80241204 C6620034 */ lwc1 $f2, 0x34($s3) -/* D30E88 80241208 3C014387 */ lui $at, 0x4387 -/* D30E8C 8024120C 44810000 */ mtc1 $at, $f0 -/* D30E90 80241210 44064000 */ mfc1 $a2, $f8 -/* D30E94 80241214 46020001 */ sub.s $f0, $f0, $f2 -/* D30E98 80241218 C6660038 */ lwc1 $f6, 0x38($s3) -/* D30E9C 8024121C C6640040 */ lwc1 $f4, 0x40($s3) -/* D30EA0 80241220 44070000 */ mfc1 $a3, $f0 -/* D30EA4 80241224 27A50014 */ addiu $a1, $sp, 0x14 -/* D30EA8 80241228 E7A60010 */ swc1 $f6, 0x10($sp) -/* D30EAC 8024122C 0C00A7E7 */ jal add_vec2D_polar -/* D30EB0 80241230 E7A40014 */ swc1 $f4, 0x14($sp) -/* D30EB4 80241234 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D30EB8 80241238 4600020D */ trunc.w.s $f8, $f0 -/* D30EBC 8024123C 44024000 */ mfc1 $v0, $f8 -/* D30EC0 80241240 E6400038 */ swc1 $f0, 0x38($s2) -/* D30EC4 80241244 A6220010 */ sh $v0, 0x10($s1) -/* D30EC8 80241248 C660003C */ lwc1 $f0, 0x3c($s3) -/* D30ECC 8024124C C622006C */ lwc1 $f2, 0x6c($s1) -/* D30ED0 80241250 468010A0 */ cvt.s.w $f2, $f2 -/* D30ED4 80241254 46020000 */ add.s $f0, $f0, $f2 -/* D30ED8 80241258 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D30EDC 8024125C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D30EE0 80241260 E640003C */ swc1 $f0, 0x3c($s2) -/* D30EE4 80241264 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D30EE8 80241268 4600020D */ trunc.w.s $f8, $f0 -/* D30EEC 8024126C 44024000 */ mfc1 $v0, $f8 -/* D30EF0 80241270 00000000 */ nop -/* D30EF4 80241274 A6220012 */ sh $v0, 0x12($s1) -/* D30EF8 80241278 4600120D */ trunc.w.s $f8, $f2 -/* D30EFC 8024127C 44024000 */ mfc1 $v0, $f8 -/* D30F00 80241280 E6420040 */ swc1 $f2, 0x40($s2) -/* D30F04 80241284 A6220014 */ sh $v0, 0x14($s1) -/* D30F08 80241288 8C660028 */ lw $a2, 0x28($v1) -/* D30F0C 8024128C 8C670030 */ lw $a3, 0x30($v1) -/* D30F10 80241290 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D30F14 80241294 0C00A720 */ jal atan2 -/* D30F18 80241298 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D30F1C 8024129C 3C03E0EF */ lui $v1, 0xe0ef -/* D30F20 802412A0 E640000C */ swc1 $f0, 0xc($s2) -/* D30F24 802412A4 8E220000 */ lw $v0, ($s1) -/* D30F28 802412A8 3463FFFF */ ori $v1, $v1, 0xffff -/* D30F2C 802412AC 00431024 */ and $v0, $v0, $v1 -/* D30F30 802412B0 AE220000 */ sw $v0, ($s1) -/* D30F34 802412B4 24020001 */ addiu $v0, $zero, 1 -/* D30F38 802412B8 A640008E */ sh $zero, 0x8e($s2) -/* D30F3C 802412BC 080904CE */ j .L80241338 -/* D30F40 802412C0 AE820070 */ sw $v0, 0x70($s4) -.L802412C4: -/* D30F44 802412C4 86240008 */ lh $a0, 8($s1) -/* D30F48 802412C8 0C00FB3A */ jal get_enemy -/* D30F4C 802412CC 2484FFFF */ addiu $a0, $a0, -1 -/* D30F50 802412D0 0040802D */ daddu $s0, $v0, $zero -/* D30F54 802412D4 0C00EABB */ jal get_npc_unsafe -/* D30F58 802412D8 86040008 */ lh $a0, 8($s0) -/* D30F5C 802412DC 9642008E */ lhu $v0, 0x8e($s2) -/* D30F60 802412E0 24420001 */ addiu $v0, $v0, 1 -/* D30F64 802412E4 A642008E */ sh $v0, 0x8e($s2) -/* D30F68 802412E8 00021400 */ sll $v0, $v0, 0x10 -/* D30F6C 802412EC 8E23007C */ lw $v1, 0x7c($s1) -/* D30F70 802412F0 00021403 */ sra $v0, $v0, 0x10 -/* D30F74 802412F4 0043102A */ slt $v0, $v0, $v1 -/* D30F78 802412F8 50400001 */ beql $v0, $zero, .L80241300 -/* D30F7C 802412FC A2200007 */ sb $zero, 7($s1) -.L80241300: -/* D30F80 80241300 8E03006C */ lw $v1, 0x6c($s0) -/* D30F84 80241304 24020004 */ addiu $v0, $zero, 4 -/* D30F88 80241308 1462000B */ bne $v1, $v0, .L80241338 -/* D30F8C 8024130C 3C021F10 */ lui $v0, 0x1f10 -/* D30F90 80241310 8E230000 */ lw $v1, ($s1) -/* D30F94 80241314 3C01C47A */ lui $at, 0xc47a -/* D30F98 80241318 44810000 */ mtc1 $at, $f0 -/* D30F9C 8024131C 00621825 */ or $v1, $v1, $v0 -/* D30FA0 80241320 AE230000 */ sw $v1, ($s1) -/* D30FA4 80241324 AE400038 */ sw $zero, 0x38($s2) -/* D30FA8 80241328 E640003C */ swc1 $f0, 0x3c($s2) -/* D30FAC 8024132C AE400040 */ sw $zero, 0x40($s2) -/* D30FB0 80241330 A2330007 */ sb $s3, 7($s1) -/* D30FB4 80241334 AE800070 */ sw $zero, 0x70($s4) -.L80241338: -/* D30FB8 80241338 8FBF002C */ lw $ra, 0x2c($sp) -/* D30FBC 8024133C 8FB40028 */ lw $s4, 0x28($sp) -/* D30FC0 80241340 8FB30024 */ lw $s3, 0x24($sp) -/* D30FC4 80241344 8FB20020 */ lw $s2, 0x20($sp) -/* D30FC8 80241348 8FB1001C */ lw $s1, 0x1c($sp) -/* D30FCC 8024134C 8FB00018 */ lw $s0, 0x18($sp) -/* D30FD0 80241350 0000102D */ daddu $v0, $zero, $zero -/* D30FD4 80241354 03E00008 */ jr $ra -/* D30FD8 80241358 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s deleted file mode 100644 index 3f76c8186f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_8024078C_D37F8C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024078C_D37F8C -/* D37F8C 8024078C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D37F90 80240790 AFB40028 */ sw $s4, 0x28($sp) -/* D37F94 80240794 0080A02D */ daddu $s4, $a0, $zero -/* D37F98 80240798 AFBF002C */ sw $ra, 0x2c($sp) -/* D37F9C 8024079C AFB30024 */ sw $s3, 0x24($sp) -/* D37FA0 802407A0 AFB20020 */ sw $s2, 0x20($sp) -/* D37FA4 802407A4 AFB1001C */ sw $s1, 0x1c($sp) -/* D37FA8 802407A8 AFB00018 */ sw $s0, 0x18($sp) -/* D37FAC 802407AC 8E910148 */ lw $s1, 0x148($s4) -/* D37FB0 802407B0 86240008 */ lh $a0, 8($s1) -/* D37FB4 802407B4 0C00EABB */ jal get_npc_unsafe -/* D37FB8 802407B8 00A0802D */ daddu $s0, $a1, $zero -/* D37FBC 802407BC 16000005 */ bnez $s0, .L802407D4 -/* D37FC0 802407C0 0040902D */ daddu $s2, $v0, $zero -/* D37FC4 802407C4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D37FC8 802407C8 30420004 */ andi $v0, $v0, 4 -/* D37FCC 802407CC 10400015 */ beqz $v0, .L80240824 -/* D37FD0 802407D0 00000000 */ nop -.L802407D4: -/* D37FD4 802407D4 AE800070 */ sw $zero, 0x70($s4) -/* D37FD8 802407D8 8E420000 */ lw $v0, ($s2) -/* D37FDC 802407DC 3C031F30 */ lui $v1, 0x1f30 -/* D37FE0 802407E0 A640008E */ sh $zero, 0x8e($s2) -/* D37FE4 802407E4 34420102 */ ori $v0, $v0, 0x102 -/* D37FE8 802407E8 AE420000 */ sw $v0, ($s2) -/* D37FEC 802407EC 8E220000 */ lw $v0, ($s1) -/* D37FF0 802407F0 3C01C47A */ lui $at, 0xc47a -/* D37FF4 802407F4 44810000 */ mtc1 $at, $f0 -/* D37FF8 802407F8 00431025 */ or $v0, $v0, $v1 -/* D37FFC 802407FC AE220000 */ sw $v0, ($s1) -/* D38000 80240800 AE400038 */ sw $zero, 0x38($s2) -/* D38004 80240804 E640003C */ swc1 $f0, 0x3c($s2) -/* D38008 80240808 AE400040 */ sw $zero, 0x40($s2) -/* D3800C 8024080C 8E2300B0 */ lw $v1, 0xb0($s1) -/* D38010 80240810 30620004 */ andi $v0, $v1, 4 -/* D38014 80240814 10400003 */ beqz $v0, .L80240824 -/* D38018 80240818 2402FFFB */ addiu $v0, $zero, -5 -/* D3801C 8024081C 00621024 */ and $v0, $v1, $v0 -/* D38020 80240820 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240824: -/* D38024 80240824 8E930070 */ lw $s3, 0x70($s4) -/* D38028 80240828 12600005 */ beqz $s3, .L80240840 -/* D3802C 8024082C 24020001 */ addiu $v0, $zero, 1 -/* D38030 80240830 12620048 */ beq $s3, $v0, .L80240954 -/* D38034 80240834 00000000 */ nop -/* D38038 80240838 08090272 */ j .L802409C8 -/* D3803C 8024083C 00000000 */ nop -.L80240840: -/* D38040 80240840 86240008 */ lh $a0, 8($s1) -/* D38044 80240844 0C00FB3A */ jal get_enemy -/* D38048 80240848 2484FFFF */ addiu $a0, $a0, -1 -/* D3804C 8024084C 0040802D */ daddu $s0, $v0, $zero -/* D38050 80240850 0C00EABB */ jal get_npc_unsafe -/* D38054 80240854 86040008 */ lh $a0, 8($s0) -/* D38058 80240858 24030001 */ addiu $v1, $zero, 1 -/* D3805C 8024085C 0040982D */ daddu $s3, $v0, $zero -/* D38060 80240860 A2230007 */ sb $v1, 7($s1) -/* D38064 80240864 8E03006C */ lw $v1, 0x6c($s0) -/* D38068 80240868 24020003 */ addiu $v0, $zero, 3 -/* D3806C 8024086C 14620056 */ bne $v1, $v0, .L802409C8 -/* D38070 80240870 00000000 */ nop -/* D38074 80240874 8E2500A8 */ lw $a1, 0xa8($s1) -/* D38078 80240878 10A00003 */ beqz $a1, .L80240888 -/* D3807C 8024087C 0260202D */ daddu $a0, $s3, $zero -/* D38080 80240880 0C012530 */ jal func_800494C0 -/* D38084 80240884 0000302D */ daddu $a2, $zero, $zero -.L80240888: -/* D38088 80240888 27A40010 */ addiu $a0, $sp, 0x10 -/* D3808C 8024088C C6280070 */ lwc1 $f8, 0x70($s1) -/* D38090 80240890 46804220 */ cvt.s.w $f8, $f8 -/* D38094 80240894 C6620034 */ lwc1 $f2, 0x34($s3) -/* D38098 80240898 3C014387 */ lui $at, 0x4387 -/* D3809C 8024089C 44810000 */ mtc1 $at, $f0 -/* D380A0 802408A0 44064000 */ mfc1 $a2, $f8 -/* D380A4 802408A4 46020001 */ sub.s $f0, $f0, $f2 -/* D380A8 802408A8 C6660038 */ lwc1 $f6, 0x38($s3) -/* D380AC 802408AC C6640040 */ lwc1 $f4, 0x40($s3) -/* D380B0 802408B0 44070000 */ mfc1 $a3, $f0 -/* D380B4 802408B4 27A50014 */ addiu $a1, $sp, 0x14 -/* D380B8 802408B8 E7A60010 */ swc1 $f6, 0x10($sp) -/* D380BC 802408BC 0C00A7E7 */ jal add_vec2D_polar -/* D380C0 802408C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* D380C4 802408C4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* D380C8 802408C8 4600020D */ trunc.w.s $f8, $f0 -/* D380CC 802408CC 44024000 */ mfc1 $v0, $f8 -/* D380D0 802408D0 E6400038 */ swc1 $f0, 0x38($s2) -/* D380D4 802408D4 A6220010 */ sh $v0, 0x10($s1) -/* D380D8 802408D8 C660003C */ lwc1 $f0, 0x3c($s3) -/* D380DC 802408DC C622006C */ lwc1 $f2, 0x6c($s1) -/* D380E0 802408E0 468010A0 */ cvt.s.w $f2, $f2 -/* D380E4 802408E4 46020000 */ add.s $f0, $f0, $f2 -/* D380E8 802408E8 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* D380EC 802408EC 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* D380F0 802408F0 E640003C */ swc1 $f0, 0x3c($s2) -/* D380F4 802408F4 C7A20014 */ lwc1 $f2, 0x14($sp) -/* D380F8 802408F8 4600020D */ trunc.w.s $f8, $f0 -/* D380FC 802408FC 44024000 */ mfc1 $v0, $f8 -/* D38100 80240900 00000000 */ nop -/* D38104 80240904 A6220012 */ sh $v0, 0x12($s1) -/* D38108 80240908 4600120D */ trunc.w.s $f8, $f2 -/* D3810C 8024090C 44024000 */ mfc1 $v0, $f8 -/* D38110 80240910 E6420040 */ swc1 $f2, 0x40($s2) -/* D38114 80240914 A6220014 */ sh $v0, 0x14($s1) -/* D38118 80240918 8C660028 */ lw $a2, 0x28($v1) -/* D3811C 8024091C 8C670030 */ lw $a3, 0x30($v1) -/* D38120 80240920 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D38124 80240924 0C00A720 */ jal atan2 -/* D38128 80240928 C64E0040 */ lwc1 $f14, 0x40($s2) -/* D3812C 8024092C 3C03E0EF */ lui $v1, 0xe0ef -/* D38130 80240930 E640000C */ swc1 $f0, 0xc($s2) -/* D38134 80240934 8E220000 */ lw $v0, ($s1) -/* D38138 80240938 3463FFFF */ ori $v1, $v1, 0xffff -/* D3813C 8024093C 00431024 */ and $v0, $v0, $v1 -/* D38140 80240940 AE220000 */ sw $v0, ($s1) -/* D38144 80240944 24020001 */ addiu $v0, $zero, 1 -/* D38148 80240948 A640008E */ sh $zero, 0x8e($s2) -/* D3814C 8024094C 08090272 */ j .L802409C8 -/* D38150 80240950 AE820070 */ sw $v0, 0x70($s4) -.L80240954: -/* D38154 80240954 86240008 */ lh $a0, 8($s1) -/* D38158 80240958 0C00FB3A */ jal get_enemy -/* D3815C 8024095C 2484FFFF */ addiu $a0, $a0, -1 -/* D38160 80240960 0040802D */ daddu $s0, $v0, $zero -/* D38164 80240964 0C00EABB */ jal get_npc_unsafe -/* D38168 80240968 86040008 */ lh $a0, 8($s0) -/* D3816C 8024096C 9642008E */ lhu $v0, 0x8e($s2) -/* D38170 80240970 24420001 */ addiu $v0, $v0, 1 -/* D38174 80240974 A642008E */ sh $v0, 0x8e($s2) -/* D38178 80240978 00021400 */ sll $v0, $v0, 0x10 -/* D3817C 8024097C 8E23007C */ lw $v1, 0x7c($s1) -/* D38180 80240980 00021403 */ sra $v0, $v0, 0x10 -/* D38184 80240984 0043102A */ slt $v0, $v0, $v1 -/* D38188 80240988 50400001 */ beql $v0, $zero, .L80240990 -/* D3818C 8024098C A2200007 */ sb $zero, 7($s1) -.L80240990: -/* D38190 80240990 8E03006C */ lw $v1, 0x6c($s0) -/* D38194 80240994 24020004 */ addiu $v0, $zero, 4 -/* D38198 80240998 1462000B */ bne $v1, $v0, .L802409C8 -/* D3819C 8024099C 3C021F10 */ lui $v0, 0x1f10 -/* D381A0 802409A0 8E230000 */ lw $v1, ($s1) -/* D381A4 802409A4 3C01C47A */ lui $at, 0xc47a -/* D381A8 802409A8 44810000 */ mtc1 $at, $f0 -/* D381AC 802409AC 00621825 */ or $v1, $v1, $v0 -/* D381B0 802409B0 AE230000 */ sw $v1, ($s1) -/* D381B4 802409B4 AE400038 */ sw $zero, 0x38($s2) -/* D381B8 802409B8 E640003C */ swc1 $f0, 0x3c($s2) -/* D381BC 802409BC AE400040 */ sw $zero, 0x40($s2) -/* D381C0 802409C0 A2330007 */ sb $s3, 7($s1) -/* D381C4 802409C4 AE800070 */ sw $zero, 0x70($s4) -.L802409C8: -/* D381C8 802409C8 8FBF002C */ lw $ra, 0x2c($sp) -/* D381CC 802409CC 8FB40028 */ lw $s4, 0x28($sp) -/* D381D0 802409D0 8FB30024 */ lw $s3, 0x24($sp) -/* D381D4 802409D4 8FB20020 */ lw $s2, 0x20($sp) -/* D381D8 802409D8 8FB1001C */ lw $s1, 0x1c($sp) -/* D381DC 802409DC 8FB00018 */ lw $s0, 0x18($sp) -/* D381E0 802409E0 0000102D */ daddu $v0, $zero, $zero -/* D381E4 802409E4 03E00008 */ jr $ra -/* D381E8 802409E8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s deleted file mode 100644 index 6585ba0017..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024009C_95405C -/* 95405C 8024009C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 954060 802400A0 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 954064 802400A4 8C430000 */ lw $v1, ($v0) -/* 954068 802400A8 2404FFBF */ addiu $a0, $zero, -0x41 -/* 95406C 802400AC 00641824 */ and $v1, $v1, $a0 -/* 954070 802400B0 AC430000 */ sw $v1, ($v0) -/* 954074 802400B4 03E00008 */ jr $ra -/* 954078 802400B8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s deleted file mode 100644 index dcb6633d77..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E8_9540A8 -/* 9540A8 802400E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9540AC 802400EC AFB00010 */ sw $s0, 0x10($sp) -/* 9540B0 802400F0 0080802D */ daddu $s0, $a0, $zero -/* 9540B4 802400F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 9540B8 802400F8 AFB10014 */ sw $s1, 0x14($sp) -/* 9540BC 802400FC 8E11000C */ lw $s1, 0xc($s0) -/* 9540C0 80240100 8E250000 */ lw $a1, ($s1) -/* 9540C4 80240104 0C0B1EAF */ jal get_variable -/* 9540C8 80240108 26310004 */ addiu $s1, $s1, 4 -/* 9540CC 8024010C 0200202D */ daddu $a0, $s0, $zero -/* 9540D0 80240110 3C038011 */ lui $v1, %hi(gPlayerData) -/* 9540D4 80240114 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 9540D8 80240118 000210C0 */ sll $v0, $v0, 3 -/* 9540DC 8024011C 00431021 */ addu $v0, $v0, $v1 -/* 9540E0 80240120 90460015 */ lbu $a2, 0x15($v0) -/* 9540E4 80240124 8E250000 */ lw $a1, ($s1) -/* 9540E8 80240128 24C60001 */ addiu $a2, $a2, 1 -/* 9540EC 8024012C A0460015 */ sb $a2, 0x15($v0) -/* 9540F0 80240130 00063600 */ sll $a2, $a2, 0x18 -/* 9540F4 80240134 0C0B2026 */ jal set_variable -/* 9540F8 80240138 00063603 */ sra $a2, $a2, 0x18 -/* 9540FC 8024013C 8FBF0018 */ lw $ra, 0x18($sp) -/* 954100 80240140 8FB10014 */ lw $s1, 0x14($sp) -/* 954104 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* 954108 80240148 24020002 */ addiu $v0, $zero, 2 -/* 95410C 8024014C 03E00008 */ jr $ra -/* 954110 80240150 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s deleted file mode 100644 index 99d15f5035..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C8_954488 -/* 954488 802404C8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 95448C 802404CC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 954490 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954494 802404D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 954498 802404D8 00021100 */ sll $v0, $v0, 4 -/* 95449C 802404DC 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 9544A0 802404E0 00822021 */ addu $a0, $a0, $v0 -/* 9544A4 802404E4 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 9544A8 802404E8 0C0496CF */ jal set_message_string -/* 9544AC 802404EC 0000282D */ daddu $a1, $zero, $zero -/* 9544B0 802404F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9544B4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* 9544B8 802404F8 03E00008 */ jr $ra -/* 9544BC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240500_9544C0.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240500_9544C0.s deleted file mode 100644 index 83309d920d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240500_9544C0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500_9544C0 -/* 9544C0 80240500 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9544C4 80240504 AFB1001C */ sw $s1, 0x1c($sp) -/* 9544C8 80240508 0080882D */ daddu $s1, $a0, $zero -/* 9544CC 8024050C AFBF0020 */ sw $ra, 0x20($sp) -/* 9544D0 80240510 AFB00018 */ sw $s0, 0x18($sp) -/* 9544D4 80240514 8E30000C */ lw $s0, 0xc($s1) -/* 9544D8 80240518 8E050000 */ lw $a1, ($s0) -/* 9544DC 8024051C 0C0B1EAF */ jal get_variable -/* 9544E0 80240520 26100004 */ addiu $s0, $s0, 4 -/* 9544E4 80240524 0C04417A */ jal get_entity_by_index -/* 9544E8 80240528 0040202D */ daddu $a0, $v0, $zero -/* 9544EC 8024052C 8E100000 */ lw $s0, ($s0) -/* 9544F0 80240530 C444004C */ lwc1 $f4, 0x4c($v0) -/* 9544F4 80240534 3C014148 */ lui $at, 0x4148 -/* 9544F8 80240538 44810000 */ mtc1 $at, $f0 -/* 9544FC 8024053C 3C013F33 */ lui $at, 0x3f33 -/* 954500 80240540 34213333 */ ori $at, $at, 0x3333 -/* 954504 80240544 44811000 */ mtc1 $at, $f2 -/* 954508 80240548 AFA00014 */ sw $zero, 0x14($sp) -/* 95450C 8024054C 46002100 */ add.s $f4, $f4, $f0 -/* 954510 80240550 E7A20010 */ swc1 $f2, 0x10($sp) -/* 954514 80240554 8C450048 */ lw $a1, 0x48($v0) -/* 954518 80240558 8C470050 */ lw $a3, 0x50($v0) -/* 95451C 8024055C 44062000 */ mfc1 $a2, $f4 -/* 954520 80240560 0C01C5D4 */ jal func_80071750 -/* 954524 80240564 0000202D */ daddu $a0, $zero, $zero -/* 954528 80240568 0220202D */ daddu $a0, $s1, $zero -/* 95452C 8024056C 0200282D */ daddu $a1, $s0, $zero -/* 954530 80240570 0C0B2026 */ jal set_variable -/* 954534 80240574 0040302D */ daddu $a2, $v0, $zero -/* 954538 80240578 8FBF0020 */ lw $ra, 0x20($sp) -/* 95453C 8024057C 8FB1001C */ lw $s1, 0x1c($sp) -/* 954540 80240580 8FB00018 */ lw $s0, 0x18($sp) -/* 954544 80240584 24020002 */ addiu $v0, $zero, 2 -/* 954548 80240588 03E00008 */ jr $ra -/* 95454C 8024058C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s deleted file mode 100644 index 5abb6d2953..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C4_954584 -/* 954584 802405C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954588 802405C8 AFBF0018 */ sw $ra, 0x18($sp) -/* 95458C 802405CC 8C82000C */ lw $v0, 0xc($a0) -/* 954590 802405D0 0C0B1EAF */ jal get_variable -/* 954594 802405D4 8C450000 */ lw $a1, ($v0) -/* 954598 802405D8 0C04417A */ jal get_entity_by_index -/* 95459C 802405DC 0040202D */ daddu $a0, $v0, $zero -/* 9545A0 802405E0 3C013F80 */ lui $at, 0x3f80 -/* 9545A4 802405E4 44810000 */ mtc1 $at, $f0 -/* 9545A8 802405E8 C442004C */ lwc1 $f2, 0x4c($v0) -/* 9545AC 802405EC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9545B0 802405F0 3C014148 */ lui $at, 0x4148 -/* 9545B4 802405F4 44810000 */ mtc1 $at, $f0 -/* 9545B8 802405F8 2403004B */ addiu $v1, $zero, 0x4b -/* 9545BC 802405FC AFA30014 */ sw $v1, 0x14($sp) -/* 9545C0 80240600 46001080 */ add.s $f2, $f2, $f0 -/* 9545C4 80240604 8C450048 */ lw $a1, 0x48($v0) -/* 9545C8 80240608 8C470050 */ lw $a3, 0x50($v0) -/* 9545CC 8024060C 44061000 */ mfc1 $a2, $f2 -/* 9545D0 80240610 0C01C2EC */ jal func_80070BB0 -/* 9545D4 80240614 24040004 */ addiu $a0, $zero, 4 -/* 9545D8 80240618 8FBF0018 */ lw $ra, 0x18($sp) -/* 9545DC 8024061C 24020002 */ addiu $v0, $zero, 2 -/* 9545E0 80240620 03E00008 */ jr $ra -/* 9545E4 80240624 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240628_9545E8.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240628_9545E8.s deleted file mode 100644 index 7bd9f09715..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240628_9545E8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628_9545E8 -/* 9545E8 80240628 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9545EC 8024062C AFBF0018 */ sw $ra, 0x18($sp) -/* 9545F0 80240630 0C00EAD2 */ jal get_npc_safe -/* 9545F4 80240634 2404FFFC */ addiu $a0, $zero, -4 -/* 9545F8 80240638 C444003C */ lwc1 $f4, 0x3c($v0) -/* 9545FC 8024063C 3C014148 */ lui $at, 0x4148 -/* 954600 80240640 44811000 */ mtc1 $at, $f2 -/* 954604 80240644 3C013F80 */ lui $at, 0x3f80 -/* 954608 80240648 44810000 */ mtc1 $at, $f0 -/* 95460C 8024064C 2403001E */ addiu $v1, $zero, 0x1e -/* 954610 80240650 AFA30014 */ sw $v1, 0x14($sp) -/* 954614 80240654 46022100 */ add.s $f4, $f4, $f2 -/* 954618 80240658 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95461C 8024065C 8C450038 */ lw $a1, 0x38($v0) -/* 954620 80240660 8C470040 */ lw $a3, 0x40($v0) -/* 954624 80240664 44062000 */ mfc1 $a2, $f4 -/* 954628 80240668 0C01C2EC */ jal func_80070BB0 -/* 95462C 8024066C 24040009 */ addiu $a0, $zero, 9 -/* 954630 80240670 8FBF0018 */ lw $ra, 0x18($sp) -/* 954634 80240674 24020002 */ addiu $v0, $zero, 2 -/* 954638 80240678 03E00008 */ jr $ra -/* 95463C 8024067C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s deleted file mode 100644 index 3c62eb34d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8_954B78 -/* 954B78 80240BB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954B7C 80240BBC AFB10014 */ sw $s1, 0x14($sp) -/* 954B80 80240BC0 0080882D */ daddu $s1, $a0, $zero -/* 954B84 80240BC4 AFB20018 */ sw $s2, 0x18($sp) -/* 954B88 80240BC8 AFBF001C */ sw $ra, 0x1c($sp) -/* 954B8C 80240BCC AFB00010 */ sw $s0, 0x10($sp) -/* 954B90 80240BD0 8E30000C */ lw $s0, 0xc($s1) -/* 954B94 80240BD4 10A00010 */ beqz $a1, .L80240C18 -/* 954B98 80240BD8 0000902D */ daddu $s2, $zero, $zero -/* 954B9C 80240BDC 8E050000 */ lw $a1, ($s0) -/* 954BA0 80240BE0 0C0B1EAF */ jal get_variable -/* 954BA4 80240BE4 26100004 */ addiu $s0, $s0, 4 -/* 954BA8 80240BE8 AE220084 */ sw $v0, 0x84($s1) -/* 954BAC 80240BEC 8E050000 */ lw $a1, ($s0) -/* 954BB0 80240BF0 0C0B1EAF */ jal get_variable -/* 954BB4 80240BF4 0220202D */ daddu $a0, $s1, $zero -/* 954BB8 80240BF8 0240202D */ daddu $a0, $s2, $zero -/* 954BBC 80240BFC 240500D0 */ addiu $a1, $zero, 0xd0 -/* 954BC0 80240C00 00A0302D */ daddu $a2, $a1, $zero -/* 954BC4 80240C04 00A0382D */ daddu $a3, $a1, $zero -/* 954BC8 80240C08 AE220088 */ sw $v0, 0x88($s1) -/* 954BCC 80240C0C AE200070 */ sw $zero, 0x70($s1) -/* 954BD0 80240C10 0C04DF84 */ jal set_transition_stencil_color -/* 954BD4 80240C14 AE200074 */ sw $zero, 0x74($s1) -.L80240C18: -/* 954BD8 80240C18 8E230070 */ lw $v1, 0x70($s1) -/* 954BDC 80240C1C 24040001 */ addiu $a0, $zero, 1 -/* 954BE0 80240C20 10640019 */ beq $v1, $a0, .L80240C88 -/* 954BE4 80240C24 28620002 */ slti $v0, $v1, 2 -/* 954BE8 80240C28 10400005 */ beqz $v0, .L80240C40 -/* 954BEC 80240C2C 24020002 */ addiu $v0, $zero, 2 -/* 954BF0 80240C30 10600007 */ beqz $v1, .L80240C50 -/* 954BF4 80240C34 240500FF */ addiu $a1, $zero, 0xff -/* 954BF8 80240C38 08090332 */ j .L80240CC8 -/* 954BFC 80240C3C 00000000 */ nop -.L80240C40: -/* 954C00 80240C40 10620019 */ beq $v1, $v0, .L80240CA8 -/* 954C04 80240C44 00000000 */ nop -/* 954C08 80240C48 08090332 */ j .L80240CC8 -/* 954C0C 80240C4C 00000000 */ nop -.L80240C50: -/* 954C10 80240C50 8E220074 */ lw $v0, 0x74($s1) -/* 954C14 80240C54 14450004 */ bne $v0, $a1, .L80240C68 -/* 954C18 80240C58 00000000 */ nop -/* 954C1C 80240C5C AE240070 */ sw $a0, 0x70($s1) -/* 954C20 80240C60 AE200078 */ sw $zero, 0x78($s1) -/* 954C24 80240C64 8E220074 */ lw $v0, 0x74($s1) -.L80240C68: -/* 954C28 80240C68 8E230084 */ lw $v1, 0x84($s1) -/* 954C2C 80240C6C 00431021 */ addu $v0, $v0, $v1 -/* 954C30 80240C70 AE220074 */ sw $v0, 0x74($s1) -/* 954C34 80240C74 28420100 */ slti $v0, $v0, 0x100 -/* 954C38 80240C78 50400013 */ beql $v0, $zero, .L80240CC8 -/* 954C3C 80240C7C AE250074 */ sw $a1, 0x74($s1) -/* 954C40 80240C80 08090332 */ j .L80240CC8 -/* 954C44 80240C84 00000000 */ nop -.L80240C88: -/* 954C48 80240C88 8E220078 */ lw $v0, 0x78($s1) -/* 954C4C 80240C8C 24420001 */ addiu $v0, $v0, 1 -/* 954C50 80240C90 AE220078 */ sw $v0, 0x78($s1) -/* 954C54 80240C94 28420002 */ slti $v0, $v0, 2 -/* 954C58 80240C98 1440000B */ bnez $v0, .L80240CC8 -/* 954C5C 80240C9C 24020002 */ addiu $v0, $zero, 2 -/* 954C60 80240CA0 08090332 */ j .L80240CC8 -/* 954C64 80240CA4 AE220070 */ sw $v0, 0x70($s1) -.L80240CA8: -/* 954C68 80240CA8 8E230074 */ lw $v1, 0x74($s1) -/* 954C6C 80240CAC 50600001 */ beql $v1, $zero, .L80240CB4 -/* 954C70 80240CB0 24120001 */ addiu $s2, $zero, 1 -.L80240CB4: -/* 954C74 80240CB4 8E220088 */ lw $v0, 0x88($s1) -/* 954C78 80240CB8 00621023 */ subu $v0, $v1, $v0 -/* 954C7C 80240CBC 04410002 */ bgez $v0, .L80240CC8 -/* 954C80 80240CC0 AE220074 */ sw $v0, 0x74($s1) -/* 954C84 80240CC4 AE200074 */ sw $zero, 0x74($s1) -.L80240CC8: -/* 954C88 80240CC8 C6200074 */ lwc1 $f0, 0x74($s1) -/* 954C8C 80240CCC 46800020 */ cvt.s.w $f0, $f0 -/* 954C90 80240CD0 44050000 */ mfc1 $a1, $f0 -/* 954C94 80240CD4 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 954C98 80240CD8 24040001 */ addiu $a0, $zero, 1 -/* 954C9C 80240CDC 0240102D */ daddu $v0, $s2, $zero -/* 954CA0 80240CE0 8FBF001C */ lw $ra, 0x1c($sp) -/* 954CA4 80240CE4 8FB20018 */ lw $s2, 0x18($sp) -/* 954CA8 80240CE8 8FB10014 */ lw $s1, 0x14($sp) -/* 954CAC 80240CEC 8FB00010 */ lw $s0, 0x10($sp) -/* 954CB0 80240CF0 03E00008 */ jr $ra -/* 954CB4 80240CF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s deleted file mode 100644 index f6b6f3a5b2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402FC_879EDC -/* 879EDC 802402FC 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 879EE0 80240300 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 879EE4 80240304 8C430000 */ lw $v1, ($v0) -/* 879EE8 80240308 2404FFBF */ addiu $a0, $zero, -0x41 -/* 879EEC 8024030C 00641824 */ and $v1, $v1, $a0 -/* 879EF0 80240310 AC430000 */ sw $v1, ($v0) -/* 879EF4 80240314 03E00008 */ jr $ra -/* 879EF8 80240318 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s deleted file mode 100644 index 8e7bf9f98a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240348_879F28 -/* 879F28 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 879F2C 8024034C AFB00010 */ sw $s0, 0x10($sp) -/* 879F30 80240350 0080802D */ daddu $s0, $a0, $zero -/* 879F34 80240354 AFBF0018 */ sw $ra, 0x18($sp) -/* 879F38 80240358 AFB10014 */ sw $s1, 0x14($sp) -/* 879F3C 8024035C 8E11000C */ lw $s1, 0xc($s0) -/* 879F40 80240360 8E250000 */ lw $a1, ($s1) -/* 879F44 80240364 0C0B1EAF */ jal get_variable -/* 879F48 80240368 26310004 */ addiu $s1, $s1, 4 -/* 879F4C 8024036C 0200202D */ daddu $a0, $s0, $zero -/* 879F50 80240370 3C038011 */ lui $v1, %hi(gPlayerData) -/* 879F54 80240374 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 879F58 80240378 000210C0 */ sll $v0, $v0, 3 -/* 879F5C 8024037C 00431021 */ addu $v0, $v0, $v1 -/* 879F60 80240380 90460015 */ lbu $a2, 0x15($v0) -/* 879F64 80240384 8E250000 */ lw $a1, ($s1) -/* 879F68 80240388 24C60001 */ addiu $a2, $a2, 1 -/* 879F6C 8024038C A0460015 */ sb $a2, 0x15($v0) -/* 879F70 80240390 00063600 */ sll $a2, $a2, 0x18 -/* 879F74 80240394 0C0B2026 */ jal set_variable -/* 879F78 80240398 00063603 */ sra $a2, $a2, 0x18 -/* 879F7C 8024039C 8FBF0018 */ lw $ra, 0x18($sp) -/* 879F80 802403A0 8FB10014 */ lw $s1, 0x14($sp) -/* 879F84 802403A4 8FB00010 */ lw $s0, 0x10($sp) -/* 879F88 802403A8 24020002 */ addiu $v0, $zero, 2 -/* 879F8C 802403AC 03E00008 */ jr $ra -/* 879F90 802403B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s deleted file mode 100644 index ffe575e64b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728_87A308 -/* 87A308 80240728 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 87A30C 8024072C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 87A310 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87A314 80240734 AFBF0010 */ sw $ra, 0x10($sp) -/* 87A318 80240738 00021100 */ sll $v0, $v0, 4 -/* 87A31C 8024073C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 87A320 80240740 00822021 */ addu $a0, $a0, $v0 -/* 87A324 80240744 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 87A328 80240748 0C0496CF */ jal set_message_string -/* 87A32C 8024074C 0000282D */ daddu $a1, $zero, $zero -/* 87A330 80240750 8FBF0010 */ lw $ra, 0x10($sp) -/* 87A334 80240754 24020002 */ addiu $v0, $zero, 2 -/* 87A338 80240758 03E00008 */ jr $ra -/* 87A33C 8024075C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s deleted file mode 100644 index 6485868d3e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240760_87A340 -/* 87A340 80240760 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87A344 80240764 AFB1001C */ sw $s1, 0x1c($sp) -/* 87A348 80240768 0080882D */ daddu $s1, $a0, $zero -/* 87A34C 8024076C AFBF0020 */ sw $ra, 0x20($sp) -/* 87A350 80240770 AFB00018 */ sw $s0, 0x18($sp) -/* 87A354 80240774 8E30000C */ lw $s0, 0xc($s1) -/* 87A358 80240778 8E050000 */ lw $a1, ($s0) -/* 87A35C 8024077C 0C0B1EAF */ jal get_variable -/* 87A360 80240780 26100004 */ addiu $s0, $s0, 4 -/* 87A364 80240784 0C04417A */ jal get_entity_by_index -/* 87A368 80240788 0040202D */ daddu $a0, $v0, $zero -/* 87A36C 8024078C 8E100000 */ lw $s0, ($s0) -/* 87A370 80240790 C444004C */ lwc1 $f4, 0x4c($v0) -/* 87A374 80240794 3C014148 */ lui $at, 0x4148 -/* 87A378 80240798 44810000 */ mtc1 $at, $f0 -/* 87A37C 8024079C 3C013F33 */ lui $at, 0x3f33 -/* 87A380 802407A0 34213333 */ ori $at, $at, 0x3333 -/* 87A384 802407A4 44811000 */ mtc1 $at, $f2 -/* 87A388 802407A8 AFA00014 */ sw $zero, 0x14($sp) -/* 87A38C 802407AC 46002100 */ add.s $f4, $f4, $f0 -/* 87A390 802407B0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 87A394 802407B4 8C450048 */ lw $a1, 0x48($v0) -/* 87A398 802407B8 8C470050 */ lw $a3, 0x50($v0) -/* 87A39C 802407BC 44062000 */ mfc1 $a2, $f4 -/* 87A3A0 802407C0 0C01C5D4 */ jal func_80071750 -/* 87A3A4 802407C4 0000202D */ daddu $a0, $zero, $zero -/* 87A3A8 802407C8 0220202D */ daddu $a0, $s1, $zero -/* 87A3AC 802407CC 0200282D */ daddu $a1, $s0, $zero -/* 87A3B0 802407D0 0C0B2026 */ jal set_variable -/* 87A3B4 802407D4 0040302D */ daddu $a2, $v0, $zero -/* 87A3B8 802407D8 8FBF0020 */ lw $ra, 0x20($sp) -/* 87A3BC 802407DC 8FB1001C */ lw $s1, 0x1c($sp) -/* 87A3C0 802407E0 8FB00018 */ lw $s0, 0x18($sp) -/* 87A3C4 802407E4 24020002 */ addiu $v0, $zero, 2 -/* 87A3C8 802407E8 03E00008 */ jr $ra -/* 87A3CC 802407EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s deleted file mode 100644 index 900a0dc6a9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240824_87A404 -/* 87A404 80240824 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87A408 80240828 AFBF0018 */ sw $ra, 0x18($sp) -/* 87A40C 8024082C 8C82000C */ lw $v0, 0xc($a0) -/* 87A410 80240830 0C0B1EAF */ jal get_variable -/* 87A414 80240834 8C450000 */ lw $a1, ($v0) -/* 87A418 80240838 0C04417A */ jal get_entity_by_index -/* 87A41C 8024083C 0040202D */ daddu $a0, $v0, $zero -/* 87A420 80240840 3C013F80 */ lui $at, 0x3f80 -/* 87A424 80240844 44810000 */ mtc1 $at, $f0 -/* 87A428 80240848 C442004C */ lwc1 $f2, 0x4c($v0) -/* 87A42C 8024084C E7A00010 */ swc1 $f0, 0x10($sp) -/* 87A430 80240850 3C014148 */ lui $at, 0x4148 -/* 87A434 80240854 44810000 */ mtc1 $at, $f0 -/* 87A438 80240858 2403004B */ addiu $v1, $zero, 0x4b -/* 87A43C 8024085C AFA30014 */ sw $v1, 0x14($sp) -/* 87A440 80240860 46001080 */ add.s $f2, $f2, $f0 -/* 87A444 80240864 8C450048 */ lw $a1, 0x48($v0) -/* 87A448 80240868 8C470050 */ lw $a3, 0x50($v0) -/* 87A44C 8024086C 44061000 */ mfc1 $a2, $f2 -/* 87A450 80240870 0C01C2EC */ jal func_80070BB0 -/* 87A454 80240874 24040004 */ addiu $a0, $zero, 4 -/* 87A458 80240878 8FBF0018 */ lw $ra, 0x18($sp) -/* 87A45C 8024087C 24020002 */ addiu $v0, $zero, 2 -/* 87A460 80240880 03E00008 */ jr $ra -/* 87A464 80240884 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s deleted file mode 100644 index 8d82e0003e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240888_87A468 -/* 87A468 80240888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87A46C 8024088C AFBF0018 */ sw $ra, 0x18($sp) -/* 87A470 80240890 0C00EAD2 */ jal get_npc_safe -/* 87A474 80240894 2404FFFC */ addiu $a0, $zero, -4 -/* 87A478 80240898 C444003C */ lwc1 $f4, 0x3c($v0) -/* 87A47C 8024089C 3C014148 */ lui $at, 0x4148 -/* 87A480 802408A0 44811000 */ mtc1 $at, $f2 -/* 87A484 802408A4 3C013F80 */ lui $at, 0x3f80 -/* 87A488 802408A8 44810000 */ mtc1 $at, $f0 -/* 87A48C 802408AC 2403001E */ addiu $v1, $zero, 0x1e -/* 87A490 802408B0 AFA30014 */ sw $v1, 0x14($sp) -/* 87A494 802408B4 46022100 */ add.s $f4, $f4, $f2 -/* 87A498 802408B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87A49C 802408BC 8C450038 */ lw $a1, 0x38($v0) -/* 87A4A0 802408C0 8C470040 */ lw $a3, 0x40($v0) -/* 87A4A4 802408C4 44062000 */ mfc1 $a2, $f4 -/* 87A4A8 802408C8 0C01C2EC */ jal func_80070BB0 -/* 87A4AC 802408CC 24040009 */ addiu $a0, $zero, 9 -/* 87A4B0 802408D0 8FBF0018 */ lw $ra, 0x18($sp) -/* 87A4B4 802408D4 24020002 */ addiu $v0, $zero, 2 -/* 87A4B8 802408D8 03E00008 */ jr $ra -/* 87A4BC 802408DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s deleted file mode 100644 index 653c72ab0d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E18_87A9F8 -/* 87A9F8 80240E18 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87A9FC 80240E1C AFB10014 */ sw $s1, 0x14($sp) -/* 87AA00 80240E20 0080882D */ daddu $s1, $a0, $zero -/* 87AA04 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 87AA08 80240E28 AFBF001C */ sw $ra, 0x1c($sp) -/* 87AA0C 80240E2C AFB00010 */ sw $s0, 0x10($sp) -/* 87AA10 80240E30 8E30000C */ lw $s0, 0xc($s1) -/* 87AA14 80240E34 10A00010 */ beqz $a1, .L80240E78 -/* 87AA18 80240E38 0000902D */ daddu $s2, $zero, $zero -/* 87AA1C 80240E3C 8E050000 */ lw $a1, ($s0) -/* 87AA20 80240E40 0C0B1EAF */ jal get_variable -/* 87AA24 80240E44 26100004 */ addiu $s0, $s0, 4 -/* 87AA28 80240E48 AE220084 */ sw $v0, 0x84($s1) -/* 87AA2C 80240E4C 8E050000 */ lw $a1, ($s0) -/* 87AA30 80240E50 0C0B1EAF */ jal get_variable -/* 87AA34 80240E54 0220202D */ daddu $a0, $s1, $zero -/* 87AA38 80240E58 0240202D */ daddu $a0, $s2, $zero -/* 87AA3C 80240E5C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 87AA40 80240E60 00A0302D */ daddu $a2, $a1, $zero -/* 87AA44 80240E64 00A0382D */ daddu $a3, $a1, $zero -/* 87AA48 80240E68 AE220088 */ sw $v0, 0x88($s1) -/* 87AA4C 80240E6C AE200070 */ sw $zero, 0x70($s1) -/* 87AA50 80240E70 0C04DF84 */ jal set_transition_stencil_color -/* 87AA54 80240E74 AE200074 */ sw $zero, 0x74($s1) -.L80240E78: -/* 87AA58 80240E78 8E230070 */ lw $v1, 0x70($s1) -/* 87AA5C 80240E7C 24040001 */ addiu $a0, $zero, 1 -/* 87AA60 80240E80 10640019 */ beq $v1, $a0, .L80240EE8 -/* 87AA64 80240E84 28620002 */ slti $v0, $v1, 2 -/* 87AA68 80240E88 10400005 */ beqz $v0, .L80240EA0 -/* 87AA6C 80240E8C 24020002 */ addiu $v0, $zero, 2 -/* 87AA70 80240E90 10600007 */ beqz $v1, .L80240EB0 -/* 87AA74 80240E94 240500FF */ addiu $a1, $zero, 0xff -/* 87AA78 80240E98 080903CA */ j .L80240F28 -/* 87AA7C 80240E9C 00000000 */ nop -.L80240EA0: -/* 87AA80 80240EA0 10620019 */ beq $v1, $v0, .L80240F08 -/* 87AA84 80240EA4 00000000 */ nop -/* 87AA88 80240EA8 080903CA */ j .L80240F28 -/* 87AA8C 80240EAC 00000000 */ nop -.L80240EB0: -/* 87AA90 80240EB0 8E220074 */ lw $v0, 0x74($s1) -/* 87AA94 80240EB4 14450004 */ bne $v0, $a1, .L80240EC8 -/* 87AA98 80240EB8 00000000 */ nop -/* 87AA9C 80240EBC AE240070 */ sw $a0, 0x70($s1) -/* 87AAA0 80240EC0 AE200078 */ sw $zero, 0x78($s1) -/* 87AAA4 80240EC4 8E220074 */ lw $v0, 0x74($s1) -.L80240EC8: -/* 87AAA8 80240EC8 8E230084 */ lw $v1, 0x84($s1) -/* 87AAAC 80240ECC 00431021 */ addu $v0, $v0, $v1 -/* 87AAB0 80240ED0 AE220074 */ sw $v0, 0x74($s1) -/* 87AAB4 80240ED4 28420100 */ slti $v0, $v0, 0x100 -/* 87AAB8 80240ED8 50400013 */ beql $v0, $zero, .L80240F28 -/* 87AABC 80240EDC AE250074 */ sw $a1, 0x74($s1) -/* 87AAC0 80240EE0 080903CA */ j .L80240F28 -/* 87AAC4 80240EE4 00000000 */ nop -.L80240EE8: -/* 87AAC8 80240EE8 8E220078 */ lw $v0, 0x78($s1) -/* 87AACC 80240EEC 24420001 */ addiu $v0, $v0, 1 -/* 87AAD0 80240EF0 AE220078 */ sw $v0, 0x78($s1) -/* 87AAD4 80240EF4 28420002 */ slti $v0, $v0, 2 -/* 87AAD8 80240EF8 1440000B */ bnez $v0, .L80240F28 -/* 87AADC 80240EFC 24020002 */ addiu $v0, $zero, 2 -/* 87AAE0 80240F00 080903CA */ j .L80240F28 -/* 87AAE4 80240F04 AE220070 */ sw $v0, 0x70($s1) -.L80240F08: -/* 87AAE8 80240F08 8E230074 */ lw $v1, 0x74($s1) -/* 87AAEC 80240F0C 50600001 */ beql $v1, $zero, .L80240F14 -/* 87AAF0 80240F10 24120001 */ addiu $s2, $zero, 1 -.L80240F14: -/* 87AAF4 80240F14 8E220088 */ lw $v0, 0x88($s1) -/* 87AAF8 80240F18 00621023 */ subu $v0, $v1, $v0 -/* 87AAFC 80240F1C 04410002 */ bgez $v0, .L80240F28 -/* 87AB00 80240F20 AE220074 */ sw $v0, 0x74($s1) -/* 87AB04 80240F24 AE200074 */ sw $zero, 0x74($s1) -.L80240F28: -/* 87AB08 80240F28 C6200074 */ lwc1 $f0, 0x74($s1) -/* 87AB0C 80240F2C 46800020 */ cvt.s.w $f0, $f0 -/* 87AB10 80240F30 44050000 */ mfc1 $a1, $f0 -/* 87AB14 80240F34 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 87AB18 80240F38 24040001 */ addiu $a0, $zero, 1 -/* 87AB1C 80240F3C 0240102D */ daddu $v0, $s2, $zero -/* 87AB20 80240F40 8FBF001C */ lw $ra, 0x1c($sp) -/* 87AB24 80240F44 8FB20018 */ lw $s2, 0x18($sp) -/* 87AB28 80240F48 8FB10014 */ lw $s1, 0x14($sp) -/* 87AB2C 80240F4C 8FB00010 */ lw $s0, 0x10($sp) -/* 87AB30 80240F50 03E00008 */ jr $ra -/* 87AB34 80240F54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s deleted file mode 100644 index 479280f112..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C88_87B868 -/* 87B868 80241C88 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 87B86C 80241C8C AFB3004C */ sw $s3, 0x4c($sp) -/* 87B870 80241C90 0080982D */ daddu $s3, $a0, $zero -/* 87B874 80241C94 AFBF0054 */ sw $ra, 0x54($sp) -/* 87B878 80241C98 AFB40050 */ sw $s4, 0x50($sp) -/* 87B87C 80241C9C AFB20048 */ sw $s2, 0x48($sp) -/* 87B880 80241CA0 AFB10044 */ sw $s1, 0x44($sp) -/* 87B884 80241CA4 AFB00040 */ sw $s0, 0x40($sp) -/* 87B888 80241CA8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 87B88C 80241CAC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 87B890 80241CB0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 87B894 80241CB4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 87B898 80241CB8 8E710148 */ lw $s1, 0x148($s3) -/* 87B89C 80241CBC 00A0902D */ daddu $s2, $a1, $zero -/* 87B8A0 80241CC0 86240008 */ lh $a0, 8($s1) -/* 87B8A4 80241CC4 0C00EABB */ jal get_npc_unsafe -/* 87B8A8 80241CC8 00C0A02D */ daddu $s4, $a2, $zero -/* 87B8AC 80241CCC 0040802D */ daddu $s0, $v0, $zero -/* 87B8B0 80241CD0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 87B8B4 80241CD4 46800020 */ cvt.s.w $f0, $f0 -/* 87B8B8 80241CD8 46000021 */ cvt.d.s $f0, $f0 -/* 87B8BC 80241CDC 3C014059 */ lui $at, 0x4059 -/* 87B8C0 80241CE0 44811800 */ mtc1 $at, $f3 -/* 87B8C4 80241CE4 44801000 */ mtc1 $zero, $f2 -/* 87B8C8 80241CE8 8602008E */ lh $v0, 0x8e($s0) -/* 87B8CC 80241CEC 9603008E */ lhu $v1, 0x8e($s0) -/* 87B8D0 80241CF0 46220003 */ div.d $f0, $f0, $f2 -/* 87B8D4 80241CF4 46200620 */ cvt.s.d $f24, $f0 -/* 87B8D8 80241CF8 C6200088 */ lwc1 $f0, 0x88($s1) -/* 87B8DC 80241CFC 46800020 */ cvt.s.w $f0, $f0 -/* 87B8E0 80241D00 46000021 */ cvt.d.s $f0, $f0 -/* 87B8E4 80241D04 46220003 */ div.d $f0, $f0, $f2 -/* 87B8E8 80241D08 46200020 */ cvt.s.d $f0, $f0 -/* 87B8EC 80241D0C 18400003 */ blez $v0, .L80241D1C -/* 87B8F0 80241D10 4600C680 */ add.s $f26, $f24, $f0 -/* 87B8F4 80241D14 2462FFFF */ addiu $v0, $v1, -1 -/* 87B8F8 80241D18 A602008E */ sh $v0, 0x8e($s0) -.L80241D1C: -/* 87B8FC 80241D1C 8E220070 */ lw $v0, 0x70($s1) -/* 87B900 80241D20 18400034 */ blez $v0, .L80241DF4 -/* 87B904 80241D24 00000000 */ nop -/* 87B908 80241D28 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 87B90C 80241D2C 46806320 */ cvt.s.w $f12, $f12 -/* 87B910 80241D30 44820000 */ mtc1 $v0, $f0 -/* 87B914 80241D34 00000000 */ nop -/* 87B918 80241D38 46800020 */ cvt.s.w $f0, $f0 -/* 87B91C 80241D3C 46000021 */ cvt.d.s $f0, $f0 -/* 87B920 80241D40 46220003 */ div.d $f0, $f0, $f2 -/* 87B924 80241D44 0C00A8BB */ jal sin_deg -/* 87B928 80241D48 462005A0 */ cvt.s.d $f22, $f0 -/* 87B92C 80241D4C 8E020000 */ lw $v0, ($s0) -/* 87B930 80241D50 30420008 */ andi $v0, $v0, 8 -/* 87B934 80241D54 10400003 */ beqz $v0, .L80241D64 -/* 87B938 80241D58 46000506 */ mov.s $f20, $f0 -/* 87B93C 80241D5C 08090769 */ j .L80241DA4 -/* 87B940 80241D60 0000102D */ daddu $v0, $zero, $zero -.L80241D64: -/* 87B944 80241D64 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B948 80241D68 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B94C 80241D6C C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B950 80241D70 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B954 80241D74 C6040040 */ lwc1 $f4, 0x40($s0) -/* 87B958 80241D78 3C01447A */ lui $at, 0x447a -/* 87B95C 80241D7C 44813000 */ mtc1 $at, $f6 -/* 87B960 80241D80 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B964 80241D84 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B968 80241D88 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 87B96C 80241D8C E7A40030 */ swc1 $f4, 0x30($sp) -/* 87B970 80241D90 E7A60034 */ swc1 $f6, 0x34($sp) -/* 87B974 80241D94 AFA20010 */ sw $v0, 0x10($sp) -/* 87B978 80241D98 8E040080 */ lw $a0, 0x80($s0) -/* 87B97C 80241D9C 0C0372DF */ jal func_800DCB7C -/* 87B980 80241DA0 27A70030 */ addiu $a3, $sp, 0x30 -.L80241DA4: -/* 87B984 80241DA4 10400007 */ beqz $v0, .L80241DC4 -/* 87B988 80241DA8 00000000 */ nop -/* 87B98C 80241DAC 4616A082 */ mul.s $f2, $f20, $f22 -/* 87B990 80241DB0 00000000 */ nop -/* 87B994 80241DB4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 87B998 80241DB8 46180000 */ add.s $f0, $f0, $f24 -/* 87B99C 80241DBC 08090774 */ j .L80241DD0 -/* 87B9A0 80241DC0 46020000 */ add.s $f0, $f0, $f2 -.L80241DC4: -/* 87B9A4 80241DC4 4616A002 */ mul.s $f0, $f20, $f22 -/* 87B9A8 80241DC8 00000000 */ nop -/* 87B9AC 80241DCC 4600D000 */ add.s $f0, $f26, $f0 -.L80241DD0: -/* 87B9B0 80241DD0 E600003C */ swc1 $f0, 0x3c($s0) -/* 87B9B4 80241DD4 8E220074 */ lw $v0, 0x74($s1) -/* 87B9B8 80241DD8 2442000A */ addiu $v0, $v0, 0xa -/* 87B9BC 80241DDC 44826000 */ mtc1 $v0, $f12 -/* 87B9C0 80241DE0 00000000 */ nop -/* 87B9C4 80241DE4 0C00A6C9 */ jal clamp_angle -/* 87B9C8 80241DE8 46806320 */ cvt.s.w $f12, $f12 -/* 87B9CC 80241DEC 4600020D */ trunc.w.s $f8, $f0 -/* 87B9D0 80241DF0 E6280074 */ swc1 $f8, 0x74($s1) -.L80241DF4: -/* 87B9D4 80241DF4 8E220090 */ lw $v0, 0x90($s1) -/* 87B9D8 80241DF8 1C400040 */ bgtz $v0, .L80241EFC -/* 87B9DC 80241DFC 2442FFFF */ addiu $v0, $v0, -1 -/* 87B9E0 80241E00 860200A8 */ lh $v0, 0xa8($s0) -/* 87B9E4 80241E04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B9E8 80241E08 44821000 */ mtc1 $v0, $f2 -/* 87B9EC 80241E0C 00000000 */ nop -/* 87B9F0 80241E10 468010A0 */ cvt.s.w $f2, $f2 -/* 87B9F4 80241E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87B9F8 80241E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87B9FC 80241E1C 46020000 */ add.s $f0, $f0, $f2 -/* 87BA00 80241E20 3C014024 */ lui $at, 0x4024 -/* 87BA04 80241E24 44812800 */ mtc1 $at, $f5 -/* 87BA08 80241E28 44802000 */ mtc1 $zero, $f4 -/* 87BA0C 80241E2C C442002C */ lwc1 $f2, 0x2c($v0) -/* 87BA10 80241E30 46000021 */ cvt.d.s $f0, $f0 -/* 87BA14 80241E34 46240000 */ add.d $f0, $f0, $f4 -/* 87BA18 80241E38 460010A1 */ cvt.d.s $f2, $f2 -/* 87BA1C 80241E3C 4620103C */ c.lt.d $f2, $f0 -/* 87BA20 80241E40 00000000 */ nop -/* 87BA24 80241E44 4500002E */ bc1f .L80241F00 -/* 87BA28 80241E48 0280202D */ daddu $a0, $s4, $zero -/* 87BA2C 80241E4C 24020001 */ addiu $v0, $zero, 1 -/* 87BA30 80241E50 AFA20010 */ sw $v0, 0x10($sp) -/* 87BA34 80241E54 8E460024 */ lw $a2, 0x24($s2) -/* 87BA38 80241E58 8E470028 */ lw $a3, 0x28($s2) -/* 87BA3C 80241E5C 0C01242D */ jal func_800490B4 -/* 87BA40 80241E60 0220282D */ daddu $a1, $s1, $zero -/* 87BA44 80241E64 10400026 */ beqz $v0, .L80241F00 -/* 87BA48 80241E68 0000202D */ daddu $a0, $zero, $zero -/* 87BA4C 80241E6C 0200282D */ daddu $a1, $s0, $zero -/* 87BA50 80241E70 0000302D */ daddu $a2, $zero, $zero -/* 87BA54 80241E74 2412000C */ addiu $s2, $zero, 0xc -/* 87BA58 80241E78 860300A8 */ lh $v1, 0xa8($s0) -/* 87BA5C 80241E7C 3C013F80 */ lui $at, 0x3f80 -/* 87BA60 80241E80 44810000 */ mtc1 $at, $f0 -/* 87BA64 80241E84 3C014000 */ lui $at, 0x4000 -/* 87BA68 80241E88 44811000 */ mtc1 $at, $f2 -/* 87BA6C 80241E8C 3C01C1A0 */ lui $at, 0xc1a0 -/* 87BA70 80241E90 44812000 */ mtc1 $at, $f4 -/* 87BA74 80241E94 44834000 */ mtc1 $v1, $f8 -/* 87BA78 80241E98 00000000 */ nop -/* 87BA7C 80241E9C 46804220 */ cvt.s.w $f8, $f8 -/* 87BA80 80241EA0 44074000 */ mfc1 $a3, $f8 -/* 87BA84 80241EA4 27A20038 */ addiu $v0, $sp, 0x38 -/* 87BA88 80241EA8 AFB2001C */ sw $s2, 0x1c($sp) -/* 87BA8C 80241EAC AFA20020 */ sw $v0, 0x20($sp) -/* 87BA90 80241EB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87BA94 80241EB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87BA98 80241EB8 0C01BFA4 */ jal fx_emote -/* 87BA9C 80241EBC E7A40018 */ swc1 $f4, 0x18($sp) -/* 87BAA0 80241EC0 0200202D */ daddu $a0, $s0, $zero -/* 87BAA4 80241EC4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 87BAA8 80241EC8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 87BAAC 80241ECC 3C060020 */ lui $a2, 0x20 -/* 87BAB0 80241ED0 0C012530 */ jal func_800494C0 -/* 87BAB4 80241ED4 E4800064 */ swc1 $f0, 0x64($a0) -/* 87BAB8 80241ED8 8E220018 */ lw $v0, 0x18($s1) -/* 87BABC 80241EDC 9442002A */ lhu $v0, 0x2a($v0) -/* 87BAC0 80241EE0 30420001 */ andi $v0, $v0, 1 -/* 87BAC4 80241EE4 10400003 */ beqz $v0, .L80241EF4 -/* 87BAC8 80241EE8 2402000A */ addiu $v0, $zero, 0xa -/* 87BACC 80241EEC 080907E7 */ j .L80241F9C -/* 87BAD0 80241EF0 AE620070 */ sw $v0, 0x70($s3) -.L80241EF4: -/* 87BAD4 80241EF4 080907E7 */ j .L80241F9C -/* 87BAD8 80241EF8 AE720070 */ sw $s2, 0x70($s3) -.L80241EFC: -/* 87BADC 80241EFC AE220090 */ sw $v0, 0x90($s1) -.L80241F00: -/* 87BAE0 80241F00 8602008C */ lh $v0, 0x8c($s0) -/* 87BAE4 80241F04 14400025 */ bnez $v0, .L80241F9C -/* 87BAE8 80241F08 00000000 */ nop -/* 87BAEC 80241F0C 8602008E */ lh $v0, 0x8e($s0) -/* 87BAF0 80241F10 1C400022 */ bgtz $v0, .L80241F9C -/* 87BAF4 80241F14 00000000 */ nop -/* 87BAF8 80241F18 8E620074 */ lw $v0, 0x74($s3) -/* 87BAFC 80241F1C 2442FFFF */ addiu $v0, $v0, -1 -/* 87BB00 80241F20 1840001D */ blez $v0, .L80241F98 -/* 87BB04 80241F24 AE620074 */ sw $v0, 0x74($s3) -/* 87BB08 80241F28 8E220018 */ lw $v0, 0x18($s1) -/* 87BB0C 80241F2C 9442002A */ lhu $v0, 0x2a($v0) -/* 87BB10 80241F30 30420010 */ andi $v0, $v0, 0x10 -/* 87BB14 80241F34 14400007 */ bnez $v0, .L80241F54 -/* 87BB18 80241F38 00000000 */ nop -/* 87BB1C 80241F3C C600000C */ lwc1 $f0, 0xc($s0) -/* 87BB20 80241F40 3C014334 */ lui $at, 0x4334 -/* 87BB24 80241F44 44816000 */ mtc1 $at, $f12 -/* 87BB28 80241F48 0C00A6C9 */ jal clamp_angle -/* 87BB2C 80241F4C 460C0300 */ add.s $f12, $f0, $f12 -/* 87BB30 80241F50 E600000C */ swc1 $f0, 0xc($s0) -.L80241F54: -/* 87BB34 80241F54 0C00A67F */ jal rand_int -/* 87BB38 80241F58 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 87BB3C 80241F5C 3C032E8B */ lui $v1, 0x2e8b -/* 87BB40 80241F60 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 87BB44 80241F64 00430018 */ mult $v0, $v1 -/* 87BB48 80241F68 00021FC3 */ sra $v1, $v0, 0x1f -/* 87BB4C 80241F6C 00004010 */ mfhi $t0 -/* 87BB50 80241F70 00082043 */ sra $a0, $t0, 1 -/* 87BB54 80241F74 00832023 */ subu $a0, $a0, $v1 -/* 87BB58 80241F78 00041840 */ sll $v1, $a0, 1 -/* 87BB5C 80241F7C 00641821 */ addu $v1, $v1, $a0 -/* 87BB60 80241F80 00031880 */ sll $v1, $v1, 2 -/* 87BB64 80241F84 00641823 */ subu $v1, $v1, $a0 -/* 87BB68 80241F88 00431023 */ subu $v0, $v0, $v1 -/* 87BB6C 80241F8C 24420005 */ addiu $v0, $v0, 5 -/* 87BB70 80241F90 080907E7 */ j .L80241F9C -/* 87BB74 80241F94 A602008E */ sh $v0, 0x8e($s0) -.L80241F98: -/* 87BB78 80241F98 AE600070 */ sw $zero, 0x70($s3) -.L80241F9C: -/* 87BB7C 80241F9C 8FBF0054 */ lw $ra, 0x54($sp) -/* 87BB80 80241FA0 8FB40050 */ lw $s4, 0x50($sp) -/* 87BB84 80241FA4 8FB3004C */ lw $s3, 0x4c($sp) -/* 87BB88 80241FA8 8FB20048 */ lw $s2, 0x48($sp) -/* 87BB8C 80241FAC 8FB10044 */ lw $s1, 0x44($sp) -/* 87BB90 80241FB0 8FB00040 */ lw $s0, 0x40($sp) -/* 87BB94 80241FB4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 87BB98 80241FB8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 87BB9C 80241FBC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 87BBA0 80241FC0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 87BBA4 80241FC4 03E00008 */ jr $ra -/* 87BBA8 80241FC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s deleted file mode 100644 index a270270a11..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242248_87BE28 -/* 87BE28 80242248 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 87BE2C 8024224C AFB20030 */ sw $s2, 0x30($sp) -/* 87BE30 80242250 0080902D */ daddu $s2, $a0, $zero -/* 87BE34 80242254 AFBF0038 */ sw $ra, 0x38($sp) -/* 87BE38 80242258 AFB30034 */ sw $s3, 0x34($sp) -/* 87BE3C 8024225C AFB1002C */ sw $s1, 0x2c($sp) -/* 87BE40 80242260 AFB00028 */ sw $s0, 0x28($sp) -/* 87BE44 80242264 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 87BE48 80242268 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 87BE4C 8024226C 8E510148 */ lw $s1, 0x148($s2) -/* 87BE50 80242270 86240008 */ lh $a0, 8($s1) -/* 87BE54 80242274 0C00EABB */ jal get_npc_unsafe -/* 87BE58 80242278 00A0982D */ daddu $s3, $a1, $zero -/* 87BE5C 8024227C 0040802D */ daddu $s0, $v0, $zero -/* 87BE60 80242280 0200202D */ daddu $a0, $s0, $zero -/* 87BE64 80242284 C6220088 */ lwc1 $f2, 0x88($s1) -/* 87BE68 80242288 468010A0 */ cvt.s.w $f2, $f2 -/* 87BE6C 8024228C 460010A1 */ cvt.d.s $f2, $f2 -/* 87BE70 80242290 C604001C */ lwc1 $f4, 0x1c($s0) -/* 87BE74 80242294 C6000014 */ lwc1 $f0, 0x14($s0) -/* 87BE78 80242298 8E050018 */ lw $a1, 0x18($s0) -/* 87BE7C 8024229C 46002100 */ add.s $f4, $f4, $f0 -/* 87BE80 802422A0 8E06000C */ lw $a2, 0xc($s0) -/* 87BE84 802422A4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 87BE88 802422A8 46800020 */ cvt.s.w $f0, $f0 -/* 87BE8C 802422AC E604001C */ swc1 $f4, 0x1c($s0) -/* 87BE90 802422B0 3C014059 */ lui $at, 0x4059 -/* 87BE94 802422B4 44812800 */ mtc1 $at, $f5 -/* 87BE98 802422B8 44802000 */ mtc1 $zero, $f4 -/* 87BE9C 802422BC 46000021 */ cvt.d.s $f0, $f0 -/* 87BEA0 802422C0 46240003 */ div.d $f0, $f0, $f4 -/* 87BEA4 802422C4 46200520 */ cvt.s.d $f20, $f0 -/* 87BEA8 802422C8 46241083 */ div.d $f2, $f2, $f4 -/* 87BEAC 802422CC 0C00EA95 */ jal npc_move_heading -/* 87BEB0 802422D0 462015A0 */ cvt.s.d $f22, $f2 -/* 87BEB4 802422D4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 87BEB8 802422D8 44801000 */ mtc1 $zero, $f2 -/* 87BEBC 802422DC 44801800 */ mtc1 $zero, $f3 -/* 87BEC0 802422E0 46002021 */ cvt.d.s $f0, $f4 -/* 87BEC4 802422E4 4620103E */ c.le.d $f2, $f0 -/* 87BEC8 802422E8 00000000 */ nop -/* 87BECC 802422EC 45000030 */ bc1f .L802423B0 -/* 87BED0 802422F0 00000000 */ nop -/* 87BED4 802422F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87BED8 802422F8 46040000 */ add.s $f0, $f0, $f4 -/* 87BEDC 802422FC E600003C */ swc1 $f0, 0x3c($s0) -/* 87BEE0 80242300 8E2200CC */ lw $v0, 0xcc($s1) -/* 87BEE4 80242304 8C420024 */ lw $v0, 0x24($v0) -/* 87BEE8 80242308 AE020028 */ sw $v0, 0x28($s0) -/* 87BEEC 8024230C A2200007 */ sb $zero, 7($s1) -/* 87BEF0 80242310 8E020000 */ lw $v0, ($s0) -/* 87BEF4 80242314 30420008 */ andi $v0, $v0, 8 -/* 87BEF8 80242318 14400011 */ bnez $v0, .L80242360 -/* 87BEFC 8024231C 0000102D */ daddu $v0, $zero, $zero -/* 87BF00 80242320 27A50018 */ addiu $a1, $sp, 0x18 -/* 87BF04 80242324 27A6001C */ addiu $a2, $sp, 0x1c -/* 87BF08 80242328 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87BF0C 8024232C C602003C */ lwc1 $f2, 0x3c($s0) -/* 87BF10 80242330 C6040040 */ lwc1 $f4, 0x40($s0) -/* 87BF14 80242334 3C01447A */ lui $at, 0x447a -/* 87BF18 80242338 44813000 */ mtc1 $at, $f6 -/* 87BF1C 8024233C 27A20024 */ addiu $v0, $sp, 0x24 -/* 87BF20 80242340 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87BF24 80242344 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 87BF28 80242348 E7A40020 */ swc1 $f4, 0x20($sp) -/* 87BF2C 8024234C E7A60024 */ swc1 $f6, 0x24($sp) -/* 87BF30 80242350 AFA20010 */ sw $v0, 0x10($sp) -/* 87BF34 80242354 8E040080 */ lw $a0, 0x80($s0) -/* 87BF38 80242358 0C0372DF */ jal func_800DCB7C -/* 87BF3C 8024235C 27A70020 */ addiu $a3, $sp, 0x20 -.L80242360: -/* 87BF40 80242360 1040000B */ beqz $v0, .L80242390 -/* 87BF44 80242364 00000000 */ nop -/* 87BF48 80242368 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 87BF4C 8024236C 46140080 */ add.s $f2, $f0, $f20 -/* 87BF50 80242370 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87BF54 80242374 4600103E */ c.le.s $f2, $f0 -/* 87BF58 80242378 00000000 */ nop -/* 87BF5C 8024237C 4500008D */ bc1f .L802425B4 -/* 87BF60 80242380 00000000 */ nop -/* 87BF64 80242384 E602003C */ swc1 $f2, 0x3c($s0) -/* 87BF68 80242388 0809096D */ j .L802425B4 -/* 87BF6C 8024238C AE400070 */ sw $zero, 0x70($s2) -.L80242390: -/* 87BF70 80242390 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87BF74 80242394 C6000064 */ lwc1 $f0, 0x64($s0) -/* 87BF78 80242398 4602003E */ c.le.s $f0, $f2 -/* 87BF7C 8024239C 00000000 */ nop -/* 87BF80 802423A0 45030084 */ bc1tl .L802425B4 -/* 87BF84 802423A4 AE400070 */ sw $zero, 0x70($s2) -/* 87BF88 802423A8 0809096D */ j .L802425B4 -/* 87BF8C 802423AC 00000000 */ nop -.L802423B0: -/* 87BF90 802423B0 4622003C */ c.lt.d $f0, $f2 -/* 87BF94 802423B4 00000000 */ nop -/* 87BF98 802423B8 4500007E */ bc1f .L802425B4 -/* 87BF9C 802423BC 00000000 */ nop -/* 87BFA0 802423C0 9602008E */ lhu $v0, 0x8e($s0) -/* 87BFA4 802423C4 24420001 */ addiu $v0, $v0, 1 -/* 87BFA8 802423C8 A602008E */ sh $v0, 0x8e($s0) -/* 87BFAC 802423CC 00021400 */ sll $v0, $v0, 0x10 -/* 87BFB0 802423D0 8E630020 */ lw $v1, 0x20($s3) -/* 87BFB4 802423D4 00021403 */ sra $v0, $v0, 0x10 -/* 87BFB8 802423D8 0043102A */ slt $v0, $v0, $v1 -/* 87BFBC 802423DC 14400026 */ bnez $v0, .L80242478 -/* 87BFC0 802423E0 00000000 */ nop -/* 87BFC4 802423E4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87BFC8 802423E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87BFCC 802423EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87BFD0 802423F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87BFD4 802423F4 A600008E */ sh $zero, 0x8e($s0) -/* 87BFD8 802423F8 8C460028 */ lw $a2, 0x28($v0) -/* 87BFDC 802423FC 0C00A720 */ jal atan2 -/* 87BFE0 80242400 8C470030 */ lw $a3, 0x30($v0) -/* 87BFE4 80242404 46000506 */ mov.s $f20, $f0 -/* 87BFE8 80242408 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87BFEC 8024240C 0C00A70A */ jal get_clamped_angle_diff -/* 87BFF0 80242410 4600A386 */ mov.s $f14, $f20 -/* 87BFF4 80242414 46000086 */ mov.s $f2, $f0 -/* 87BFF8 80242418 8E62001C */ lw $v0, 0x1c($s3) -/* 87BFFC 8024241C 46001005 */ abs.s $f0, $f2 -/* 87C000 80242420 44822000 */ mtc1 $v0, $f4 -/* 87C004 80242424 00000000 */ nop -/* 87C008 80242428 46802120 */ cvt.s.w $f4, $f4 -/* 87C00C 8024242C 4600203C */ c.lt.s $f4, $f0 -/* 87C010 80242430 00000000 */ nop -/* 87C014 80242434 4500000D */ bc1f .L8024246C -/* 87C018 80242438 00000000 */ nop -/* 87C01C 8024243C 44800000 */ mtc1 $zero, $f0 -/* 87C020 80242440 C614000C */ lwc1 $f20, 0xc($s0) -/* 87C024 80242444 4600103C */ c.lt.s $f2, $f0 -/* 87C028 80242448 00000000 */ nop -/* 87C02C 8024244C 45000006 */ bc1f .L80242468 -/* 87C030 80242450 00021023 */ negu $v0, $v0 -/* 87C034 80242454 44820000 */ mtc1 $v0, $f0 -/* 87C038 80242458 00000000 */ nop -/* 87C03C 8024245C 46800020 */ cvt.s.w $f0, $f0 -/* 87C040 80242460 0809091B */ j .L8024246C -/* 87C044 80242464 4600A500 */ add.s $f20, $f20, $f0 -.L80242468: -/* 87C048 80242468 4604A500 */ add.s $f20, $f20, $f4 -.L8024246C: -/* 87C04C 8024246C 0C00A6C9 */ jal clamp_angle -/* 87C050 80242470 4600A306 */ mov.s $f12, $f20 -/* 87C054 80242474 E600000C */ swc1 $f0, 0xc($s0) -.L80242478: -/* 87C058 80242478 8E020000 */ lw $v0, ($s0) -/* 87C05C 8024247C 30420008 */ andi $v0, $v0, 8 -/* 87C060 80242480 1040000A */ beqz $v0, .L802424AC -/* 87C064 80242484 27A50018 */ addiu $a1, $sp, 0x18 -/* 87C068 80242488 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87C06C 8024248C C600001C */ lwc1 $f0, 0x1c($s0) -/* 87C070 80242490 46001080 */ add.s $f2, $f2, $f0 -/* 87C074 80242494 4616103C */ c.lt.s $f2, $f22 -/* 87C078 80242498 00000000 */ nop -/* 87C07C 8024249C 45020045 */ bc1fl .L802425B4 -/* 87C080 802424A0 E602003C */ swc1 $f2, 0x3c($s0) -/* 87C084 802424A4 0809096C */ j .L802425B0 -/* 87C088 802424A8 E616003C */ swc1 $f22, 0x3c($s0) -.L802424AC: -/* 87C08C 802424AC C6000038 */ lwc1 $f0, 0x38($s0) -/* 87C090 802424B0 27A6001C */ addiu $a2, $sp, 0x1c -/* 87C094 802424B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87C098 802424B8 860200A8 */ lh $v0, 0xa8($s0) -/* 87C09C 802424BC C600001C */ lwc1 $f0, 0x1c($s0) -/* 87C0A0 802424C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 87C0A4 802424C4 44821000 */ mtc1 $v0, $f2 -/* 87C0A8 802424C8 00000000 */ nop -/* 87C0AC 802424CC 468010A0 */ cvt.s.w $f2, $f2 -/* 87C0B0 802424D0 46000005 */ abs.s $f0, $f0 -/* 87C0B4 802424D4 46020000 */ add.s $f0, $f0, $f2 -/* 87C0B8 802424D8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 87C0BC 802424DC 27A20024 */ addiu $v0, $sp, 0x24 -/* 87C0C0 802424E0 46022100 */ add.s $f4, $f4, $f2 -/* 87C0C4 802424E4 3C014024 */ lui $at, 0x4024 -/* 87C0C8 802424E8 44811800 */ mtc1 $at, $f3 -/* 87C0CC 802424EC 44801000 */ mtc1 $zero, $f2 -/* 87C0D0 802424F0 46000021 */ cvt.d.s $f0, $f0 -/* 87C0D4 802424F4 46220000 */ add.d $f0, $f0, $f2 -/* 87C0D8 802424F8 E7A60020 */ swc1 $f6, 0x20($sp) -/* 87C0DC 802424FC E7A4001C */ swc1 $f4, 0x1c($sp) -/* 87C0E0 80242500 46200020 */ cvt.s.d $f0, $f0 -/* 87C0E4 80242504 E7A00024 */ swc1 $f0, 0x24($sp) -/* 87C0E8 80242508 AFA20010 */ sw $v0, 0x10($sp) -/* 87C0EC 8024250C 8E040080 */ lw $a0, 0x80($s0) -/* 87C0F0 80242510 0C0372DF */ jal func_800DCB7C -/* 87C0F4 80242514 27A70020 */ addiu $a3, $sp, 0x20 -/* 87C0F8 80242518 10400015 */ beqz $v0, .L80242570 -/* 87C0FC 8024251C 00000000 */ nop -/* 87C100 80242520 860200A8 */ lh $v0, 0xa8($s0) -/* 87C104 80242524 C604001C */ lwc1 $f4, 0x1c($s0) -/* 87C108 80242528 44820000 */ mtc1 $v0, $f0 -/* 87C10C 8024252C 00000000 */ nop -/* 87C110 80242530 46800020 */ cvt.s.w $f0, $f0 -/* 87C114 80242534 46002085 */ abs.s $f2, $f4 -/* 87C118 80242538 46020000 */ add.s $f0, $f0, $f2 -/* 87C11C 8024253C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 87C120 80242540 4600103E */ c.le.s $f2, $f0 -/* 87C124 80242544 00000000 */ nop -/* 87C128 80242548 45000005 */ bc1f .L80242560 -/* 87C12C 8024254C 00000000 */ nop -/* 87C130 80242550 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 87C134 80242554 AE00001C */ sw $zero, 0x1c($s0) -/* 87C138 80242558 0809096D */ j .L802425B4 -/* 87C13C 8024255C E600003C */ swc1 $f0, 0x3c($s0) -.L80242560: -/* 87C140 80242560 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87C144 80242564 46040000 */ add.s $f0, $f0, $f4 -/* 87C148 80242568 0809096D */ j .L802425B4 -/* 87C14C 8024256C E600003C */ swc1 $f0, 0x3c($s0) -.L80242570: -/* 87C150 80242570 C606003C */ lwc1 $f6, 0x3c($s0) -/* 87C154 80242574 860200A8 */ lh $v0, 0xa8($s0) -/* 87C158 80242578 46163081 */ sub.s $f2, $f6, $f22 -/* 87C15C 8024257C 44820000 */ mtc1 $v0, $f0 -/* 87C160 80242580 00000000 */ nop -/* 87C164 80242584 46800020 */ cvt.s.w $f0, $f0 -/* 87C168 80242588 46001080 */ add.s $f2, $f2, $f0 -/* 87C16C 8024258C C604001C */ lwc1 $f4, 0x1c($s0) -/* 87C170 80242590 46002005 */ abs.s $f0, $f4 -/* 87C174 80242594 4602003C */ c.lt.s $f0, $f2 -/* 87C178 80242598 00000000 */ nop -/* 87C17C 8024259C 45020005 */ bc1fl .L802425B4 -/* 87C180 802425A0 AE00001C */ sw $zero, 0x1c($s0) -/* 87C184 802425A4 46043000 */ add.s $f0, $f6, $f4 -/* 87C188 802425A8 0809096D */ j .L802425B4 -/* 87C18C 802425AC E600003C */ swc1 $f0, 0x3c($s0) -.L802425B0: -/* 87C190 802425B0 AE00001C */ sw $zero, 0x1c($s0) -.L802425B4: -/* 87C194 802425B4 8FBF0038 */ lw $ra, 0x38($sp) -/* 87C198 802425B8 8FB30034 */ lw $s3, 0x34($sp) -/* 87C19C 802425BC 8FB20030 */ lw $s2, 0x30($sp) -/* 87C1A0 802425C0 8FB1002C */ lw $s1, 0x2c($sp) -/* 87C1A4 802425C4 8FB00028 */ lw $s0, 0x28($sp) -/* 87C1A8 802425C8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 87C1AC 802425CC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 87C1B0 802425D0 03E00008 */ jr $ra -/* 87C1B4 802425D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s deleted file mode 100644 index 627f8abb30..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425D8_87C1B8 -/* 87C1B8 802425D8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 87C1BC 802425DC AFB00028 */ sw $s0, 0x28($sp) -/* 87C1C0 802425E0 00A0802D */ daddu $s0, $a1, $zero -/* 87C1C4 802425E4 AFB1002C */ sw $s1, 0x2c($sp) -/* 87C1C8 802425E8 00C0882D */ daddu $s1, $a2, $zero -/* 87C1CC 802425EC AFBF0034 */ sw $ra, 0x34($sp) -/* 87C1D0 802425F0 AFB20030 */ sw $s2, 0x30($sp) -/* 87C1D4 802425F4 AE200070 */ sw $zero, 0x70($s1) -/* 87C1D8 802425F8 8C830000 */ lw $v1, ($a0) -/* 87C1DC 802425FC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 87C1E0 80242600 A480008E */ sh $zero, 0x8e($a0) -/* 87C1E4 80242604 00621824 */ and $v1, $v1, $v0 -/* 87C1E8 80242608 34650800 */ ori $a1, $v1, 0x800 -/* 87C1EC 8024260C AC850000 */ sw $a1, ($a0) -/* 87C1F0 80242610 8E0200D0 */ lw $v0, 0xd0($s0) -/* 87C1F4 80242614 8C420034 */ lw $v0, 0x34($v0) -/* 87C1F8 80242618 10400003 */ beqz $v0, .L80242628 -/* 87C1FC 8024261C 00E0902D */ daddu $s2, $a3, $zero -/* 87C200 80242620 0809098C */ j .L80242630 -/* 87C204 80242624 34620808 */ ori $v0, $v1, 0x808 -.L80242628: -/* 87C208 80242628 2402FFF7 */ addiu $v0, $zero, -9 -/* 87C20C 8024262C 00A21024 */ and $v0, $a1, $v0 -.L80242630: -/* 87C210 80242630 AC820000 */ sw $v0, ($a0) -/* 87C214 80242634 27A20024 */ addiu $v0, $sp, 0x24 -/* 87C218 80242638 27A50018 */ addiu $a1, $sp, 0x18 -/* 87C21C 8024263C C4800038 */ lwc1 $f0, 0x38($a0) -/* 87C220 80242640 C482003C */ lwc1 $f2, 0x3c($a0) -/* 87C224 80242644 C4840040 */ lwc1 $f4, 0x40($a0) -/* 87C228 80242648 3C01447A */ lui $at, 0x447a -/* 87C22C 8024264C 44813000 */ mtc1 $at, $f6 -/* 87C230 80242650 27A6001C */ addiu $a2, $sp, 0x1c -/* 87C234 80242654 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87C238 80242658 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 87C23C 8024265C E7A40020 */ swc1 $f4, 0x20($sp) -/* 87C240 80242660 E7A60024 */ swc1 $f6, 0x24($sp) -/* 87C244 80242664 AFA20010 */ sw $v0, 0x10($sp) -/* 87C248 80242668 8C840080 */ lw $a0, 0x80($a0) -/* 87C24C 8024266C 0C0372DF */ jal func_800DCB7C -/* 87C250 80242670 27A70020 */ addiu $a3, $sp, 0x20 -/* 87C254 80242674 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 87C258 80242678 3C014059 */ lui $at, 0x4059 -/* 87C25C 8024267C 44812800 */ mtc1 $at, $f5 -/* 87C260 80242680 44802000 */ mtc1 $zero, $f4 -/* 87C264 80242684 460010A1 */ cvt.d.s $f2, $f2 -/* 87C268 80242688 46241082 */ mul.d $f2, $f2, $f4 -/* 87C26C 8024268C 00000000 */ nop -/* 87C270 80242690 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 87C274 80242694 46000021 */ cvt.d.s $f0, $f0 -/* 87C278 80242698 46240002 */ mul.d $f0, $f0, $f4 -/* 87C27C 8024269C 00000000 */ nop -/* 87C280 802426A0 3C013FE0 */ lui $at, 0x3fe0 -/* 87C284 802426A4 44812800 */ mtc1 $at, $f5 -/* 87C288 802426A8 44802000 */ mtc1 $zero, $f4 -/* 87C28C 802426AC 00000000 */ nop -/* 87C290 802426B0 46241080 */ add.d $f2, $f2, $f4 -/* 87C294 802426B4 AE000074 */ sw $zero, 0x74($s0) -/* 87C298 802426B8 46240000 */ add.d $f0, $f0, $f4 -/* 87C29C 802426BC AE000090 */ sw $zero, 0x90($s0) -/* 87C2A0 802426C0 4620120D */ trunc.w.d $f8, $f2 -/* 87C2A4 802426C4 E6080078 */ swc1 $f8, 0x78($s0) -/* 87C2A8 802426C8 4620020D */ trunc.w.d $f8, $f0 -/* 87C2AC 802426CC E6080088 */ swc1 $f8, 0x88($s0) -/* 87C2B0 802426D0 8E420014 */ lw $v0, 0x14($s2) -/* 87C2B4 802426D4 AE220074 */ sw $v0, 0x74($s1) -/* 87C2B8 802426D8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 87C2BC 802426DC 34420010 */ ori $v0, $v0, 0x10 -/* 87C2C0 802426E0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 87C2C4 802426E4 8FBF0034 */ lw $ra, 0x34($sp) -/* 87C2C8 802426E8 8FB20030 */ lw $s2, 0x30($sp) -/* 87C2CC 802426EC 8FB1002C */ lw $s1, 0x2c($sp) -/* 87C2D0 802426F0 8FB00028 */ lw $s0, 0x28($sp) -/* 87C2D4 802426F4 03E00008 */ jr $ra -/* 87C2D8 802426F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index 70cdd8d5bc..d43adf879b 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -46,7 +46,7 @@ glabel func_802426FC_87C2DC /* 87C380 802427A0 02A0202D */ daddu $a0, $s5, $zero /* 87C384 802427A4 0240282D */ daddu $a1, $s2, $zero /* 87C388 802427A8 0280302D */ daddu $a2, $s4, $zero -/* 87C38C 802427AC 0C090976 */ jal func_802425D8_87C1B8 +/* 87C38C 802427AC 0C090976 */ jal tik_07_UnkFunc5 /* 87C390 802427B0 0200382D */ daddu $a3, $s0, $zero .L802427B4: /* 87C394 802427B4 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80242830_87C410 glabel L80242840_87C420 /* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero /* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero -/* 87C428 80242848 0C090722 */ jal func_80241C88_87B868 +/* 87C428 80242848 0C090722 */ jal tik_07_UnkFunc4 /* 87C42C 8024284C 0260302D */ daddu $a2, $s3, $zero /* 87C430 80242850 08090A31 */ j .L802428C4 /* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80242898_87C478 glabel L802428B0_87C490 /* 87C490 802428B0 0280202D */ daddu $a0, $s4, $zero /* 87C494 802428B4 0200282D */ daddu $a1, $s0, $zero -/* 87C498 802428B8 0C090892 */ jal func_80242248_87BE28 +/* 87C498 802428B8 0C090892 */ jal tik_07_UnkFunc6 /* 87C49C 802428BC 0260302D */ daddu $a2, $s3, $zero glabel L802428C0_87C4A0 /* 87C4A0 802428C0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s deleted file mode 100644 index 11155c50ca..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024069C_886A5C -/* 886A5C 8024069C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 886A60 802406A0 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 886A64 802406A4 8C430000 */ lw $v1, ($v0) -/* 886A68 802406A8 2404FFBF */ addiu $a0, $zero, -0x41 -/* 886A6C 802406AC 00641824 */ and $v1, $v1, $a0 -/* 886A70 802406B0 AC430000 */ sw $v1, ($v0) -/* 886A74 802406B4 03E00008 */ jr $ra -/* 886A78 802406B8 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s deleted file mode 100644 index ede94af3ff..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E8_886AA8 -/* 886AA8 802406E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 886AAC 802406EC AFB00010 */ sw $s0, 0x10($sp) -/* 886AB0 802406F0 0080802D */ daddu $s0, $a0, $zero -/* 886AB4 802406F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 886AB8 802406F8 AFB10014 */ sw $s1, 0x14($sp) -/* 886ABC 802406FC 8E11000C */ lw $s1, 0xc($s0) -/* 886AC0 80240700 8E250000 */ lw $a1, ($s1) -/* 886AC4 80240704 0C0B1EAF */ jal get_variable -/* 886AC8 80240708 26310004 */ addiu $s1, $s1, 4 -/* 886ACC 8024070C 0200202D */ daddu $a0, $s0, $zero -/* 886AD0 80240710 3C038011 */ lui $v1, %hi(gPlayerData) -/* 886AD4 80240714 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 886AD8 80240718 000210C0 */ sll $v0, $v0, 3 -/* 886ADC 8024071C 00431021 */ addu $v0, $v0, $v1 -/* 886AE0 80240720 90460015 */ lbu $a2, 0x15($v0) -/* 886AE4 80240724 8E250000 */ lw $a1, ($s1) -/* 886AE8 80240728 24C60001 */ addiu $a2, $a2, 1 -/* 886AEC 8024072C A0460015 */ sb $a2, 0x15($v0) -/* 886AF0 80240730 00063600 */ sll $a2, $a2, 0x18 -/* 886AF4 80240734 0C0B2026 */ jal set_variable -/* 886AF8 80240738 00063603 */ sra $a2, $a2, 0x18 -/* 886AFC 8024073C 8FBF0018 */ lw $ra, 0x18($sp) -/* 886B00 80240740 8FB10014 */ lw $s1, 0x14($sp) -/* 886B04 80240744 8FB00010 */ lw $s0, 0x10($sp) -/* 886B08 80240748 24020002 */ addiu $v0, $zero, 2 -/* 886B0C 8024074C 03E00008 */ jr $ra -/* 886B10 80240750 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s deleted file mode 100644 index f6fb405623..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AC8_886E88 -/* 886E88 80240AC8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 886E8C 80240ACC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 886E90 80240AD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886E94 80240AD4 AFBF0010 */ sw $ra, 0x10($sp) -/* 886E98 80240AD8 00021100 */ sll $v0, $v0, 4 -/* 886E9C 80240ADC 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 886EA0 80240AE0 00822021 */ addu $a0, $a0, $v0 -/* 886EA4 80240AE4 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 886EA8 80240AE8 0C0496CF */ jal set_message_string -/* 886EAC 80240AEC 0000282D */ daddu $a1, $zero, $zero -/* 886EB0 80240AF0 8FBF0010 */ lw $ra, 0x10($sp) -/* 886EB4 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 886EB8 80240AF8 03E00008 */ jr $ra -/* 886EBC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s deleted file mode 100644 index 9a733e1265..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00_886EC0 -/* 886EC0 80240B00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 886EC4 80240B04 AFB1001C */ sw $s1, 0x1c($sp) -/* 886EC8 80240B08 0080882D */ daddu $s1, $a0, $zero -/* 886ECC 80240B0C AFBF0020 */ sw $ra, 0x20($sp) -/* 886ED0 80240B10 AFB00018 */ sw $s0, 0x18($sp) -/* 886ED4 80240B14 8E30000C */ lw $s0, 0xc($s1) -/* 886ED8 80240B18 8E050000 */ lw $a1, ($s0) -/* 886EDC 80240B1C 0C0B1EAF */ jal get_variable -/* 886EE0 80240B20 26100004 */ addiu $s0, $s0, 4 -/* 886EE4 80240B24 0C04417A */ jal get_entity_by_index -/* 886EE8 80240B28 0040202D */ daddu $a0, $v0, $zero -/* 886EEC 80240B2C 8E100000 */ lw $s0, ($s0) -/* 886EF0 80240B30 C444004C */ lwc1 $f4, 0x4c($v0) -/* 886EF4 80240B34 3C014148 */ lui $at, 0x4148 -/* 886EF8 80240B38 44810000 */ mtc1 $at, $f0 -/* 886EFC 80240B3C 3C013F33 */ lui $at, 0x3f33 -/* 886F00 80240B40 34213333 */ ori $at, $at, 0x3333 -/* 886F04 80240B44 44811000 */ mtc1 $at, $f2 -/* 886F08 80240B48 AFA00014 */ sw $zero, 0x14($sp) -/* 886F0C 80240B4C 46002100 */ add.s $f4, $f4, $f0 -/* 886F10 80240B50 E7A20010 */ swc1 $f2, 0x10($sp) -/* 886F14 80240B54 8C450048 */ lw $a1, 0x48($v0) -/* 886F18 80240B58 8C470050 */ lw $a3, 0x50($v0) -/* 886F1C 80240B5C 44062000 */ mfc1 $a2, $f4 -/* 886F20 80240B60 0C01C5D4 */ jal func_80071750 -/* 886F24 80240B64 0000202D */ daddu $a0, $zero, $zero -/* 886F28 80240B68 0220202D */ daddu $a0, $s1, $zero -/* 886F2C 80240B6C 0200282D */ daddu $a1, $s0, $zero -/* 886F30 80240B70 0C0B2026 */ jal set_variable -/* 886F34 80240B74 0040302D */ daddu $a2, $v0, $zero -/* 886F38 80240B78 8FBF0020 */ lw $ra, 0x20($sp) -/* 886F3C 80240B7C 8FB1001C */ lw $s1, 0x1c($sp) -/* 886F40 80240B80 8FB00018 */ lw $s0, 0x18($sp) -/* 886F44 80240B84 24020002 */ addiu $v0, $zero, 2 -/* 886F48 80240B88 03E00008 */ jr $ra -/* 886F4C 80240B8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s deleted file mode 100644 index a0820f26e1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC4_886F84 -/* 886F84 80240BC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 886F88 80240BC8 AFBF0018 */ sw $ra, 0x18($sp) -/* 886F8C 80240BCC 8C82000C */ lw $v0, 0xc($a0) -/* 886F90 80240BD0 0C0B1EAF */ jal get_variable -/* 886F94 80240BD4 8C450000 */ lw $a1, ($v0) -/* 886F98 80240BD8 0C04417A */ jal get_entity_by_index -/* 886F9C 80240BDC 0040202D */ daddu $a0, $v0, $zero -/* 886FA0 80240BE0 3C013F80 */ lui $at, 0x3f80 -/* 886FA4 80240BE4 44810000 */ mtc1 $at, $f0 -/* 886FA8 80240BE8 C442004C */ lwc1 $f2, 0x4c($v0) -/* 886FAC 80240BEC E7A00010 */ swc1 $f0, 0x10($sp) -/* 886FB0 80240BF0 3C014148 */ lui $at, 0x4148 -/* 886FB4 80240BF4 44810000 */ mtc1 $at, $f0 -/* 886FB8 80240BF8 2403004B */ addiu $v1, $zero, 0x4b -/* 886FBC 80240BFC AFA30014 */ sw $v1, 0x14($sp) -/* 886FC0 80240C00 46001080 */ add.s $f2, $f2, $f0 -/* 886FC4 80240C04 8C450048 */ lw $a1, 0x48($v0) -/* 886FC8 80240C08 8C470050 */ lw $a3, 0x50($v0) -/* 886FCC 80240C0C 44061000 */ mfc1 $a2, $f2 -/* 886FD0 80240C10 0C01C2EC */ jal func_80070BB0 -/* 886FD4 80240C14 24040004 */ addiu $a0, $zero, 4 -/* 886FD8 80240C18 8FBF0018 */ lw $ra, 0x18($sp) -/* 886FDC 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* 886FE0 80240C20 03E00008 */ jr $ra -/* 886FE4 80240C24 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s deleted file mode 100644 index 2a6e2c0566..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C28_886FE8 -/* 886FE8 80240C28 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 886FEC 80240C2C AFBF0018 */ sw $ra, 0x18($sp) -/* 886FF0 80240C30 0C00EAD2 */ jal get_npc_safe -/* 886FF4 80240C34 2404FFFC */ addiu $a0, $zero, -4 -/* 886FF8 80240C38 C444003C */ lwc1 $f4, 0x3c($v0) -/* 886FFC 80240C3C 3C014148 */ lui $at, 0x4148 -/* 887000 80240C40 44811000 */ mtc1 $at, $f2 -/* 887004 80240C44 3C013F80 */ lui $at, 0x3f80 -/* 887008 80240C48 44810000 */ mtc1 $at, $f0 -/* 88700C 80240C4C 2403001E */ addiu $v1, $zero, 0x1e -/* 887010 80240C50 AFA30014 */ sw $v1, 0x14($sp) -/* 887014 80240C54 46022100 */ add.s $f4, $f4, $f2 -/* 887018 80240C58 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88701C 80240C5C 8C450038 */ lw $a1, 0x38($v0) -/* 887020 80240C60 8C470040 */ lw $a3, 0x40($v0) -/* 887024 80240C64 44062000 */ mfc1 $a2, $f4 -/* 887028 80240C68 0C01C2EC */ jal func_80070BB0 -/* 88702C 80240C6C 24040009 */ addiu $a0, $zero, 9 -/* 887030 80240C70 8FBF0018 */ lw $ra, 0x18($sp) -/* 887034 80240C74 24020002 */ addiu $v0, $zero, 2 -/* 887038 80240C78 03E00008 */ jr $ra -/* 88703C 80240C7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s deleted file mode 100644 index acf3c1beb5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8_887578 -/* 887578 802411B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88757C 802411BC AFB10014 */ sw $s1, 0x14($sp) -/* 887580 802411C0 0080882D */ daddu $s1, $a0, $zero -/* 887584 802411C4 AFB20018 */ sw $s2, 0x18($sp) -/* 887588 802411C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 88758C 802411CC AFB00010 */ sw $s0, 0x10($sp) -/* 887590 802411D0 8E30000C */ lw $s0, 0xc($s1) -/* 887594 802411D4 10A00010 */ beqz $a1, .L80241218 -/* 887598 802411D8 0000902D */ daddu $s2, $zero, $zero -/* 88759C 802411DC 8E050000 */ lw $a1, ($s0) -/* 8875A0 802411E0 0C0B1EAF */ jal get_variable -/* 8875A4 802411E4 26100004 */ addiu $s0, $s0, 4 -/* 8875A8 802411E8 AE220084 */ sw $v0, 0x84($s1) -/* 8875AC 802411EC 8E050000 */ lw $a1, ($s0) -/* 8875B0 802411F0 0C0B1EAF */ jal get_variable -/* 8875B4 802411F4 0220202D */ daddu $a0, $s1, $zero -/* 8875B8 802411F8 0240202D */ daddu $a0, $s2, $zero -/* 8875BC 802411FC 240500D0 */ addiu $a1, $zero, 0xd0 -/* 8875C0 80241200 00A0302D */ daddu $a2, $a1, $zero -/* 8875C4 80241204 00A0382D */ daddu $a3, $a1, $zero -/* 8875C8 80241208 AE220088 */ sw $v0, 0x88($s1) -/* 8875CC 8024120C AE200070 */ sw $zero, 0x70($s1) -/* 8875D0 80241210 0C04DF84 */ jal set_transition_stencil_color -/* 8875D4 80241214 AE200074 */ sw $zero, 0x74($s1) -.L80241218: -/* 8875D8 80241218 8E230070 */ lw $v1, 0x70($s1) -/* 8875DC 8024121C 24040001 */ addiu $a0, $zero, 1 -/* 8875E0 80241220 10640019 */ beq $v1, $a0, .L80241288 -/* 8875E4 80241224 28620002 */ slti $v0, $v1, 2 -/* 8875E8 80241228 10400005 */ beqz $v0, .L80241240 -/* 8875EC 8024122C 24020002 */ addiu $v0, $zero, 2 -/* 8875F0 80241230 10600007 */ beqz $v1, .L80241250 -/* 8875F4 80241234 240500FF */ addiu $a1, $zero, 0xff -/* 8875F8 80241238 080904B2 */ j .L802412C8 -/* 8875FC 8024123C 00000000 */ nop -.L80241240: -/* 887600 80241240 10620019 */ beq $v1, $v0, .L802412A8 -/* 887604 80241244 00000000 */ nop -/* 887608 80241248 080904B2 */ j .L802412C8 -/* 88760C 8024124C 00000000 */ nop -.L80241250: -/* 887610 80241250 8E220074 */ lw $v0, 0x74($s1) -/* 887614 80241254 14450004 */ bne $v0, $a1, .L80241268 -/* 887618 80241258 00000000 */ nop -/* 88761C 8024125C AE240070 */ sw $a0, 0x70($s1) -/* 887620 80241260 AE200078 */ sw $zero, 0x78($s1) -/* 887624 80241264 8E220074 */ lw $v0, 0x74($s1) -.L80241268: -/* 887628 80241268 8E230084 */ lw $v1, 0x84($s1) -/* 88762C 8024126C 00431021 */ addu $v0, $v0, $v1 -/* 887630 80241270 AE220074 */ sw $v0, 0x74($s1) -/* 887634 80241274 28420100 */ slti $v0, $v0, 0x100 -/* 887638 80241278 50400013 */ beql $v0, $zero, .L802412C8 -/* 88763C 8024127C AE250074 */ sw $a1, 0x74($s1) -/* 887640 80241280 080904B2 */ j .L802412C8 -/* 887644 80241284 00000000 */ nop -.L80241288: -/* 887648 80241288 8E220078 */ lw $v0, 0x78($s1) -/* 88764C 8024128C 24420001 */ addiu $v0, $v0, 1 -/* 887650 80241290 AE220078 */ sw $v0, 0x78($s1) -/* 887654 80241294 28420002 */ slti $v0, $v0, 2 -/* 887658 80241298 1440000B */ bnez $v0, .L802412C8 -/* 88765C 8024129C 24020002 */ addiu $v0, $zero, 2 -/* 887660 802412A0 080904B2 */ j .L802412C8 -/* 887664 802412A4 AE220070 */ sw $v0, 0x70($s1) -.L802412A8: -/* 887668 802412A8 8E230074 */ lw $v1, 0x74($s1) -/* 88766C 802412AC 50600001 */ beql $v1, $zero, .L802412B4 -/* 887670 802412B0 24120001 */ addiu $s2, $zero, 1 -.L802412B4: -/* 887674 802412B4 8E220088 */ lw $v0, 0x88($s1) -/* 887678 802412B8 00621023 */ subu $v0, $v1, $v0 -/* 88767C 802412BC 04410002 */ bgez $v0, .L802412C8 -/* 887680 802412C0 AE220074 */ sw $v0, 0x74($s1) -/* 887684 802412C4 AE200074 */ sw $zero, 0x74($s1) -.L802412C8: -/* 887688 802412C8 C6200074 */ lwc1 $f0, 0x74($s1) -/* 88768C 802412CC 46800020 */ cvt.s.w $f0, $f0 -/* 887690 802412D0 44050000 */ mfc1 $a1, $f0 -/* 887694 802412D4 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 887698 802412D8 24040001 */ addiu $a0, $zero, 1 -/* 88769C 802412DC 0240102D */ daddu $v0, $s2, $zero -/* 8876A0 802412E0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8876A4 802412E4 8FB20018 */ lw $s2, 0x18($sp) -/* 8876A8 802412E8 8FB10014 */ lw $s1, 0x14($sp) -/* 8876AC 802412EC 8FB00010 */ lw $s0, 0x10($sp) -/* 8876B0 802412F0 03E00008 */ jr $ra -/* 8876B4 802412F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s deleted file mode 100644 index f8a9b4951a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38_889808 -/* 889808 80240C38 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 88980C 80240C3C 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 889810 80240C40 8C430000 */ lw $v1, ($v0) -/* 889814 80240C44 2404FFBF */ addiu $a0, $zero, -0x41 -/* 889818 80240C48 00641824 */ and $v1, $v1, $a0 -/* 88981C 80240C4C AC430000 */ sw $v1, ($v0) -/* 889820 80240C50 03E00008 */ jr $ra -/* 889824 80240C54 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s deleted file mode 100644 index d0bc216970..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C84_889854 -/* 889854 80240C84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889858 80240C88 AFB00010 */ sw $s0, 0x10($sp) -/* 88985C 80240C8C 0080802D */ daddu $s0, $a0, $zero -/* 889860 80240C90 AFBF0018 */ sw $ra, 0x18($sp) -/* 889864 80240C94 AFB10014 */ sw $s1, 0x14($sp) -/* 889868 80240C98 8E11000C */ lw $s1, 0xc($s0) -/* 88986C 80240C9C 8E250000 */ lw $a1, ($s1) -/* 889870 80240CA0 0C0B1EAF */ jal get_variable -/* 889874 80240CA4 26310004 */ addiu $s1, $s1, 4 -/* 889878 80240CA8 0200202D */ daddu $a0, $s0, $zero -/* 88987C 80240CAC 3C038011 */ lui $v1, %hi(gPlayerData) -/* 889880 80240CB0 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 889884 80240CB4 000210C0 */ sll $v0, $v0, 3 -/* 889888 80240CB8 00431021 */ addu $v0, $v0, $v1 -/* 88988C 80240CBC 90460015 */ lbu $a2, 0x15($v0) -/* 889890 80240CC0 8E250000 */ lw $a1, ($s1) -/* 889894 80240CC4 24C60001 */ addiu $a2, $a2, 1 -/* 889898 80240CC8 A0460015 */ sb $a2, 0x15($v0) -/* 88989C 80240CCC 00063600 */ sll $a2, $a2, 0x18 -/* 8898A0 80240CD0 0C0B2026 */ jal set_variable -/* 8898A4 80240CD4 00063603 */ sra $a2, $a2, 0x18 -/* 8898A8 80240CD8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8898AC 80240CDC 8FB10014 */ lw $s1, 0x14($sp) -/* 8898B0 80240CE0 8FB00010 */ lw $s0, 0x10($sp) -/* 8898B4 80240CE4 24020002 */ addiu $v0, $zero, 2 -/* 8898B8 80240CE8 03E00008 */ jr $ra -/* 8898BC 80240CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s deleted file mode 100644 index 9feb25b8fe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241064_889C34 -/* 889C34 80241064 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 889C38 80241068 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 889C3C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 889C40 80241070 AFBF0010 */ sw $ra, 0x10($sp) -/* 889C44 80241074 00021100 */ sll $v0, $v0, 4 -/* 889C48 80241078 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 889C4C 8024107C 00822021 */ addu $a0, $a0, $v0 -/* 889C50 80241080 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 889C54 80241084 0C0496CF */ jal set_message_string -/* 889C58 80241088 0000282D */ daddu $a1, $zero, $zero -/* 889C5C 8024108C 8FBF0010 */ lw $ra, 0x10($sp) -/* 889C60 80241090 24020002 */ addiu $v0, $zero, 2 -/* 889C64 80241094 03E00008 */ jr $ra -/* 889C68 80241098 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s deleted file mode 100644 index 52c2ae1d55..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024109C_889C6C -/* 889C6C 8024109C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 889C70 802410A0 AFB1001C */ sw $s1, 0x1c($sp) -/* 889C74 802410A4 0080882D */ daddu $s1, $a0, $zero -/* 889C78 802410A8 AFBF0020 */ sw $ra, 0x20($sp) -/* 889C7C 802410AC AFB00018 */ sw $s0, 0x18($sp) -/* 889C80 802410B0 8E30000C */ lw $s0, 0xc($s1) -/* 889C84 802410B4 8E050000 */ lw $a1, ($s0) -/* 889C88 802410B8 0C0B1EAF */ jal get_variable -/* 889C8C 802410BC 26100004 */ addiu $s0, $s0, 4 -/* 889C90 802410C0 0C04417A */ jal get_entity_by_index -/* 889C94 802410C4 0040202D */ daddu $a0, $v0, $zero -/* 889C98 802410C8 8E100000 */ lw $s0, ($s0) -/* 889C9C 802410CC C444004C */ lwc1 $f4, 0x4c($v0) -/* 889CA0 802410D0 3C014148 */ lui $at, 0x4148 -/* 889CA4 802410D4 44810000 */ mtc1 $at, $f0 -/* 889CA8 802410D8 3C013F33 */ lui $at, 0x3f33 -/* 889CAC 802410DC 34213333 */ ori $at, $at, 0x3333 -/* 889CB0 802410E0 44811000 */ mtc1 $at, $f2 -/* 889CB4 802410E4 AFA00014 */ sw $zero, 0x14($sp) -/* 889CB8 802410E8 46002100 */ add.s $f4, $f4, $f0 -/* 889CBC 802410EC E7A20010 */ swc1 $f2, 0x10($sp) -/* 889CC0 802410F0 8C450048 */ lw $a1, 0x48($v0) -/* 889CC4 802410F4 8C470050 */ lw $a3, 0x50($v0) -/* 889CC8 802410F8 44062000 */ mfc1 $a2, $f4 -/* 889CCC 802410FC 0C01C5D4 */ jal func_80071750 -/* 889CD0 80241100 0000202D */ daddu $a0, $zero, $zero -/* 889CD4 80241104 0220202D */ daddu $a0, $s1, $zero -/* 889CD8 80241108 0200282D */ daddu $a1, $s0, $zero -/* 889CDC 8024110C 0C0B2026 */ jal set_variable -/* 889CE0 80241110 0040302D */ daddu $a2, $v0, $zero -/* 889CE4 80241114 8FBF0020 */ lw $ra, 0x20($sp) -/* 889CE8 80241118 8FB1001C */ lw $s1, 0x1c($sp) -/* 889CEC 8024111C 8FB00018 */ lw $s0, 0x18($sp) -/* 889CF0 80241120 24020002 */ addiu $v0, $zero, 2 -/* 889CF4 80241124 03E00008 */ jr $ra -/* 889CF8 80241128 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s deleted file mode 100644 index f23465fd07..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241160_889D30 -/* 889D30 80241160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889D34 80241164 AFBF0018 */ sw $ra, 0x18($sp) -/* 889D38 80241168 8C82000C */ lw $v0, 0xc($a0) -/* 889D3C 8024116C 0C0B1EAF */ jal get_variable -/* 889D40 80241170 8C450000 */ lw $a1, ($v0) -/* 889D44 80241174 0C04417A */ jal get_entity_by_index -/* 889D48 80241178 0040202D */ daddu $a0, $v0, $zero -/* 889D4C 8024117C 3C013F80 */ lui $at, 0x3f80 -/* 889D50 80241180 44810000 */ mtc1 $at, $f0 -/* 889D54 80241184 C442004C */ lwc1 $f2, 0x4c($v0) -/* 889D58 80241188 E7A00010 */ swc1 $f0, 0x10($sp) -/* 889D5C 8024118C 3C014148 */ lui $at, 0x4148 -/* 889D60 80241190 44810000 */ mtc1 $at, $f0 -/* 889D64 80241194 2403004B */ addiu $v1, $zero, 0x4b -/* 889D68 80241198 AFA30014 */ sw $v1, 0x14($sp) -/* 889D6C 8024119C 46001080 */ add.s $f2, $f2, $f0 -/* 889D70 802411A0 8C450048 */ lw $a1, 0x48($v0) -/* 889D74 802411A4 8C470050 */ lw $a3, 0x50($v0) -/* 889D78 802411A8 44061000 */ mfc1 $a2, $f2 -/* 889D7C 802411AC 0C01C2EC */ jal func_80070BB0 -/* 889D80 802411B0 24040004 */ addiu $a0, $zero, 4 -/* 889D84 802411B4 8FBF0018 */ lw $ra, 0x18($sp) -/* 889D88 802411B8 24020002 */ addiu $v0, $zero, 2 -/* 889D8C 802411BC 03E00008 */ jr $ra -/* 889D90 802411C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s deleted file mode 100644 index fed4111d12..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411C4_889D94 -/* 889D94 802411C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889D98 802411C8 AFBF0018 */ sw $ra, 0x18($sp) -/* 889D9C 802411CC 0C00EAD2 */ jal get_npc_safe -/* 889DA0 802411D0 2404FFFC */ addiu $a0, $zero, -4 -/* 889DA4 802411D4 C444003C */ lwc1 $f4, 0x3c($v0) -/* 889DA8 802411D8 3C014148 */ lui $at, 0x4148 -/* 889DAC 802411DC 44811000 */ mtc1 $at, $f2 -/* 889DB0 802411E0 3C013F80 */ lui $at, 0x3f80 -/* 889DB4 802411E4 44810000 */ mtc1 $at, $f0 -/* 889DB8 802411E8 2403001E */ addiu $v1, $zero, 0x1e -/* 889DBC 802411EC AFA30014 */ sw $v1, 0x14($sp) -/* 889DC0 802411F0 46022100 */ add.s $f4, $f4, $f2 -/* 889DC4 802411F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 889DC8 802411F8 8C450038 */ lw $a1, 0x38($v0) -/* 889DCC 802411FC 8C470040 */ lw $a3, 0x40($v0) -/* 889DD0 80241200 44062000 */ mfc1 $a2, $f4 -/* 889DD4 80241204 0C01C2EC */ jal func_80070BB0 -/* 889DD8 80241208 24040009 */ addiu $a0, $zero, 9 -/* 889DDC 8024120C 8FBF0018 */ lw $ra, 0x18($sp) -/* 889DE0 80241210 24020002 */ addiu $v0, $zero, 2 -/* 889DE4 80241214 03E00008 */ jr $ra -/* 889DE8 80241218 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s deleted file mode 100644 index d12c8e949f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241754_88A324 -/* 88A324 80241754 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A328 80241758 AFB10014 */ sw $s1, 0x14($sp) -/* 88A32C 8024175C 0080882D */ daddu $s1, $a0, $zero -/* 88A330 80241760 AFB20018 */ sw $s2, 0x18($sp) -/* 88A334 80241764 AFBF001C */ sw $ra, 0x1c($sp) -/* 88A338 80241768 AFB00010 */ sw $s0, 0x10($sp) -/* 88A33C 8024176C 8E30000C */ lw $s0, 0xc($s1) -/* 88A340 80241770 10A00010 */ beqz $a1, .L802417B4 -/* 88A344 80241774 0000902D */ daddu $s2, $zero, $zero -/* 88A348 80241778 8E050000 */ lw $a1, ($s0) -/* 88A34C 8024177C 0C0B1EAF */ jal get_variable -/* 88A350 80241780 26100004 */ addiu $s0, $s0, 4 -/* 88A354 80241784 AE220084 */ sw $v0, 0x84($s1) -/* 88A358 80241788 8E050000 */ lw $a1, ($s0) -/* 88A35C 8024178C 0C0B1EAF */ jal get_variable -/* 88A360 80241790 0220202D */ daddu $a0, $s1, $zero -/* 88A364 80241794 0240202D */ daddu $a0, $s2, $zero -/* 88A368 80241798 240500D0 */ addiu $a1, $zero, 0xd0 -/* 88A36C 8024179C 00A0302D */ daddu $a2, $a1, $zero -/* 88A370 802417A0 00A0382D */ daddu $a3, $a1, $zero -/* 88A374 802417A4 AE220088 */ sw $v0, 0x88($s1) -/* 88A378 802417A8 AE200070 */ sw $zero, 0x70($s1) -/* 88A37C 802417AC 0C04DF84 */ jal set_transition_stencil_color -/* 88A380 802417B0 AE200074 */ sw $zero, 0x74($s1) -.L802417B4: -/* 88A384 802417B4 8E230070 */ lw $v1, 0x70($s1) -/* 88A388 802417B8 24040001 */ addiu $a0, $zero, 1 -/* 88A38C 802417BC 10640019 */ beq $v1, $a0, .L80241824 -/* 88A390 802417C0 28620002 */ slti $v0, $v1, 2 -/* 88A394 802417C4 10400005 */ beqz $v0, .L802417DC -/* 88A398 802417C8 24020002 */ addiu $v0, $zero, 2 -/* 88A39C 802417CC 10600007 */ beqz $v1, .L802417EC -/* 88A3A0 802417D0 240500FF */ addiu $a1, $zero, 0xff -/* 88A3A4 802417D4 08090619 */ j .L80241864 -/* 88A3A8 802417D8 00000000 */ nop -.L802417DC: -/* 88A3AC 802417DC 10620019 */ beq $v1, $v0, .L80241844 -/* 88A3B0 802417E0 00000000 */ nop -/* 88A3B4 802417E4 08090619 */ j .L80241864 -/* 88A3B8 802417E8 00000000 */ nop -.L802417EC: -/* 88A3BC 802417EC 8E220074 */ lw $v0, 0x74($s1) -/* 88A3C0 802417F0 14450004 */ bne $v0, $a1, .L80241804 -/* 88A3C4 802417F4 00000000 */ nop -/* 88A3C8 802417F8 AE240070 */ sw $a0, 0x70($s1) -/* 88A3CC 802417FC AE200078 */ sw $zero, 0x78($s1) -/* 88A3D0 80241800 8E220074 */ lw $v0, 0x74($s1) -.L80241804: -/* 88A3D4 80241804 8E230084 */ lw $v1, 0x84($s1) -/* 88A3D8 80241808 00431021 */ addu $v0, $v0, $v1 -/* 88A3DC 8024180C AE220074 */ sw $v0, 0x74($s1) -/* 88A3E0 80241810 28420100 */ slti $v0, $v0, 0x100 -/* 88A3E4 80241814 50400013 */ beql $v0, $zero, .L80241864 -/* 88A3E8 80241818 AE250074 */ sw $a1, 0x74($s1) -/* 88A3EC 8024181C 08090619 */ j .L80241864 -/* 88A3F0 80241820 00000000 */ nop -.L80241824: -/* 88A3F4 80241824 8E220078 */ lw $v0, 0x78($s1) -/* 88A3F8 80241828 24420001 */ addiu $v0, $v0, 1 -/* 88A3FC 8024182C AE220078 */ sw $v0, 0x78($s1) -/* 88A400 80241830 28420002 */ slti $v0, $v0, 2 -/* 88A404 80241834 1440000B */ bnez $v0, .L80241864 -/* 88A408 80241838 24020002 */ addiu $v0, $zero, 2 -/* 88A40C 8024183C 08090619 */ j .L80241864 -/* 88A410 80241840 AE220070 */ sw $v0, 0x70($s1) -.L80241844: -/* 88A414 80241844 8E230074 */ lw $v1, 0x74($s1) -/* 88A418 80241848 50600001 */ beql $v1, $zero, .L80241850 -/* 88A41C 8024184C 24120001 */ addiu $s2, $zero, 1 -.L80241850: -/* 88A420 80241850 8E220088 */ lw $v0, 0x88($s1) -/* 88A424 80241854 00621023 */ subu $v0, $v1, $v0 -/* 88A428 80241858 04410002 */ bgez $v0, .L80241864 -/* 88A42C 8024185C AE220074 */ sw $v0, 0x74($s1) -/* 88A430 80241860 AE200074 */ sw $zero, 0x74($s1) -.L80241864: -/* 88A434 80241864 C6200074 */ lwc1 $f0, 0x74($s1) -/* 88A438 80241868 46800020 */ cvt.s.w $f0, $f0 -/* 88A43C 8024186C 44050000 */ mfc1 $a1, $f0 -/* 88A440 80241870 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 88A444 80241874 24040001 */ addiu $a0, $zero, 1 -/* 88A448 80241878 0240102D */ daddu $v0, $s2, $zero -/* 88A44C 8024187C 8FBF001C */ lw $ra, 0x1c($sp) -/* 88A450 80241880 8FB20018 */ lw $s2, 0x18($sp) -/* 88A454 80241884 8FB10014 */ lw $s1, 0x14($sp) -/* 88A458 80241888 8FB00010 */ lw $s0, 0x10($sp) -/* 88A45C 8024188C 03E00008 */ jr $ra -/* 88A460 80241890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s deleted file mode 100644 index 13161a2cff..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C_892A6C -/* 892A6C 8024004C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 892A70 80240050 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 892A74 80240054 8C430000 */ lw $v1, ($v0) -/* 892A78 80240058 2404FFBF */ addiu $a0, $zero, -0x41 -/* 892A7C 8024005C 00641824 */ and $v1, $v1, $a0 -/* 892A80 80240060 AC430000 */ sw $v1, ($v0) -/* 892A84 80240064 03E00008 */ jr $ra -/* 892A88 80240068 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s deleted file mode 100644 index 71954aa10d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240098_892AB8 -/* 892AB8 80240098 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 892ABC 8024009C AFB00010 */ sw $s0, 0x10($sp) -/* 892AC0 802400A0 0080802D */ daddu $s0, $a0, $zero -/* 892AC4 802400A4 AFBF0018 */ sw $ra, 0x18($sp) -/* 892AC8 802400A8 AFB10014 */ sw $s1, 0x14($sp) -/* 892ACC 802400AC 8E11000C */ lw $s1, 0xc($s0) -/* 892AD0 802400B0 8E250000 */ lw $a1, ($s1) -/* 892AD4 802400B4 0C0B1EAF */ jal get_variable -/* 892AD8 802400B8 26310004 */ addiu $s1, $s1, 4 -/* 892ADC 802400BC 0200202D */ daddu $a0, $s0, $zero -/* 892AE0 802400C0 3C038011 */ lui $v1, %hi(gPlayerData) -/* 892AE4 802400C4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 892AE8 802400C8 000210C0 */ sll $v0, $v0, 3 -/* 892AEC 802400CC 00431021 */ addu $v0, $v0, $v1 -/* 892AF0 802400D0 90460015 */ lbu $a2, 0x15($v0) -/* 892AF4 802400D4 8E250000 */ lw $a1, ($s1) -/* 892AF8 802400D8 24C60001 */ addiu $a2, $a2, 1 -/* 892AFC 802400DC A0460015 */ sb $a2, 0x15($v0) -/* 892B00 802400E0 00063600 */ sll $a2, $a2, 0x18 -/* 892B04 802400E4 0C0B2026 */ jal set_variable -/* 892B08 802400E8 00063603 */ sra $a2, $a2, 0x18 -/* 892B0C 802400EC 8FBF0018 */ lw $ra, 0x18($sp) -/* 892B10 802400F0 8FB10014 */ lw $s1, 0x14($sp) -/* 892B14 802400F4 8FB00010 */ lw $s0, 0x10($sp) -/* 892B18 802400F8 24020002 */ addiu $v0, $zero, 2 -/* 892B1C 802400FC 03E00008 */ jr $ra -/* 892B20 80240100 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s deleted file mode 100644 index 1702a4ae75..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478_892E98 -/* 892E98 80240478 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 892E9C 8024047C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 892EA0 80240480 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892EA4 80240484 AFBF0010 */ sw $ra, 0x10($sp) -/* 892EA8 80240488 00021100 */ sll $v0, $v0, 4 -/* 892EAC 8024048C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 892EB0 80240490 00822021 */ addu $a0, $a0, $v0 -/* 892EB4 80240494 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 892EB8 80240498 0C0496CF */ jal set_message_string -/* 892EBC 8024049C 0000282D */ daddu $a1, $zero, $zero -/* 892EC0 802404A0 8FBF0010 */ lw $ra, 0x10($sp) -/* 892EC4 802404A4 24020002 */ addiu $v0, $zero, 2 -/* 892EC8 802404A8 03E00008 */ jr $ra -/* 892ECC 802404AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802404B0_892ED0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802404B0_892ED0.s deleted file mode 100644 index 7fed013fb0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802404B0_892ED0.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_892ED0 -/* 892ED0 802404B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 892ED4 802404B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 892ED8 802404B8 0080882D */ daddu $s1, $a0, $zero -/* 892EDC 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* 892EE0 802404C0 AFB00018 */ sw $s0, 0x18($sp) -/* 892EE4 802404C4 8E30000C */ lw $s0, 0xc($s1) -/* 892EE8 802404C8 8E050000 */ lw $a1, ($s0) -/* 892EEC 802404CC 0C0B1EAF */ jal get_variable -/* 892EF0 802404D0 26100004 */ addiu $s0, $s0, 4 -/* 892EF4 802404D4 0C04417A */ jal get_entity_by_index -/* 892EF8 802404D8 0040202D */ daddu $a0, $v0, $zero -/* 892EFC 802404DC 8E100000 */ lw $s0, ($s0) -/* 892F00 802404E0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 892F04 802404E4 3C014148 */ lui $at, 0x4148 -/* 892F08 802404E8 44810000 */ mtc1 $at, $f0 -/* 892F0C 802404EC 3C013F33 */ lui $at, 0x3f33 -/* 892F10 802404F0 34213333 */ ori $at, $at, 0x3333 -/* 892F14 802404F4 44811000 */ mtc1 $at, $f2 -/* 892F18 802404F8 AFA00014 */ sw $zero, 0x14($sp) -/* 892F1C 802404FC 46002100 */ add.s $f4, $f4, $f0 -/* 892F20 80240500 E7A20010 */ swc1 $f2, 0x10($sp) -/* 892F24 80240504 8C450048 */ lw $a1, 0x48($v0) -/* 892F28 80240508 8C470050 */ lw $a3, 0x50($v0) -/* 892F2C 8024050C 44062000 */ mfc1 $a2, $f4 -/* 892F30 80240510 0C01C5D4 */ jal func_80071750 -/* 892F34 80240514 0000202D */ daddu $a0, $zero, $zero -/* 892F38 80240518 0220202D */ daddu $a0, $s1, $zero -/* 892F3C 8024051C 0200282D */ daddu $a1, $s0, $zero -/* 892F40 80240520 0C0B2026 */ jal set_variable -/* 892F44 80240524 0040302D */ daddu $a2, $v0, $zero -/* 892F48 80240528 8FBF0020 */ lw $ra, 0x20($sp) -/* 892F4C 8024052C 8FB1001C */ lw $s1, 0x1c($sp) -/* 892F50 80240530 8FB00018 */ lw $s0, 0x18($sp) -/* 892F54 80240534 24020002 */ addiu $v0, $zero, 2 -/* 892F58 80240538 03E00008 */ jr $ra -/* 892F5C 8024053C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s deleted file mode 100644 index 5958ac7b27..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240574_892F94 -/* 892F94 80240574 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 892F98 80240578 AFBF0018 */ sw $ra, 0x18($sp) -/* 892F9C 8024057C 8C82000C */ lw $v0, 0xc($a0) -/* 892FA0 80240580 0C0B1EAF */ jal get_variable -/* 892FA4 80240584 8C450000 */ lw $a1, ($v0) -/* 892FA8 80240588 0C04417A */ jal get_entity_by_index -/* 892FAC 8024058C 0040202D */ daddu $a0, $v0, $zero -/* 892FB0 80240590 3C013F80 */ lui $at, 0x3f80 -/* 892FB4 80240594 44810000 */ mtc1 $at, $f0 -/* 892FB8 80240598 C442004C */ lwc1 $f2, 0x4c($v0) -/* 892FBC 8024059C E7A00010 */ swc1 $f0, 0x10($sp) -/* 892FC0 802405A0 3C014148 */ lui $at, 0x4148 -/* 892FC4 802405A4 44810000 */ mtc1 $at, $f0 -/* 892FC8 802405A8 2403004B */ addiu $v1, $zero, 0x4b -/* 892FCC 802405AC AFA30014 */ sw $v1, 0x14($sp) -/* 892FD0 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 892FD4 802405B4 8C450048 */ lw $a1, 0x48($v0) -/* 892FD8 802405B8 8C470050 */ lw $a3, 0x50($v0) -/* 892FDC 802405BC 44061000 */ mfc1 $a2, $f2 -/* 892FE0 802405C0 0C01C2EC */ jal func_80070BB0 -/* 892FE4 802405C4 24040004 */ addiu $a0, $zero, 4 -/* 892FE8 802405C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 892FEC 802405CC 24020002 */ addiu $v0, $zero, 2 -/* 892FF0 802405D0 03E00008 */ jr $ra -/* 892FF4 802405D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s deleted file mode 100644 index 92df541dcd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D8_892FF8 -/* 892FF8 802405D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 892FFC 802405DC AFBF0018 */ sw $ra, 0x18($sp) -/* 893000 802405E0 0C00EAD2 */ jal get_npc_safe -/* 893004 802405E4 2404FFFC */ addiu $a0, $zero, -4 -/* 893008 802405E8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 89300C 802405EC 3C014148 */ lui $at, 0x4148 -/* 893010 802405F0 44811000 */ mtc1 $at, $f2 -/* 893014 802405F4 3C013F80 */ lui $at, 0x3f80 -/* 893018 802405F8 44810000 */ mtc1 $at, $f0 -/* 89301C 802405FC 2403001E */ addiu $v1, $zero, 0x1e -/* 893020 80240600 AFA30014 */ sw $v1, 0x14($sp) -/* 893024 80240604 46022100 */ add.s $f4, $f4, $f2 -/* 893028 80240608 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89302C 8024060C 8C450038 */ lw $a1, 0x38($v0) -/* 893030 80240610 8C470040 */ lw $a3, 0x40($v0) -/* 893034 80240614 44062000 */ mfc1 $a2, $f4 -/* 893038 80240618 0C01C2EC */ jal func_80070BB0 -/* 89303C 8024061C 24040009 */ addiu $a0, $zero, 9 -/* 893040 80240620 8FBF0018 */ lw $ra, 0x18($sp) -/* 893044 80240624 24020002 */ addiu $v0, $zero, 2 -/* 893048 80240628 03E00008 */ jr $ra -/* 89304C 8024062C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s deleted file mode 100644 index df04045040..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B68_893588 -/* 893588 80240B68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89358C 80240B6C AFB10014 */ sw $s1, 0x14($sp) -/* 893590 80240B70 0080882D */ daddu $s1, $a0, $zero -/* 893594 80240B74 AFB20018 */ sw $s2, 0x18($sp) -/* 893598 80240B78 AFBF001C */ sw $ra, 0x1c($sp) -/* 89359C 80240B7C AFB00010 */ sw $s0, 0x10($sp) -/* 8935A0 80240B80 8E30000C */ lw $s0, 0xc($s1) -/* 8935A4 80240B84 10A00010 */ beqz $a1, .L80240BC8 -/* 8935A8 80240B88 0000902D */ daddu $s2, $zero, $zero -/* 8935AC 80240B8C 8E050000 */ lw $a1, ($s0) -/* 8935B0 80240B90 0C0B1EAF */ jal get_variable -/* 8935B4 80240B94 26100004 */ addiu $s0, $s0, 4 -/* 8935B8 80240B98 AE220084 */ sw $v0, 0x84($s1) -/* 8935BC 80240B9C 8E050000 */ lw $a1, ($s0) -/* 8935C0 80240BA0 0C0B1EAF */ jal get_variable -/* 8935C4 80240BA4 0220202D */ daddu $a0, $s1, $zero -/* 8935C8 80240BA8 0240202D */ daddu $a0, $s2, $zero -/* 8935CC 80240BAC 240500D0 */ addiu $a1, $zero, 0xd0 -/* 8935D0 80240BB0 00A0302D */ daddu $a2, $a1, $zero -/* 8935D4 80240BB4 00A0382D */ daddu $a3, $a1, $zero -/* 8935D8 80240BB8 AE220088 */ sw $v0, 0x88($s1) -/* 8935DC 80240BBC AE200070 */ sw $zero, 0x70($s1) -/* 8935E0 80240BC0 0C04DF84 */ jal set_transition_stencil_color -/* 8935E4 80240BC4 AE200074 */ sw $zero, 0x74($s1) -.L80240BC8: -/* 8935E8 80240BC8 8E230070 */ lw $v1, 0x70($s1) -/* 8935EC 80240BCC 24040001 */ addiu $a0, $zero, 1 -/* 8935F0 80240BD0 10640019 */ beq $v1, $a0, .L80240C38 -/* 8935F4 80240BD4 28620002 */ slti $v0, $v1, 2 -/* 8935F8 80240BD8 10400005 */ beqz $v0, .L80240BF0 -/* 8935FC 80240BDC 24020002 */ addiu $v0, $zero, 2 -/* 893600 80240BE0 10600007 */ beqz $v1, .L80240C00 -/* 893604 80240BE4 240500FF */ addiu $a1, $zero, 0xff -/* 893608 80240BE8 0809031E */ j .L80240C78 -/* 89360C 80240BEC 00000000 */ nop -.L80240BF0: -/* 893610 80240BF0 10620019 */ beq $v1, $v0, .L80240C58 -/* 893614 80240BF4 00000000 */ nop -/* 893618 80240BF8 0809031E */ j .L80240C78 -/* 89361C 80240BFC 00000000 */ nop -.L80240C00: -/* 893620 80240C00 8E220074 */ lw $v0, 0x74($s1) -/* 893624 80240C04 14450004 */ bne $v0, $a1, .L80240C18 -/* 893628 80240C08 00000000 */ nop -/* 89362C 80240C0C AE240070 */ sw $a0, 0x70($s1) -/* 893630 80240C10 AE200078 */ sw $zero, 0x78($s1) -/* 893634 80240C14 8E220074 */ lw $v0, 0x74($s1) -.L80240C18: -/* 893638 80240C18 8E230084 */ lw $v1, 0x84($s1) -/* 89363C 80240C1C 00431021 */ addu $v0, $v0, $v1 -/* 893640 80240C20 AE220074 */ sw $v0, 0x74($s1) -/* 893644 80240C24 28420100 */ slti $v0, $v0, 0x100 -/* 893648 80240C28 50400013 */ beql $v0, $zero, .L80240C78 -/* 89364C 80240C2C AE250074 */ sw $a1, 0x74($s1) -/* 893650 80240C30 0809031E */ j .L80240C78 -/* 893654 80240C34 00000000 */ nop -.L80240C38: -/* 893658 80240C38 8E220078 */ lw $v0, 0x78($s1) -/* 89365C 80240C3C 24420001 */ addiu $v0, $v0, 1 -/* 893660 80240C40 AE220078 */ sw $v0, 0x78($s1) -/* 893664 80240C44 28420002 */ slti $v0, $v0, 2 -/* 893668 80240C48 1440000B */ bnez $v0, .L80240C78 -/* 89366C 80240C4C 24020002 */ addiu $v0, $zero, 2 -/* 893670 80240C50 0809031E */ j .L80240C78 -/* 893674 80240C54 AE220070 */ sw $v0, 0x70($s1) -.L80240C58: -/* 893678 80240C58 8E230074 */ lw $v1, 0x74($s1) -/* 89367C 80240C5C 50600001 */ beql $v1, $zero, .L80240C64 -/* 893680 80240C60 24120001 */ addiu $s2, $zero, 1 -.L80240C64: -/* 893684 80240C64 8E220088 */ lw $v0, 0x88($s1) -/* 893688 80240C68 00621023 */ subu $v0, $v1, $v0 -/* 89368C 80240C6C 04410002 */ bgez $v0, .L80240C78 -/* 893690 80240C70 AE220074 */ sw $v0, 0x74($s1) -/* 893694 80240C74 AE200074 */ sw $zero, 0x74($s1) -.L80240C78: -/* 893698 80240C78 C6200074 */ lwc1 $f0, 0x74($s1) -/* 89369C 80240C7C 46800020 */ cvt.s.w $f0, $f0 -/* 8936A0 80240C80 44050000 */ mfc1 $a1, $f0 -/* 8936A4 80240C84 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 8936A8 80240C88 24040001 */ addiu $a0, $zero, 1 -/* 8936AC 80240C8C 0240102D */ daddu $v0, $s2, $zero -/* 8936B0 80240C90 8FBF001C */ lw $ra, 0x1c($sp) -/* 8936B4 80240C94 8FB20018 */ lw $s2, 0x18($sp) -/* 8936B8 80240C98 8FB10014 */ lw $s1, 0x14($sp) -/* 8936BC 80240C9C 8FB00010 */ lw $s0, 0x10($sp) -/* 8936C0 80240CA0 03E00008 */ jr $ra -/* 8936C4 80240CA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s deleted file mode 100644 index 67dbc226d4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C_897BEC -/* 897BEC 8024060C 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 897BF0 80240610 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 897BF4 80240614 8C430000 */ lw $v1, ($v0) -/* 897BF8 80240618 2404FFBF */ addiu $a0, $zero, -0x41 -/* 897BFC 8024061C 00641824 */ and $v1, $v1, $a0 -/* 897C00 80240620 AC430000 */ sw $v1, ($v0) -/* 897C04 80240624 03E00008 */ jr $ra -/* 897C08 80240628 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240658_897C38.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240658_897C38.s deleted file mode 100644 index 3f36040e96..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240658_897C38.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240658_897C38 -/* 897C38 80240658 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 897C3C 8024065C AFB00010 */ sw $s0, 0x10($sp) -/* 897C40 80240660 0080802D */ daddu $s0, $a0, $zero -/* 897C44 80240664 AFBF0018 */ sw $ra, 0x18($sp) -/* 897C48 80240668 AFB10014 */ sw $s1, 0x14($sp) -/* 897C4C 8024066C 8E11000C */ lw $s1, 0xc($s0) -/* 897C50 80240670 8E250000 */ lw $a1, ($s1) -/* 897C54 80240674 0C0B1EAF */ jal get_variable -/* 897C58 80240678 26310004 */ addiu $s1, $s1, 4 -/* 897C5C 8024067C 0200202D */ daddu $a0, $s0, $zero -/* 897C60 80240680 3C038011 */ lui $v1, %hi(gPlayerData) -/* 897C64 80240684 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 897C68 80240688 000210C0 */ sll $v0, $v0, 3 -/* 897C6C 8024068C 00431021 */ addu $v0, $v0, $v1 -/* 897C70 80240690 90460015 */ lbu $a2, 0x15($v0) -/* 897C74 80240694 8E250000 */ lw $a1, ($s1) -/* 897C78 80240698 24C60001 */ addiu $a2, $a2, 1 -/* 897C7C 8024069C A0460015 */ sb $a2, 0x15($v0) -/* 897C80 802406A0 00063600 */ sll $a2, $a2, 0x18 -/* 897C84 802406A4 0C0B2026 */ jal set_variable -/* 897C88 802406A8 00063603 */ sra $a2, $a2, 0x18 -/* 897C8C 802406AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 897C90 802406B0 8FB10014 */ lw $s1, 0x14($sp) -/* 897C94 802406B4 8FB00010 */ lw $s0, 0x10($sp) -/* 897C98 802406B8 24020002 */ addiu $v0, $zero, 2 -/* 897C9C 802406BC 03E00008 */ jr $ra -/* 897CA0 802406C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s deleted file mode 100644 index 200dcd223a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A38_898018 -/* 898018 80240A38 3C028011 */ lui $v0, %hi(gPlayerData+0x12) -/* 89801C 80240A3C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) -/* 898020 80240A40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 898024 80240A44 AFBF0010 */ sw $ra, 0x10($sp) -/* 898028 80240A48 00021100 */ sll $v0, $v0, 4 -/* 89802C 80240A4C 3C048009 */ lui $a0, %hi(D_8008EF20) -/* 898030 80240A50 00822021 */ addu $a0, $a0, $v0 -/* 898034 80240A54 8C84EF20 */ lw $a0, %lo(D_8008EF20)($a0) -/* 898038 80240A58 0C0496CF */ jal set_message_string -/* 89803C 80240A5C 0000282D */ daddu $a1, $zero, $zero -/* 898040 80240A60 8FBF0010 */ lw $ra, 0x10($sp) -/* 898044 80240A64 24020002 */ addiu $v0, $zero, 2 -/* 898048 80240A68 03E00008 */ jr $ra -/* 89804C 80240A6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s deleted file mode 100644 index bd083477dd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A70_898050 -/* 898050 80240A70 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 898054 80240A74 AFB1001C */ sw $s1, 0x1c($sp) -/* 898058 80240A78 0080882D */ daddu $s1, $a0, $zero -/* 89805C 80240A7C AFBF0020 */ sw $ra, 0x20($sp) -/* 898060 80240A80 AFB00018 */ sw $s0, 0x18($sp) -/* 898064 80240A84 8E30000C */ lw $s0, 0xc($s1) -/* 898068 80240A88 8E050000 */ lw $a1, ($s0) -/* 89806C 80240A8C 0C0B1EAF */ jal get_variable -/* 898070 80240A90 26100004 */ addiu $s0, $s0, 4 -/* 898074 80240A94 0C04417A */ jal get_entity_by_index -/* 898078 80240A98 0040202D */ daddu $a0, $v0, $zero -/* 89807C 80240A9C 8E100000 */ lw $s0, ($s0) -/* 898080 80240AA0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 898084 80240AA4 3C014148 */ lui $at, 0x4148 -/* 898088 80240AA8 44810000 */ mtc1 $at, $f0 -/* 89808C 80240AAC 3C013F33 */ lui $at, 0x3f33 -/* 898090 80240AB0 34213333 */ ori $at, $at, 0x3333 -/* 898094 80240AB4 44811000 */ mtc1 $at, $f2 -/* 898098 80240AB8 AFA00014 */ sw $zero, 0x14($sp) -/* 89809C 80240ABC 46002100 */ add.s $f4, $f4, $f0 -/* 8980A0 80240AC0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 8980A4 80240AC4 8C450048 */ lw $a1, 0x48($v0) -/* 8980A8 80240AC8 8C470050 */ lw $a3, 0x50($v0) -/* 8980AC 80240ACC 44062000 */ mfc1 $a2, $f4 -/* 8980B0 80240AD0 0C01C5D4 */ jal func_80071750 -/* 8980B4 80240AD4 0000202D */ daddu $a0, $zero, $zero -/* 8980B8 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* 8980BC 80240ADC 0200282D */ daddu $a1, $s0, $zero -/* 8980C0 80240AE0 0C0B2026 */ jal set_variable -/* 8980C4 80240AE4 0040302D */ daddu $a2, $v0, $zero -/* 8980C8 80240AE8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8980CC 80240AEC 8FB1001C */ lw $s1, 0x1c($sp) -/* 8980D0 80240AF0 8FB00018 */ lw $s0, 0x18($sp) -/* 8980D4 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 8980D8 80240AF8 03E00008 */ jr $ra -/* 8980DC 80240AFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s deleted file mode 100644 index 2a8214a1c5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B34_898114 -/* 898114 80240B34 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 898118 80240B38 AFBF0018 */ sw $ra, 0x18($sp) -/* 89811C 80240B3C 8C82000C */ lw $v0, 0xc($a0) -/* 898120 80240B40 0C0B1EAF */ jal get_variable -/* 898124 80240B44 8C450000 */ lw $a1, ($v0) -/* 898128 80240B48 0C04417A */ jal get_entity_by_index -/* 89812C 80240B4C 0040202D */ daddu $a0, $v0, $zero -/* 898130 80240B50 3C013F80 */ lui $at, 0x3f80 -/* 898134 80240B54 44810000 */ mtc1 $at, $f0 -/* 898138 80240B58 C442004C */ lwc1 $f2, 0x4c($v0) -/* 89813C 80240B5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 898140 80240B60 3C014148 */ lui $at, 0x4148 -/* 898144 80240B64 44810000 */ mtc1 $at, $f0 -/* 898148 80240B68 2403004B */ addiu $v1, $zero, 0x4b -/* 89814C 80240B6C AFA30014 */ sw $v1, 0x14($sp) -/* 898150 80240B70 46001080 */ add.s $f2, $f2, $f0 -/* 898154 80240B74 8C450048 */ lw $a1, 0x48($v0) -/* 898158 80240B78 8C470050 */ lw $a3, 0x50($v0) -/* 89815C 80240B7C 44061000 */ mfc1 $a2, $f2 -/* 898160 80240B80 0C01C2EC */ jal func_80070BB0 -/* 898164 80240B84 24040004 */ addiu $a0, $zero, 4 -/* 898168 80240B88 8FBF0018 */ lw $ra, 0x18($sp) -/* 89816C 80240B8C 24020002 */ addiu $v0, $zero, 2 -/* 898170 80240B90 03E00008 */ jr $ra -/* 898174 80240B94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s deleted file mode 100644 index 13b5495cba..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B98_898178 -/* 898178 80240B98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89817C 80240B9C AFBF0018 */ sw $ra, 0x18($sp) -/* 898180 80240BA0 0C00EAD2 */ jal get_npc_safe -/* 898184 80240BA4 2404FFFC */ addiu $a0, $zero, -4 -/* 898188 80240BA8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 89818C 80240BAC 3C014148 */ lui $at, 0x4148 -/* 898190 80240BB0 44811000 */ mtc1 $at, $f2 -/* 898194 80240BB4 3C013F80 */ lui $at, 0x3f80 -/* 898198 80240BB8 44810000 */ mtc1 $at, $f0 -/* 89819C 80240BBC 2403001E */ addiu $v1, $zero, 0x1e -/* 8981A0 80240BC0 AFA30014 */ sw $v1, 0x14($sp) -/* 8981A4 80240BC4 46022100 */ add.s $f4, $f4, $f2 -/* 8981A8 80240BC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8981AC 80240BCC 8C450038 */ lw $a1, 0x38($v0) -/* 8981B0 80240BD0 8C470040 */ lw $a3, 0x40($v0) -/* 8981B4 80240BD4 44062000 */ mfc1 $a2, $f4 -/* 8981B8 80240BD8 0C01C2EC */ jal func_80070BB0 -/* 8981BC 80240BDC 24040009 */ addiu $a0, $zero, 9 -/* 8981C0 80240BE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8981C4 80240BE4 24020002 */ addiu $v0, $zero, 2 -/* 8981C8 80240BE8 03E00008 */ jr $ra -/* 8981CC 80240BEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s deleted file mode 100644 index 6f2114dc98..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128_898708 -/* 898708 80241128 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89870C 8024112C AFB10014 */ sw $s1, 0x14($sp) -/* 898710 80241130 0080882D */ daddu $s1, $a0, $zero -/* 898714 80241134 AFB20018 */ sw $s2, 0x18($sp) -/* 898718 80241138 AFBF001C */ sw $ra, 0x1c($sp) -/* 89871C 8024113C AFB00010 */ sw $s0, 0x10($sp) -/* 898720 80241140 8E30000C */ lw $s0, 0xc($s1) -/* 898724 80241144 10A00010 */ beqz $a1, .L80241188 -/* 898728 80241148 0000902D */ daddu $s2, $zero, $zero -/* 89872C 8024114C 8E050000 */ lw $a1, ($s0) -/* 898730 80241150 0C0B1EAF */ jal get_variable -/* 898734 80241154 26100004 */ addiu $s0, $s0, 4 -/* 898738 80241158 AE220084 */ sw $v0, 0x84($s1) -/* 89873C 8024115C 8E050000 */ lw $a1, ($s0) -/* 898740 80241160 0C0B1EAF */ jal get_variable -/* 898744 80241164 0220202D */ daddu $a0, $s1, $zero -/* 898748 80241168 0240202D */ daddu $a0, $s2, $zero -/* 89874C 8024116C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 898750 80241170 00A0302D */ daddu $a2, $a1, $zero -/* 898754 80241174 00A0382D */ daddu $a3, $a1, $zero -/* 898758 80241178 AE220088 */ sw $v0, 0x88($s1) -/* 89875C 8024117C AE200070 */ sw $zero, 0x70($s1) -/* 898760 80241180 0C04DF84 */ jal set_transition_stencil_color -/* 898764 80241184 AE200074 */ sw $zero, 0x74($s1) -.L80241188: -/* 898768 80241188 8E230070 */ lw $v1, 0x70($s1) -/* 89876C 8024118C 24040001 */ addiu $a0, $zero, 1 -/* 898770 80241190 10640019 */ beq $v1, $a0, .L802411F8 -/* 898774 80241194 28620002 */ slti $v0, $v1, 2 -/* 898778 80241198 10400005 */ beqz $v0, .L802411B0 -/* 89877C 8024119C 24020002 */ addiu $v0, $zero, 2 -/* 898780 802411A0 10600007 */ beqz $v1, .L802411C0 -/* 898784 802411A4 240500FF */ addiu $a1, $zero, 0xff -/* 898788 802411A8 0809048E */ j .L80241238 -/* 89878C 802411AC 00000000 */ nop -.L802411B0: -/* 898790 802411B0 10620019 */ beq $v1, $v0, .L80241218 -/* 898794 802411B4 00000000 */ nop -/* 898798 802411B8 0809048E */ j .L80241238 -/* 89879C 802411BC 00000000 */ nop -.L802411C0: -/* 8987A0 802411C0 8E220074 */ lw $v0, 0x74($s1) -/* 8987A4 802411C4 14450004 */ bne $v0, $a1, .L802411D8 -/* 8987A8 802411C8 00000000 */ nop -/* 8987AC 802411CC AE240070 */ sw $a0, 0x70($s1) -/* 8987B0 802411D0 AE200078 */ sw $zero, 0x78($s1) -/* 8987B4 802411D4 8E220074 */ lw $v0, 0x74($s1) -.L802411D8: -/* 8987B8 802411D8 8E230084 */ lw $v1, 0x84($s1) -/* 8987BC 802411DC 00431021 */ addu $v0, $v0, $v1 -/* 8987C0 802411E0 AE220074 */ sw $v0, 0x74($s1) -/* 8987C4 802411E4 28420100 */ slti $v0, $v0, 0x100 -/* 8987C8 802411E8 50400013 */ beql $v0, $zero, .L80241238 -/* 8987CC 802411EC AE250074 */ sw $a1, 0x74($s1) -/* 8987D0 802411F0 0809048E */ j .L80241238 -/* 8987D4 802411F4 00000000 */ nop -.L802411F8: -/* 8987D8 802411F8 8E220078 */ lw $v0, 0x78($s1) -/* 8987DC 802411FC 24420001 */ addiu $v0, $v0, 1 -/* 8987E0 80241200 AE220078 */ sw $v0, 0x78($s1) -/* 8987E4 80241204 28420002 */ slti $v0, $v0, 2 -/* 8987E8 80241208 1440000B */ bnez $v0, .L80241238 -/* 8987EC 8024120C 24020002 */ addiu $v0, $zero, 2 -/* 8987F0 80241210 0809048E */ j .L80241238 -/* 8987F4 80241214 AE220070 */ sw $v0, 0x70($s1) -.L80241218: -/* 8987F8 80241218 8E230074 */ lw $v1, 0x74($s1) -/* 8987FC 8024121C 50600001 */ beql $v1, $zero, .L80241224 -/* 898800 80241220 24120001 */ addiu $s2, $zero, 1 -.L80241224: -/* 898804 80241224 8E220088 */ lw $v0, 0x88($s1) -/* 898808 80241228 00621023 */ subu $v0, $v1, $v0 -/* 89880C 8024122C 04410002 */ bgez $v0, .L80241238 -/* 898810 80241230 AE220074 */ sw $v0, 0x74($s1) -/* 898814 80241234 AE200074 */ sw $zero, 0x74($s1) -.L80241238: -/* 898818 80241238 C6200074 */ lwc1 $f0, 0x74($s1) -/* 89881C 8024123C 46800020 */ cvt.s.w $f0, $f0 -/* 898820 80241240 44050000 */ mfc1 $a1, $f0 -/* 898824 80241244 0C04DF62 */ jal set_transition_stencil_zoom_0 -/* 898828 80241248 24040001 */ addiu $a0, $zero, 1 -/* 89882C 8024124C 0240102D */ daddu $v0, $s2, $zero -/* 898830 80241250 8FBF001C */ lw $ra, 0x1c($sp) -/* 898834 80241254 8FB20018 */ lw $s2, 0x18($sp) -/* 898838 80241258 8FB10014 */ lw $s1, 0x14($sp) -/* 89883C 8024125C 8FB00010 */ lw $s0, 0x10($sp) -/* 898840 80241260 03E00008 */ jr $ra -/* 898844 80241264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s deleted file mode 100644 index 6d393ca893..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240A0C_9A19EC.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A0C_9A19EC -/* 9A19EC 80240A0C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9A19F0 80240A10 AFB20038 */ sw $s2, 0x38($sp) -/* 9A19F4 80240A14 0080902D */ daddu $s2, $a0, $zero -/* 9A19F8 80240A18 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A19FC 80240A1C AFB40040 */ sw $s4, 0x40($sp) -/* 9A1A00 80240A20 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A1A04 80240A24 AFB10034 */ sw $s1, 0x34($sp) -/* 9A1A08 80240A28 AFB00030 */ sw $s0, 0x30($sp) -/* 9A1A0C 80240A2C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9A1A10 80240A30 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9A1A14 80240A34 8E510148 */ lw $s1, 0x148($s2) -/* 9A1A18 80240A38 00A0982D */ daddu $s3, $a1, $zero -/* 9A1A1C 80240A3C 86240008 */ lh $a0, 8($s1) -/* 9A1A20 80240A40 0C00EABB */ jal get_npc_unsafe -/* 9A1A24 80240A44 00C0A02D */ daddu $s4, $a2, $zero -/* 9A1A28 80240A48 8E630014 */ lw $v1, 0x14($s3) -/* 9A1A2C 80240A4C 04600030 */ bltz $v1, .L80240B10 -/* 9A1A30 80240A50 0040802D */ daddu $s0, $v0, $zero -/* 9A1A34 80240A54 8E420074 */ lw $v0, 0x74($s2) -/* 9A1A38 80240A58 1C40002C */ bgtz $v0, .L80240B0C -/* 9A1A3C 80240A5C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A1A40 80240A60 0280202D */ daddu $a0, $s4, $zero -/* 9A1A44 80240A64 AE430074 */ sw $v1, 0x74($s2) -/* 9A1A48 80240A68 AFA00010 */ sw $zero, 0x10($sp) -/* 9A1A4C 80240A6C 8E66000C */ lw $a2, 0xc($s3) -/* 9A1A50 80240A70 8E670010 */ lw $a3, 0x10($s3) -/* 9A1A54 80240A74 0C01242D */ jal func_800490B4 -/* 9A1A58 80240A78 0220282D */ daddu $a1, $s1, $zero -/* 9A1A5C 80240A7C 10400021 */ beqz $v0, .L80240B04 -/* 9A1A60 80240A80 0000202D */ daddu $a0, $zero, $zero -/* 9A1A64 80240A84 0200282D */ daddu $a1, $s0, $zero -/* 9A1A68 80240A88 0000302D */ daddu $a2, $zero, $zero -/* 9A1A6C 80240A8C 860300A8 */ lh $v1, 0xa8($s0) -/* 9A1A70 80240A90 3C013F80 */ lui $at, 0x3f80 -/* 9A1A74 80240A94 44810000 */ mtc1 $at, $f0 -/* 9A1A78 80240A98 3C014000 */ lui $at, 0x4000 -/* 9A1A7C 80240A9C 44811000 */ mtc1 $at, $f2 -/* 9A1A80 80240AA0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A1A84 80240AA4 44812000 */ mtc1 $at, $f4 -/* 9A1A88 80240AA8 2402000F */ addiu $v0, $zero, 0xf -/* 9A1A8C 80240AAC AFA2001C */ sw $v0, 0x1c($sp) -/* 9A1A90 80240AB0 44833000 */ mtc1 $v1, $f6 -/* 9A1A94 80240AB4 00000000 */ nop -/* 9A1A98 80240AB8 468031A0 */ cvt.s.w $f6, $f6 -/* 9A1A9C 80240ABC 44073000 */ mfc1 $a3, $f6 -/* 9A1AA0 80240AC0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A1AA4 80240AC4 AFA20020 */ sw $v0, 0x20($sp) -/* 9A1AA8 80240AC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A1AAC 80240ACC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A1AB0 80240AD0 0C01BFA4 */ jal fx_emote -/* 9A1AB4 80240AD4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A1AB8 80240AD8 0200202D */ daddu $a0, $s0, $zero -/* 9A1ABC 80240ADC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A1AC0 80240AE0 0C012530 */ jal func_800494C0 -/* 9A1AC4 80240AE4 3C060020 */ lui $a2, 0x20 -/* 9A1AC8 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 9A1ACC 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 9A1AD0 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 9A1AD4 80240AF4 14400064 */ bnez $v0, .L80240C88 -/* 9A1AD8 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 9A1ADC 80240AFC 08090322 */ j .L80240C88 -/* 9A1AE0 80240B00 2402000C */ addiu $v0, $zero, 0xc -.L80240B04: -/* 9A1AE4 80240B04 8E420074 */ lw $v0, 0x74($s2) -/* 9A1AE8 80240B08 2442FFFF */ addiu $v0, $v0, -1 -.L80240B0C: -/* 9A1AEC 80240B0C AE420074 */ sw $v0, 0x74($s2) -.L80240B10: -/* 9A1AF0 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 9A1AF4 80240B14 1440005D */ bnez $v0, .L80240C8C -/* 9A1AF8 80240B18 00000000 */ nop -/* 9A1AFC 80240B1C C6000018 */ lwc1 $f0, 0x18($s0) -/* 9A1B00 80240B20 3C014010 */ lui $at, 0x4010 -/* 9A1B04 80240B24 44811800 */ mtc1 $at, $f3 -/* 9A1B08 80240B28 44801000 */ mtc1 $zero, $f2 -/* 9A1B0C 80240B2C 46000021 */ cvt.d.s $f0, $f0 -/* 9A1B10 80240B30 4622003C */ c.lt.d $f0, $f2 -/* 9A1B14 80240B34 00000000 */ nop -/* 9A1B18 80240B38 45000003 */ bc1f .L80240B48 -/* 9A1B1C 80240B3C 0200202D */ daddu $a0, $s0, $zero -/* 9A1B20 80240B40 080902D3 */ j .L80240B4C -/* 9A1B24 80240B44 0000282D */ daddu $a1, $zero, $zero -.L80240B48: -/* 9A1B28 80240B48 24050001 */ addiu $a1, $zero, 1 -.L80240B4C: -/* 9A1B2C 80240B4C 0C00F598 */ jal func_8003D660 -/* 9A1B30 80240B50 00000000 */ nop -/* 9A1B34 80240B54 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A1B38 80240B58 8E430078 */ lw $v1, 0x78($s2) -/* 9A1B3C 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A1B40 80240B60 00031040 */ sll $v0, $v1, 1 -/* 9A1B44 80240B64 00431021 */ addu $v0, $v0, $v1 -/* 9A1B48 80240B68 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A1B4C 80240B6C 00021080 */ sll $v0, $v0, 2 -/* 9A1B50 80240B70 00431021 */ addu $v0, $v0, $v1 -/* 9A1B54 80240B74 C4560004 */ lwc1 $f22, 4($v0) -/* 9A1B58 80240B78 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9A1B5C 80240B7C C454000C */ lwc1 $f20, 0xc($v0) -/* 9A1B60 80240B80 4680A520 */ cvt.s.w $f20, $f20 -/* 9A1B64 80240B84 4406B000 */ mfc1 $a2, $f22 -/* 9A1B68 80240B88 4407A000 */ mfc1 $a3, $f20 -/* 9A1B6C 80240B8C 0C00A720 */ jal atan2 -/* 9A1B70 80240B90 00000000 */ nop -/* 9A1B74 80240B94 8E050018 */ lw $a1, 0x18($s0) -/* 9A1B78 80240B98 44060000 */ mfc1 $a2, $f0 -/* 9A1B7C 80240B9C 0200202D */ daddu $a0, $s0, $zero -/* 9A1B80 80240BA0 0C00EA95 */ jal npc_move_heading -/* 9A1B84 80240BA4 AE06000C */ sw $a2, 0xc($s0) -/* 9A1B88 80240BA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A1B8C 80240BAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A1B90 80240BB0 4406B000 */ mfc1 $a2, $f22 -/* 9A1B94 80240BB4 4407A000 */ mfc1 $a3, $f20 -/* 9A1B98 80240BB8 0C00A7B5 */ jal dist2D -/* 9A1B9C 80240BBC 00000000 */ nop -/* 9A1BA0 80240BC0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A1BA4 80240BC4 4602003E */ c.le.s $f0, $f2 -/* 9A1BA8 80240BC8 00000000 */ nop -/* 9A1BAC 80240BCC 4500002F */ bc1f .L80240C8C -/* 9A1BB0 80240BD0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9A1BB4 80240BD4 24020002 */ addiu $v0, $zero, 2 -/* 9A1BB8 80240BD8 0C00A67F */ jal rand_int -/* 9A1BBC 80240BDC AE420070 */ sw $v0, 0x70($s2) -/* 9A1BC0 80240BE0 3C035555 */ lui $v1, 0x5555 -/* 9A1BC4 80240BE4 34635556 */ ori $v1, $v1, 0x5556 -/* 9A1BC8 80240BE8 00430018 */ mult $v0, $v1 -/* 9A1BCC 80240BEC 000227C3 */ sra $a0, $v0, 0x1f -/* 9A1BD0 80240BF0 00004010 */ mfhi $t0 -/* 9A1BD4 80240BF4 01042023 */ subu $a0, $t0, $a0 -/* 9A1BD8 80240BF8 00041840 */ sll $v1, $a0, 1 -/* 9A1BDC 80240BFC 00641821 */ addu $v1, $v1, $a0 -/* 9A1BE0 80240C00 00431023 */ subu $v0, $v0, $v1 -/* 9A1BE4 80240C04 24430002 */ addiu $v1, $v0, 2 -/* 9A1BE8 80240C08 AE430074 */ sw $v1, 0x74($s2) -/* 9A1BEC 80240C0C 8E62002C */ lw $v0, 0x2c($s3) -/* 9A1BF0 80240C10 18400009 */ blez $v0, .L80240C38 -/* 9A1BF4 80240C14 24020004 */ addiu $v0, $zero, 4 -/* 9A1BF8 80240C18 8E620004 */ lw $v0, 4($s3) -/* 9A1BFC 80240C1C 18400006 */ blez $v0, .L80240C38 -/* 9A1C00 80240C20 24020004 */ addiu $v0, $zero, 4 -/* 9A1C04 80240C24 8E620008 */ lw $v0, 8($s3) -/* 9A1C08 80240C28 18400003 */ blez $v0, .L80240C38 -/* 9A1C0C 80240C2C 24020004 */ addiu $v0, $zero, 4 -/* 9A1C10 80240C30 14600002 */ bnez $v1, .L80240C3C -/* 9A1C14 80240C34 00000000 */ nop -.L80240C38: -/* 9A1C18 80240C38 AE420070 */ sw $v0, 0x70($s2) -.L80240C3C: -/* 9A1C1C 80240C3C 0C00A67F */ jal rand_int -/* 9A1C20 80240C40 24042710 */ addiu $a0, $zero, 0x2710 -/* 9A1C24 80240C44 3C0351EB */ lui $v1, 0x51eb -/* 9A1C28 80240C48 3463851F */ ori $v1, $v1, 0x851f -/* 9A1C2C 80240C4C 00430018 */ mult $v0, $v1 -/* 9A1C30 80240C50 00021FC3 */ sra $v1, $v0, 0x1f -/* 9A1C34 80240C54 00004010 */ mfhi $t0 -/* 9A1C38 80240C58 00082143 */ sra $a0, $t0, 5 -/* 9A1C3C 80240C5C 00832023 */ subu $a0, $a0, $v1 -/* 9A1C40 80240C60 00041840 */ sll $v1, $a0, 1 -/* 9A1C44 80240C64 00641821 */ addu $v1, $v1, $a0 -/* 9A1C48 80240C68 000318C0 */ sll $v1, $v1, 3 -/* 9A1C4C 80240C6C 00641821 */ addu $v1, $v1, $a0 -/* 9A1C50 80240C70 00031880 */ sll $v1, $v1, 2 -/* 9A1C54 80240C74 8E640004 */ lw $a0, 4($s3) -/* 9A1C58 80240C78 00431023 */ subu $v0, $v0, $v1 -/* 9A1C5C 80240C7C 0044102A */ slt $v0, $v0, $a0 -/* 9A1C60 80240C80 10400002 */ beqz $v0, .L80240C8C -/* 9A1C64 80240C84 24020004 */ addiu $v0, $zero, 4 -.L80240C88: -/* 9A1C68 80240C88 AE420070 */ sw $v0, 0x70($s2) -.L80240C8C: -/* 9A1C6C 80240C8C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A1C70 80240C90 8FB40040 */ lw $s4, 0x40($sp) -/* 9A1C74 80240C94 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A1C78 80240C98 8FB20038 */ lw $s2, 0x38($sp) -/* 9A1C7C 80240C9C 8FB10034 */ lw $s1, 0x34($sp) -/* 9A1C80 80240CA0 8FB00030 */ lw $s0, 0x30($sp) -/* 9A1C84 80240CA4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9A1C88 80240CA8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9A1C8C 80240CAC 03E00008 */ jr $ra -/* 9A1C90 80240CB0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s deleted file mode 100644 index a96a9dd400..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D74_9A1D54 -/* 9A1D54 80240D74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A1D58 80240D78 AFB40040 */ sw $s4, 0x40($sp) -/* 9A1D5C 80240D7C 0080A02D */ daddu $s4, $a0, $zero -/* 9A1D60 80240D80 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A1D64 80240D84 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A1D68 80240D88 AFB20038 */ sw $s2, 0x38($sp) -/* 9A1D6C 80240D8C AFB10034 */ sw $s1, 0x34($sp) -/* 9A1D70 80240D90 AFB00030 */ sw $s0, 0x30($sp) -/* 9A1D74 80240D94 8E910148 */ lw $s1, 0x148($s4) -/* 9A1D78 80240D98 00A0902D */ daddu $s2, $a1, $zero -/* 9A1D7C 80240D9C 86240008 */ lh $a0, 8($s1) -/* 9A1D80 80240DA0 0C00EABB */ jal get_npc_unsafe -/* 9A1D84 80240DA4 00C0982D */ daddu $s3, $a2, $zero -/* 9A1D88 80240DA8 8E430014 */ lw $v1, 0x14($s2) -/* 9A1D8C 80240DAC 04600031 */ bltz $v1, .L80240E74 -/* 9A1D90 80240DB0 0040802D */ daddu $s0, $v0, $zero -/* 9A1D94 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 9A1D98 80240DB8 AFA00010 */ sw $zero, 0x10($sp) -/* 9A1D9C 80240DBC 8E460024 */ lw $a2, 0x24($s2) -/* 9A1DA0 80240DC0 8E470028 */ lw $a3, 0x28($s2) -/* 9A1DA4 80240DC4 0C01242D */ jal func_800490B4 -/* 9A1DA8 80240DC8 0220282D */ daddu $a1, $s1, $zero -/* 9A1DAC 80240DCC 10400029 */ beqz $v0, .L80240E74 -/* 9A1DB0 80240DD0 0000202D */ daddu $a0, $zero, $zero -/* 9A1DB4 80240DD4 0200282D */ daddu $a1, $s0, $zero -/* 9A1DB8 80240DD8 0000302D */ daddu $a2, $zero, $zero -/* 9A1DBC 80240DDC 860300A8 */ lh $v1, 0xa8($s0) -/* 9A1DC0 80240DE0 3C013F80 */ lui $at, 0x3f80 -/* 9A1DC4 80240DE4 44810000 */ mtc1 $at, $f0 -/* 9A1DC8 80240DE8 3C014000 */ lui $at, 0x4000 -/* 9A1DCC 80240DEC 44811000 */ mtc1 $at, $f2 -/* 9A1DD0 80240DF0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A1DD4 80240DF4 44812000 */ mtc1 $at, $f4 -/* 9A1DD8 80240DF8 2402000F */ addiu $v0, $zero, 0xf -/* 9A1DDC 80240DFC AFA2001C */ sw $v0, 0x1c($sp) -/* 9A1DE0 80240E00 44833000 */ mtc1 $v1, $f6 -/* 9A1DE4 80240E04 00000000 */ nop -/* 9A1DE8 80240E08 468031A0 */ cvt.s.w $f6, $f6 -/* 9A1DEC 80240E0C 44073000 */ mfc1 $a3, $f6 -/* 9A1DF0 80240E10 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A1DF4 80240E14 AFA20020 */ sw $v0, 0x20($sp) -/* 9A1DF8 80240E18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A1DFC 80240E1C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A1E00 80240E20 0C01BFA4 */ jal fx_emote -/* 9A1E04 80240E24 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A1E08 80240E28 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A1E0C 80240E2C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A1E10 80240E30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A1E14 80240E34 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A1E18 80240E38 8C460028 */ lw $a2, 0x28($v0) -/* 9A1E1C 80240E3C 0C00A720 */ jal atan2 -/* 9A1E20 80240E40 8C470030 */ lw $a3, 0x30($v0) -/* 9A1E24 80240E44 0200202D */ daddu $a0, $s0, $zero -/* 9A1E28 80240E48 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A1E2C 80240E4C 3C060020 */ lui $a2, 0x20 -/* 9A1E30 80240E50 0C012530 */ jal func_800494C0 -/* 9A1E34 80240E54 E480000C */ swc1 $f0, 0xc($a0) -/* 9A1E38 80240E58 8E220018 */ lw $v0, 0x18($s1) -/* 9A1E3C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) -/* 9A1E40 80240E60 30420001 */ andi $v0, $v0, 1 -/* 9A1E44 80240E64 14400029 */ bnez $v0, .L80240F0C -/* 9A1E48 80240E68 2402000A */ addiu $v0, $zero, 0xa -/* 9A1E4C 80240E6C 080903C3 */ j .L80240F0C -/* 9A1E50 80240E70 2402000C */ addiu $v0, $zero, 0xc -.L80240E74: -/* 9A1E54 80240E74 8602008C */ lh $v0, 0x8c($s0) -/* 9A1E58 80240E78 14400025 */ bnez $v0, .L80240F10 -/* 9A1E5C 80240E7C 00000000 */ nop -/* 9A1E60 80240E80 9602008E */ lhu $v0, 0x8e($s0) -/* 9A1E64 80240E84 2442FFFF */ addiu $v0, $v0, -1 -/* 9A1E68 80240E88 A602008E */ sh $v0, 0x8e($s0) -/* 9A1E6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 -/* 9A1E70 80240E90 1440001F */ bnez $v0, .L80240F10 -/* 9A1E74 80240E94 00000000 */ nop -/* 9A1E78 80240E98 8E820074 */ lw $v0, 0x74($s4) -/* 9A1E7C 80240E9C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A1E80 80240EA0 10400019 */ beqz $v0, .L80240F08 -/* 9A1E84 80240EA4 AE820074 */ sw $v0, 0x74($s4) -/* 9A1E88 80240EA8 8E220018 */ lw $v0, 0x18($s1) -/* 9A1E8C 80240EAC 9442002A */ lhu $v0, 0x2a($v0) -/* 9A1E90 80240EB0 30420010 */ andi $v0, $v0, 0x10 -/* 9A1E94 80240EB4 14400007 */ bnez $v0, .L80240ED4 -/* 9A1E98 80240EB8 00000000 */ nop -/* 9A1E9C 80240EBC C600000C */ lwc1 $f0, 0xc($s0) -/* 9A1EA0 80240EC0 3C014334 */ lui $at, 0x4334 -/* 9A1EA4 80240EC4 44816000 */ mtc1 $at, $f12 -/* 9A1EA8 80240EC8 0C00A6C9 */ jal clamp_angle -/* 9A1EAC 80240ECC 460C0300 */ add.s $f12, $f0, $f12 -/* 9A1EB0 80240ED0 E600000C */ swc1 $f0, 0xc($s0) -.L80240ED4: -/* 9A1EB4 80240ED4 8E440008 */ lw $a0, 8($s2) -/* 9A1EB8 80240ED8 000417C2 */ srl $v0, $a0, 0x1f -/* 9A1EBC 80240EDC 00822021 */ addu $a0, $a0, $v0 -/* 9A1EC0 80240EE0 00042043 */ sra $a0, $a0, 1 -/* 9A1EC4 80240EE4 0C00A67F */ jal rand_int -/* 9A1EC8 80240EE8 24840001 */ addiu $a0, $a0, 1 -/* 9A1ECC 80240EEC 8E430008 */ lw $v1, 8($s2) -/* 9A1ED0 80240EF0 000327C2 */ srl $a0, $v1, 0x1f -/* 9A1ED4 80240EF4 00641821 */ addu $v1, $v1, $a0 -/* 9A1ED8 80240EF8 00031843 */ sra $v1, $v1, 1 -/* 9A1EDC 80240EFC 00621821 */ addu $v1, $v1, $v0 -/* 9A1EE0 80240F00 080903C4 */ j .L80240F10 -/* 9A1EE4 80240F04 A603008E */ sh $v1, 0x8e($s0) -.L80240F08: -/* 9A1EE8 80240F08 24020004 */ addiu $v0, $zero, 4 -.L80240F0C: -/* 9A1EEC 80240F0C AE820070 */ sw $v0, 0x70($s4) -.L80240F10: -/* 9A1EF0 80240F10 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A1EF4 80240F14 8FB40040 */ lw $s4, 0x40($sp) -/* 9A1EF8 80240F18 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A1EFC 80240F1C 8FB20038 */ lw $s2, 0x38($sp) -/* 9A1F00 80240F20 8FB10034 */ lw $s1, 0x34($sp) -/* 9A1F04 80240F24 8FB00030 */ lw $s0, 0x30($sp) -/* 9A1F08 80240F28 03E00008 */ jr $ra -/* 9A1F0C 80240F2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s deleted file mode 100644 index e06c8ef3eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241200_9A21E0 -/* 9A21E0 80241200 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A21E4 80241204 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A21E8 80241208 0080982D */ daddu $s3, $a0, $zero -/* 9A21EC 8024120C AFBF0040 */ sw $ra, 0x40($sp) -/* 9A21F0 80241210 AFB20038 */ sw $s2, 0x38($sp) -/* 9A21F4 80241214 AFB10034 */ sw $s1, 0x34($sp) -/* 9A21F8 80241218 AFB00030 */ sw $s0, 0x30($sp) -/* 9A21FC 8024121C 8E720148 */ lw $s2, 0x148($s3) -/* 9A2200 80241220 00A0882D */ daddu $s1, $a1, $zero -/* 9A2204 80241224 86440008 */ lh $a0, 8($s2) -/* 9A2208 80241228 0C00EABB */ jal get_npc_unsafe -/* 9A220C 8024122C 00C0802D */ daddu $s0, $a2, $zero -/* 9A2210 80241230 0200202D */ daddu $a0, $s0, $zero -/* 9A2214 80241234 0240282D */ daddu $a1, $s2, $zero -/* 9A2218 80241238 24030001 */ addiu $v1, $zero, 1 -/* 9A221C 8024123C AFA30010 */ sw $v1, 0x10($sp) -/* 9A2220 80241240 8E260024 */ lw $a2, 0x24($s1) -/* 9A2224 80241244 8E270028 */ lw $a3, 0x28($s1) -/* 9A2228 80241248 0C01242D */ jal func_800490B4 -/* 9A222C 8024124C 0040802D */ daddu $s0, $v0, $zero -/* 9A2230 80241250 1440001E */ bnez $v0, .L802412CC -/* 9A2234 80241254 0200202D */ daddu $a0, $s0, $zero -/* 9A2238 80241258 24040002 */ addiu $a0, $zero, 2 -/* 9A223C 8024125C 0200282D */ daddu $a1, $s0, $zero -/* 9A2240 80241260 0000302D */ daddu $a2, $zero, $zero -/* 9A2244 80241264 860300A8 */ lh $v1, 0xa8($s0) -/* 9A2248 80241268 3C013F80 */ lui $at, 0x3f80 -/* 9A224C 8024126C 44810000 */ mtc1 $at, $f0 -/* 9A2250 80241270 3C014000 */ lui $at, 0x4000 -/* 9A2254 80241274 44811000 */ mtc1 $at, $f2 -/* 9A2258 80241278 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A225C 8024127C 44812000 */ mtc1 $at, $f4 -/* 9A2260 80241280 2402000F */ addiu $v0, $zero, 0xf -/* 9A2264 80241284 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A2268 80241288 44833000 */ mtc1 $v1, $f6 -/* 9A226C 8024128C 00000000 */ nop -/* 9A2270 80241290 468031A0 */ cvt.s.w $f6, $f6 -/* 9A2274 80241294 44073000 */ mfc1 $a3, $f6 -/* 9A2278 80241298 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A227C 8024129C AFA20020 */ sw $v0, 0x20($sp) -/* 9A2280 802412A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A2284 802412A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A2288 802412A8 0C01BFA4 */ jal fx_emote -/* 9A228C 802412AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A2290 802412B0 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A2294 802412B4 8C430000 */ lw $v1, ($v0) -/* 9A2298 802412B8 24020019 */ addiu $v0, $zero, 0x19 -/* 9A229C 802412BC A602008E */ sh $v0, 0x8e($s0) -/* 9A22A0 802412C0 2402000E */ addiu $v0, $zero, 0xe -/* 9A22A4 802412C4 080904C0 */ j .L80241300 -/* 9A22A8 802412C8 AE030028 */ sw $v1, 0x28($s0) -.L802412CC: -/* 9A22AC 802412CC 0C00F598 */ jal func_8003D660 -/* 9A22B0 802412D0 24050001 */ addiu $a1, $zero, 1 -/* 9A22B4 802412D4 8E050018 */ lw $a1, 0x18($s0) -/* 9A22B8 802412D8 8E06000C */ lw $a2, 0xc($s0) -/* 9A22BC 802412DC 0C00EA95 */ jal npc_move_heading -/* 9A22C0 802412E0 0200202D */ daddu $a0, $s0, $zero -/* 9A22C4 802412E4 8602008E */ lh $v0, 0x8e($s0) -/* 9A22C8 802412E8 9603008E */ lhu $v1, 0x8e($s0) -/* 9A22CC 802412EC 18400003 */ blez $v0, .L802412FC -/* 9A22D0 802412F0 2462FFFF */ addiu $v0, $v1, -1 -/* 9A22D4 802412F4 080904C1 */ j .L80241304 -/* 9A22D8 802412F8 A602008E */ sh $v0, 0x8e($s0) -.L802412FC: -/* 9A22DC 802412FC 2402000C */ addiu $v0, $zero, 0xc -.L80241300: -/* 9A22E0 80241300 AE620070 */ sw $v0, 0x70($s3) -.L80241304: -/* 9A22E4 80241304 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A22E8 80241308 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A22EC 8024130C 8FB20038 */ lw $s2, 0x38($sp) -/* 9A22F0 80241310 8FB10034 */ lw $s1, 0x34($sp) -/* 9A22F4 80241314 8FB00030 */ lw $s0, 0x30($sp) -/* 9A22F8 80241318 03E00008 */ jr $ra -/* 9A22FC 8024131C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s deleted file mode 100644 index 54e1d1219d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241388_9A2368.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241388_9A2368 -/* 9A2368 80241388 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A236C 8024138C AFB10014 */ sw $s1, 0x14($sp) -/* 9A2370 80241390 0080882D */ daddu $s1, $a0, $zero -/* 9A2374 80241394 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A2378 80241398 AFB20018 */ sw $s2, 0x18($sp) -/* 9A237C 8024139C AFB00010 */ sw $s0, 0x10($sp) -/* 9A2380 802413A0 8E300148 */ lw $s0, 0x148($s1) -/* 9A2384 802413A4 86040008 */ lh $a0, 8($s0) -/* 9A2388 802413A8 0C00EABB */ jal get_npc_unsafe -/* 9A238C 802413AC 00A0902D */ daddu $s2, $a1, $zero -/* 9A2390 802413B0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A2394 802413B4 8E240078 */ lw $a0, 0x78($s1) -/* 9A2398 802413B8 8C630000 */ lw $v1, ($v1) -/* 9A239C 802413BC 0083182A */ slt $v1, $a0, $v1 -/* 9A23A0 802413C0 10600013 */ beqz $v1, .L80241410 -/* 9A23A4 802413C4 0040302D */ daddu $a2, $v0, $zero -/* 9A23A8 802413C8 00041040 */ sll $v0, $a0, 1 -/* 9A23AC 802413CC 00441021 */ addu $v0, $v0, $a0 -/* 9A23B0 802413D0 00022880 */ sll $a1, $v0, 2 -.L802413D4: -/* 9A23B4 802413D4 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A23B8 802413D8 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9A23BC 802413DC 00A31021 */ addu $v0, $a1, $v1 -/* 9A23C0 802413E0 C4400008 */ lwc1 $f0, 8($v0) -/* 9A23C4 802413E4 46800020 */ cvt.s.w $f0, $f0 -/* 9A23C8 802413E8 4602003E */ c.le.s $f0, $f2 -/* 9A23CC 802413EC 00000000 */ nop -/* 9A23D0 802413F0 45020003 */ bc1fl .L80241400 -/* 9A23D4 802413F4 24840001 */ addiu $a0, $a0, 1 -/* 9A23D8 802413F8 08090504 */ j .L80241410 -/* 9A23DC 802413FC AE240078 */ sw $a0, 0x78($s1) -.L80241400: -/* 9A23E0 80241400 8C620000 */ lw $v0, ($v1) -/* 9A23E4 80241404 0082102A */ slt $v0, $a0, $v0 -/* 9A23E8 80241408 1440FFF2 */ bnez $v0, .L802413D4 -/* 9A23EC 8024140C 24A5000C */ addiu $a1, $a1, 0xc -.L80241410: -/* 9A23F0 80241410 C6400000 */ lwc1 $f0, ($s2) -/* 9A23F4 80241414 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9A23F8 80241418 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A23FC 8024141C 8C420004 */ lw $v0, 4($v0) -/* 9A2400 80241420 ACC20028 */ sw $v0, 0x28($a2) -/* 9A2404 80241424 24020001 */ addiu $v0, $zero, 1 -/* 9A2408 80241428 AE200074 */ sw $zero, 0x74($s1) -/* 9A240C 8024142C AE220070 */ sw $v0, 0x70($s1) -/* 9A2410 80241430 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A2414 80241434 8FB20018 */ lw $s2, 0x18($sp) -/* 9A2418 80241438 8FB10014 */ lw $s1, 0x14($sp) -/* 9A241C 8024143C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2420 80241440 03E00008 */ jr $ra -/* 9A2424 80241444 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 94448d264c..f44f46557f 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -137,7 +137,7 @@ glabel L8024162C_9A260C glabel L8024163C_9A261C /* 9A261C 8024163C 0280202D */ daddu $a0, $s4, $zero /* 9A2620 80241640 0260282D */ daddu $a1, $s3, $zero -/* 9A2624 80241644 0C090283 */ jal func_80240A0C_9A19EC +/* 9A2624 80241644 0C090283 */ jal trd_02_UnkFunc13 /* 9A2628 80241648 02A0302D */ daddu $a2, $s5, $zero /* 9A262C 8024164C 080905C7 */ j L8024171C_9A26FC /* 9A2630 80241650 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241654_9A2634 glabel L80241664_9A2644 /* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero -/* 9A264C 8024166C 0C09035D */ jal func_80240D74_9A1D54 +/* 9A264C 8024166C 0C09035D */ jal trd_02_UnkFunc14 /* 9A2650 80241670 02A0302D */ daddu $a2, $s5, $zero /* 9A2654 80241674 080905C7 */ j L8024171C_9A26FC /* 9A2658 80241678 00000000 */ nop @@ -180,7 +180,7 @@ glabel L802416BC_9A269C glabel L802416CC_9A26AC /* 9A26AC 802416CC 0280202D */ daddu $a0, $s4, $zero /* 9A26B0 802416D0 0260282D */ daddu $a1, $s3, $zero -/* 9A26B4 802416D4 0C090480 */ jal func_80241200_9A21E0 +/* 9A26B4 802416D4 0C090480 */ jal trd_02_UnkFunc15 /* 9A26B8 802416D8 02A0302D */ daddu $a2, $s5, $zero /* 9A26BC 802416DC 080905C7 */ j L8024171C_9A26FC /* 9A26C0 802416E0 00000000 */ nop @@ -194,7 +194,7 @@ glabel L802416E4_9A26C4 glabel L802416FC_9A26DC /* 9A26DC 802416FC 0280202D */ daddu $a0, $s4, $zero /* 9A26E0 80241700 0260282D */ daddu $a1, $s3, $zero -/* 9A26E4 80241704 0C0904E2 */ jal func_80241388_9A2368 +/* 9A26E4 80241704 0C0904E2 */ jal trd_02_UnkFunc16 /* 9A26E8 80241708 02A0302D */ daddu $a2, $s5, $zero /* 9A26EC 8024170C 080905C7 */ j L8024171C_9A26FC /* 9A26F0 80241710 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index a9884bee73..84da38f00b 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -149,7 +149,7 @@ glabel L80241950_9A2930 glabel L80241968_9A2948 /* 9A2948 80241968 0260202D */ daddu $a0, $s3, $zero /* 9A294C 8024196C 0280282D */ daddu $a1, $s4, $zero -/* 9A2950 80241970 0C090283 */ jal func_80240A0C_9A19EC +/* 9A2950 80241970 0C090283 */ jal trd_02_UnkFunc13 /* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero /* 9A2958 80241978 08090688 */ j L80241A20_9A2A00 /* 9A295C 8024197C 00000000 */ nop @@ -161,7 +161,7 @@ glabel L80241980_9A2960 glabel L80241990_9A2970 /* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero -/* 9A2978 80241998 0C09035D */ jal func_80240D74_9A1D54 +/* 9A2978 80241998 0C09035D */ jal trd_02_UnkFunc14 /* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero /* 9A2980 802419A0 08090688 */ j L80241A20_9A2A00 /* 9A2984 802419A4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s deleted file mode 100644 index 8c0a8da54f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240DDC_9A91CC.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_9A91CC -/* 9A91CC 80240DDC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9A91D0 80240DE0 AFB20038 */ sw $s2, 0x38($sp) -/* 9A91D4 80240DE4 0080902D */ daddu $s2, $a0, $zero -/* 9A91D8 80240DE8 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A91DC 80240DEC AFB40040 */ sw $s4, 0x40($sp) -/* 9A91E0 80240DF0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A91E4 80240DF4 AFB10034 */ sw $s1, 0x34($sp) -/* 9A91E8 80240DF8 AFB00030 */ sw $s0, 0x30($sp) -/* 9A91EC 80240DFC F7B60050 */ sdc1 $f22, 0x50($sp) -/* 9A91F0 80240E00 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 9A91F4 80240E04 8E510148 */ lw $s1, 0x148($s2) -/* 9A91F8 80240E08 00A0982D */ daddu $s3, $a1, $zero -/* 9A91FC 80240E0C 86240008 */ lh $a0, 8($s1) -/* 9A9200 80240E10 0C00EABB */ jal get_npc_unsafe -/* 9A9204 80240E14 00C0A02D */ daddu $s4, $a2, $zero -/* 9A9208 80240E18 8E630014 */ lw $v1, 0x14($s3) -/* 9A920C 80240E1C 04600030 */ bltz $v1, .L80240EE0 -/* 9A9210 80240E20 0040802D */ daddu $s0, $v0, $zero -/* 9A9214 80240E24 8E420074 */ lw $v0, 0x74($s2) -/* 9A9218 80240E28 1C40002C */ bgtz $v0, .L80240EDC -/* 9A921C 80240E2C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A9220 80240E30 0280202D */ daddu $a0, $s4, $zero -/* 9A9224 80240E34 AE430074 */ sw $v1, 0x74($s2) -/* 9A9228 80240E38 AFA00010 */ sw $zero, 0x10($sp) -/* 9A922C 80240E3C 8E66000C */ lw $a2, 0xc($s3) -/* 9A9230 80240E40 8E670010 */ lw $a3, 0x10($s3) -/* 9A9234 80240E44 0C01242D */ jal func_800490B4 -/* 9A9238 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 9A923C 80240E4C 10400021 */ beqz $v0, .L80240ED4 -/* 9A9240 80240E50 0000202D */ daddu $a0, $zero, $zero -/* 9A9244 80240E54 0200282D */ daddu $a1, $s0, $zero -/* 9A9248 80240E58 0000302D */ daddu $a2, $zero, $zero -/* 9A924C 80240E5C 860300A8 */ lh $v1, 0xa8($s0) -/* 9A9250 80240E60 3C013F80 */ lui $at, 0x3f80 -/* 9A9254 80240E64 44810000 */ mtc1 $at, $f0 -/* 9A9258 80240E68 3C014000 */ lui $at, 0x4000 -/* 9A925C 80240E6C 44811000 */ mtc1 $at, $f2 -/* 9A9260 80240E70 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A9264 80240E74 44812000 */ mtc1 $at, $f4 -/* 9A9268 80240E78 2402000F */ addiu $v0, $zero, 0xf -/* 9A926C 80240E7C AFA2001C */ sw $v0, 0x1c($sp) -/* 9A9270 80240E80 44833000 */ mtc1 $v1, $f6 -/* 9A9274 80240E84 00000000 */ nop -/* 9A9278 80240E88 468031A0 */ cvt.s.w $f6, $f6 -/* 9A927C 80240E8C 44073000 */ mfc1 $a3, $f6 -/* 9A9280 80240E90 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A9284 80240E94 AFA20020 */ sw $v0, 0x20($sp) -/* 9A9288 80240E98 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A928C 80240E9C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A9290 80240EA0 0C01BFA4 */ jal fx_emote -/* 9A9294 80240EA4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A9298 80240EA8 0200202D */ daddu $a0, $s0, $zero -/* 9A929C 80240EAC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A92A0 80240EB0 0C012530 */ jal func_800494C0 -/* 9A92A4 80240EB4 3C060020 */ lui $a2, 0x20 -/* 9A92A8 80240EB8 8E220018 */ lw $v0, 0x18($s1) -/* 9A92AC 80240EBC 9442002A */ lhu $v0, 0x2a($v0) -/* 9A92B0 80240EC0 30420001 */ andi $v0, $v0, 1 -/* 9A92B4 80240EC4 14400064 */ bnez $v0, .L80241058 -/* 9A92B8 80240EC8 2402000A */ addiu $v0, $zero, 0xa -/* 9A92BC 80240ECC 08090416 */ j .L80241058 -/* 9A92C0 80240ED0 2402000C */ addiu $v0, $zero, 0xc -.L80240ED4: -/* 9A92C4 80240ED4 8E420074 */ lw $v0, 0x74($s2) -/* 9A92C8 80240ED8 2442FFFF */ addiu $v0, $v0, -1 -.L80240EDC: -/* 9A92CC 80240EDC AE420074 */ sw $v0, 0x74($s2) -.L80240EE0: -/* 9A92D0 80240EE0 8602008C */ lh $v0, 0x8c($s0) -/* 9A92D4 80240EE4 1440005D */ bnez $v0, .L8024105C -/* 9A92D8 80240EE8 00000000 */ nop -/* 9A92DC 80240EEC C6000018 */ lwc1 $f0, 0x18($s0) -/* 9A92E0 80240EF0 3C014010 */ lui $at, 0x4010 -/* 9A92E4 80240EF4 44811800 */ mtc1 $at, $f3 -/* 9A92E8 80240EF8 44801000 */ mtc1 $zero, $f2 -/* 9A92EC 80240EFC 46000021 */ cvt.d.s $f0, $f0 -/* 9A92F0 80240F00 4622003C */ c.lt.d $f0, $f2 -/* 9A92F4 80240F04 00000000 */ nop -/* 9A92F8 80240F08 45000003 */ bc1f .L80240F18 -/* 9A92FC 80240F0C 0200202D */ daddu $a0, $s0, $zero -/* 9A9300 80240F10 080903C7 */ j .L80240F1C -/* 9A9304 80240F14 0000282D */ daddu $a1, $zero, $zero -.L80240F18: -/* 9A9308 80240F18 24050001 */ addiu $a1, $zero, 1 -.L80240F1C: -/* 9A930C 80240F1C 0C00F598 */ jal func_8003D660 -/* 9A9310 80240F20 00000000 */ nop -/* 9A9314 80240F24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A9318 80240F28 8E430078 */ lw $v1, 0x78($s2) -/* 9A931C 80240F2C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A9320 80240F30 00031040 */ sll $v0, $v1, 1 -/* 9A9324 80240F34 00431021 */ addu $v0, $v0, $v1 -/* 9A9328 80240F38 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A932C 80240F3C 00021080 */ sll $v0, $v0, 2 -/* 9A9330 80240F40 00431021 */ addu $v0, $v0, $v1 -/* 9A9334 80240F44 C4560004 */ lwc1 $f22, 4($v0) -/* 9A9338 80240F48 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9A933C 80240F4C C454000C */ lwc1 $f20, 0xc($v0) -/* 9A9340 80240F50 4680A520 */ cvt.s.w $f20, $f20 -/* 9A9344 80240F54 4406B000 */ mfc1 $a2, $f22 -/* 9A9348 80240F58 4407A000 */ mfc1 $a3, $f20 -/* 9A934C 80240F5C 0C00A720 */ jal atan2 -/* 9A9350 80240F60 00000000 */ nop -/* 9A9354 80240F64 8E050018 */ lw $a1, 0x18($s0) -/* 9A9358 80240F68 44060000 */ mfc1 $a2, $f0 -/* 9A935C 80240F6C 0200202D */ daddu $a0, $s0, $zero -/* 9A9360 80240F70 0C00EA95 */ jal npc_move_heading -/* 9A9364 80240F74 AE06000C */ sw $a2, 0xc($s0) -/* 9A9368 80240F78 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A936C 80240F7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A9370 80240F80 4406B000 */ mfc1 $a2, $f22 -/* 9A9374 80240F84 4407A000 */ mfc1 $a3, $f20 -/* 9A9378 80240F88 0C00A7B5 */ jal dist2D -/* 9A937C 80240F8C 00000000 */ nop -/* 9A9380 80240F90 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A9384 80240F94 4602003E */ c.le.s $f0, $f2 -/* 9A9388 80240F98 00000000 */ nop -/* 9A938C 80240F9C 4500002F */ bc1f .L8024105C -/* 9A9390 80240FA0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9A9394 80240FA4 24020002 */ addiu $v0, $zero, 2 -/* 9A9398 80240FA8 0C00A67F */ jal rand_int -/* 9A939C 80240FAC AE420070 */ sw $v0, 0x70($s2) -/* 9A93A0 80240FB0 3C035555 */ lui $v1, 0x5555 -/* 9A93A4 80240FB4 34635556 */ ori $v1, $v1, 0x5556 -/* 9A93A8 80240FB8 00430018 */ mult $v0, $v1 -/* 9A93AC 80240FBC 000227C3 */ sra $a0, $v0, 0x1f -/* 9A93B0 80240FC0 00004010 */ mfhi $t0 -/* 9A93B4 80240FC4 01042023 */ subu $a0, $t0, $a0 -/* 9A93B8 80240FC8 00041840 */ sll $v1, $a0, 1 -/* 9A93BC 80240FCC 00641821 */ addu $v1, $v1, $a0 -/* 9A93C0 80240FD0 00431023 */ subu $v0, $v0, $v1 -/* 9A93C4 80240FD4 24430002 */ addiu $v1, $v0, 2 -/* 9A93C8 80240FD8 AE430074 */ sw $v1, 0x74($s2) -/* 9A93CC 80240FDC 8E62002C */ lw $v0, 0x2c($s3) -/* 9A93D0 80240FE0 18400009 */ blez $v0, .L80241008 -/* 9A93D4 80240FE4 24020004 */ addiu $v0, $zero, 4 -/* 9A93D8 80240FE8 8E620004 */ lw $v0, 4($s3) -/* 9A93DC 80240FEC 18400006 */ blez $v0, .L80241008 -/* 9A93E0 80240FF0 24020004 */ addiu $v0, $zero, 4 -/* 9A93E4 80240FF4 8E620008 */ lw $v0, 8($s3) -/* 9A93E8 80240FF8 18400003 */ blez $v0, .L80241008 -/* 9A93EC 80240FFC 24020004 */ addiu $v0, $zero, 4 -/* 9A93F0 80241000 14600002 */ bnez $v1, .L8024100C -/* 9A93F4 80241004 00000000 */ nop -.L80241008: -/* 9A93F8 80241008 AE420070 */ sw $v0, 0x70($s2) -.L8024100C: -/* 9A93FC 8024100C 0C00A67F */ jal rand_int -/* 9A9400 80241010 24042710 */ addiu $a0, $zero, 0x2710 -/* 9A9404 80241014 3C0351EB */ lui $v1, 0x51eb -/* 9A9408 80241018 3463851F */ ori $v1, $v1, 0x851f -/* 9A940C 8024101C 00430018 */ mult $v0, $v1 -/* 9A9410 80241020 00021FC3 */ sra $v1, $v0, 0x1f -/* 9A9414 80241024 00004010 */ mfhi $t0 -/* 9A9418 80241028 00082143 */ sra $a0, $t0, 5 -/* 9A941C 8024102C 00832023 */ subu $a0, $a0, $v1 -/* 9A9420 80241030 00041840 */ sll $v1, $a0, 1 -/* 9A9424 80241034 00641821 */ addu $v1, $v1, $a0 -/* 9A9428 80241038 000318C0 */ sll $v1, $v1, 3 -/* 9A942C 8024103C 00641821 */ addu $v1, $v1, $a0 -/* 9A9430 80241040 00031880 */ sll $v1, $v1, 2 -/* 9A9434 80241044 8E640004 */ lw $a0, 4($s3) -/* 9A9438 80241048 00431023 */ subu $v0, $v0, $v1 -/* 9A943C 8024104C 0044102A */ slt $v0, $v0, $a0 -/* 9A9440 80241050 10400002 */ beqz $v0, .L8024105C -/* 9A9444 80241054 24020004 */ addiu $v0, $zero, 4 -.L80241058: -/* 9A9448 80241058 AE420070 */ sw $v0, 0x70($s2) -.L8024105C: -/* 9A944C 8024105C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A9450 80241060 8FB40040 */ lw $s4, 0x40($sp) -/* 9A9454 80241064 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A9458 80241068 8FB20038 */ lw $s2, 0x38($sp) -/* 9A945C 8024106C 8FB10034 */ lw $s1, 0x34($sp) -/* 9A9460 80241070 8FB00030 */ lw $s0, 0x30($sp) -/* 9A9464 80241074 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 9A9468 80241078 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 9A946C 8024107C 03E00008 */ jr $ra -/* 9A9470 80241080 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s deleted file mode 100644 index e579b97328..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241144_9A9534 -/* 9A9534 80241144 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A9538 80241148 AFB40040 */ sw $s4, 0x40($sp) -/* 9A953C 8024114C 0080A02D */ daddu $s4, $a0, $zero -/* 9A9540 80241150 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A9544 80241154 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A9548 80241158 AFB20038 */ sw $s2, 0x38($sp) -/* 9A954C 8024115C AFB10034 */ sw $s1, 0x34($sp) -/* 9A9550 80241160 AFB00030 */ sw $s0, 0x30($sp) -/* 9A9554 80241164 8E910148 */ lw $s1, 0x148($s4) -/* 9A9558 80241168 00A0902D */ daddu $s2, $a1, $zero -/* 9A955C 8024116C 86240008 */ lh $a0, 8($s1) -/* 9A9560 80241170 0C00EABB */ jal get_npc_unsafe -/* 9A9564 80241174 00C0982D */ daddu $s3, $a2, $zero -/* 9A9568 80241178 8E430014 */ lw $v1, 0x14($s2) -/* 9A956C 8024117C 04600031 */ bltz $v1, .L80241244 -/* 9A9570 80241180 0040802D */ daddu $s0, $v0, $zero -/* 9A9574 80241184 0260202D */ daddu $a0, $s3, $zero -/* 9A9578 80241188 AFA00010 */ sw $zero, 0x10($sp) -/* 9A957C 8024118C 8E460024 */ lw $a2, 0x24($s2) -/* 9A9580 80241190 8E470028 */ lw $a3, 0x28($s2) -/* 9A9584 80241194 0C01242D */ jal func_800490B4 -/* 9A9588 80241198 0220282D */ daddu $a1, $s1, $zero -/* 9A958C 8024119C 10400029 */ beqz $v0, .L80241244 -/* 9A9590 802411A0 0000202D */ daddu $a0, $zero, $zero -/* 9A9594 802411A4 0200282D */ daddu $a1, $s0, $zero -/* 9A9598 802411A8 0000302D */ daddu $a2, $zero, $zero -/* 9A959C 802411AC 860300A8 */ lh $v1, 0xa8($s0) -/* 9A95A0 802411B0 3C013F80 */ lui $at, 0x3f80 -/* 9A95A4 802411B4 44810000 */ mtc1 $at, $f0 -/* 9A95A8 802411B8 3C014000 */ lui $at, 0x4000 -/* 9A95AC 802411BC 44811000 */ mtc1 $at, $f2 -/* 9A95B0 802411C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A95B4 802411C4 44812000 */ mtc1 $at, $f4 -/* 9A95B8 802411C8 2402000F */ addiu $v0, $zero, 0xf -/* 9A95BC 802411CC AFA2001C */ sw $v0, 0x1c($sp) -/* 9A95C0 802411D0 44833000 */ mtc1 $v1, $f6 -/* 9A95C4 802411D4 00000000 */ nop -/* 9A95C8 802411D8 468031A0 */ cvt.s.w $f6, $f6 -/* 9A95CC 802411DC 44073000 */ mfc1 $a3, $f6 -/* 9A95D0 802411E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A95D4 802411E4 AFA20020 */ sw $v0, 0x20($sp) -/* 9A95D8 802411E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A95DC 802411EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A95E0 802411F0 0C01BFA4 */ jal fx_emote -/* 9A95E4 802411F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A95E8 802411F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A95EC 802411FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A95F0 80241200 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A95F4 80241204 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A95F8 80241208 8C460028 */ lw $a2, 0x28($v0) -/* 9A95FC 8024120C 0C00A720 */ jal atan2 -/* 9A9600 80241210 8C470030 */ lw $a3, 0x30($v0) -/* 9A9604 80241214 0200202D */ daddu $a0, $s0, $zero -/* 9A9608 80241218 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A960C 8024121C 3C060020 */ lui $a2, 0x20 -/* 9A9610 80241220 0C012530 */ jal func_800494C0 -/* 9A9614 80241224 E480000C */ swc1 $f0, 0xc($a0) -/* 9A9618 80241228 8E220018 */ lw $v0, 0x18($s1) -/* 9A961C 8024122C 9442002A */ lhu $v0, 0x2a($v0) -/* 9A9620 80241230 30420001 */ andi $v0, $v0, 1 -/* 9A9624 80241234 14400029 */ bnez $v0, .L802412DC -/* 9A9628 80241238 2402000A */ addiu $v0, $zero, 0xa -/* 9A962C 8024123C 080904B7 */ j .L802412DC -/* 9A9630 80241240 2402000C */ addiu $v0, $zero, 0xc -.L80241244: -/* 9A9634 80241244 8602008C */ lh $v0, 0x8c($s0) -/* 9A9638 80241248 14400025 */ bnez $v0, .L802412E0 -/* 9A963C 8024124C 00000000 */ nop -/* 9A9640 80241250 9602008E */ lhu $v0, 0x8e($s0) -/* 9A9644 80241254 2442FFFF */ addiu $v0, $v0, -1 -/* 9A9648 80241258 A602008E */ sh $v0, 0x8e($s0) -/* 9A964C 8024125C 00021400 */ sll $v0, $v0, 0x10 -/* 9A9650 80241260 1440001F */ bnez $v0, .L802412E0 -/* 9A9654 80241264 00000000 */ nop -/* 9A9658 80241268 8E820074 */ lw $v0, 0x74($s4) -/* 9A965C 8024126C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A9660 80241270 10400019 */ beqz $v0, .L802412D8 -/* 9A9664 80241274 AE820074 */ sw $v0, 0x74($s4) -/* 9A9668 80241278 8E220018 */ lw $v0, 0x18($s1) -/* 9A966C 8024127C 9442002A */ lhu $v0, 0x2a($v0) -/* 9A9670 80241280 30420010 */ andi $v0, $v0, 0x10 -/* 9A9674 80241284 14400007 */ bnez $v0, .L802412A4 -/* 9A9678 80241288 00000000 */ nop -/* 9A967C 8024128C C600000C */ lwc1 $f0, 0xc($s0) -/* 9A9680 80241290 3C014334 */ lui $at, 0x4334 -/* 9A9684 80241294 44816000 */ mtc1 $at, $f12 -/* 9A9688 80241298 0C00A6C9 */ jal clamp_angle -/* 9A968C 8024129C 460C0300 */ add.s $f12, $f0, $f12 -/* 9A9690 802412A0 E600000C */ swc1 $f0, 0xc($s0) -.L802412A4: -/* 9A9694 802412A4 8E440008 */ lw $a0, 8($s2) -/* 9A9698 802412A8 000417C2 */ srl $v0, $a0, 0x1f -/* 9A969C 802412AC 00822021 */ addu $a0, $a0, $v0 -/* 9A96A0 802412B0 00042043 */ sra $a0, $a0, 1 -/* 9A96A4 802412B4 0C00A67F */ jal rand_int -/* 9A96A8 802412B8 24840001 */ addiu $a0, $a0, 1 -/* 9A96AC 802412BC 8E430008 */ lw $v1, 8($s2) -/* 9A96B0 802412C0 000327C2 */ srl $a0, $v1, 0x1f -/* 9A96B4 802412C4 00641821 */ addu $v1, $v1, $a0 -/* 9A96B8 802412C8 00031843 */ sra $v1, $v1, 1 -/* 9A96BC 802412CC 00621821 */ addu $v1, $v1, $v0 -/* 9A96C0 802412D0 080904B8 */ j .L802412E0 -/* 9A96C4 802412D4 A603008E */ sh $v1, 0x8e($s0) -.L802412D8: -/* 9A96C8 802412D8 24020004 */ addiu $v0, $zero, 4 -.L802412DC: -/* 9A96CC 802412DC AE820070 */ sw $v0, 0x70($s4) -.L802412E0: -/* 9A96D0 802412E0 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A96D4 802412E4 8FB40040 */ lw $s4, 0x40($sp) -/* 9A96D8 802412E8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A96DC 802412EC 8FB20038 */ lw $s2, 0x38($sp) -/* 9A96E0 802412F0 8FB10034 */ lw $s1, 0x34($sp) -/* 9A96E4 802412F4 8FB00030 */ lw $s0, 0x30($sp) -/* 9A96E8 802412F8 03E00008 */ jr $ra -/* 9A96EC 802412FC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s deleted file mode 100644 index e3e59afd61..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802415D0_9A99C0.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D0_9A99C0 -/* 9A99C0 802415D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A99C4 802415D4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A99C8 802415D8 0080982D */ daddu $s3, $a0, $zero -/* 9A99CC 802415DC AFBF0040 */ sw $ra, 0x40($sp) -/* 9A99D0 802415E0 AFB20038 */ sw $s2, 0x38($sp) -/* 9A99D4 802415E4 AFB10034 */ sw $s1, 0x34($sp) -/* 9A99D8 802415E8 AFB00030 */ sw $s0, 0x30($sp) -/* 9A99DC 802415EC 8E720148 */ lw $s2, 0x148($s3) -/* 9A99E0 802415F0 00A0882D */ daddu $s1, $a1, $zero -/* 9A99E4 802415F4 86440008 */ lh $a0, 8($s2) -/* 9A99E8 802415F8 0C00EABB */ jal get_npc_unsafe -/* 9A99EC 802415FC 00C0802D */ daddu $s0, $a2, $zero -/* 9A99F0 80241600 0200202D */ daddu $a0, $s0, $zero -/* 9A99F4 80241604 0240282D */ daddu $a1, $s2, $zero -/* 9A99F8 80241608 24030001 */ addiu $v1, $zero, 1 -/* 9A99FC 8024160C AFA30010 */ sw $v1, 0x10($sp) -/* 9A9A00 80241610 8E260024 */ lw $a2, 0x24($s1) -/* 9A9A04 80241614 8E270028 */ lw $a3, 0x28($s1) -/* 9A9A08 80241618 0C01242D */ jal func_800490B4 -/* 9A9A0C 8024161C 0040802D */ daddu $s0, $v0, $zero -/* 9A9A10 80241620 1440001E */ bnez $v0, .L8024169C -/* 9A9A14 80241624 0200202D */ daddu $a0, $s0, $zero -/* 9A9A18 80241628 24040002 */ addiu $a0, $zero, 2 -/* 9A9A1C 8024162C 0200282D */ daddu $a1, $s0, $zero -/* 9A9A20 80241630 0000302D */ daddu $a2, $zero, $zero -/* 9A9A24 80241634 860300A8 */ lh $v1, 0xa8($s0) -/* 9A9A28 80241638 3C013F80 */ lui $at, 0x3f80 -/* 9A9A2C 8024163C 44810000 */ mtc1 $at, $f0 -/* 9A9A30 80241640 3C014000 */ lui $at, 0x4000 -/* 9A9A34 80241644 44811000 */ mtc1 $at, $f2 -/* 9A9A38 80241648 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A9A3C 8024164C 44812000 */ mtc1 $at, $f4 -/* 9A9A40 80241650 2402000F */ addiu $v0, $zero, 0xf -/* 9A9A44 80241654 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A9A48 80241658 44833000 */ mtc1 $v1, $f6 -/* 9A9A4C 8024165C 00000000 */ nop -/* 9A9A50 80241660 468031A0 */ cvt.s.w $f6, $f6 -/* 9A9A54 80241664 44073000 */ mfc1 $a3, $f6 -/* 9A9A58 80241668 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A9A5C 8024166C AFA20020 */ sw $v0, 0x20($sp) -/* 9A9A60 80241670 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A9A64 80241674 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A9A68 80241678 0C01BFA4 */ jal fx_emote -/* 9A9A6C 8024167C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A9A70 80241680 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A9A74 80241684 8C430000 */ lw $v1, ($v0) -/* 9A9A78 80241688 24020019 */ addiu $v0, $zero, 0x19 -/* 9A9A7C 8024168C A602008E */ sh $v0, 0x8e($s0) -/* 9A9A80 80241690 2402000E */ addiu $v0, $zero, 0xe -/* 9A9A84 80241694 080905B4 */ j .L802416D0 -/* 9A9A88 80241698 AE030028 */ sw $v1, 0x28($s0) -.L8024169C: -/* 9A9A8C 8024169C 0C00F598 */ jal func_8003D660 -/* 9A9A90 802416A0 24050001 */ addiu $a1, $zero, 1 -/* 9A9A94 802416A4 8E050018 */ lw $a1, 0x18($s0) -/* 9A9A98 802416A8 8E06000C */ lw $a2, 0xc($s0) -/* 9A9A9C 802416AC 0C00EA95 */ jal npc_move_heading -/* 9A9AA0 802416B0 0200202D */ daddu $a0, $s0, $zero -/* 9A9AA4 802416B4 8602008E */ lh $v0, 0x8e($s0) -/* 9A9AA8 802416B8 9603008E */ lhu $v1, 0x8e($s0) -/* 9A9AAC 802416BC 18400003 */ blez $v0, .L802416CC -/* 9A9AB0 802416C0 2462FFFF */ addiu $v0, $v1, -1 -/* 9A9AB4 802416C4 080905B5 */ j .L802416D4 -/* 9A9AB8 802416C8 A602008E */ sh $v0, 0x8e($s0) -.L802416CC: -/* 9A9ABC 802416CC 2402000C */ addiu $v0, $zero, 0xc -.L802416D0: -/* 9A9AC0 802416D0 AE620070 */ sw $v0, 0x70($s3) -.L802416D4: -/* 9A9AC4 802416D4 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A9AC8 802416D8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A9ACC 802416DC 8FB20038 */ lw $s2, 0x38($sp) -/* 9A9AD0 802416E0 8FB10034 */ lw $s1, 0x34($sp) -/* 9A9AD4 802416E4 8FB00030 */ lw $s0, 0x30($sp) -/* 9A9AD8 802416E8 03E00008 */ jr $ra -/* 9A9ADC 802416EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s deleted file mode 100644 index eb13f48069..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241758_9A9B48 -/* 9A9B48 80241758 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A9B4C 8024175C AFB10014 */ sw $s1, 0x14($sp) -/* 9A9B50 80241760 0080882D */ daddu $s1, $a0, $zero -/* 9A9B54 80241764 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A9B58 80241768 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9B5C 8024176C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9B60 80241770 8E300148 */ lw $s0, 0x148($s1) -/* 9A9B64 80241774 86040008 */ lh $a0, 8($s0) -/* 9A9B68 80241778 0C00EABB */ jal get_npc_unsafe -/* 9A9B6C 8024177C 00A0902D */ daddu $s2, $a1, $zero -/* 9A9B70 80241780 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A9B74 80241784 8E240078 */ lw $a0, 0x78($s1) -/* 9A9B78 80241788 8C630000 */ lw $v1, ($v1) -/* 9A9B7C 8024178C 0083182A */ slt $v1, $a0, $v1 -/* 9A9B80 80241790 10600013 */ beqz $v1, .L802417E0 -/* 9A9B84 80241794 0040302D */ daddu $a2, $v0, $zero -/* 9A9B88 80241798 00041040 */ sll $v0, $a0, 1 -/* 9A9B8C 8024179C 00441021 */ addu $v0, $v0, $a0 -/* 9A9B90 802417A0 00022880 */ sll $a1, $v0, 2 -.L802417A4: -/* 9A9B94 802417A4 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A9B98 802417A8 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9A9B9C 802417AC 00A31021 */ addu $v0, $a1, $v1 -/* 9A9BA0 802417B0 C4400008 */ lwc1 $f0, 8($v0) -/* 9A9BA4 802417B4 46800020 */ cvt.s.w $f0, $f0 -/* 9A9BA8 802417B8 4602003E */ c.le.s $f0, $f2 -/* 9A9BAC 802417BC 00000000 */ nop -/* 9A9BB0 802417C0 45020003 */ bc1fl .L802417D0 -/* 9A9BB4 802417C4 24840001 */ addiu $a0, $a0, 1 -/* 9A9BB8 802417C8 080905F8 */ j .L802417E0 -/* 9A9BBC 802417CC AE240078 */ sw $a0, 0x78($s1) -.L802417D0: -/* 9A9BC0 802417D0 8C620000 */ lw $v0, ($v1) -/* 9A9BC4 802417D4 0082102A */ slt $v0, $a0, $v0 -/* 9A9BC8 802417D8 1440FFF2 */ bnez $v0, .L802417A4 -/* 9A9BCC 802417DC 24A5000C */ addiu $a1, $a1, 0xc -.L802417E0: -/* 9A9BD0 802417E0 C6400000 */ lwc1 $f0, ($s2) -/* 9A9BD4 802417E4 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9A9BD8 802417E8 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A9BDC 802417EC 8C420004 */ lw $v0, 4($v0) -/* 9A9BE0 802417F0 ACC20028 */ sw $v0, 0x28($a2) -/* 9A9BE4 802417F4 24020001 */ addiu $v0, $zero, 1 -/* 9A9BE8 802417F8 AE200074 */ sw $zero, 0x74($s1) -/* 9A9BEC 802417FC AE220070 */ sw $v0, 0x70($s1) -/* 9A9BF0 80241800 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A9BF4 80241804 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9BF8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9BFC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9C00 80241810 03E00008 */ jr $ra -/* 9A9C04 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index cb0e59d570..3c4f271447 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -137,7 +137,7 @@ glabel L802419FC_9A9DEC glabel L80241A0C_9A9DFC /* 9A9DFC 80241A0C 0280202D */ daddu $a0, $s4, $zero /* 9A9E00 80241A10 0260282D */ daddu $a1, $s3, $zero -/* 9A9E04 80241A14 0C090377 */ jal func_80240DDC_9A91CC +/* 9A9E04 80241A14 0C090377 */ jal trd_04_UnkFunc13 /* 9A9E08 80241A18 02A0302D */ daddu $a2, $s5, $zero /* 9A9E0C 80241A1C 080906BB */ j L80241AEC_9A9EDC /* 9A9E10 80241A20 00000000 */ nop @@ -149,7 +149,7 @@ glabel L80241A24_9A9E14 glabel L80241A34_9A9E24 /* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero -/* 9A9E2C 80241A3C 0C090451 */ jal func_80241144_9A9534 +/* 9A9E2C 80241A3C 0C090451 */ jal trd_04_UnkFunc14 /* 9A9E30 80241A40 02A0302D */ daddu $a2, $s5, $zero /* 9A9E34 80241A44 080906BB */ j L80241AEC_9A9EDC /* 9A9E38 80241A48 00000000 */ nop @@ -180,7 +180,7 @@ glabel L80241A8C_9A9E7C glabel L80241A9C_9A9E8C /* 9A9E8C 80241A9C 0280202D */ daddu $a0, $s4, $zero /* 9A9E90 80241AA0 0260282D */ daddu $a1, $s3, $zero -/* 9A9E94 80241AA4 0C090574 */ jal func_802415D0_9A99C0 +/* 9A9E94 80241AA4 0C090574 */ jal trd_04_UnkFunc15 /* 9A9E98 80241AA8 02A0302D */ daddu $a2, $s5, $zero /* 9A9E9C 80241AAC 080906BB */ j L80241AEC_9A9EDC /* 9A9EA0 80241AB0 00000000 */ nop @@ -194,7 +194,7 @@ glabel L80241AB4_9A9EA4 glabel L80241ACC_9A9EBC /* 9A9EBC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9A9EC0 80241AD0 0260282D */ daddu $a1, $s3, $zero -/* 9A9EC4 80241AD4 0C0905D6 */ jal func_80241758_9A9B48 +/* 9A9EC4 80241AD4 0C0905D6 */ jal trd_04_UnkFunc16 /* 9A9EC8 80241AD8 02A0302D */ daddu $a2, $s5, $zero /* 9A9ECC 80241ADC 080906BB */ j L80241AEC_9A9EDC /* 9A9ED0 80241AE0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index 5209aef809..82db97c1f9 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -149,7 +149,7 @@ glabel L80241D20_9AA110 glabel L80241D38_9AA128 /* 9AA128 80241D38 0260202D */ daddu $a0, $s3, $zero /* 9AA12C 80241D3C 0280282D */ daddu $a1, $s4, $zero -/* 9AA130 80241D40 0C090377 */ jal func_80240DDC_9A91CC +/* 9AA130 80241D40 0C090377 */ jal trd_04_UnkFunc13 /* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero /* 9AA138 80241D48 0809077C */ j L80241DF0_9AA1E0 /* 9AA13C 80241D4C 00000000 */ nop @@ -161,7 +161,7 @@ glabel L80241D50_9AA140 glabel L80241D60_9AA150 /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero -/* 9AA158 80241D68 0C090451 */ jal func_80241144_9A9534 +/* 9AA158 80241D68 0C090451 */ jal trd_04_UnkFunc14 /* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero /* 9AA160 80241D70 0809077C */ j L80241DF0_9AA1E0 /* 9AA164 80241D74 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s deleted file mode 100644 index 3207060b82..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B0_9AAAA0 -/* 9AAAA0 802426B0 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 9AAAA4 802426B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 9AAAA8 802426B8 0080982D */ daddu $s3, $a0, $zero -/* 9AAAAC 802426BC AFBF0054 */ sw $ra, 0x54($sp) -/* 9AAAB0 802426C0 AFB40050 */ sw $s4, 0x50($sp) -/* 9AAAB4 802426C4 AFB20048 */ sw $s2, 0x48($sp) -/* 9AAAB8 802426C8 AFB10044 */ sw $s1, 0x44($sp) -/* 9AAABC 802426CC AFB00040 */ sw $s0, 0x40($sp) -/* 9AAAC0 802426D0 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 9AAAC4 802426D4 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 9AAAC8 802426D8 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 9AAACC 802426DC F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9AAAD0 802426E0 8E710148 */ lw $s1, 0x148($s3) -/* 9AAAD4 802426E4 00A0902D */ daddu $s2, $a1, $zero -/* 9AAAD8 802426E8 86240008 */ lh $a0, 8($s1) -/* 9AAADC 802426EC 0C00EABB */ jal get_npc_unsafe -/* 9AAAE0 802426F0 00C0A02D */ daddu $s4, $a2, $zero -/* 9AAAE4 802426F4 0040802D */ daddu $s0, $v0, $zero -/* 9AAAE8 802426F8 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AAAEC 802426FC 46800020 */ cvt.s.w $f0, $f0 -/* 9AAAF0 80242700 46000021 */ cvt.d.s $f0, $f0 -/* 9AAAF4 80242704 3C014059 */ lui $at, 0x4059 -/* 9AAAF8 80242708 44811800 */ mtc1 $at, $f3 -/* 9AAAFC 8024270C 44801000 */ mtc1 $zero, $f2 -/* 9AAB00 80242710 8602008E */ lh $v0, 0x8e($s0) -/* 9AAB04 80242714 9603008E */ lhu $v1, 0x8e($s0) -/* 9AAB08 80242718 46220003 */ div.d $f0, $f0, $f2 -/* 9AAB0C 8024271C 46200620 */ cvt.s.d $f24, $f0 -/* 9AAB10 80242720 C6200088 */ lwc1 $f0, 0x88($s1) -/* 9AAB14 80242724 46800020 */ cvt.s.w $f0, $f0 -/* 9AAB18 80242728 46000021 */ cvt.d.s $f0, $f0 -/* 9AAB1C 8024272C 46220003 */ div.d $f0, $f0, $f2 -/* 9AAB20 80242730 46200020 */ cvt.s.d $f0, $f0 -/* 9AAB24 80242734 18400003 */ blez $v0, .L80242744 -/* 9AAB28 80242738 4600C680 */ add.s $f26, $f24, $f0 -/* 9AAB2C 8024273C 2462FFFF */ addiu $v0, $v1, -1 -/* 9AAB30 80242740 A602008E */ sh $v0, 0x8e($s0) -.L80242744: -/* 9AAB34 80242744 8E220070 */ lw $v0, 0x70($s1) -/* 9AAB38 80242748 18400034 */ blez $v0, .L8024281C -/* 9AAB3C 8024274C 00000000 */ nop -/* 9AAB40 80242750 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9AAB44 80242754 46806320 */ cvt.s.w $f12, $f12 -/* 9AAB48 80242758 44820000 */ mtc1 $v0, $f0 -/* 9AAB4C 8024275C 00000000 */ nop -/* 9AAB50 80242760 46800020 */ cvt.s.w $f0, $f0 -/* 9AAB54 80242764 46000021 */ cvt.d.s $f0, $f0 -/* 9AAB58 80242768 46220003 */ div.d $f0, $f0, $f2 -/* 9AAB5C 8024276C 0C00A8BB */ jal sin_deg -/* 9AAB60 80242770 462005A0 */ cvt.s.d $f22, $f0 -/* 9AAB64 80242774 8E020000 */ lw $v0, ($s0) -/* 9AAB68 80242778 30420008 */ andi $v0, $v0, 8 -/* 9AAB6C 8024277C 10400003 */ beqz $v0, .L8024278C -/* 9AAB70 80242780 46000506 */ mov.s $f20, $f0 -/* 9AAB74 80242784 080909F3 */ j .L802427CC -/* 9AAB78 80242788 0000102D */ daddu $v0, $zero, $zero -.L8024278C: -/* 9AAB7C 8024278C 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AAB80 80242790 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AAB84 80242794 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AAB88 80242798 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AAB8C 8024279C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AAB90 802427A0 3C01447A */ lui $at, 0x447a -/* 9AAB94 802427A4 44813000 */ mtc1 $at, $f6 -/* 9AAB98 802427A8 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AAB9C 802427AC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AABA0 802427B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9AABA4 802427B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9AABA8 802427B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9AABAC 802427BC AFA20010 */ sw $v0, 0x10($sp) -/* 9AABB0 802427C0 8E040080 */ lw $a0, 0x80($s0) -/* 9AABB4 802427C4 0C0372DF */ jal func_800DCB7C -/* 9AABB8 802427C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802427CC: -/* 9AABBC 802427CC 10400007 */ beqz $v0, .L802427EC -/* 9AABC0 802427D0 00000000 */ nop -/* 9AABC4 802427D4 4616A082 */ mul.s $f2, $f20, $f22 -/* 9AABC8 802427D8 00000000 */ nop -/* 9AABCC 802427DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9AABD0 802427E0 46180000 */ add.s $f0, $f0, $f24 -/* 9AABD4 802427E4 080909FE */ j .L802427F8 -/* 9AABD8 802427E8 46020000 */ add.s $f0, $f0, $f2 -.L802427EC: -/* 9AABDC 802427EC 4616A002 */ mul.s $f0, $f20, $f22 -/* 9AABE0 802427F0 00000000 */ nop -/* 9AABE4 802427F4 4600D000 */ add.s $f0, $f26, $f0 -.L802427F8: -/* 9AABE8 802427F8 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AABEC 802427FC 8E220074 */ lw $v0, 0x74($s1) -/* 9AABF0 80242800 2442000A */ addiu $v0, $v0, 0xa -/* 9AABF4 80242804 44826000 */ mtc1 $v0, $f12 -/* 9AABF8 80242808 00000000 */ nop -/* 9AABFC 8024280C 0C00A6C9 */ jal clamp_angle -/* 9AAC00 80242810 46806320 */ cvt.s.w $f12, $f12 -/* 9AAC04 80242814 4600020D */ trunc.w.s $f8, $f0 -/* 9AAC08 80242818 E6280074 */ swc1 $f8, 0x74($s1) -.L8024281C: -/* 9AAC0C 8024281C 8E220090 */ lw $v0, 0x90($s1) -/* 9AAC10 80242820 1C400040 */ bgtz $v0, .L80242924 -/* 9AAC14 80242824 2442FFFF */ addiu $v0, $v0, -1 -/* 9AAC18 80242828 860200A8 */ lh $v0, 0xa8($s0) -/* 9AAC1C 8024282C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AAC20 80242830 44821000 */ mtc1 $v0, $f2 -/* 9AAC24 80242834 00000000 */ nop -/* 9AAC28 80242838 468010A0 */ cvt.s.w $f2, $f2 -/* 9AAC2C 8024283C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AAC30 80242840 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AAC34 80242844 46020000 */ add.s $f0, $f0, $f2 -/* 9AAC38 80242848 3C014024 */ lui $at, 0x4024 -/* 9AAC3C 8024284C 44812800 */ mtc1 $at, $f5 -/* 9AAC40 80242850 44802000 */ mtc1 $zero, $f4 -/* 9AAC44 80242854 C442002C */ lwc1 $f2, 0x2c($v0) -/* 9AAC48 80242858 46000021 */ cvt.d.s $f0, $f0 -/* 9AAC4C 8024285C 46240000 */ add.d $f0, $f0, $f4 -/* 9AAC50 80242860 460010A1 */ cvt.d.s $f2, $f2 -/* 9AAC54 80242864 4620103C */ c.lt.d $f2, $f0 -/* 9AAC58 80242868 00000000 */ nop -/* 9AAC5C 8024286C 4500002E */ bc1f .L80242928 -/* 9AAC60 80242870 0280202D */ daddu $a0, $s4, $zero -/* 9AAC64 80242874 24020001 */ addiu $v0, $zero, 1 -/* 9AAC68 80242878 AFA20010 */ sw $v0, 0x10($sp) -/* 9AAC6C 8024287C 8E460024 */ lw $a2, 0x24($s2) -/* 9AAC70 80242880 8E470028 */ lw $a3, 0x28($s2) -/* 9AAC74 80242884 0C01242D */ jal func_800490B4 -/* 9AAC78 80242888 0220282D */ daddu $a1, $s1, $zero -/* 9AAC7C 8024288C 10400026 */ beqz $v0, .L80242928 -/* 9AAC80 80242890 0000202D */ daddu $a0, $zero, $zero -/* 9AAC84 80242894 0200282D */ daddu $a1, $s0, $zero -/* 9AAC88 80242898 0000302D */ daddu $a2, $zero, $zero -/* 9AAC8C 8024289C 2412000C */ addiu $s2, $zero, 0xc -/* 9AAC90 802428A0 860300A8 */ lh $v1, 0xa8($s0) -/* 9AAC94 802428A4 3C013F80 */ lui $at, 0x3f80 -/* 9AAC98 802428A8 44810000 */ mtc1 $at, $f0 -/* 9AAC9C 802428AC 3C014000 */ lui $at, 0x4000 -/* 9AACA0 802428B0 44811000 */ mtc1 $at, $f2 -/* 9AACA4 802428B4 3C01C1A0 */ lui $at, 0xc1a0 -/* 9AACA8 802428B8 44812000 */ mtc1 $at, $f4 -/* 9AACAC 802428BC 44834000 */ mtc1 $v1, $f8 -/* 9AACB0 802428C0 00000000 */ nop -/* 9AACB4 802428C4 46804220 */ cvt.s.w $f8, $f8 -/* 9AACB8 802428C8 44074000 */ mfc1 $a3, $f8 -/* 9AACBC 802428CC 27A20038 */ addiu $v0, $sp, 0x38 -/* 9AACC0 802428D0 AFB2001C */ sw $s2, 0x1c($sp) -/* 9AACC4 802428D4 AFA20020 */ sw $v0, 0x20($sp) -/* 9AACC8 802428D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AACCC 802428DC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9AACD0 802428E0 0C01BFA4 */ jal fx_emote -/* 9AACD4 802428E4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9AACD8 802428E8 0200202D */ daddu $a0, $s0, $zero -/* 9AACDC 802428EC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9AACE0 802428F0 C480003C */ lwc1 $f0, 0x3c($a0) -/* 9AACE4 802428F4 3C060020 */ lui $a2, 0x20 -/* 9AACE8 802428F8 0C012530 */ jal func_800494C0 -/* 9AACEC 802428FC E4800064 */ swc1 $f0, 0x64($a0) -/* 9AACF0 80242900 8E220018 */ lw $v0, 0x18($s1) -/* 9AACF4 80242904 9442002A */ lhu $v0, 0x2a($v0) -/* 9AACF8 80242908 30420001 */ andi $v0, $v0, 1 -/* 9AACFC 8024290C 10400003 */ beqz $v0, .L8024291C -/* 9AAD00 80242910 2402000A */ addiu $v0, $zero, 0xa -/* 9AAD04 80242914 08090A71 */ j .L802429C4 -/* 9AAD08 80242918 AE620070 */ sw $v0, 0x70($s3) -.L8024291C: -/* 9AAD0C 8024291C 08090A71 */ j .L802429C4 -/* 9AAD10 80242920 AE720070 */ sw $s2, 0x70($s3) -.L80242924: -/* 9AAD14 80242924 AE220090 */ sw $v0, 0x90($s1) -.L80242928: -/* 9AAD18 80242928 8602008C */ lh $v0, 0x8c($s0) -/* 9AAD1C 8024292C 14400025 */ bnez $v0, .L802429C4 -/* 9AAD20 80242930 00000000 */ nop -/* 9AAD24 80242934 8602008E */ lh $v0, 0x8e($s0) -/* 9AAD28 80242938 1C400022 */ bgtz $v0, .L802429C4 -/* 9AAD2C 8024293C 00000000 */ nop -/* 9AAD30 80242940 8E620074 */ lw $v0, 0x74($s3) -/* 9AAD34 80242944 2442FFFF */ addiu $v0, $v0, -1 -/* 9AAD38 80242948 1840001D */ blez $v0, .L802429C0 -/* 9AAD3C 8024294C AE620074 */ sw $v0, 0x74($s3) -/* 9AAD40 80242950 8E220018 */ lw $v0, 0x18($s1) -/* 9AAD44 80242954 9442002A */ lhu $v0, 0x2a($v0) -/* 9AAD48 80242958 30420010 */ andi $v0, $v0, 0x10 -/* 9AAD4C 8024295C 14400007 */ bnez $v0, .L8024297C -/* 9AAD50 80242960 00000000 */ nop -/* 9AAD54 80242964 C600000C */ lwc1 $f0, 0xc($s0) -/* 9AAD58 80242968 3C014334 */ lui $at, 0x4334 -/* 9AAD5C 8024296C 44816000 */ mtc1 $at, $f12 -/* 9AAD60 80242970 0C00A6C9 */ jal clamp_angle -/* 9AAD64 80242974 460C0300 */ add.s $f12, $f0, $f12 -/* 9AAD68 80242978 E600000C */ swc1 $f0, 0xc($s0) -.L8024297C: -/* 9AAD6C 8024297C 0C00A67F */ jal rand_int -/* 9AAD70 80242980 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9AAD74 80242984 3C032E8B */ lui $v1, 0x2e8b -/* 9AAD78 80242988 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9AAD7C 8024298C 00430018 */ mult $v0, $v1 -/* 9AAD80 80242990 00021FC3 */ sra $v1, $v0, 0x1f -/* 9AAD84 80242994 00004010 */ mfhi $t0 -/* 9AAD88 80242998 00082043 */ sra $a0, $t0, 1 -/* 9AAD8C 8024299C 00832023 */ subu $a0, $a0, $v1 -/* 9AAD90 802429A0 00041840 */ sll $v1, $a0, 1 -/* 9AAD94 802429A4 00641821 */ addu $v1, $v1, $a0 -/* 9AAD98 802429A8 00031880 */ sll $v1, $v1, 2 -/* 9AAD9C 802429AC 00641823 */ subu $v1, $v1, $a0 -/* 9AADA0 802429B0 00431023 */ subu $v0, $v0, $v1 -/* 9AADA4 802429B4 24420005 */ addiu $v0, $v0, 5 -/* 9AADA8 802429B8 08090A71 */ j .L802429C4 -/* 9AADAC 802429BC A602008E */ sh $v0, 0x8e($s0) -.L802429C0: -/* 9AADB0 802429C0 AE600070 */ sw $zero, 0x70($s3) -.L802429C4: -/* 9AADB4 802429C4 8FBF0054 */ lw $ra, 0x54($sp) -/* 9AADB8 802429C8 8FB40050 */ lw $s4, 0x50($sp) -/* 9AADBC 802429CC 8FB3004C */ lw $s3, 0x4c($sp) -/* 9AADC0 802429D0 8FB20048 */ lw $s2, 0x48($sp) -/* 9AADC4 802429D4 8FB10044 */ lw $s1, 0x44($sp) -/* 9AADC8 802429D8 8FB00040 */ lw $s0, 0x40($sp) -/* 9AADCC 802429DC D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 9AADD0 802429E0 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 9AADD4 802429E4 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 9AADD8 802429E8 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9AADDC 802429EC 03E00008 */ jr $ra -/* 9AADE0 802429F0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s deleted file mode 100644 index 56369a877e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C70_9AB060 -/* 9AB060 80242C70 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9AB064 80242C74 AFB20030 */ sw $s2, 0x30($sp) -/* 9AB068 80242C78 0080902D */ daddu $s2, $a0, $zero -/* 9AB06C 80242C7C AFBF0038 */ sw $ra, 0x38($sp) -/* 9AB070 80242C80 AFB30034 */ sw $s3, 0x34($sp) -/* 9AB074 80242C84 AFB1002C */ sw $s1, 0x2c($sp) -/* 9AB078 80242C88 AFB00028 */ sw $s0, 0x28($sp) -/* 9AB07C 80242C8C F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9AB080 80242C90 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9AB084 80242C94 8E510148 */ lw $s1, 0x148($s2) -/* 9AB088 80242C98 86240008 */ lh $a0, 8($s1) -/* 9AB08C 80242C9C 0C00EABB */ jal get_npc_unsafe -/* 9AB090 80242CA0 00A0982D */ daddu $s3, $a1, $zero -/* 9AB094 80242CA4 0040802D */ daddu $s0, $v0, $zero -/* 9AB098 80242CA8 0200202D */ daddu $a0, $s0, $zero -/* 9AB09C 80242CAC C6220088 */ lwc1 $f2, 0x88($s1) -/* 9AB0A0 80242CB0 468010A0 */ cvt.s.w $f2, $f2 -/* 9AB0A4 80242CB4 460010A1 */ cvt.d.s $f2, $f2 -/* 9AB0A8 80242CB8 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB0AC 80242CBC C6000014 */ lwc1 $f0, 0x14($s0) -/* 9AB0B0 80242CC0 8E050018 */ lw $a1, 0x18($s0) -/* 9AB0B4 80242CC4 46002100 */ add.s $f4, $f4, $f0 -/* 9AB0B8 80242CC8 8E06000C */ lw $a2, 0xc($s0) -/* 9AB0BC 80242CCC C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AB0C0 80242CD0 46800020 */ cvt.s.w $f0, $f0 -/* 9AB0C4 80242CD4 E604001C */ swc1 $f4, 0x1c($s0) -/* 9AB0C8 80242CD8 3C014059 */ lui $at, 0x4059 -/* 9AB0CC 80242CDC 44812800 */ mtc1 $at, $f5 -/* 9AB0D0 80242CE0 44802000 */ mtc1 $zero, $f4 -/* 9AB0D4 80242CE4 46000021 */ cvt.d.s $f0, $f0 -/* 9AB0D8 80242CE8 46240003 */ div.d $f0, $f0, $f4 -/* 9AB0DC 80242CEC 46200520 */ cvt.s.d $f20, $f0 -/* 9AB0E0 80242CF0 46241083 */ div.d $f2, $f2, $f4 -/* 9AB0E4 80242CF4 0C00EA95 */ jal npc_move_heading -/* 9AB0E8 80242CF8 462015A0 */ cvt.s.d $f22, $f2 -/* 9AB0EC 80242CFC C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB0F0 80242D00 44801000 */ mtc1 $zero, $f2 -/* 9AB0F4 80242D04 44801800 */ mtc1 $zero, $f3 -/* 9AB0F8 80242D08 46002021 */ cvt.d.s $f0, $f4 -/* 9AB0FC 80242D0C 4620103E */ c.le.d $f2, $f0 -/* 9AB100 80242D10 00000000 */ nop -/* 9AB104 80242D14 45000030 */ bc1f .L80242DD8 -/* 9AB108 80242D18 00000000 */ nop -/* 9AB10C 80242D1C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB110 80242D20 46040000 */ add.s $f0, $f0, $f4 -/* 9AB114 80242D24 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AB118 80242D28 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AB11C 80242D2C 8C420024 */ lw $v0, 0x24($v0) -/* 9AB120 80242D30 AE020028 */ sw $v0, 0x28($s0) -/* 9AB124 80242D34 A2200007 */ sb $zero, 7($s1) -/* 9AB128 80242D38 8E020000 */ lw $v0, ($s0) -/* 9AB12C 80242D3C 30420008 */ andi $v0, $v0, 8 -/* 9AB130 80242D40 14400011 */ bnez $v0, .L80242D88 -/* 9AB134 80242D44 0000102D */ daddu $v0, $zero, $zero -/* 9AB138 80242D48 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB13C 80242D4C 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB140 80242D50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AB144 80242D54 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB148 80242D58 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AB14C 80242D5C 3C01447A */ lui $at, 0x447a -/* 9AB150 80242D60 44813000 */ mtc1 $at, $f6 -/* 9AB154 80242D64 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB158 80242D68 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB15C 80242D6C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9AB160 80242D70 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9AB164 80242D74 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9AB168 80242D78 AFA20010 */ sw $v0, 0x10($sp) -/* 9AB16C 80242D7C 8E040080 */ lw $a0, 0x80($s0) -/* 9AB170 80242D80 0C0372DF */ jal func_800DCB7C -/* 9AB174 80242D84 27A70020 */ addiu $a3, $sp, 0x20 -.L80242D88: -/* 9AB178 80242D88 1040000B */ beqz $v0, .L80242DB8 -/* 9AB17C 80242D8C 00000000 */ nop -/* 9AB180 80242D90 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB184 80242D94 46140080 */ add.s $f2, $f0, $f20 -/* 9AB188 80242D98 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB18C 80242D9C 4600103E */ c.le.s $f2, $f0 -/* 9AB190 80242DA0 00000000 */ nop -/* 9AB194 80242DA4 4500008D */ bc1f .L80242FDC -/* 9AB198 80242DA8 00000000 */ nop -/* 9AB19C 80242DAC E602003C */ swc1 $f2, 0x3c($s0) -/* 9AB1A0 80242DB0 08090BF7 */ j .L80242FDC -/* 9AB1A4 80242DB4 AE400070 */ sw $zero, 0x70($s2) -.L80242DB8: -/* 9AB1A8 80242DB8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB1AC 80242DBC C6000064 */ lwc1 $f0, 0x64($s0) -/* 9AB1B0 80242DC0 4602003E */ c.le.s $f0, $f2 -/* 9AB1B4 80242DC4 00000000 */ nop -/* 9AB1B8 80242DC8 45030084 */ bc1tl .L80242FDC -/* 9AB1BC 80242DCC AE400070 */ sw $zero, 0x70($s2) -/* 9AB1C0 80242DD0 08090BF7 */ j .L80242FDC -/* 9AB1C4 80242DD4 00000000 */ nop -.L80242DD8: -/* 9AB1C8 80242DD8 4622003C */ c.lt.d $f0, $f2 -/* 9AB1CC 80242DDC 00000000 */ nop -/* 9AB1D0 80242DE0 4500007E */ bc1f .L80242FDC -/* 9AB1D4 80242DE4 00000000 */ nop -/* 9AB1D8 80242DE8 9602008E */ lhu $v0, 0x8e($s0) -/* 9AB1DC 80242DEC 24420001 */ addiu $v0, $v0, 1 -/* 9AB1E0 80242DF0 A602008E */ sh $v0, 0x8e($s0) -/* 9AB1E4 80242DF4 00021400 */ sll $v0, $v0, 0x10 -/* 9AB1E8 80242DF8 8E630020 */ lw $v1, 0x20($s3) -/* 9AB1EC 80242DFC 00021403 */ sra $v0, $v0, 0x10 -/* 9AB1F0 80242E00 0043102A */ slt $v0, $v0, $v1 -/* 9AB1F4 80242E04 14400026 */ bnez $v0, .L80242EA0 -/* 9AB1F8 80242E08 00000000 */ nop -/* 9AB1FC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AB200 80242E10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AB204 80242E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AB208 80242E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AB20C 80242E1C A600008E */ sh $zero, 0x8e($s0) -/* 9AB210 80242E20 8C460028 */ lw $a2, 0x28($v0) -/* 9AB214 80242E24 0C00A720 */ jal atan2 -/* 9AB218 80242E28 8C470030 */ lw $a3, 0x30($v0) -/* 9AB21C 80242E2C 46000506 */ mov.s $f20, $f0 -/* 9AB220 80242E30 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9AB224 80242E34 0C00A70A */ jal get_clamped_angle_diff -/* 9AB228 80242E38 4600A386 */ mov.s $f14, $f20 -/* 9AB22C 80242E3C 46000086 */ mov.s $f2, $f0 -/* 9AB230 80242E40 8E62001C */ lw $v0, 0x1c($s3) -/* 9AB234 80242E44 46001005 */ abs.s $f0, $f2 -/* 9AB238 80242E48 44822000 */ mtc1 $v0, $f4 -/* 9AB23C 80242E4C 00000000 */ nop -/* 9AB240 80242E50 46802120 */ cvt.s.w $f4, $f4 -/* 9AB244 80242E54 4600203C */ c.lt.s $f4, $f0 -/* 9AB248 80242E58 00000000 */ nop -/* 9AB24C 80242E5C 4500000D */ bc1f .L80242E94 -/* 9AB250 80242E60 00000000 */ nop -/* 9AB254 80242E64 44800000 */ mtc1 $zero, $f0 -/* 9AB258 80242E68 C614000C */ lwc1 $f20, 0xc($s0) -/* 9AB25C 80242E6C 4600103C */ c.lt.s $f2, $f0 -/* 9AB260 80242E70 00000000 */ nop -/* 9AB264 80242E74 45000006 */ bc1f .L80242E90 -/* 9AB268 80242E78 00021023 */ negu $v0, $v0 -/* 9AB26C 80242E7C 44820000 */ mtc1 $v0, $f0 -/* 9AB270 80242E80 00000000 */ nop -/* 9AB274 80242E84 46800020 */ cvt.s.w $f0, $f0 -/* 9AB278 80242E88 08090BA5 */ j .L80242E94 -/* 9AB27C 80242E8C 4600A500 */ add.s $f20, $f20, $f0 -.L80242E90: -/* 9AB280 80242E90 4604A500 */ add.s $f20, $f20, $f4 -.L80242E94: -/* 9AB284 80242E94 0C00A6C9 */ jal clamp_angle -/* 9AB288 80242E98 4600A306 */ mov.s $f12, $f20 -/* 9AB28C 80242E9C E600000C */ swc1 $f0, 0xc($s0) -.L80242EA0: -/* 9AB290 80242EA0 8E020000 */ lw $v0, ($s0) -/* 9AB294 80242EA4 30420008 */ andi $v0, $v0, 8 -/* 9AB298 80242EA8 1040000A */ beqz $v0, .L80242ED4 -/* 9AB29C 80242EAC 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB2A0 80242EB0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB2A4 80242EB4 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9AB2A8 80242EB8 46001080 */ add.s $f2, $f2, $f0 -/* 9AB2AC 80242EBC 4616103C */ c.lt.s $f2, $f22 -/* 9AB2B0 80242EC0 00000000 */ nop -/* 9AB2B4 80242EC4 45020045 */ bc1fl .L80242FDC -/* 9AB2B8 80242EC8 E602003C */ swc1 $f2, 0x3c($s0) -/* 9AB2BC 80242ECC 08090BF6 */ j .L80242FD8 -/* 9AB2C0 80242ED0 E616003C */ swc1 $f22, 0x3c($s0) -.L80242ED4: -/* 9AB2C4 80242ED4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AB2C8 80242ED8 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB2CC 80242EDC E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB2D0 80242EE0 860200A8 */ lh $v0, 0xa8($s0) -/* 9AB2D4 80242EE4 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9AB2D8 80242EE8 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9AB2DC 80242EEC 44821000 */ mtc1 $v0, $f2 -/* 9AB2E0 80242EF0 00000000 */ nop -/* 9AB2E4 80242EF4 468010A0 */ cvt.s.w $f2, $f2 -/* 9AB2E8 80242EF8 46000005 */ abs.s $f0, $f0 -/* 9AB2EC 80242EFC 46020000 */ add.s $f0, $f0, $f2 -/* 9AB2F0 80242F00 C6060040 */ lwc1 $f6, 0x40($s0) -/* 9AB2F4 80242F04 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB2F8 80242F08 46022100 */ add.s $f4, $f4, $f2 -/* 9AB2FC 80242F0C 3C014024 */ lui $at, 0x4024 -/* 9AB300 80242F10 44811800 */ mtc1 $at, $f3 -/* 9AB304 80242F14 44801000 */ mtc1 $zero, $f2 -/* 9AB308 80242F18 46000021 */ cvt.d.s $f0, $f0 -/* 9AB30C 80242F1C 46220000 */ add.d $f0, $f0, $f2 -/* 9AB310 80242F20 E7A60020 */ swc1 $f6, 0x20($sp) -/* 9AB314 80242F24 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9AB318 80242F28 46200020 */ cvt.s.d $f0, $f0 -/* 9AB31C 80242F2C E7A00024 */ swc1 $f0, 0x24($sp) -/* 9AB320 80242F30 AFA20010 */ sw $v0, 0x10($sp) -/* 9AB324 80242F34 8E040080 */ lw $a0, 0x80($s0) -/* 9AB328 80242F38 0C0372DF */ jal func_800DCB7C -/* 9AB32C 80242F3C 27A70020 */ addiu $a3, $sp, 0x20 -/* 9AB330 80242F40 10400015 */ beqz $v0, .L80242F98 -/* 9AB334 80242F44 00000000 */ nop -/* 9AB338 80242F48 860200A8 */ lh $v0, 0xa8($s0) -/* 9AB33C 80242F4C C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB340 80242F50 44820000 */ mtc1 $v0, $f0 -/* 9AB344 80242F54 00000000 */ nop -/* 9AB348 80242F58 46800020 */ cvt.s.w $f0, $f0 -/* 9AB34C 80242F5C 46002085 */ abs.s $f2, $f4 -/* 9AB350 80242F60 46020000 */ add.s $f0, $f0, $f2 -/* 9AB354 80242F64 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9AB358 80242F68 4600103E */ c.le.s $f2, $f0 -/* 9AB35C 80242F6C 00000000 */ nop -/* 9AB360 80242F70 45000005 */ bc1f .L80242F88 -/* 9AB364 80242F74 00000000 */ nop -/* 9AB368 80242F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB36C 80242F7C AE00001C */ sw $zero, 0x1c($s0) -/* 9AB370 80242F80 08090BF7 */ j .L80242FDC -/* 9AB374 80242F84 E600003C */ swc1 $f0, 0x3c($s0) -.L80242F88: -/* 9AB378 80242F88 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB37C 80242F8C 46040000 */ add.s $f0, $f0, $f4 -/* 9AB380 80242F90 08090BF7 */ j .L80242FDC -/* 9AB384 80242F94 E600003C */ swc1 $f0, 0x3c($s0) -.L80242F98: -/* 9AB388 80242F98 C606003C */ lwc1 $f6, 0x3c($s0) -/* 9AB38C 80242F9C 860200A8 */ lh $v0, 0xa8($s0) -/* 9AB390 80242FA0 46163081 */ sub.s $f2, $f6, $f22 -/* 9AB394 80242FA4 44820000 */ mtc1 $v0, $f0 -/* 9AB398 80242FA8 00000000 */ nop -/* 9AB39C 80242FAC 46800020 */ cvt.s.w $f0, $f0 -/* 9AB3A0 80242FB0 46001080 */ add.s $f2, $f2, $f0 -/* 9AB3A4 80242FB4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB3A8 80242FB8 46002005 */ abs.s $f0, $f4 -/* 9AB3AC 80242FBC 4602003C */ c.lt.s $f0, $f2 -/* 9AB3B0 80242FC0 00000000 */ nop -/* 9AB3B4 80242FC4 45020005 */ bc1fl .L80242FDC -/* 9AB3B8 80242FC8 AE00001C */ sw $zero, 0x1c($s0) -/* 9AB3BC 80242FCC 46043000 */ add.s $f0, $f6, $f4 -/* 9AB3C0 80242FD0 08090BF7 */ j .L80242FDC -/* 9AB3C4 80242FD4 E600003C */ swc1 $f0, 0x3c($s0) -.L80242FD8: -/* 9AB3C8 80242FD8 AE00001C */ sw $zero, 0x1c($s0) -.L80242FDC: -/* 9AB3CC 80242FDC 8FBF0038 */ lw $ra, 0x38($sp) -/* 9AB3D0 80242FE0 8FB30034 */ lw $s3, 0x34($sp) -/* 9AB3D4 80242FE4 8FB20030 */ lw $s2, 0x30($sp) -/* 9AB3D8 80242FE8 8FB1002C */ lw $s1, 0x2c($sp) -/* 9AB3DC 80242FEC 8FB00028 */ lw $s0, 0x28($sp) -/* 9AB3E0 80242FF0 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9AB3E4 80242FF4 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9AB3E8 80242FF8 03E00008 */ jr $ra -/* 9AB3EC 80242FFC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s deleted file mode 100644 index e54b16bc69..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243000_9AB3F0 -/* 9AB3F0 80243000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9AB3F4 80243004 AFB00028 */ sw $s0, 0x28($sp) -/* 9AB3F8 80243008 00A0802D */ daddu $s0, $a1, $zero -/* 9AB3FC 8024300C AFB1002C */ sw $s1, 0x2c($sp) -/* 9AB400 80243010 00C0882D */ daddu $s1, $a2, $zero -/* 9AB404 80243014 AFBF0034 */ sw $ra, 0x34($sp) -/* 9AB408 80243018 AFB20030 */ sw $s2, 0x30($sp) -/* 9AB40C 8024301C AE200070 */ sw $zero, 0x70($s1) -/* 9AB410 80243020 8C830000 */ lw $v1, ($a0) -/* 9AB414 80243024 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9AB418 80243028 A480008E */ sh $zero, 0x8e($a0) -/* 9AB41C 8024302C 00621824 */ and $v1, $v1, $v0 -/* 9AB420 80243030 34650800 */ ori $a1, $v1, 0x800 -/* 9AB424 80243034 AC850000 */ sw $a1, ($a0) -/* 9AB428 80243038 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9AB42C 8024303C 8C420034 */ lw $v0, 0x34($v0) -/* 9AB430 80243040 10400003 */ beqz $v0, .L80243050 -/* 9AB434 80243044 00E0902D */ daddu $s2, $a3, $zero -/* 9AB438 80243048 08090C16 */ j .L80243058 -/* 9AB43C 8024304C 34620808 */ ori $v0, $v1, 0x808 -.L80243050: -/* 9AB440 80243050 2402FFF7 */ addiu $v0, $zero, -9 -/* 9AB444 80243054 00A21024 */ and $v0, $a1, $v0 -.L80243058: -/* 9AB448 80243058 AC820000 */ sw $v0, ($a0) -/* 9AB44C 8024305C 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB450 80243060 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB454 80243064 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9AB458 80243068 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9AB45C 8024306C C4840040 */ lwc1 $f4, 0x40($a0) -/* 9AB460 80243070 3C01447A */ lui $at, 0x447a -/* 9AB464 80243074 44813000 */ mtc1 $at, $f6 -/* 9AB468 80243078 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB46C 8024307C E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB470 80243080 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9AB474 80243084 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9AB478 80243088 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9AB47C 8024308C AFA20010 */ sw $v0, 0x10($sp) -/* 9AB480 80243090 8C840080 */ lw $a0, 0x80($a0) -/* 9AB484 80243094 0C0372DF */ jal func_800DCB7C -/* 9AB488 80243098 27A70020 */ addiu $a3, $sp, 0x20 -/* 9AB48C 8024309C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9AB490 802430A0 3C014059 */ lui $at, 0x4059 -/* 9AB494 802430A4 44812800 */ mtc1 $at, $f5 -/* 9AB498 802430A8 44802000 */ mtc1 $zero, $f4 -/* 9AB49C 802430AC 460010A1 */ cvt.d.s $f2, $f2 -/* 9AB4A0 802430B0 46241082 */ mul.d $f2, $f2, $f4 -/* 9AB4A4 802430B4 00000000 */ nop -/* 9AB4A8 802430B8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB4AC 802430BC 46000021 */ cvt.d.s $f0, $f0 -/* 9AB4B0 802430C0 46240002 */ mul.d $f0, $f0, $f4 -/* 9AB4B4 802430C4 00000000 */ nop -/* 9AB4B8 802430C8 3C013FE0 */ lui $at, 0x3fe0 -/* 9AB4BC 802430CC 44812800 */ mtc1 $at, $f5 -/* 9AB4C0 802430D0 44802000 */ mtc1 $zero, $f4 -/* 9AB4C4 802430D4 00000000 */ nop -/* 9AB4C8 802430D8 46241080 */ add.d $f2, $f2, $f4 -/* 9AB4CC 802430DC AE000074 */ sw $zero, 0x74($s0) -/* 9AB4D0 802430E0 46240000 */ add.d $f0, $f0, $f4 -/* 9AB4D4 802430E4 AE000090 */ sw $zero, 0x90($s0) -/* 9AB4D8 802430E8 4620120D */ trunc.w.d $f8, $f2 -/* 9AB4DC 802430EC E6080078 */ swc1 $f8, 0x78($s0) -/* 9AB4E0 802430F0 4620020D */ trunc.w.d $f8, $f0 -/* 9AB4E4 802430F4 E6080088 */ swc1 $f8, 0x88($s0) -/* 9AB4E8 802430F8 8E420014 */ lw $v0, 0x14($s2) -/* 9AB4EC 802430FC AE220074 */ sw $v0, 0x74($s1) -/* 9AB4F0 80243100 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9AB4F4 80243104 34420010 */ ori $v0, $v0, 0x10 -/* 9AB4F8 80243108 AE0200B0 */ sw $v0, 0xb0($s0) -/* 9AB4FC 8024310C 8FBF0034 */ lw $ra, 0x34($sp) -/* 9AB500 80243110 8FB20030 */ lw $s2, 0x30($sp) -/* 9AB504 80243114 8FB1002C */ lw $s1, 0x2c($sp) -/* 9AB508 80243118 8FB00028 */ lw $s0, 0x28($sp) -/* 9AB50C 8024311C 03E00008 */ jr $ra -/* 9AB510 80243120 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index 277beb3e1e..bc5ceea2fb 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -46,7 +46,7 @@ glabel func_80243124_9AB514 /* 9AB5B8 802431C8 02A0202D */ daddu $a0, $s5, $zero /* 9AB5BC 802431CC 0240282D */ daddu $a1, $s2, $zero /* 9AB5C0 802431D0 0280302D */ daddu $a2, $s4, $zero -/* 9AB5C4 802431D4 0C090C00 */ jal func_80243000_9AB3F0 +/* 9AB5C4 802431D4 0C090C00 */ jal trd_04_UnkFunc5 /* 9AB5C8 802431D8 0200382D */ daddu $a3, $s0, $zero .L802431DC: /* 9AB5CC 802431DC 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80243258_9AB648 glabel L80243268_9AB658 /* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero /* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero -/* 9AB660 80243270 0C0909AC */ jal func_802426B0_9AAAA0 +/* 9AB660 80243270 0C0909AC */ jal trd_04_UnkFunc4 /* 9AB664 80243274 0260302D */ daddu $a2, $s3, $zero /* 9AB668 80243278 08090CBB */ j .L802432EC /* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L802432C0_9AB6B0 glabel L802432D8_9AB6C8 /* 9AB6C8 802432D8 0280202D */ daddu $a0, $s4, $zero /* 9AB6CC 802432DC 0200282D */ daddu $a1, $s0, $zero -/* 9AB6D0 802432E0 0C090B1C */ jal func_80242C70_9AB060 +/* 9AB6D0 802432E0 0C090B1C */ jal trd_04_UnkFunc6 /* 9AB6D4 802432E4 0260302D */ daddu $a2, $s3, $zero glabel L802432E8_9AB6D8 /* 9AB6D8 802432E8 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index aa55ca876b..865c55113a 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -46,7 +46,7 @@ glabel func_80243650_9ABA40 /* 9ABAE4 802436F4 02A0202D */ daddu $a0, $s5, $zero /* 9ABAE8 802436F8 0240282D */ daddu $a1, $s2, $zero /* 9ABAEC 802436FC 0260302D */ daddu $a2, $s3, $zero -/* 9ABAF0 80243700 0C090C00 */ jal func_80243000_9AB3F0 +/* 9ABAF0 80243700 0C090C00 */ jal trd_04_UnkFunc5 /* 9ABAF4 80243704 0200382D */ daddu $a3, $s0, $zero /* 9ABAF8 80243708 86A200A8 */ lh $v0, 0xa8($s5) /* 9ABAFC 8024370C AE42008C */ sw $v0, 0x8c($s2) @@ -96,7 +96,7 @@ glabel L80243798_9ABB88 glabel L802437A8_9ABB98 /* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero /* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBA0 802437B0 0C0909AC */ jal func_802426B0_9AAAA0 +/* 9ABBA0 802437B0 0C0909AC */ jal trd_04_UnkFunc4 /* 9ABBA4 802437B4 0280302D */ daddu $a2, $s4, $zero /* 9ABBA8 802437B8 8E630070 */ lw $v1, 0x70($s3) /* 9ABBAC 802437BC 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s deleted file mode 100644 index 8f5cb02021..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024137C_9B7CFC -/* 9B7CFC 8024137C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 9B7D00 80241380 AFB3004C */ sw $s3, 0x4c($sp) -/* 9B7D04 80241384 0080982D */ daddu $s3, $a0, $zero -/* 9B7D08 80241388 AFBF0054 */ sw $ra, 0x54($sp) -/* 9B7D0C 8024138C AFB40050 */ sw $s4, 0x50($sp) -/* 9B7D10 80241390 AFB20048 */ sw $s2, 0x48($sp) -/* 9B7D14 80241394 AFB10044 */ sw $s1, 0x44($sp) -/* 9B7D18 80241398 AFB00040 */ sw $s0, 0x40($sp) -/* 9B7D1C 8024139C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 9B7D20 802413A0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 9B7D24 802413A4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 9B7D28 802413A8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9B7D2C 802413AC 8E710148 */ lw $s1, 0x148($s3) -/* 9B7D30 802413B0 00A0902D */ daddu $s2, $a1, $zero -/* 9B7D34 802413B4 86240008 */ lh $a0, 8($s1) -/* 9B7D38 802413B8 0C00EABB */ jal get_npc_unsafe -/* 9B7D3C 802413BC 00C0A02D */ daddu $s4, $a2, $zero -/* 9B7D40 802413C0 0040802D */ daddu $s0, $v0, $zero -/* 9B7D44 802413C4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B7D48 802413C8 46800020 */ cvt.s.w $f0, $f0 -/* 9B7D4C 802413CC 46000021 */ cvt.d.s $f0, $f0 -/* 9B7D50 802413D0 3C014059 */ lui $at, 0x4059 -/* 9B7D54 802413D4 44811800 */ mtc1 $at, $f3 -/* 9B7D58 802413D8 44801000 */ mtc1 $zero, $f2 -/* 9B7D5C 802413DC 8602008E */ lh $v0, 0x8e($s0) -/* 9B7D60 802413E0 9603008E */ lhu $v1, 0x8e($s0) -/* 9B7D64 802413E4 46220003 */ div.d $f0, $f0, $f2 -/* 9B7D68 802413E8 46200620 */ cvt.s.d $f24, $f0 -/* 9B7D6C 802413EC C6200088 */ lwc1 $f0, 0x88($s1) -/* 9B7D70 802413F0 46800020 */ cvt.s.w $f0, $f0 -/* 9B7D74 802413F4 46000021 */ cvt.d.s $f0, $f0 -/* 9B7D78 802413F8 46220003 */ div.d $f0, $f0, $f2 -/* 9B7D7C 802413FC 46200020 */ cvt.s.d $f0, $f0 -/* 9B7D80 80241400 18400003 */ blez $v0, .L80241410 -/* 9B7D84 80241404 4600C680 */ add.s $f26, $f24, $f0 -/* 9B7D88 80241408 2462FFFF */ addiu $v0, $v1, -1 -/* 9B7D8C 8024140C A602008E */ sh $v0, 0x8e($s0) -.L80241410: -/* 9B7D90 80241410 8E220070 */ lw $v0, 0x70($s1) -/* 9B7D94 80241414 18400034 */ blez $v0, .L802414E8 -/* 9B7D98 80241418 00000000 */ nop -/* 9B7D9C 8024141C C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9B7DA0 80241420 46806320 */ cvt.s.w $f12, $f12 -/* 9B7DA4 80241424 44820000 */ mtc1 $v0, $f0 -/* 9B7DA8 80241428 00000000 */ nop -/* 9B7DAC 8024142C 46800020 */ cvt.s.w $f0, $f0 -/* 9B7DB0 80241430 46000021 */ cvt.d.s $f0, $f0 -/* 9B7DB4 80241434 46220003 */ div.d $f0, $f0, $f2 -/* 9B7DB8 80241438 0C00A8BB */ jal sin_deg -/* 9B7DBC 8024143C 462005A0 */ cvt.s.d $f22, $f0 -/* 9B7DC0 80241440 8E020000 */ lw $v0, ($s0) -/* 9B7DC4 80241444 30420008 */ andi $v0, $v0, 8 -/* 9B7DC8 80241448 10400003 */ beqz $v0, .L80241458 -/* 9B7DCC 8024144C 46000506 */ mov.s $f20, $f0 -/* 9B7DD0 80241450 08090526 */ j .L80241498 -/* 9B7DD4 80241454 0000102D */ daddu $v0, $zero, $zero -.L80241458: -/* 9B7DD8 80241458 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B7DDC 8024145C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B7DE0 80241460 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B7DE4 80241464 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B7DE8 80241468 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B7DEC 8024146C 3C01447A */ lui $at, 0x447a -/* 9B7DF0 80241470 44813000 */ mtc1 $at, $f6 -/* 9B7DF4 80241474 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B7DF8 80241478 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B7DFC 8024147C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9B7E00 80241480 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9B7E04 80241484 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9B7E08 80241488 AFA20010 */ sw $v0, 0x10($sp) -/* 9B7E0C 8024148C 8E040080 */ lw $a0, 0x80($s0) -/* 9B7E10 80241490 0C0372DF */ jal func_800DCB7C -/* 9B7E14 80241494 27A70030 */ addiu $a3, $sp, 0x30 -.L80241498: -/* 9B7E18 80241498 10400007 */ beqz $v0, .L802414B8 -/* 9B7E1C 8024149C 00000000 */ nop -/* 9B7E20 802414A0 4616A082 */ mul.s $f2, $f20, $f22 -/* 9B7E24 802414A4 00000000 */ nop -/* 9B7E28 802414A8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9B7E2C 802414AC 46180000 */ add.s $f0, $f0, $f24 -/* 9B7E30 802414B0 08090531 */ j .L802414C4 -/* 9B7E34 802414B4 46020000 */ add.s $f0, $f0, $f2 -.L802414B8: -/* 9B7E38 802414B8 4616A002 */ mul.s $f0, $f20, $f22 -/* 9B7E3C 802414BC 00000000 */ nop -/* 9B7E40 802414C0 4600D000 */ add.s $f0, $f26, $f0 -.L802414C4: -/* 9B7E44 802414C4 E600003C */ swc1 $f0, 0x3c($s0) -/* 9B7E48 802414C8 8E220074 */ lw $v0, 0x74($s1) -/* 9B7E4C 802414CC 2442000A */ addiu $v0, $v0, 0xa -/* 9B7E50 802414D0 44826000 */ mtc1 $v0, $f12 -/* 9B7E54 802414D4 00000000 */ nop -/* 9B7E58 802414D8 0C00A6C9 */ jal clamp_angle -/* 9B7E5C 802414DC 46806320 */ cvt.s.w $f12, $f12 -/* 9B7E60 802414E0 4600020D */ trunc.w.s $f8, $f0 -/* 9B7E64 802414E4 E6280074 */ swc1 $f8, 0x74($s1) -.L802414E8: -/* 9B7E68 802414E8 8E220090 */ lw $v0, 0x90($s1) -/* 9B7E6C 802414EC 1C400040 */ bgtz $v0, .L802415F0 -/* 9B7E70 802414F0 2442FFFF */ addiu $v0, $v0, -1 -/* 9B7E74 802414F4 860200A8 */ lh $v0, 0xa8($s0) -/* 9B7E78 802414F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7E7C 802414FC 44821000 */ mtc1 $v0, $f2 -/* 9B7E80 80241500 00000000 */ nop -/* 9B7E84 80241504 468010A0 */ cvt.s.w $f2, $f2 -/* 9B7E88 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B7E8C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B7E90 80241510 46020000 */ add.s $f0, $f0, $f2 -/* 9B7E94 80241514 3C014024 */ lui $at, 0x4024 -/* 9B7E98 80241518 44812800 */ mtc1 $at, $f5 -/* 9B7E9C 8024151C 44802000 */ mtc1 $zero, $f4 -/* 9B7EA0 80241520 C442002C */ lwc1 $f2, 0x2c($v0) -/* 9B7EA4 80241524 46000021 */ cvt.d.s $f0, $f0 -/* 9B7EA8 80241528 46240000 */ add.d $f0, $f0, $f4 -/* 9B7EAC 8024152C 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7EB0 80241530 4620103C */ c.lt.d $f2, $f0 -/* 9B7EB4 80241534 00000000 */ nop -/* 9B7EB8 80241538 4500002E */ bc1f .L802415F4 -/* 9B7EBC 8024153C 0280202D */ daddu $a0, $s4, $zero -/* 9B7EC0 80241540 24020001 */ addiu $v0, $zero, 1 -/* 9B7EC4 80241544 AFA20010 */ sw $v0, 0x10($sp) -/* 9B7EC8 80241548 8E460024 */ lw $a2, 0x24($s2) -/* 9B7ECC 8024154C 8E470028 */ lw $a3, 0x28($s2) -/* 9B7ED0 80241550 0C01242D */ jal func_800490B4 -/* 9B7ED4 80241554 0220282D */ daddu $a1, $s1, $zero -/* 9B7ED8 80241558 10400026 */ beqz $v0, .L802415F4 -/* 9B7EDC 8024155C 0000202D */ daddu $a0, $zero, $zero -/* 9B7EE0 80241560 0200282D */ daddu $a1, $s0, $zero -/* 9B7EE4 80241564 0000302D */ daddu $a2, $zero, $zero -/* 9B7EE8 80241568 2412000C */ addiu $s2, $zero, 0xc -/* 9B7EEC 8024156C 860300A8 */ lh $v1, 0xa8($s0) -/* 9B7EF0 80241570 3C013F80 */ lui $at, 0x3f80 -/* 9B7EF4 80241574 44810000 */ mtc1 $at, $f0 -/* 9B7EF8 80241578 3C014000 */ lui $at, 0x4000 -/* 9B7EFC 8024157C 44811000 */ mtc1 $at, $f2 -/* 9B7F00 80241580 3C01C1A0 */ lui $at, 0xc1a0 -/* 9B7F04 80241584 44812000 */ mtc1 $at, $f4 -/* 9B7F08 80241588 44834000 */ mtc1 $v1, $f8 -/* 9B7F0C 8024158C 00000000 */ nop -/* 9B7F10 80241590 46804220 */ cvt.s.w $f8, $f8 -/* 9B7F14 80241594 44074000 */ mfc1 $a3, $f8 -/* 9B7F18 80241598 27A20038 */ addiu $v0, $sp, 0x38 -/* 9B7F1C 8024159C AFB2001C */ sw $s2, 0x1c($sp) -/* 9B7F20 802415A0 AFA20020 */ sw $v0, 0x20($sp) -/* 9B7F24 802415A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B7F28 802415A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9B7F2C 802415AC 0C01BFA4 */ jal fx_emote -/* 9B7F30 802415B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9B7F34 802415B4 0200202D */ daddu $a0, $s0, $zero -/* 9B7F38 802415B8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9B7F3C 802415BC C480003C */ lwc1 $f0, 0x3c($a0) -/* 9B7F40 802415C0 3C060020 */ lui $a2, 0x20 -/* 9B7F44 802415C4 0C012530 */ jal func_800494C0 -/* 9B7F48 802415C8 E4800064 */ swc1 $f0, 0x64($a0) -/* 9B7F4C 802415CC 8E220018 */ lw $v0, 0x18($s1) -/* 9B7F50 802415D0 9442002A */ lhu $v0, 0x2a($v0) -/* 9B7F54 802415D4 30420001 */ andi $v0, $v0, 1 -/* 9B7F58 802415D8 10400003 */ beqz $v0, .L802415E8 -/* 9B7F5C 802415DC 2402000A */ addiu $v0, $zero, 0xa -/* 9B7F60 802415E0 080905A4 */ j .L80241690 -/* 9B7F64 802415E4 AE620070 */ sw $v0, 0x70($s3) -.L802415E8: -/* 9B7F68 802415E8 080905A4 */ j .L80241690 -/* 9B7F6C 802415EC AE720070 */ sw $s2, 0x70($s3) -.L802415F0: -/* 9B7F70 802415F0 AE220090 */ sw $v0, 0x90($s1) -.L802415F4: -/* 9B7F74 802415F4 8602008C */ lh $v0, 0x8c($s0) -/* 9B7F78 802415F8 14400025 */ bnez $v0, .L80241690 -/* 9B7F7C 802415FC 00000000 */ nop -/* 9B7F80 80241600 8602008E */ lh $v0, 0x8e($s0) -/* 9B7F84 80241604 1C400022 */ bgtz $v0, .L80241690 -/* 9B7F88 80241608 00000000 */ nop -/* 9B7F8C 8024160C 8E620074 */ lw $v0, 0x74($s3) -/* 9B7F90 80241610 2442FFFF */ addiu $v0, $v0, -1 -/* 9B7F94 80241614 1840001D */ blez $v0, .L8024168C -/* 9B7F98 80241618 AE620074 */ sw $v0, 0x74($s3) -/* 9B7F9C 8024161C 8E220018 */ lw $v0, 0x18($s1) -/* 9B7FA0 80241620 9442002A */ lhu $v0, 0x2a($v0) -/* 9B7FA4 80241624 30420010 */ andi $v0, $v0, 0x10 -/* 9B7FA8 80241628 14400007 */ bnez $v0, .L80241648 -/* 9B7FAC 8024162C 00000000 */ nop -/* 9B7FB0 80241630 C600000C */ lwc1 $f0, 0xc($s0) -/* 9B7FB4 80241634 3C014334 */ lui $at, 0x4334 -/* 9B7FB8 80241638 44816000 */ mtc1 $at, $f12 -/* 9B7FBC 8024163C 0C00A6C9 */ jal clamp_angle -/* 9B7FC0 80241640 460C0300 */ add.s $f12, $f0, $f12 -/* 9B7FC4 80241644 E600000C */ swc1 $f0, 0xc($s0) -.L80241648: -/* 9B7FC8 80241648 0C00A67F */ jal rand_int -/* 9B7FCC 8024164C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9B7FD0 80241650 3C032E8B */ lui $v1, 0x2e8b -/* 9B7FD4 80241654 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9B7FD8 80241658 00430018 */ mult $v0, $v1 -/* 9B7FDC 8024165C 00021FC3 */ sra $v1, $v0, 0x1f -/* 9B7FE0 80241660 00004010 */ mfhi $t0 -/* 9B7FE4 80241664 00082043 */ sra $a0, $t0, 1 -/* 9B7FE8 80241668 00832023 */ subu $a0, $a0, $v1 -/* 9B7FEC 8024166C 00041840 */ sll $v1, $a0, 1 -/* 9B7FF0 80241670 00641821 */ addu $v1, $v1, $a0 -/* 9B7FF4 80241674 00031880 */ sll $v1, $v1, 2 -/* 9B7FF8 80241678 00641823 */ subu $v1, $v1, $a0 -/* 9B7FFC 8024167C 00431023 */ subu $v0, $v0, $v1 -/* 9B8000 80241680 24420005 */ addiu $v0, $v0, 5 -/* 9B8004 80241684 080905A4 */ j .L80241690 -/* 9B8008 80241688 A602008E */ sh $v0, 0x8e($s0) -.L8024168C: -/* 9B800C 8024168C AE600070 */ sw $zero, 0x70($s3) -.L80241690: -/* 9B8010 80241690 8FBF0054 */ lw $ra, 0x54($sp) -/* 9B8014 80241694 8FB40050 */ lw $s4, 0x50($sp) -/* 9B8018 80241698 8FB3004C */ lw $s3, 0x4c($sp) -/* 9B801C 8024169C 8FB20048 */ lw $s2, 0x48($sp) -/* 9B8020 802416A0 8FB10044 */ lw $s1, 0x44($sp) -/* 9B8024 802416A4 8FB00040 */ lw $s0, 0x40($sp) -/* 9B8028 802416A8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 9B802C 802416AC D7B80068 */ ldc1 $f24, 0x68($sp) -/* 9B8030 802416B0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 9B8034 802416B4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9B8038 802416B8 03E00008 */ jr $ra -/* 9B803C 802416BC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s deleted file mode 100644 index 787df6f87d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024193C_9B82BC -/* 9B82BC 8024193C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B82C0 80241940 AFB20030 */ sw $s2, 0x30($sp) -/* 9B82C4 80241944 0080902D */ daddu $s2, $a0, $zero -/* 9B82C8 80241948 AFBF0038 */ sw $ra, 0x38($sp) -/* 9B82CC 8024194C AFB30034 */ sw $s3, 0x34($sp) -/* 9B82D0 80241950 AFB1002C */ sw $s1, 0x2c($sp) -/* 9B82D4 80241954 AFB00028 */ sw $s0, 0x28($sp) -/* 9B82D8 80241958 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9B82DC 8024195C F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9B82E0 80241960 8E510148 */ lw $s1, 0x148($s2) -/* 9B82E4 80241964 86240008 */ lh $a0, 8($s1) -/* 9B82E8 80241968 0C00EABB */ jal get_npc_unsafe -/* 9B82EC 8024196C 00A0982D */ daddu $s3, $a1, $zero -/* 9B82F0 80241970 0040802D */ daddu $s0, $v0, $zero -/* 9B82F4 80241974 0200202D */ daddu $a0, $s0, $zero -/* 9B82F8 80241978 C6220088 */ lwc1 $f2, 0x88($s1) -/* 9B82FC 8024197C 468010A0 */ cvt.s.w $f2, $f2 -/* 9B8300 80241980 460010A1 */ cvt.d.s $f2, $f2 -/* 9B8304 80241984 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B8308 80241988 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9B830C 8024198C 8E050018 */ lw $a1, 0x18($s0) -/* 9B8310 80241990 46002100 */ add.s $f4, $f4, $f0 -/* 9B8314 80241994 8E06000C */ lw $a2, 0xc($s0) -/* 9B8318 80241998 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B831C 8024199C 46800020 */ cvt.s.w $f0, $f0 -/* 9B8320 802419A0 E604001C */ swc1 $f4, 0x1c($s0) -/* 9B8324 802419A4 3C014059 */ lui $at, 0x4059 -/* 9B8328 802419A8 44812800 */ mtc1 $at, $f5 -/* 9B832C 802419AC 44802000 */ mtc1 $zero, $f4 -/* 9B8330 802419B0 46000021 */ cvt.d.s $f0, $f0 -/* 9B8334 802419B4 46240003 */ div.d $f0, $f0, $f4 -/* 9B8338 802419B8 46200520 */ cvt.s.d $f20, $f0 -/* 9B833C 802419BC 46241083 */ div.d $f2, $f2, $f4 -/* 9B8340 802419C0 0C00EA95 */ jal npc_move_heading -/* 9B8344 802419C4 462015A0 */ cvt.s.d $f22, $f2 -/* 9B8348 802419C8 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B834C 802419CC 44801000 */ mtc1 $zero, $f2 -/* 9B8350 802419D0 44801800 */ mtc1 $zero, $f3 -/* 9B8354 802419D4 46002021 */ cvt.d.s $f0, $f4 -/* 9B8358 802419D8 4620103E */ c.le.d $f2, $f0 -/* 9B835C 802419DC 00000000 */ nop -/* 9B8360 802419E0 45000030 */ bc1f .L80241AA4 -/* 9B8364 802419E4 00000000 */ nop -/* 9B8368 802419E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B836C 802419EC 46040000 */ add.s $f0, $f0, $f4 -/* 9B8370 802419F0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9B8374 802419F4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8378 802419F8 8C420024 */ lw $v0, 0x24($v0) -/* 9B837C 802419FC AE020028 */ sw $v0, 0x28($s0) -/* 9B8380 80241A00 A2200007 */ sb $zero, 7($s1) -/* 9B8384 80241A04 8E020000 */ lw $v0, ($s0) -/* 9B8388 80241A08 30420008 */ andi $v0, $v0, 8 -/* 9B838C 80241A0C 14400011 */ bnez $v0, .L80241A54 -/* 9B8390 80241A10 0000102D */ daddu $v0, $zero, $zero -/* 9B8394 80241A14 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B8398 80241A18 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B839C 80241A1C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B83A0 80241A20 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B83A4 80241A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B83A8 80241A28 3C01447A */ lui $at, 0x447a -/* 9B83AC 80241A2C 44813000 */ mtc1 $at, $f6 -/* 9B83B0 80241A30 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B83B4 80241A34 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B83B8 80241A38 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9B83BC 80241A3C E7A40020 */ swc1 $f4, 0x20($sp) -/* 9B83C0 80241A40 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9B83C4 80241A44 AFA20010 */ sw $v0, 0x10($sp) -/* 9B83C8 80241A48 8E040080 */ lw $a0, 0x80($s0) -/* 9B83CC 80241A4C 0C0372DF */ jal func_800DCB7C -/* 9B83D0 80241A50 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A54: -/* 9B83D4 80241A54 1040000B */ beqz $v0, .L80241A84 -/* 9B83D8 80241A58 00000000 */ nop -/* 9B83DC 80241A5C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B83E0 80241A60 46140080 */ add.s $f2, $f0, $f20 -/* 9B83E4 80241A64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B83E8 80241A68 4600103E */ c.le.s $f2, $f0 -/* 9B83EC 80241A6C 00000000 */ nop -/* 9B83F0 80241A70 4500008D */ bc1f .L80241CA8 -/* 9B83F4 80241A74 00000000 */ nop -/* 9B83F8 80241A78 E602003C */ swc1 $f2, 0x3c($s0) -/* 9B83FC 80241A7C 0809072A */ j .L80241CA8 -/* 9B8400 80241A80 AE400070 */ sw $zero, 0x70($s2) -.L80241A84: -/* 9B8404 80241A84 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8408 80241A88 C6000064 */ lwc1 $f0, 0x64($s0) -/* 9B840C 80241A8C 4602003E */ c.le.s $f0, $f2 -/* 9B8410 80241A90 00000000 */ nop -/* 9B8414 80241A94 45030084 */ bc1tl .L80241CA8 -/* 9B8418 80241A98 AE400070 */ sw $zero, 0x70($s2) -/* 9B841C 80241A9C 0809072A */ j .L80241CA8 -/* 9B8420 80241AA0 00000000 */ nop -.L80241AA4: -/* 9B8424 80241AA4 4622003C */ c.lt.d $f0, $f2 -/* 9B8428 80241AA8 00000000 */ nop -/* 9B842C 80241AAC 4500007E */ bc1f .L80241CA8 -/* 9B8430 80241AB0 00000000 */ nop -/* 9B8434 80241AB4 9602008E */ lhu $v0, 0x8e($s0) -/* 9B8438 80241AB8 24420001 */ addiu $v0, $v0, 1 -/* 9B843C 80241ABC A602008E */ sh $v0, 0x8e($s0) -/* 9B8440 80241AC0 00021400 */ sll $v0, $v0, 0x10 -/* 9B8444 80241AC4 8E630020 */ lw $v1, 0x20($s3) -/* 9B8448 80241AC8 00021403 */ sra $v0, $v0, 0x10 -/* 9B844C 80241ACC 0043102A */ slt $v0, $v0, $v1 -/* 9B8450 80241AD0 14400026 */ bnez $v0, .L80241B6C -/* 9B8454 80241AD4 00000000 */ nop -/* 9B8458 80241AD8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B845C 80241ADC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B8460 80241AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B8464 80241AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B8468 80241AE8 A600008E */ sh $zero, 0x8e($s0) -/* 9B846C 80241AEC 8C460028 */ lw $a2, 0x28($v0) -/* 9B8470 80241AF0 0C00A720 */ jal atan2 -/* 9B8474 80241AF4 8C470030 */ lw $a3, 0x30($v0) -/* 9B8478 80241AF8 46000506 */ mov.s $f20, $f0 -/* 9B847C 80241AFC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B8480 80241B00 0C00A70A */ jal get_clamped_angle_diff -/* 9B8484 80241B04 4600A386 */ mov.s $f14, $f20 -/* 9B8488 80241B08 46000086 */ mov.s $f2, $f0 -/* 9B848C 80241B0C 8E62001C */ lw $v0, 0x1c($s3) -/* 9B8490 80241B10 46001005 */ abs.s $f0, $f2 -/* 9B8494 80241B14 44822000 */ mtc1 $v0, $f4 -/* 9B8498 80241B18 00000000 */ nop -/* 9B849C 80241B1C 46802120 */ cvt.s.w $f4, $f4 -/* 9B84A0 80241B20 4600203C */ c.lt.s $f4, $f0 -/* 9B84A4 80241B24 00000000 */ nop -/* 9B84A8 80241B28 4500000D */ bc1f .L80241B60 -/* 9B84AC 80241B2C 00000000 */ nop -/* 9B84B0 80241B30 44800000 */ mtc1 $zero, $f0 -/* 9B84B4 80241B34 C614000C */ lwc1 $f20, 0xc($s0) -/* 9B84B8 80241B38 4600103C */ c.lt.s $f2, $f0 -/* 9B84BC 80241B3C 00000000 */ nop -/* 9B84C0 80241B40 45000006 */ bc1f .L80241B5C -/* 9B84C4 80241B44 00021023 */ negu $v0, $v0 -/* 9B84C8 80241B48 44820000 */ mtc1 $v0, $f0 -/* 9B84CC 80241B4C 00000000 */ nop -/* 9B84D0 80241B50 46800020 */ cvt.s.w $f0, $f0 -/* 9B84D4 80241B54 080906D8 */ j .L80241B60 -/* 9B84D8 80241B58 4600A500 */ add.s $f20, $f20, $f0 -.L80241B5C: -/* 9B84DC 80241B5C 4604A500 */ add.s $f20, $f20, $f4 -.L80241B60: -/* 9B84E0 80241B60 0C00A6C9 */ jal clamp_angle -/* 9B84E4 80241B64 4600A306 */ mov.s $f12, $f20 -/* 9B84E8 80241B68 E600000C */ swc1 $f0, 0xc($s0) -.L80241B6C: -/* 9B84EC 80241B6C 8E020000 */ lw $v0, ($s0) -/* 9B84F0 80241B70 30420008 */ andi $v0, $v0, 8 -/* 9B84F4 80241B74 1040000A */ beqz $v0, .L80241BA0 -/* 9B84F8 80241B78 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B84FC 80241B7C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8500 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9B8504 80241B84 46001080 */ add.s $f2, $f2, $f0 -/* 9B8508 80241B88 4616103C */ c.lt.s $f2, $f22 -/* 9B850C 80241B8C 00000000 */ nop -/* 9B8510 80241B90 45020045 */ bc1fl .L80241CA8 -/* 9B8514 80241B94 E602003C */ swc1 $f2, 0x3c($s0) -/* 9B8518 80241B98 08090729 */ j .L80241CA4 -/* 9B851C 80241B9C E616003C */ swc1 $f22, 0x3c($s0) -.L80241BA0: -/* 9B8520 80241BA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B8524 80241BA4 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B8528 80241BA8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B852C 80241BAC 860200A8 */ lh $v0, 0xa8($s0) -/* 9B8530 80241BB0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9B8534 80241BB4 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9B8538 80241BB8 44821000 */ mtc1 $v0, $f2 -/* 9B853C 80241BBC 00000000 */ nop -/* 9B8540 80241BC0 468010A0 */ cvt.s.w $f2, $f2 -/* 9B8544 80241BC4 46000005 */ abs.s $f0, $f0 -/* 9B8548 80241BC8 46020000 */ add.s $f0, $f0, $f2 -/* 9B854C 80241BCC C6060040 */ lwc1 $f6, 0x40($s0) -/* 9B8550 80241BD0 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B8554 80241BD4 46022100 */ add.s $f4, $f4, $f2 -/* 9B8558 80241BD8 3C014024 */ lui $at, 0x4024 -/* 9B855C 80241BDC 44811800 */ mtc1 $at, $f3 -/* 9B8560 80241BE0 44801000 */ mtc1 $zero, $f2 -/* 9B8564 80241BE4 46000021 */ cvt.d.s $f0, $f0 -/* 9B8568 80241BE8 46220000 */ add.d $f0, $f0, $f2 -/* 9B856C 80241BEC E7A60020 */ swc1 $f6, 0x20($sp) -/* 9B8570 80241BF0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9B8574 80241BF4 46200020 */ cvt.s.d $f0, $f0 -/* 9B8578 80241BF8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 9B857C 80241BFC AFA20010 */ sw $v0, 0x10($sp) -/* 9B8580 80241C00 8E040080 */ lw $a0, 0x80($s0) -/* 9B8584 80241C04 0C0372DF */ jal func_800DCB7C -/* 9B8588 80241C08 27A70020 */ addiu $a3, $sp, 0x20 -/* 9B858C 80241C0C 10400015 */ beqz $v0, .L80241C64 -/* 9B8590 80241C10 00000000 */ nop -/* 9B8594 80241C14 860200A8 */ lh $v0, 0xa8($s0) -/* 9B8598 80241C18 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B859C 80241C1C 44820000 */ mtc1 $v0, $f0 -/* 9B85A0 80241C20 00000000 */ nop -/* 9B85A4 80241C24 46800020 */ cvt.s.w $f0, $f0 -/* 9B85A8 80241C28 46002085 */ abs.s $f2, $f4 -/* 9B85AC 80241C2C 46020000 */ add.s $f0, $f0, $f2 -/* 9B85B0 80241C30 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9B85B4 80241C34 4600103E */ c.le.s $f2, $f0 -/* 9B85B8 80241C38 00000000 */ nop -/* 9B85BC 80241C3C 45000005 */ bc1f .L80241C54 -/* 9B85C0 80241C40 00000000 */ nop -/* 9B85C4 80241C44 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B85C8 80241C48 AE00001C */ sw $zero, 0x1c($s0) -/* 9B85CC 80241C4C 0809072A */ j .L80241CA8 -/* 9B85D0 80241C50 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C54: -/* 9B85D4 80241C54 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B85D8 80241C58 46040000 */ add.s $f0, $f0, $f4 -/* 9B85DC 80241C5C 0809072A */ j .L80241CA8 -/* 9B85E0 80241C60 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C64: -/* 9B85E4 80241C64 C606003C */ lwc1 $f6, 0x3c($s0) -/* 9B85E8 80241C68 860200A8 */ lh $v0, 0xa8($s0) -/* 9B85EC 80241C6C 46163081 */ sub.s $f2, $f6, $f22 -/* 9B85F0 80241C70 44820000 */ mtc1 $v0, $f0 -/* 9B85F4 80241C74 00000000 */ nop -/* 9B85F8 80241C78 46800020 */ cvt.s.w $f0, $f0 -/* 9B85FC 80241C7C 46001080 */ add.s $f2, $f2, $f0 -/* 9B8600 80241C80 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B8604 80241C84 46002005 */ abs.s $f0, $f4 -/* 9B8608 80241C88 4602003C */ c.lt.s $f0, $f2 -/* 9B860C 80241C8C 00000000 */ nop -/* 9B8610 80241C90 45020005 */ bc1fl .L80241CA8 -/* 9B8614 80241C94 AE00001C */ sw $zero, 0x1c($s0) -/* 9B8618 80241C98 46043000 */ add.s $f0, $f6, $f4 -/* 9B861C 80241C9C 0809072A */ j .L80241CA8 -/* 9B8620 80241CA0 E600003C */ swc1 $f0, 0x3c($s0) -.L80241CA4: -/* 9B8624 80241CA4 AE00001C */ sw $zero, 0x1c($s0) -.L80241CA8: -/* 9B8628 80241CA8 8FBF0038 */ lw $ra, 0x38($sp) -/* 9B862C 80241CAC 8FB30034 */ lw $s3, 0x34($sp) -/* 9B8630 80241CB0 8FB20030 */ lw $s2, 0x30($sp) -/* 9B8634 80241CB4 8FB1002C */ lw $s1, 0x2c($sp) -/* 9B8638 80241CB8 8FB00028 */ lw $s0, 0x28($sp) -/* 9B863C 80241CBC D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9B8640 80241CC0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9B8644 80241CC4 03E00008 */ jr $ra -/* 9B8648 80241CC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s deleted file mode 100644 index 1fd5160fdd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CCC_9B864C -/* 9B864C 80241CCC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9B8650 80241CD0 AFB00028 */ sw $s0, 0x28($sp) -/* 9B8654 80241CD4 00A0802D */ daddu $s0, $a1, $zero -/* 9B8658 80241CD8 AFB1002C */ sw $s1, 0x2c($sp) -/* 9B865C 80241CDC 00C0882D */ daddu $s1, $a2, $zero -/* 9B8660 80241CE0 AFBF0034 */ sw $ra, 0x34($sp) -/* 9B8664 80241CE4 AFB20030 */ sw $s2, 0x30($sp) -/* 9B8668 80241CE8 AE200070 */ sw $zero, 0x70($s1) -/* 9B866C 80241CEC 8C830000 */ lw $v1, ($a0) -/* 9B8670 80241CF0 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9B8674 80241CF4 A480008E */ sh $zero, 0x8e($a0) -/* 9B8678 80241CF8 00621824 */ and $v1, $v1, $v0 -/* 9B867C 80241CFC 34650800 */ ori $a1, $v1, 0x800 -/* 9B8680 80241D00 AC850000 */ sw $a1, ($a0) -/* 9B8684 80241D04 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9B8688 80241D08 8C420034 */ lw $v0, 0x34($v0) -/* 9B868C 80241D0C 10400003 */ beqz $v0, .L80241D1C -/* 9B8690 80241D10 00E0902D */ daddu $s2, $a3, $zero -/* 9B8694 80241D14 08090749 */ j .L80241D24 -/* 9B8698 80241D18 34620808 */ ori $v0, $v1, 0x808 -.L80241D1C: -/* 9B869C 80241D1C 2402FFF7 */ addiu $v0, $zero, -9 -/* 9B86A0 80241D20 00A21024 */ and $v0, $a1, $v0 -.L80241D24: -/* 9B86A4 80241D24 AC820000 */ sw $v0, ($a0) -/* 9B86A8 80241D28 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B86AC 80241D2C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B86B0 80241D30 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9B86B4 80241D34 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9B86B8 80241D38 C4840040 */ lwc1 $f4, 0x40($a0) -/* 9B86BC 80241D3C 3C01447A */ lui $at, 0x447a -/* 9B86C0 80241D40 44813000 */ mtc1 $at, $f6 -/* 9B86C4 80241D44 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B86C8 80241D48 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B86CC 80241D4C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9B86D0 80241D50 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9B86D4 80241D54 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9B86D8 80241D58 AFA20010 */ sw $v0, 0x10($sp) -/* 9B86DC 80241D5C 8C840080 */ lw $a0, 0x80($a0) -/* 9B86E0 80241D60 0C0372DF */ jal func_800DCB7C -/* 9B86E4 80241D64 27A70020 */ addiu $a3, $sp, 0x20 -/* 9B86E8 80241D68 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9B86EC 80241D6C 3C014059 */ lui $at, 0x4059 -/* 9B86F0 80241D70 44812800 */ mtc1 $at, $f5 -/* 9B86F4 80241D74 44802000 */ mtc1 $zero, $f4 -/* 9B86F8 80241D78 460010A1 */ cvt.d.s $f2, $f2 -/* 9B86FC 80241D7C 46241082 */ mul.d $f2, $f2, $f4 -/* 9B8700 80241D80 00000000 */ nop -/* 9B8704 80241D84 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B8708 80241D88 46000021 */ cvt.d.s $f0, $f0 -/* 9B870C 80241D8C 46240002 */ mul.d $f0, $f0, $f4 -/* 9B8710 80241D90 00000000 */ nop -/* 9B8714 80241D94 3C013FE0 */ lui $at, 0x3fe0 -/* 9B8718 80241D98 44812800 */ mtc1 $at, $f5 -/* 9B871C 80241D9C 44802000 */ mtc1 $zero, $f4 -/* 9B8720 80241DA0 00000000 */ nop -/* 9B8724 80241DA4 46241080 */ add.d $f2, $f2, $f4 -/* 9B8728 80241DA8 AE000074 */ sw $zero, 0x74($s0) -/* 9B872C 80241DAC 46240000 */ add.d $f0, $f0, $f4 -/* 9B8730 80241DB0 AE000090 */ sw $zero, 0x90($s0) -/* 9B8734 80241DB4 4620120D */ trunc.w.d $f8, $f2 -/* 9B8738 80241DB8 E6080078 */ swc1 $f8, 0x78($s0) -/* 9B873C 80241DBC 4620020D */ trunc.w.d $f8, $f0 -/* 9B8740 80241DC0 E6080088 */ swc1 $f8, 0x88($s0) -/* 9B8744 80241DC4 8E420014 */ lw $v0, 0x14($s2) -/* 9B8748 80241DC8 AE220074 */ sw $v0, 0x74($s1) -/* 9B874C 80241DCC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9B8750 80241DD0 34420010 */ ori $v0, $v0, 0x10 -/* 9B8754 80241DD4 AE0200B0 */ sw $v0, 0xb0($s0) -/* 9B8758 80241DD8 8FBF0034 */ lw $ra, 0x34($sp) -/* 9B875C 80241DDC 8FB20030 */ lw $s2, 0x30($sp) -/* 9B8760 80241DE0 8FB1002C */ lw $s1, 0x2c($sp) -/* 9B8764 80241DE4 8FB00028 */ lw $s0, 0x28($sp) -/* 9B8768 80241DE8 03E00008 */ jr $ra -/* 9B876C 80241DEC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index e2e7daaafb..e95719a428 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -46,7 +46,7 @@ glabel func_80241DF0_9B8770 /* 9B8814 80241E94 02A0202D */ daddu $a0, $s5, $zero /* 9B8818 80241E98 0240282D */ daddu $a1, $s2, $zero /* 9B881C 80241E9C 0280302D */ daddu $a2, $s4, $zero -/* 9B8820 80241EA0 0C090733 */ jal func_80241CCC_9B864C +/* 9B8820 80241EA0 0C090733 */ jal trd_07_UnkFunc5 /* 9B8824 80241EA4 0200382D */ daddu $a3, $s0, $zero .L80241EA8: /* 9B8828 80241EA8 2402FFFE */ addiu $v0, $zero, -2 @@ -91,7 +91,7 @@ glabel L80241F24_9B88A4 glabel L80241F34_9B88B4 /* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero -/* 9B88BC 80241F3C 0C0904DF */ jal func_8024137C_9B7CFC +/* 9B88BC 80241F3C 0C0904DF */ jal trd_07_UnkFunc4 /* 9B88C0 80241F40 0260302D */ daddu $a2, $s3, $zero /* 9B88C4 80241F44 080907EE */ j .L80241FB8 /* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero @@ -124,7 +124,7 @@ glabel L80241F8C_9B890C glabel L80241FA4_9B8924 /* 9B8924 80241FA4 0280202D */ daddu $a0, $s4, $zero /* 9B8928 80241FA8 0200282D */ daddu $a1, $s0, $zero -/* 9B892C 80241FAC 0C09064F */ jal func_8024193C_9B82BC +/* 9B892C 80241FAC 0C09064F */ jal trd_07_UnkFunc6 /* 9B8930 80241FB0 0260302D */ daddu $a2, $s3, $zero glabel L80241FB4_9B8934 /* 9B8934 80241FB4 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index e6199e8102..749dea4642 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -46,7 +46,7 @@ glabel func_8024231C_9B8C9C /* 9B8D40 802423C0 02A0202D */ daddu $a0, $s5, $zero /* 9B8D44 802423C4 0240282D */ daddu $a1, $s2, $zero /* 9B8D48 802423C8 0260302D */ daddu $a2, $s3, $zero -/* 9B8D4C 802423CC 0C090733 */ jal func_80241CCC_9B864C +/* 9B8D4C 802423CC 0C090733 */ jal trd_07_UnkFunc5 /* 9B8D50 802423D0 0200382D */ daddu $a3, $s0, $zero /* 9B8D54 802423D4 86A200A8 */ lh $v0, 0xa8($s5) /* 9B8D58 802423D8 AE42008C */ sw $v0, 0x8c($s2) @@ -96,7 +96,7 @@ glabel L80242464_9B8DE4 glabel L80242474_9B8DF4 /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero /* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero -/* 9B8DFC 8024247C 0C0904DF */ jal func_8024137C_9B7CFC +/* 9B8DFC 8024247C 0C0904DF */ jal trd_07_UnkFunc4 /* 9B8E00 80242480 0280302D */ daddu $a2, $s4, $zero /* 9B8E04 80242484 8E630070 */ lw $v1, 0x70($s3) /* 9B8E08 80242488 2402000A */ addiu $v0, $zero, 0xa diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index c3d4490d98..9a9497bed1 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -7872,27 +7872,45 @@ segments: start: 0xBFA0A0 vram: 0x80240000 subsections: - - [0xBFA0A0, c] - - [0xBFA100, c] - - [0xBFA150, data] - - [0xBFA260, data] - - [0xBFD800, data] - - [0xBFD840, rodata] + - [0xBFA0A0, .c, BFA0A0] + - [0xBFA100, .c, BFA100] + - [0xBFA150, .data, BFA0A0] + - [0xBFA260, .data, BFA100] + - [0xBFD800, .data, BFA100] + - [0xBFD840, .rodata, BFA0A0] + - [0xBFD864, .rodata, BFA100] - name: world/area_dgb/dgb_01/ type: code overlay: True start: 0xBFD880 vram: 0x80240000 subsections: - - [0xBFD880, c] - - [0xBFD8C0, c] - - [0xBFD9A0, c] - - [0xC00C70, data] - - [0xC00DD0, data] - - [0xC01770, data] - - [0xC047F0, data] - - [0xC20C70, rodata] - - [0xC20CF8, rodata] + - [0xBFD880, .c, BFD880] + - [0xBFD8C0, .c, BFD8C0] + - [0xBFD9A0, .c, BFD9A0] + - [0xC00C70, .data, BFD9A0] + - [0xC00DD0, .data, BFD9A0] + - [0xC01770, .data, BFD9A0] + - [0xC047F0, rgba16, img0, 64, 32] + - [0xC057F0, .data, data0] + - [0xC05870, rgba16, img1, 64, 32] + - [0xC06870, .data, data1] + - [0xC068F0, rgba16, img2, 32, 32] + - [0xC070F0, .data, data2] + - [0xC07170, rgba16, img3, 16, 32] + - [0xC07570, .data, data3] + - [0xC075F0, rgba16, img4, 16, 32] + - [0xC079F0, .data, data4] + - [0xC07A70, rgba16, img5, 16, 32] + - [0xC07E70, .data, data5] + - [0xC07EF0, rgba16, img6, 32, 32] + - [0xC086F0, .data, data6] + - [0xC08770, rgba16, img7, 32, 32] + - [0xC08F70, .data, data7] + - [0xC08FF0, .data, data] + - [0xC20C70, .rodata, BFD9A0] # dgb_00-18, 1x 32767.0, 2 jump tables + - [0xC20D88, .rodata, BFD9A0] # "dgb_00", 2x 32767.0, jump table + - [0xC20F30, .rodata, BFD9A0] # "dgb_08" only - type: code start: 0xC20F40 vram: 0x80200000 @@ -7904,204 +7922,204 @@ segments: start: 0xC2EBA0 vram: 0x80240000 subsections: - - [0xC2EBA0, c] - - [0xC2FFD0, data] - - [0xC300F0, data] - - [0xC30650, data] - - [0xC31190, rodata] + - [0xC2EBA0, .c, C2EBA0] + - [0xC2FFD0, .data, C2EBA0] + - [0xC300F0, .data, C2EBA0] + - [0xC30650, .data, C2EBA0] + - [0xC31190, .rodata, C2EBA0] - name: world/area_dgb/dgb_03/ type: code overlay: True start: 0xC314E0 vram: 0x80240000 subsections: - - [0xC314E0, c] - - [0xC31730, c] - - [0xC33CB0, data] - - [0xC33DF0, data] - - [0xC345C0, data] - - [0xC34C20, data] - - [0xC34E50, data] - - [0xC35EA0, rodata] + - [0xC314E0, .c, C314E0] + - [0xC31730, .c, C31730] + - [0xC33CB0, .data, C31730] + - [0xC33DF0, .data, C31730] + - [0xC345C0, .data, C31730] + - [0xC34C20, .data, C31730] + - [0xC34E50, .data, C31730] + - [0xC35EA0, .rodata, C31730] - name: world/area_dgb/dgb_04/ type: code overlay: True start: 0xC36530 vram: 0x80240000 subsections: - - [0xC36530, c] - - [0xC39640, data] - - [0xC39740, data] - - [0xC39A90, data] - - [0xC3A910, rodata] - - [0xC3A978, rodata] + - [0xC36530, .c, C36530] + - [0xC39640, .data, C36530] + - [0xC39740, .data, C36530] + - [0xC39A90, .data, C36530] + - [0xC3A910, .rodata, C36530] + - [0xC3A978, .rodata, C36530] - name: world/area_dgb/dgb_05/ type: code overlay: True start: 0xC3AA10 vram: 0x80240000 subsections: - - [0xC3AA10, c] - - [0xC3BEA0, data] - - [0xC3BF90, data] - - [0xC3C200, data] - - [0xC3C280, data] - - [0xC3C2D0, data] - - [0xC3CD40, rodata] + - [0xC3AA10, .c, C3AA10] + - [0xC3BEA0, .data, C3AA10] + - [0xC3BF90, .data, C3AA10] + - [0xC3C200, .data, C3AA10] + - [0xC3C280, .data, C3AA10] + - [0xC3C2D0, .data, C3AA10] + - [0xC3CD40, .rodata, C3AA10] - name: world/area_dgb/dgb_06/ type: code overlay: True start: 0xC3D080 vram: 0x80240000 subsections: - - [0xC3D080, c] - - [0xC3D340, data] - - [0xC3D440, data] - - [0xC3D8C0, data] - - [0xC3DBE0, rodata] + - [0xC3D080, .c, C3D080] + - [0xC3D340, .data, C3D080] + - [0xC3D440, .data, C3D080] + - [0xC3D8C0, .data, C3D080] + - [0xC3DBE0, .rodata, C3D080] - name: world/area_dgb/dgb_07/ type: code overlay: True start: 0xC3DBF0 vram: 0x80240000 subsections: - - [0xC3DBF0, c] - - [0xC3F020, data] - - [0xC3F120, data] - - [0xC3F3E0, data] - - [0xC3FA70, rodata] - - [0xC3FA80, rodata] + - [0xC3DBF0, .c, C3DBF0] + - [0xC3F020, .data, C3DBF0] + - [0xC3F120, .data, C3DBF0] + - [0xC3F3E0, .data, C3DBF0] + - [0xC3FA70, .rodata, C3DBF0] + - [0xC3FA80, .rodata, C3DBF0] - name: world/area_dgb/dgb_08/ type: code overlay: True start: 0xC3FDB0 vram: 0x80240000 subsections: - - [0xC3FDB0, c] - - [0xC43A40, data] - - [0xC43B40, data] - - [0xC43EB0, data] - - [0xC46790, data] - - [0xC467A0, rodata] - - [0xC467B0, rodata] - - [0xC46B40, rodata] + - [0xC3FDB0, .c, C3FDB0] + - [0xC43A40, .data, C3FDB0] + - [0xC43B40, .data, C3FDB0] + - [0xC43EB0, .data, C3FDB0] + - [0xC46790, .data, C3FDB0] + - [0xC467A0, .rodata, C3FDB0] + - [0xC467B0, .rodata, C3FDB0] + - [0xC46B40, .rodata, C3FDB0] - name: world/area_dgb/dgb_09/ type: code overlay: True start: 0xC46BE0 vram: 0x80240000 subsections: - - [0xC46BE0, c] - - [0xC4A3E0, data] - - [0xC4A500, data] - - [0xC4AA30, data] - - [0xC4ABE0, data] - - [0xC4BF50, rodata] - - [0xC4C2F8, rodata] + - [0xC46BE0, .c, C46BE0] + - [0xC4A3E0, .data, C46BE0] + - [0xC4A500, .data, C46BE0] + - [0xC4AA30, .data, C46BE0] + - [0xC4ABE0, .data, C46BE0] + - [0xC4BF50, .rodata, C46BE0] + - [0xC4C2F8, .rodata, C46BE0] - name: world/area_dgb/dgb_10/ type: code overlay: True start: 0xC4C390 vram: 0x80240000 subsections: - - [0xC4C390, c] - - [0xC4C580, data] - - [0xC4C680, data] - - [0xC4CA00, data] - - [0xC4D270, data] - - [0xC4D3D0, rodata] + - [0xC4C390, .c, C4C390] + - [0xC4C580, .data, C4C390] + - [0xC4C680, .data, C4C390] + - [0xC4CA00, .data, C4C390] + - [0xC4D270, .data, C4C390] + - [0xC4D3D0, .rodata, C4C390] - name: world/area_dgb/dgb_11/ type: code overlay: True start: 0xC4D3E0 vram: 0x80240000 subsections: - - [0xC4D3E0, c] - - [0xC4D430, data] - - [0xC4D550, data] - - [0xC4D950, data] - - [0xC4DEE0, rodata] + - [0xC4D3E0, .c, C4D3E0] + - [0xC4D430, .data, C4D3E0] + - [0xC4D550, .data, C4D3E0] + - [0xC4D950, .data, C4D3E0] + - [0xC4DEE0, .rodata, C4D3E0] - name: world/area_dgb/dgb_12/ type: code overlay: True start: 0xC4DEF0 vram: 0x80240000 subsections: - - [0xC4DEF0, c] - - [0xC4E1B0, data] - - [0xC4E2A0, data] - - [0xC4E760, data] - - [0xC4E950, rodata] + - [0xC4DEF0, .c, C4DEF0] + - [0xC4E1B0, .data, C4DEF0] + - [0xC4E2A0, .data, C4DEF0] + - [0xC4E760, .data, C4DEF0] + - [0xC4E950, .rodata, C4DEF0] - name: world/area_dgb/dgb_13/ type: code overlay: True start: 0xC4E960 vram: 0x80240000 subsections: - - [0xC4E960, data] - - [0xC4EA50, data] - - [0xC4ECE0, data] - - [0xC4F020, rodata] + - [0xC4E960, .data, C4E960] + - [0xC4EA50, .data, C4E960] + - [0xC4ECE0, .data, C4E960] + - [0xC4F020, .rodata, C4E960] - name: world/area_dgb/dgb_14/ type: code overlay: True start: 0xC4F030 vram: 0x80240000 subsections: - - [0xC4F030, data] - - [0xC4F130, data] - - [0xC4F4B0, data] - - [0xC4F500, rodata] + - [0xC4F030, .data, C4F030] + - [0xC4F130, .data, C4F030] + - [0xC4F4B0, .data, C4F030] + - [0xC4F500, .rodata, C4F030] - name: world/area_dgb/dgb_15/ type: code overlay: True start: 0xC4F510 vram: 0x80240000 subsections: - - [0xC4F510, c] - - [0xC50CA0, c] - - [0xC50D80, data] - - [0xC50ED0, data] - - [0xC513B0, data] - - [0xC51FE0, data] - - [0xC521E0, rodata] - - [0xC52200, rodata] + - [0xC4F510, .c, C4F510] + - [0xC50CA0, .c, C50CA0] + - [0xC50D80, .data, C4F510] + - [0xC50ED0, .data, C4F510] + - [0xC513B0, .data, C4F510] + - [0xC51FE0, .data, C4F510] + - [0xC521E0, .rodata, C4F510] + - [0xC52200, .rodata, C4F510] - name: world/area_dgb/dgb_16/ type: code overlay: True start: 0xC52540 vram: 0x80240000 subsections: - - [0xC52540, c] - - [0xC53970, data] - - [0xC53A60, data] - - [0xC53CC0, data] - - [0xC53D00, data] - - [0xC55720, rodata] - - [0xC55730, rodata] + - [0xC52540, .c, C52540] + - [0xC53970, .data, C52540] + - [0xC53A60, .data, C52540] + - [0xC53CC0, .data, C52540] + - [0xC53D00, .data, C52540] + - [0xC55720, .rodata, C52540] + - [0xC55730, .rodata, C52540] - name: world/area_dgb/dgb_17/ type: code overlay: True start: 0xC55A60 vram: 0x80240000 subsections: - - [0xC55A60, data] - - [0xC55B60, data] - - [0xC55F30, rodata] + - [0xC55A60, .data, C55A60] + - [0xC55B60, .data, C55A60] + - [0xC55F30, .rodata, C55A60] - name: world/area_dgb/dgb_18/ type: code overlay: True start: 0xC55F40 vram: 0x80240000 subsections: - - [0xC55F40, c] - - [0xC56EF0, c] - - [0xC571B0, data] - - [0xC572A0, data] - - [0xC574C0, data] - - [0xC59620, data] - - [0xC59810, rodata] - - [0xC59820, rodata] + - [0xC55F40, .c, C55F40] + - [0xC56EF0, .c, C56EF0] + - [0xC571B0, .data, C55F40] + - [0xC572A0, .data, C55F40] + - [0xC574C0, .data, C55F40] + - [0xC59620, .data, C55F40] + - [0xC59810, .rodata, C55F40] + - [0xC59820, .rodata, C55F40] - name: world/area_kzn/kzn_01/ type: code overlay: True @@ -10527,6 +10545,25 @@ segments: - [0x19, 0x00BD, arn_05_tattle] - [0x19, 0x00BE, arn_02_tattle] - [0x19, 0x00BF, arn_04_tattle] + - [0x19, 0x00C0, dgb_00_tattle] + - [0x19, 0x00C1, dgb_01_tattle] + - [0x19, 0x00C2, dgb_02_tattle] + - [0x19, 0x00C3, dgb_03_tattle] + - [0x19, 0x00C4, dgb_04_tattle] + - [0x19, 0x00C5, dgb_05_tattle] + - [0x19, 0x00C6, dgb_06_tattle] + - [0x19, 0x00C7, dgb_07_tattle] + - [0x19, 0x00C8, dgb_08_tattle] + - [0x19, 0x00C9, dgb_09_tattle] + - [0x19, 0x00CA, dgb_10_tattle] + - [0x19, 0x00CB, dgb_11_tattle] + - [0x19, 0x00CC, dgb_12_tattle] + - [0x19, 0x00CD, dgb_13_tattle] + - [0x19, 0x00CE, dgb_14_tattle] + - [0x19, 0x00CF, dgb_15_tattle] + - [0x19, 0x00D0, dgb_16_tattle] + - [0x19, 0x00D1, dgb_17_tattle] + - [0x19, 0x00D2, dgb_18_tattle] - [0x19, 0x00D3, arn_08_tattle] - [0x19, 0x00D4, arn_09_tattle] - [0x19, 0x00D5, arn_10_tattle]